[Xulu-commits] r5 - in trunk: . defaults lib/xulu
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 25 21:10:14 CET 2009
Author: mojays
Date: 2009-02-25 21:09:54 +0100 (Wed, 25 Feb 2009)
New Revision: 5
Added:
trunk/defaults/startXULU.sh
Modified:
trunk/defaults/startXULU.bat
trunk/lib/xulu/XuluModellingPlatform.jar
trunk/readme.txt
Log:
startXulu.bat updated
XuluModellingPlatform.jar (in libs) updated
readme.txt updated
new startXulu.sh
Modified: trunk/defaults/startXULU.bat
===================================================================
--- trunk/defaults/startXULU.bat 2009-02-25 18:46:53 UTC (rev 4)
+++ trunk/defaults/startXULU.bat 2009-02-25 20:09:54 UTC (rev 5)
@@ -1,19 +1,22 @@
@echo off
setlocal
-set LIB_ROOT="..\xululib"
+rem ### Root directory of the libs only XULU depends on #####
+set LIB_ROOT="lib"
+rem ### Root directory of the libs also SCHMITZM depends on #####
+rem --> All libs were moved from SCHMITZM to XULU
+rem set SCHMITZM_LIB_ROOT="E:\Arbeit\SCHMITZM\Trunk\lib"
+set SCHMITZM_LIB_ROOT=%LIB_ROOT%
+
rem ###################################################################
rem ############# Xulu library paths and parameters ###############
rem ###################################################################
-set XULU_LIB=classes
-set XULU_MODELS_LIB=classes_models
+set XULU_LIB=%LIB_ROOT%\xulu\XuluModellingPlatform.jar
if "%1"=="/useXuluJar" set XULU_LIB=%LIB_ROOT%\xulu\XuluModellingPlatform.jar
-if "%1"=="/useXuluJar" set XULU_MODELS_LIB=%LIB_ROOT%\xulu\XuluModellingPlatformModels.jar
if "%1"=="/useXuluClasses" set XULU_LIB=classes
-if "%1"=="/useXuluClasses" set XULU_MODELS_LIB=classes_models
-set XULU_REGISTRY=registry_arrayGrid.xif
+set XULU_REGISTRY=registry.xif
set XULU_LANGUAGE=de
set XULU_WORK_DIR=C:\
set XULU_START_SCRIPTS=
@@ -26,42 +29,60 @@
rem ##### Where to find "Java Advanced Imaging" (and ImageIO) #####
set JAI_ROOT=%LIB_ROOT%\jai-1_1_3\lib
+rem ##### Where to find "SCHMITZM library" #####
+set SCHMITZM_ROOT=%LIB_ROOT%\schmitzm
+
+rem ##### Where to find "JINI" #####
+set JINI_ROOT=%LIB_ROOT%\jini
+
+rem ##### Where to find "R" #####
+set R_ROOT=%LIB_ROOT%\JavaRInterface
+
+
+rem ##### combine the external libs #####
+set SCHMITZM_LIB=%SCHMITZM_ROOT%\schmitzm.jar
+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 LIB_ALL=%XULU_LIB%;%SCHMITZM_LIB%;%JAI_LIB%;%JINI_LIB%;%R_LIB%
+
+
+rem ####################################################
+rem ####### External libraries of SCHMITZM #########
+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
-rem ##### Where to find "Adagios" #####
-set ADAGIOS_ROOT=%LIB_ROOT%\ADaGIoS
-
rem ##### Where to find "Log4j" #####
set LOG4J_ROOT=%LIB_ROOT%\log4j-1.2.14
rem ##### Where to find "JINI" #####
set JINI_ROOT=%LIB_ROOT%\jini
-rem ##### Where to find "R" #####
-set R_ROOT=%LIB_ROOT%\JavaRInterface
-
rem ##### Where to find "jFreeChart" #####
set JFREECHART_ROOT=%LIB_ROOT%\jFreeChart
rem ##### combine the external libs #####
-set JAI_LIB=%JAI_ROOT%\*
+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 ADAGIOS_LIB=%ADAGIOS_ROOT%\AdagiosJavaLib.jar
-set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\*
-rem set JINI_LIB=%JINI_ROOT%\lib\jsk-platform.jar;%JINI_ROOT%\lib\tools.jar
set LOG4J_LIB=%LOG4J_ROOT%\log4j-1.2.14.jar
-set R_LIB=%R_ROOT%\JRI.jar;%R_ROOT%\libjri.so;%R_ROOT%\libR.so
+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 LIB_ALL=%XULU_LIB%;%JAI_LIB%;%GT_LIB%;%ADAGIOS_LIB%;%LOG4J_LIB%;%JINI_LIB%;%R_LIB%;%JFREECHART_LIB%
+set LIB_ALL=%LIB_ALL%;%ADAGIOS_LIB%;%GT_LIB%;%LOG4J_LIB%;%JINI_LIB%;%JFREECHART_LIB%
rem ##### combine the native libs #####
-rem set JAI_NATIVE=%JAI_ROOT%\native_win\mlib_jai.dll;%JAI_ROOT%\native_win\mlib_jai_mmx.dll;%JAI_ROOT%\native_win\mlib_jai_util.dll
set JAI_NATIVE=%JAI_ROOT%\native_win
set LIB_NATIVE=%JAI_NATIVE%
Added: trunk/defaults/startXULU.sh
===================================================================
--- trunk/defaults/startXULU.sh 2009-02-25 18:46:53 UTC (rev 4)
+++ trunk/defaults/startXULU.sh 2009-02-25 20:09:54 UTC (rev 5)
@@ -0,0 +1,130 @@
+#!/bin/bash
+#############################################################################
+# XULU Start Script - This file is part of the eXtendable Unified Land Use
+# Modelling Platform (XULU)
+#############################################################################
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation; either version 2.1 of the License, or (at your
+# option) any later version.
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+# for more details.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+#
+# Diese Bibliothek ist freie Software; Sie dürfen sie unter den Bedingungen
+# der GNU Lesser General Public License, wie von der Free Software Foundation
+# veröffentlicht, weiterverteilen und/oder modifizieren; entweder gemäß Version
+# 2.1 der Lizenz oder (nach Ihrer Option) jeder späteren Version.
+# Diese Bibliothek wird in der Hoffnung weiterverbreitet, daß sie nützlich
+# sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne die implizierte Garantie
+# der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Mehr
+# Details finden Sie in der GNU Lesser General Public License.
+# Sie sollten eine Kopie der GNU Lesser General Public License zusammen mit
+# dieser Bibliothek erhalten haben; falls nicht, schreiben Sie an die Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
+#
+
+####################################################################
+############# Xulu library paths and parameters ###############
+###################################################################
+
+LIB_ROOT="../../lib"
+
+XULU_LIB=classes
+XULU_MODELS_LIB=classes_models
+if [ "$1" == "-useXuluJar" ]; then XULU_LIB=$LIB_ROOT/xulu/XuluModellingPlatform.jar ; fi
+if [ "$1" == "-useXuluJar" ]; then XULU_MODELS_LIB=$LIB_ROOT/xulu/XuluModellingPlatformModels.jar ; fi
+##if "$1"=="/useXuluClasses" set XULU_LIB=classes
+##if "$1"=="/useXuluClasses" set XULU_MODELS_LIB=classes_models
+
+XULU_REGISTRY=./registry_ProxyGrid.xif
+XULU_LANGUAGE=de
+XULU_WORK_DIR=
+XULU_START_SCRIPTS=
+XULU_RESOURCE=resource
+
+####################################################
+############# External libraries ###############
+####################################################
+
+##### Where to find "Java Advanced Imaging" #####
+JAI_ROOT=$LIB_ROOT/jai-1_1_3/lib
+
+##### Where to find "GeoTools" #####
+GT_ROOT=$LIB_ROOT/gt2-2.4.4
+
+##### Where to find gt2-arcgrid-2.1.x.jar (from SpearfishDemo) #####
+GT_ARCGRID_ROOT=$LIB_ROOT/geotoolsArcGrid
+
+##### Where to find "Adagios" #####
+ADAGIOS_ROOT=$LIB_ROOT/Adagios
+
+##### Where to find "Log4j" #####
+LOG4J_ROOT=$LIB_ROOT/log4j-1.2.14
+
+##### Where to find "JINI" #####
+JINI_ROOT=$LIB_ROOT/jini
+
+##### Where to find "R" #####
+#R_ROOT=$LIB_ROOT/JavaRInterface
+
+##### Where to find "jFreeChart" #####
+JFREECHART_ROOT=$LIB_ROOT/jFreeChart
+
+##### combine the external libs #####
+JAI_LIB=$JAI_ROOT/*
+GT_LIB=$GT_ROOT/*
+GT_LIB=$GT_LIB:$GT_ARCGRID_ROOT/gt2-arcgrid-2.3.0-M0.jar:$GT_ARCGRID_ROOT/junit-4.4.jar
+ADAGIOS_LIB=$ADAGIOS_ROOT/AdagiosJavaLib.jar
+JINI_LIB=$JINI_ROOT/lib/*:$JINI_ROOT/lib-dl/*:$JINI_ROOT/lib-ext/*
+# set JINI_LIB=$JINI_ROOT/lib/jsk-platform.jar;$JINI_ROOT/lib/tools.jar
+LOG4J_LIB=$LOG4J_ROOT/log4j-1.2.14.jar
+#R_LIB=$R_ROOT/JRI.jar;$R_ROOT/libjri.so;$R_ROOT/libR.so
+JFREECHART_LIB=$JFREECHART_ROOT/jfreechart-1.0.6.jar:$JFREECHART_ROOT/jcommon-1.0.10.jar
+
+LIB_ALL=$XULU_LIB:$JAI_LIB:$GT_LIB:$ADAGIOS_LIB:$LOG4J_LIB:$JINI_LIB:$JFREECHART_LIB #:$R_LIB
+
+##### combine the native libs #####
+JAI_NATIVE=$JAI_ROOT/native_linux
+
+LIB_NATIVE=$JAI_NATIVE
+
+
+##### combine Xulu starting parameters #####
+
+XULU_PARAMS=""
+
+if test -n $XULU_LANGUAGE ; then
+ XULU_PARAMS="$XULU_PARAMS -l $XULU_LANGUAGE"
+fi
+
+if test -n $XULU_REGISTRY ; then
+ XULU_PARAMS="$XULU_PARAMS -rf $XULU_REGISTRY"
+fi
+
+if test -n $XULU_MODELS_LIB ;then
+ XULU_PARAMS="$XULU_PARAMS -d $XULU_MODELS_LIB"
+fi
+
+if test -n $XULU_WORK_DIR; then
+ XULU_PARAMS="$XULU_PARAMS -w $XULU_WORK_DIR"
+fi
+
+
+if test -n $XULU_START_SCRIPTS; then
+ XULU_PARAMS="$XULU_PARAMS -s $XULU_START_SCRIPTS"
+fi
+
+##### determine java interpreter #####
+JAVA_PRG="java"
+
+
+##### start Xulu #####
+# -version:1.6.0_10 funktioniert unter linux nicht
+$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 $*
+
Modified: trunk/lib/xulu/XuluModellingPlatform.jar
===================================================================
(Binary files differ)
Modified: trunk/readme.txt
===================================================================
--- trunk/readme.txt 2009-02-25 18:46:53 UTC (rev 4)
+++ trunk/readme.txt 2009-02-25 20:09:54 UTC (rev 5)
@@ -80,7 +80,7 @@
to overwrite all configuration files with their defaults.
-NOTE: PLEASE DO NOT UPDATE (AND COMMIT) CHANGES ON FILES IN THE
+NOTE: PLEASE DO NOT CHANGE (OR/AND COMMIT) FILES IN THE
"DEFAULT" FOLDER!!
More information about the Xulu-commits
mailing list