Changeset 20211 for greenstone3/trunk

Timestamp:

2009-08-11T13:02:56+12:00 (15 years ago)

Author:

oranfry

Message:

use cp.jar files instead of searching for individual jars in gs3-setup. (Also a fix to root cp.jar)

Location:

greenstone3/trunk

Files:

• build.xml (modified) (1 diff)
• gs3-setup.sh (modified) (2 diffs)

greenstone3/trunk/build.xml

@@ -653 +653 @@
     <jar destfile="cp.jar">
       <manifest>
-        <attribute name="Class-Path" value="admin/cp.jar lib/java/cp.jar lib/jni/cp.jar web/WEB-INF/lib/cp.jar"/>
+        <attribute name="Class-Path" value="server.jar admin/cp.jar lib/java/cp.jar lib/jni/cp.jar web/WEB-INF/lib/cp.jar"/>
       </manifest>
     </jar>

greenstone3/trunk/gs3-setup.sh

@@ -92 +92 @@
   addtopath CLASSPATH "$GSDL3HOME/WEB-INF/classes"
   addtopath CLASSPATH "$GSDL3SRCHOME/resources/java"
-  for JARFILE in "$GSDL3SRCHOME"/*.jar; do
-    addtopath CLASSPATH "$JARFILE"
-  done
-  for JARFILE in "$GSDL3SRCHOME"/lib/jni/*.jar; do
-    addtopath CLASSPATH "$JARFILE"
-  done
-  for JARFILE in "$GSDL3SRCHOME"/lib/java/*.jar; do
-    addtopath CLASSPATH "$JARFILE"
-  done
-  for JARFILE in "$GSDL3HOME"/WEB-INF/lib/*.jar; do
-    addtopath CLASSPATH "$JARFILE"
-  done
+  addtopath CLASSPATH "$GSDL3SRCHOME/cp.jar"
+
   # Tomcat 5 jar files
   for JARFILE in "$TOMCAT_HOME"/common/endorsed/*.jar; do
@@ -113 +103 @@
   done    
   
-  for JARFILE in "$GSDL3SRCHOME"/build/*.jar; do
-    addtopath CLASSPATH "$JARFILE"
-  done
+  #shouldn't need these as they will have been copied to their correct locations elsewhere in the greenstone3 installation
+  #for JARFILE in "$GSDL3SRCHOME"/build/*.jar; do
+  #  addtopath CLASSPATH "$JARFILE"
+  #done
   echo "  - Adjusted CLASSPATH"