[Xulu-commits] r102 - trunk/defaults

[scm-commit@wald.intevation.org]

Author: mojays
Date: 2010-10-26 17:07:28 +0200 (Tue, 26 Oct 2010)
New Revision: 102

Modified:
   trunk/defaults/.classpath
   trunk/defaults/startXULU.bat
   trunk/defaults/startXULU.sh
Log:
defaults changed because of new libraries

Modified: trunk/defaults/.classpath
===================================================================
--- trunk/defaults/.classpath	2010-10-26 14:56:52 UTC (rev 101)
+++ trunk/defaults/.classpath	2010-10-26 15:07:28 UTC (rev 102)
@@ -3,7 +3,7 @@
 	<classpathentry excluding="**/.svn/" kind="src" path="src"/>
 	<classpathentry kind="lib" path="resource"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/schmitzm/schmitzm-2.3-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/schmitzm/schmitzm-library-2.3-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/geotoolsArcGrid/junit-4.4.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/batik-anim-1.7.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/batik-awt-util-1.7.jar"/>
@@ -21,6 +21,7 @@
 	<classpathentry kind="lib" path="lib/gt2-2.6/batik-xml-1.7.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/commons-beanutils-1.7.0.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/commons-io-1.4.jar"/>
+	<classpathentry kind="lib" path="lib/gt2-2.6/commons-lang-2.4.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/geoapi-2.3-M1.jar"/>
 	<classpathentry kind="lib" path="lib/gt2-2.6/geoapi-pending-2.3-M1.jar"/>
@@ -75,5 +76,6 @@
 	<classpathentry kind="lib" path="lib/jini/lib/jini-ext.jar"/>
 	<classpathentry kind="lib" path="lib/jini/lib/tools.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.14/log4j-1.2.14.jar"/>
+	<classpathentry kind="lib" path="lib/misc/mail-1.4.1.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: trunk/defaults/startXULU.bat
===================================================================
--- trunk/defaults/startXULU.bat	2010-10-26 14:56:52 UTC (rev 101)
+++ trunk/defaults/startXULU.bat	2010-10-26 15:07:28 UTC (rev 102)
@@ -40,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%\*
 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%\lib\*
 
-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 ####################################################

Modified: trunk/defaults/startXULU.sh
===================================================================
--- trunk/defaults/startXULU.sh	2010-10-26 14:56:52 UTC (rev 101)
+++ trunk/defaults/startXULU.sh	2010-10-26 15:07:28 UTC (rev 102)
@@ -72,6 +72,9 @@
 ##### Where to find "jFreeChart" #####
 JFREECHART_ROOT=$LIB_ROOT/jFreeChart
 
+##### Where to find miscellaneous libraries #####
+#MISC_ROOT=$LIB_ROOT/misc
+
 ##### combine the external libs #####
 SCHMITZM_LIB=$SCHMITZM_ROOT/*
 JAI_LIB=$JAI_ROOT/*
@@ -81,8 +84,9 @@
 LOG4J_LIB=$LOG4J_ROOT/log4j-1.2.14.jar
 #R_LIB=$R_ROOT/JRI.jar;$R_ROOT/libjri.so;$R_ROOT/libR.so # segfaulted on Intrepid
 JFREECHART_LIB=$JFREECHART_ROOT/*
+MISC_LIB=$MISC_ROOT/*
 
-LIB_ALL=$XULU_LIB:$SCHMITZM_LIB:$JAI_LIB:$GT_LIB:$LOG4J_LIB:$JINI_LIB:$JFREECHART_LIB #:$R_LIB
+LIB_ALL=$XULU_LIB:$SCHMITZM_LIB:$JAI_LIB:$GT_LIB:$LOG4J_LIB:$JINI_LIB:$JFREECHART_LIB:$MISC_LIB #:$R_LIB
 
 ##### combine the native libs #####
 JAI_NATIVE=$JAI_ROOT/native_linux