Changeset 11290

Timestamp:

2006-02-17T17:02:09+13:00 (18 years ago)

Author:

kjdon

Message:

greenstone 3 context in tomcat now goes into a separate file in conf/Catalina/localhost, rather than into the main server.xml. also some files were moved from packages/tomcat-extra to resources/tomcat

File:

• trunk/gsdl3/build.xml (modified) (2 diffs)

trunk/gsdl3/build.xml

@@ -498 +498 @@
       <fileset dir="${packages.home}/apache-tomcat-5.5.12"/>
     </move>
-    <copy file="${packages.home}/tomcat-extra/setclasspath.bat"
+    <copy file="${basedir}/resources/tomcat/setclasspath.bat"
       tofile="${packages.home}/tomcat/bin/setclasspath.bat"
       overwrite="true"/>
-    <copy file="${packages.home}/tomcat-extra/setclasspath.sh"
+    <copy file="${basedir}/resources/tomcat/setclasspath.sh"
       tofile="${packages.home}/tomcat/bin/setclasspath.sh"
       overwrite="true"/>
@@ -526 +526 @@
   <target name="configure-tomcat-local" depends="init" if="tomcat.islocal">
     <!-- re-setup the server.xml file -->
-    <copy file="${packages.home}/tomcat-extra/server.xml.in" tofile="${packages.home}/tomcat/conf/server.xml" overwrite="true">
+    <copy file="${basedir}/resources/tomcat/server.xml" tofile="${packages.home}/tomcat/conf/server.xml" overwrite="true">
       <filterset>
     <filter token="port" value="${tomcat.port}"/>
-    <filter token="gsdl3home" value="${basedir}"/>
+      </filterset>
+    </copy>
+    <!-- set up the greenstone3 context -->
+    <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true">
+      <filterset>
+    <filter token="gsdl3webhome" value="${basedir}/web"/>
       </filterset>
     </copy>