--- trunk/defaults/startXULU.bat	2009/02/25 20:09:54	5
+++ trunk/defaults/startXULU.bat	2012/05/05 19:57:55	117
@@ -3,6 +3,8 @@
 
 rem ### Root directory of the libs only XULU depends on #####
 set LIB_ROOT="lib"
+set DIST_ROOT="dist"
+rem set DIST_ROOT="lib\xulu"
 
 rem ### Root directory of the libs also SCHMITZM depends on #####
 rem --> All libs were moved from SCHMITZM to XULU
@@ -12,8 +14,8 @@
 rem ###################################################################
 rem #############   Xulu library paths and parameters   ###############
 rem ###################################################################
-set XULU_LIB=%LIB_ROOT%\xulu\XuluModellingPlatform.jar
-if "%1"=="/useXuluJar"     set XULU_LIB=%LIB_ROOT%\xulu\XuluModellingPlatform.jar
+set XULU_LIB=%DIST_ROOT%\xulu.jar
+if "%1"=="/useXuluJar"     set XULU_LIB=%DIST_ROOT%\xulu.jar
 if "%1"=="/useXuluClasses" set XULU_LIB=classes
 
 set XULU_REGISTRY=registry.xif
@@ -38,15 +40,19 @@
 rem ##### Where to find "R" #####
 set R_ROOT=%LIB_ROOT%\JavaRInterface
 
+rem ##### Where to find miscellaneous libraries #####
+set MISC_ROOT=%LIB_ROOT%\misc
+
 
 rem ##### combine the external libs #####
-set SCHMITZM_LIB=%SCHMITZM_ROOT%\schmitzm.jar
+set SCHMITZM_LIB=%SCHMITZM_ROOT%\*
 set JAI_LIB=%JAI_ROOT%\*
 set JINI_LIB=%JINI_ROOT%\lib\*
 rem set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\*
 set R_LIB=%R_ROOT%\JRI.jar;%R_ROOT%\libjri.so;%R_ROOT%\libR.so
+set MISC_LIB=%MISC_ROOT%\*
 
-set LIB_ALL=%XULU_LIB%;%SCHMITZM_LIB%;%JAI_LIB%;%JINI_LIB%;%R_LIB%
+set LIB_ALL=%XULU_LIB%;%SCHMITZM_LIB%;%JAI_LIB%;%JINI_LIB%;%R_LIB%;%MISC_LIB%
 
 
 rem ####################################################
@@ -54,13 +60,8 @@
 rem ####################################################
 set LIB_ROOT=%SCHMITZM_LIB_ROOT%
 
-rem ##### Where to find "ADAGIOS library" #####
-set ADAGIOS_ROOT=%LIB_ROOT%\Adagios
-
 rem ##### Where to find "GeoTools" #####
-set GT_ROOT=%LIB_ROOT%\gt2-2.4.4
-rem ##### Where to find gt2-arcgrid-2.1.x.jar (from SpearfishDemo) #####
-set GT_ARCGRID_ROOT=%LIB_ROOT%\geotoolsArcGrid
+set GT_ROOT=%LIB_ROOT%\geotools
 
 rem ##### Where to find "Log4j" #####
 set LOG4J_ROOT=%LIB_ROOT%\log4j-1.2.14
@@ -72,15 +73,13 @@
 set JFREECHART_ROOT=%LIB_ROOT%\jFreeChart
 
 rem ##### combine the external libs #####
-set ADAGIOS_LIB=%ADAGIOS_ROOT%\AdagiosJavaLib.jar
 set GT_LIB=%GT_ROOT%\*
-set GT_LIB=%GT_LIB%;%GT_ARCGRID_ROOT%\gt2-arcgrid-2.3.0-M0.jar;%GT_ARCGRID_ROOT%\junit-4.4.jar
 set LOG4J_LIB=%LOG4J_ROOT%\log4j-1.2.14.jar
 set JINI_LIB=%JINI_ROOT%\lib\*
 rem set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\*
-set JFREECHART_LIB=%JFREECHART_ROOT%\jfreechart-1.0.6.jar;%JFREECHART_ROOT%\jcommon-1.0.10.jar
+set JFREECHART_LIB=%JFREECHART_ROOT%\*
 
-set LIB_ALL=%LIB_ALL%;%ADAGIOS_LIB%;%GT_LIB%;%LOG4J_LIB%;%JINI_LIB%;%JFREECHART_LIB%
+set LIB_ALL=%LIB_ALL%;%GT_LIB%;%LOG4J_LIB%;%JINI_LIB%;%JFREECHART_LIB%
 
 rem ##### combine the native libs #####
 set JAI_NATIVE=%JAI_ROOT%\native_win
@@ -109,6 +108,6 @@
 
 
 rem ##### start Xulu #####
-%JAVA_PRG% -Xms300M -Xmx1000M -version:1.6 -cp %XULU_RESOURCE%;%LIB_ALL% -Djava.library.path=%LIB_NATIVE% -splash:resource\icons\xulu_start.png edu.bonn.xulu.XuluModellingPlatform %XULU_PARAMS% %*
+%JAVA_PRG% -Xms300M -Xmx1000M -cp %XULU_RESOURCE%;%LIB_ALL% -Djava.library.path=%LIB_NATIVE% -splash:resource\icons\xulu_start.png edu.bonn.xulu.XuluModellingPlatform %XULU_PARAMS% %*
 
 endlocal