[Xulu-commits] r14 - in trunk: . defaults dist lib lib/schmitzm
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 25 23:41:58 CET 2009
Author: mojays
Date: 2009-02-25 23:40:42 +0100 (Wed, 25 Feb 2009)
New Revision: 14
Added:
trunk/build.xml
trunk/dist/
trunk/dist/xulu-doc.zip
trunk/dist/xulu-src.zip
trunk/dist/xulu.jar
trunk/dist/xulu.jar.zip
Removed:
trunk/lib/xulu/
Modified:
trunk/
trunk/defaults/.classpath
trunk/defaults/startXULU.bat
trunk/defaults/startXULU.sh
trunk/lib/schmitzm/schmitzm.jar
trunk/readme.txt
Log:
new folder "dist" with latest release as jar
XuluModellingPlatform.jar in "lib" replaced by xulu.jar in "dist"
new build.xml
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- classes
javadoc
+ classes
javadoc
unused
Added: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-02-25 21:50:12 UTC (rev 13)
+++ trunk/build.xml 2009-02-25 22:40:42 UTC (rev 14)
@@ -0,0 +1,114 @@
+<!-- Build file for XULU. Target ZIPs/JARs are placed in "dist" folder.
+ Note: This script does not (yet) compile the java source!!
+
+ Option "jar" -> a JAR from the existing binaries expected in folder
+ "classes" plus a ZIP of the JAR
+ Option "src" -> a ZIP of the source code in folder "src"
+ Option "javadoc" -> a JavaDoc in folder "javadoc" plus a ZIP of
+ this folder
+ Option "all" -> all of the upper mentioned options
+ Option "basic" -> only "jar" and "src"
+
+ The default option is "basic"
+-->
+<project default="basic" basedir=".">
+
+ <!-- Destination folder for ZIPs and JARs -->
+ <property name="DEST.DIR" value="dist"/>
+ <!-- Prefix for the destination file names
+ e.g. "schmitzm" >> "schmitzm.jar", "schmitzm-src.jar" -->
+ <property name="PROJECT.PREFIX" value="xulu"/>
+ <!-- Global prefix directory for ZIP files (except ZIP of JAR!) -->
+ <property name="ZIP.ROOT.DIR" value="${PROJECT.PREFIX}"/>
+
+ <!-- Source and Destination for source code ZIP -->
+ <property name="DIR.SRC" value="src"/>
+ <property name="FILE.SRC.ZIP" value="${DEST.DIR}/${PROJECT.PREFIX}-src.zip"/>
+
+ <!-- Source and Destination for JAR file -->
+ <property name="DIR.CLASSES" value="classes"/>
+ <property name="FILE.JAR" value="${DEST.DIR}/${PROJECT.PREFIX}.jar"/>
+ <property name="FILE.JAR.ZIP" value="${FILE.JAR}.zip"/>
+
+ <!-- Destination for JavaDoc and its ZIP -->
+ <property name="DIR.JAVADOC" value="javadoc"/>
+ <property name="FILE.JAVADOC.ZIP" value="${DEST.DIR}/${PROJECT.PREFIX}-doc.zip"/>
+ <property name="LINK.JDK" value="http://java.sun.com/javase/6/docs/api/"/>
+ <property name="LINK.LOG4J" value="http://logging.apache.org/log4j/docs/api/"/>
+ <property name="JAVADOC.TITLE" value="The XULU modelling platform by Martin Schmitz"/>
+
+ <target name="all">
+ <antcall target="jar"/>
+ <antcall target="src"/>
+ <antcall target="javadoc"/>
+ </target>
+
+ <target name="basic">
+ <antcall target="jar"/>
+ <antcall target="src"/>
+ </target>
+
+ <!-- ############## Create a JAR from "classes" and ZIP it ############## -->
+ <target name="jar">
+ <!-- Create the JAR -->
+ <delete failonerror="false" file="${FILE.JAR}"/>
+ <jar destfile="${FILE.JAR}" index="false" level="8" duplicate="preserve">
+ <fileset dir="${DIR.CLASSES}">
+ <exclude name="schmitzm/test**" />
+ <exclude name="**/*.html" />
+ <exclude name="**/*.xcf" />
+ <exclude name="**/Thumbs.db" />
+ </fileset>
+ <manifest>
+ <attribute name="Created-By" value="Martin O.J. Schmitz, Stefan A. Krüger, Dominik Appl" />
+ </manifest>
+ </jar>
+ <!-- Create a ZIP of the JAR -->
+ <delete failonerror="false" file="${FILE.JAR.ZIP}"/>
+ <zip basedir="." destfile="${FILE.JAR.ZIP}">
+ <filename name="${FILE.JAR}"/>
+ </zip>
+ </target>
+
+ <!-- ############## Create a ZIP from "src" folder ############## -->
+ <target name="src">
+ <!-- Create a ZIP from "src" folder -->
+ <delete failonerror="false" file="${FILE.SRC.ZIP}"/>
+ <zip destfile="${FILE.SRC.ZIP}" update="false">
+ <zipfileset dir="${DIR.SRC}" prefix="${ZIP.ROOT.DIR}/${DIR.SRC}">
+ <exclude name="schmitzm/test**" />
+ <exclude name="**/Thumbs.db" />
+ <exclude name="**/.svn" />
+ </zipfileset>
+ </zip>
+ <!-- Add build.xml to ZIP -->
+ <zip destfile="${FILE.SRC.ZIP}" update="true">
+ <zipfileset file="build.xml" prefix="${ZIP.ROOT.DIR}"/>
+ </zip>
+ </target>
+
+ <!-- ############## Create a JavaDoc to "javadoc" and ZIP it ############## -->
+ <target name="javadoc">
+ <!-- Create a JavaDoc to "javadoc" folder -->
+ <delete failonerror="false" dir="${DIR.JAVADOC}"/>
+ <javadoc sourcepath ="${DIR.SRC}"
+ destdir ="${DIR.JAVADOC}"
+ author ="true"
+ version ="true"
+ overview ="${DIR.SRC}/overview.html"
+ windowtitle="${JAVADOC.TITLE}"
+ >
+ <excludepackage name="schmitzm.test"/>
+ <link href="${LINK.JDK}"/>
+ <link href="${LINK.LOG4J}"/>
+ </javadoc>
+ <!-- Create a ZIP from "javadoc" folder -->
+ <delete failonerror="false" file="${FILE.JAVADOC.ZIP}"/>
+ <zip destfile="${FILE.JAVADOC.ZIP}" update="false">
+ <zipfileset dir="${DIR.JAVADOC}" prefix="${ZIP.ROOT.DIR}/${DIR.JAVADOC}">
+ <exclude name="**/Thumbs.db" />
+ <exclude name="**/.svn" />
+ </zipfileset>
+ </zip>
+ </target>
+</project>
Modified: trunk/defaults/.classpath
===================================================================
--- trunk/defaults/.classpath 2009-02-25 21:50:12 UTC (rev 13)
+++ trunk/defaults/.classpath 2009-02-25 22:40:42 UTC (rev 14)
@@ -2,14 +2,47 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry excluding="**/.svn/" kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/SCHMITZM"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/clibwrapper_jiio.jar"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_codec.jar"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_core.jar"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_imageio.jar"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/mlibwrapper_jai.jar"/>
+ <classpathentry kind="lib" path="resource"/>
+ <classpathentry kind="lib" path="lib/schmitzm/schmitzm.jar"/>
+ <classpathentry kind="lib" path="lib/Adagios/AdagiosJavaLib.jar"/>
+ <classpathentry kind="lib" path="lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar"/>
+ <classpathentry kind="lib" path="lib/geotoolsArcGrid/gt2-render-2.4.2.jar"/>
+ <classpathentry kind="lib" path="lib/geotoolsArcGrid/junit-4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/geoapi-nogenerics-2.1.0.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-api-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-arcgrid-2.3.0-M0.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-arcgrid-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-arcsde-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-brewer-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-coverage-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-coverageio-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-epsg-hsql-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-epsg-wkt-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-geotiff-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-image-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-imagemosaic-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-imagepyramid-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-main-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-mappane-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-metadata-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-referencing-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-render-2.4.2.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-shapefile-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-shapefile-renderer-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/gt2-widgets-swing-2.4.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/hsqldb-1.8.0.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/jaxb-impl-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/jdom-1.0.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/jsr108-0.01.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/jts-1.8.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.4.4/vecmath-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/JavaRInterface/JRI.jar"/>
+ <classpathentry kind="lib" path="lib/jFreeChart/jcommon-1.0.10.jar"/>
+ <classpathentry kind="lib" path="lib/jFreeChart/jfreechart-1.0.6.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="lib/jini/lib/tools.jar"/>
- <classpathentry kind="lib" path="lib/schmitzm/schmitzm.jar"/>
+ <classpathentry kind="lib" path="lib/jini/lib/jini-ext.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: trunk/defaults/startXULU.bat
===================================================================
--- trunk/defaults/startXULU.bat 2009-02-25 21:50:12 UTC (rev 13)
+++ trunk/defaults/startXULU.bat 2009-02-25 22:40:42 UTC (rev 14)
@@ -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
Modified: trunk/defaults/startXULU.sh
===================================================================
--- trunk/defaults/startXULU.sh 2009-02-25 21:50:12 UTC (rev 13)
+++ trunk/defaults/startXULU.sh 2009-02-25 22:40:42 UTC (rev 14)
@@ -34,9 +34,11 @@
###################################################################
LIB_ROOT="lib"
+DIST_ROOT="dist"
+#DIST_ROOT="lib/xulu"
-XULU_LIB=$LIB_ROOT/xulu/XuluModellingPlatform.jar
-if [ "$1" == "-useXuluJar" ]; then XULU_LIB=$LIB_ROOT/xulu/XuluModellingPlatform.jar ; fi
+XULU_LIB=$DIST_ROOT/xulu.jar
+if [ "$1" == "-useXuluJar" ]; then XULU_LIB=$DIST_ROOT/xulu.jar ; fi
if [ "$1" == "-useXuluClasses" ]; then XULU_LIB=classes ; fi
XULU_REGISTRY=./registry_ProxyGrid.xif
Added: trunk/dist/xulu-doc.zip
===================================================================
(Binary files differ)
Property changes on: trunk/dist/xulu-doc.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/dist/xulu-src.zip
===================================================================
(Binary files differ)
Property changes on: trunk/dist/xulu-src.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/dist/xulu.jar
===================================================================
(Binary files differ)
Property changes on: trunk/dist/xulu.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/dist/xulu.jar.zip
===================================================================
(Binary files differ)
Property changes on: trunk/dist/xulu.jar.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/lib/schmitzm/schmitzm.jar
===================================================================
(Binary files differ)
Modified: trunk/readme.txt
===================================================================
--- trunk/readme.txt 2009-02-25 21:50:12 UTC (rev 13)
+++ trunk/readme.txt 2009-02-25 22:40:42 UTC (rev 14)
@@ -4,6 +4,7 @@
- SCHMITZM in Xulu\lib aufnehmen
- How to start XULU from Eclipse
- How to develop XULU
+- Hinweis, dass SCHMITZM im Classpath ueber GT liegen muss!
==============================================================
=== XULU README (2009-02-24, Martin Schmitz) ===
@@ -117,6 +118,10 @@
lib: Contains all the external libraries required to run/compile XULU.
All JARs in this folder must be integrated in the Java classpath.
+dist: Contains the current version of the XULU classes as JAR
+ so Xulu can be started without compile the source code
+ for your own
+
plugin: Contains configuration files for XULU plugins.
src: Contains the java source code of the XULU application and plugins.
@@ -154,6 +159,8 @@
c) Start XULU from Eclipse
--------------------------
t.b.c.
+Important: SCHMITZM must be integrated in Classpath with
+ higher priority than Geotools
-----------------------------------------------------------
More information about the Xulu-commits
mailing list