[GeoNetwork-commit] SF.net SVN: geonetwork:[7853] sandbox/GeoSource/branches/jeevlet/bin

[<fxp...@us...>]

Revision: 7853
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=7853&view=rev
Author:   fxprunayre
Date:     2011-06-15 09:43:53 +0000 (Wed, 15 Jun 2011)

Log Message:
-----------
Add webapp path parameter. Avoid issue when Xalan is in the classpath.

Modified Paths:
--------------
    sandbox/GeoSource/branches/jeevlet/bin/node.sh
    sandbox/GeoSource/branches/jeevlet/bin/startup.sh

Added Paths:
-----------
    sandbox/GeoSource/branches/jeevlet/bin/serializer-2.7.1.jar
    sandbox/GeoSource/branches/jeevlet/bin/xalan-2.7.1.jar

Modified: sandbox/GeoSource/branches/jeevlet/bin/node.sh
===================================================================
--- sandbox/GeoSource/branches/jeevlet/bin/node.sh	2011-06-15 09:38:14 UTC (rev 7852)
+++ sandbox/GeoSource/branches/jeevlet/bin/node.sh	2011-06-15 09:43:53 UTC (rev 7853)
@@ -41,16 +41,16 @@
   echo -e "  Default webapp path: $GEONETWORK_HOME"
   echo
   echo -e "Usage: ./`basename $0 $1` username password nodeid dburl"
-  echo -e "       ./`basename $0 $1` username password nodeid dburl dbpoolsize"
-  echo -e "       ./`basename $0 $1` username password nodeid dburl dbpoolsize dbdriver"
-  echo -e "       ./`basename $0 $1` username password nodeid dburl dbpoolsize dbdriver webapppath"
+  echo -e "       ./`basename $0 $1` username password nodeid dburl dbdriver"
+  echo -e "       ./`basename $0 $1` username password nodeid dburl dbdriver dbpoolsize"
+  echo -e "       ./`basename $0 $1` username password nodeid dburl dbdriver dbpoolsize webapppath"
   echo
   echo -e "Example:"
   echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb"
-  echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb 5"
-  echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb 5 org.postgresql.Driver"
-  echo -e "\t./`basename $0 $1` admin gnos 42 jdbc:h2:/tmp/geonetwork42 2 org.h2.Driver"
-  echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb 5 org.postgresql.Driver ../../web/geonetwork"
+  echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb org.postgresql.Driver "
+  echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb org.postgresql.Driver 5"
+  echo -e "\t./`basename $0 $1` admin gnos 42 jdbc:h2:/tmp/geonetwork42 org.h2.Driver 2"
+  echo -e "\t./`basename $0 $1` admin admin 42 jdbc:postgresql://localhost:5432/catdb org.postgresql.Driver 2 ../../web/geonetwork"
   echo
 }
 
@@ -91,7 +91,7 @@
 cp $GEONETWORK_SRC/web.xml $GEONETWORK_TARGET/.
 
 echo "Setting db connection ..."
-java -classpath $GEONETWORK_SRC/lib/xalan-2.7.1.jar:$GEONETWORK_SRC/lib/serializer-2.7.1.jar org.apache.xalan.xslt.Process \
+java -classpath xalan-2.7.1.jar:serializer-2.7.1.jar org.apache.xalan.xslt.Process \
 	-PARAM user $gnusername \
 	-PARAM password $gnpassword \
 	-PARAM idNode $gnnodeid \

Added: sandbox/GeoSource/branches/jeevlet/bin/serializer-2.7.1.jar
===================================================================
(Binary files differ)


Property changes on: sandbox/GeoSource/branches/jeevlet/bin/serializer-2.7.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: sandbox/GeoSource/branches/jeevlet/bin/startup.sh
===================================================================
--- sandbox/GeoSource/branches/jeevlet/bin/startup.sh	2011-06-15 09:38:14 UTC (rev 7852)
+++ sandbox/GeoSource/branches/jeevlet/bin/startup.sh	2011-06-15 09:43:53 UTC (rev 7853)
@@ -1,18 +1,26 @@
+JEEVLET_LIB=../target
+JEEVLET_DEP_LIB=$JEEVLET_LIB/lib
 
+if [ -z "$GEONETWORK_HOME" ]
+then
+  GEONETWORK_HOME=../../web/geosource
+fi
+echo "Web app: $GEONETWORK_HOME"
+
+# FIXME : Remove Xalan from classpath because it may be used by Jeeves.TransformerFactoryFactory and cause XSL issues
+rm $JEEVLET_DEP_LIB/xalan-*.jar
+rm $GEONETWORK_HOME/WEB-INF/lib/xalan-*.jar
+
+
 # Add all libs to classpath
-JEEVLET_LIB=../target
-JEEVLET_DEP_LIB=$JEEVLET_LIB/lib
-GEONETWORK_LIB=../../web/target
-#GEONETWORK_LIB=/home/francois/Neogeo3/Workspace/Catalogue/GS-MN/web/target
 for f in $JEEVLET_LIB/*.jar; do CLASSPATH=$CLASSPATH:$f; done
 for f in $JEEVLET_DEP_LIB/*.jar; do CLASSPATH=$CLASSPATH:$f; done
 for f in ../lib/*.jar; do CLASSPATH=$CLASSPATH:$f; done
-for f in $GEONETWORK_LIB/*.jar; do CLASSPATH=$CLASSPATH:$f; done
-for f in $GEONETWORK_LIB/geonetwork/WEB-INF/lib/*.jar; do CLASSPATH=$CLASSPATH:$f; done
+for f in $GEONETWORK_HOME/*.jar; do CLASSPATH=$CLASSPATH:$f; done
+for f in $GEONETWORK_HOME/WEB-INF/lib/*.jar; do CLASSPATH=$CLASSPATH:$f; done
+CLASSPATH=$CLASSPATH:$GEONETWORK_HOME/WEB-INF/classes
 echo $CLASSPATH
 
-# FIXME : Remove Xalan from classpath because it may be used by Jeeves.TransformerFactoryFactory and cause XSL issues
-rm $JEEVLET_DEP_LIB/xalan-*.jar
 
 # Start the app
 java -Xms128m -Xmx1024m -XX:MaxPermSize=128m -classpath $CLASSPATH jeevlet.StarterAuto `pwd` $*

Added: sandbox/GeoSource/branches/jeevlet/bin/xalan-2.7.1.jar
===================================================================
(Binary files differ)


Property changes on: sandbox/GeoSource/branches/jeevlet/bin/xalan-2.7.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.