Changeset 7802

Timestamp:

2004-07-22T14:34:40+12:00 (20 years ago)

Author:

kjdon

Message:

added tests so hopefully can run this more than once and it doesn't crap out. also moved some stuff from gs3-finalise.sh - finalise nowonly does the port and hostname stuff, and anything that can't be done before the configure/make/make install

File:

• trunk/gsdl3/gs3-prepare.sh (modified) (3 diffs)

trunk/gsdl3/gs3-prepare.sh

@@ -6 +6 @@
 fi
 
-#check that GSDL3HOME is set
-if test -z "$GSDL3HOME" ; then
-  source gs3-setup.sh
-fi
+source gs3-setup.sh
+
+gsdl3home=$GSDL3HOME
 
 if test -z "$CVSROOT" ; then
@@ -24 +23 @@
 # now check out extra bits
 cd packages
-cvs co mgpp
+if [ ! -d mgpp ]; then
+    cvs co -P mgpp
+fi
 cd $GSDL3HOME
 
+#### TOMCAT ####
+cd comms/jakarta/
 # unpack tomcat and rename directory
-cd comms/jakarta/
-unzip jakarta-tomcat-4.1.30.zip
-mv jakarta-tomcat-4.1.30 tomcat
+if [ ! -d tomcat ]; then
+    unzip jakarta-tomcat-4.1.30.zip
+    mv jakarta-tomcat-4.1.30 tomcat
+fi
+#edit the tomcat setclasspath script to add our classpath
+if [ ! -f ./tomcat/bin/setclasspath.sh.orig ]; then
+    mv ./tomcat/bin/setclasspath.sh ./tomcat/bin/setclasspath.sh.orig
+    cat ./tomcat/bin/setclasspath.sh.orig | sed 's,CLASSPATH=,CLASSPATH=\"$CLASSPATH\":,' > ./tomcat/bin/setclasspath.sh
+fi
+#edit the server config file
+if ! grep -q gsdl3 ./tomcat/conf/server.xml; then
+    cat ./tomcat/conf/server.xml | sed "s,<\!-- Tomcat Root Context -->,<\!-- GSDL3 Service --><Context path=\"/gsdl3\" docBase=\"${gsdl3home}/web\" debug=\"1\" reloadable=\"true\"><Resources allowLinking='true'/></Context><\!-- Tomcat Root Context -->," > server.xml.tmp
+    mv server.xml.tmp ./tomcat/conf/server.xml
+fi
+#make everyone happy by giving the right permissions to the shell scripts
+chmod a+x ./tomcat/bin/*.sh
+
 cd $GSDL3HOME
 
-# unpack the soap stuff
+# Edit the web/WEB-INF/web.xml to set gsdl3home
+if [ ! -f ./web/WEB-INF/web.xml ]; then
+    sed "s|@gsdl3home@|${gsdl3home}|" ./web/WEB-INF/web.xml.in > ./web/WEB-INF/web.xml
+fi
+
+#### SOAP ####
 cd comms/soap
-tar xzf soap-bin-2.2.tar.gz
-mv soap-2_2 soap
+# unpack soap and rename directory
+if [ ! -d soap ]; then
+    unzip soap-bin-2.3.1.zip
+    mv soap-2_3_1 soap
+    cp soap/lib/soap.jar $GSDL3HOME/lib/java
+# move the localsite deployment description into the soap webapp - localsite comes predeployed
+    cp DeployedServices.ds soap/webapps/soap/
+fi
 cd $GSDL3HOME
 
-#setup sample collections
+# edit the localsite soap server class, and class template - add in gsdl3home
+if grep -q "\@gsdl3home\@" ./src/java/org/greenstone/gsdl3/SOAPServer.java.in; then
+    sed "s|@gsdl3home@|${gsdl3home}|" ./src/java/org/greenstone/gsdl3/SOAPServer.java.in > ./src/java/org/greenstone/gsdl3/SOAPServer.tmp && mv ./src/java/org/greenstone/gsdl3/SOAPServer.tmp ./src/java/org/greenstone/gsdl3/SOAPServer.java.in
+    sed "s|@gsdl3home@|${gsdl3home}|" ./src/java/org/greenstone/gsdl3/SOAPServerLocalsite.java.in > ./src/java/org/greenstone/gsdl3/SOAPServer.java 
+fi
+
+#### SAMPLE COLLECTIONS ####
+# how can we stop these being done more than once? and do we need to?
 cd web/sites/localsite/collect
 # unpack import, index and metadata
@@ -78 +113 @@
 
 
-#edit the tomcat setclasspath script to add our classpath
-cat comms/jakarta/tomcat/bin/setclasspath.sh | sed 's,CLASSPATH=,CLASSPATH=\"$CLASSPATH\":,' > setclasspath.sh
-mv comms/jakarta/tomcat/bin/setclasspath.sh comms/jakarta/tomcat/bin/setclasspath.bak.sh
-mv setclasspath.sh comms/jakarta/tomcat/bin/setclasspath.sh
 
-#edit the server config file
-mv comms/jakarta/tomcat/conf/server.xml comms/jakarta/tomcat/conf/server.xml.orig
-cat comms/jakarta/tomcat/conf/server.xml.orig | sed "s,<\!-- Tomcat Root Context -->,<\!-- GSDL3 Service --><Context path=\"/gsdl3\" docBase=\"@gsdl3home@/web\" debug=\"1\" reloadable=\"true\"><Resources allowLinking='true'/></Context><\!-- Tomcat Root Context -->," > comms/jakarta/tomcat/conf/server.xml.in
 
-#make everyone happy by giving the right permissions to the shell scripts
-chmod a+x comms/jakarta/tomcat/bin/*.sh