Changeset 10069

Timestamp:

2005-06-13T14:19:47+12:00 (19 years ago)

Author:

kjdon

Message:

a few changes to do with directories, and hopefully it works with an external tomcat now

File:

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

trunk/gsdl3/build.xml

@@ -51 +51 @@
   <property name="build.home" value="${basedir}/build"/>
   <property name="packages.home" value="${basedir}/packages"/>
-  <property name="javalib" value="${basedir}/lib/java"/>
   <property name="web.home" value="${basedir}/web"/>
-  <property name="web.lib" value="${web.home}/lib"/>
+  <!-- jar files needed by applets go here -->
+  <property name="web.applet" value="${web.home}/applet"/>
+  <!-- jar files needed by the servlet (and extra ones) go here -->
+  <property name="web.lib" value="${web.home}/WEB-INF/lib"/>
+  <!-- other files needed by the servlet go here -->
   <property name="web.classes" value="${web.home}/WEB-INF/classes"/>
+  <!-- jni libraries and java wrappers go here -->
+  <property name="lib.jni" value="${basedir}/lib/jni"/>
   
   <property name="javadocs" value="${basedir}/docs/javadoc"/>
@@ -61 +66 @@
   <property name="app.path"      value="/${app.name}"/>
   <property name="app.version"   value="3.00alpha"/>
+
+  <!-- catalina home is set to tomcat basedir is already installed, otherwise
+  use greenstone's tomcat -->
+  <condition property="catalina.home" value="${tomcat.installed.path}"> 
+    <and>
+      <isset property="tomcat.installed.path"/>
+      <not>
+    <equals arg1="" arg2="${tomcat.installed.path}"/>
+      </not>
+    </and>
+  </condition>
   <property name="catalina.home" value="${basedir}/comms/jakarta/tomcat"/>
-  
+
   <property name="os.linux" value="Linux"/> <!-- mac??-->
   <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP, Windows NT,Windows ME"/> <!-- check this!!!-->
@@ -115 +131 @@
 
   <path id="compile.classpath">
-    <!-- Include all jar files in our lib directory -->
-    <pathelement location="${javalib}"/>
-    <fileset dir="${javalib}">
+    <!-- Include all jar files and libraries in our jni lib directory -->
+    <pathelement location="${lib.jni}"/>
+    <fileset dir="${lib.jni}">
+      <include name="*.jar"/>
+    </fileset>
+    <!-- Include all jar files in our web lib directory -->
+    <pathelement location="${web.lib}"/>
+    <fileset dir="${web.lib}">
       <include name="*.jar"/>
     </fileset>
     <!-- Include the resources directory -->
-    <pathelement location="${basedir}/resources/java"/>
-    <pathelement location="${basedir}/resources/dtd"/>
+   <!-- <pathelement location="${basedir}/resources/dtd"/>-->
     
     <!-- Include the axis jar files -->
@@ -130 +150 @@
     
     <!-- include the jar files from the packages -->
-    <!-- mg and mgpp get installed into lib/java but they may not be there yet -->
-    <pathelement location="${javalib}/mg.jar"/>
-    <pathelement location="${javalib}/mgpp.jar"/>
+    <!-- mg and mgpp get installed into lib/jni but they may not be there yet
+    so we add them in by name -->
+    <pathelement location="${lib.jni}/mg.jar"/>
+    <pathelement location="${lib.jni}/mgpp.jar"/>
     <pathelement location="${vishnu.home}/build/vishnu.jar"/>
     
@@ -149 +170 @@
   </path>
 
-  <path id="running.path">
+  <path id="local.tomcat.classpath">
+    <!-- explicitly include the jni java wrappers in the classpath -->
+    <pathelement location="${lib.jni}"/>
+    <fileset dir="${lib.jni}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+  
+  <path id="local.tomcat.path">
     <pathelement location="${mysql.home}/bin"/>
     <pathelement location="${basedir}/bin/script"/>
     <pathelement location="${basedir}/bin"/>
-    <pathelement location="${basedir}/lib"/>
+    <pathelement location="${lib.jni}"/>
     <pathelement path="${env.PATH}"/>
     <pathelement path="${env.Path}"/>
   </path>
 
-  <path id="ld.library.path">
-    <pathelement path="${env.LD_LIBRARY_PATH}"/>
-    <pathelement location="${basedir}/lib"/>
-    <pathelement location="${mysql.home}/lib/mysql"/>
-  </path>
-
-<target name="test-java">
+  <target name="test-java">
     <echo>${ant.java.version}</echo>
-</target>
+  </target>
 <!-- ==================== Primary and Global Targets ============================= -->
 
@@ -174 +197 @@
     description="Install Greenstone 3. Use this when you first checkout the code. Also running this target later on will reinstall Greenstone. Most things will be reset back to their defaults, except for code changes."/>
 
-  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-collections"/>
-
-  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building"
-    description="Do a cvs update for all sources. Doesn't reompile the code."/>
-
-    <target name="configure" depends="init,configure-tomcat,configure-files,configure-packages,configure-core,configure-gs2building"
+  <target name="prepare" depends="init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-mysql,prepare-web"/>
+
+  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web"
+    description="Do a cvs update for all sources. Doesn't recompile the code."/>
+
+    <target name="configure" depends="init,configure-tomcat,configure-web,configure-packages,configure-core,configure-gs2building"
     description="Configure the installation. Includes setting up config files and configuring the C/C++ packages. This is called from install and update. Should be re-run if you change the build.properties file."/>
 
@@ -186 +209 @@
   <target name="clean-windows-c++" depends="init,clean-windows-c++-gs2building,clean-windows-c++-packages"
     description="Remove C++ compiled code for Windows. Requires Microsoft Visual Studio"/>
-  <target name="compile" depends="init,compile-extra,compile-packages,compile-core,compile-gs2building"
+  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
     description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
   <target name="compile-windows-c++" depends="init,compile-windows-c++-gs2building,compile-windows-c++-packages"
     description="Compile the C/C++ code for Windows. Requires Microsoft Visual Studio"/>
-  <target name="update" depends="init,update-packages,update-core,update-gs2building" 
+  <target name="update" depends="init,update-packages,update-core,update-gs2building,update-web" 
     description="Update (thru CVS) all the source (including core, packages and gs2building) and recompile. Similar to install but doesn't reinstall components such as Tomcat and axis."/>
 
@@ -268 +291 @@
     <available file="${basedir}/gs2build" property="gs2build.present"/>
     <available file="${basedir}/comms/soap/axis" property="axis.present"/>
-    <available file="${basedir}/comms/jakarta/tomcat/webapps/axis" property="axis.installed"/>
+    <available file="${catalina.home}/webapps/axis" property="axis.installed"/>
     <condition property="gsdl2.islocal">
       <or>
@@ -316 +339 @@
   </target>
  
- <!-- ========== Miscellaneous Targets ================================ -->
-  
-  <target name="prepare-collections">
-    <property name="collect.dir" value="${basedir}/web/sites/localsite/collect"/>
+ <!-- ========== Web app Targets ================================ -->
+  
+  <target name="prepare-web">
+    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
     <!-- gs3mgdemo -->
     <unzip src="${collect.dir}/gs3mgdemo/import.zip" 
@@ -344 +367 @@
     <unzip src="${collect.dir}/gberg/index/index.zip" 
       dest="${collect.dir}/gberg/index"/>
-  </target>
-
-  <target name="configure-files" depends="configure-files-gsdl3,configure-files-server"/>
-  
-  <target name="configure-files-gsdl3" depends="init">
+    <mkdir dir="${web.home}/applet"/>
+  </target>
+
+  <target name="configure-web" depends="configure-web-gsdl3,configure-web-server"/>
+  
+  <target name="configure-web-gsdl3" depends="init">
     <filter token="gsdl3home" value="${basedir}"/>
-    <copy file="${basedir}/web/WEB-INF/web.xml.in" tofile="${basedir}/web/WEB-INF/web.xml" filtering="true" overwrite="true" />
-    <copy file="${basedir}/resources/java/SOAPServer.cfg.in" tofile="${basedir}/resources/java/SOAPServer.cfg" filtering="true" overwrite="true"/>
-  </target>
-  
-  <target name="configure-files-server" depends="init">
+    <copy file="${web.home}/WEB-INF/web.xml.in" tofile="${web.home}/WEB-INF/web.xml" filtering="true" overwrite="true" />
+    <copy file="${basedir}/resources/soap/SOAPServer.cfg.in" tofile="${web.classes}/SOAPServer.cfg" filtering="true" overwrite="true"/>
+  </target>
+  
+  <target name="configure-web-server" depends="init">
     <filter token="port" value="${tomcat.port}"/>
     <filter token="hostname" value="${tomcat.server}"/>
-    <copy file="${basedir}/web/sites/localsite/siteConfig.xml.in" tofile="${basedir}/web/sites/localsite/siteConfig.xml" filtering="true" overwrite="true"/>
-    <copy file="${basedir}/web/sites/gateway/siteConfig.xml.in" tofile="${basedir}/web/sites/gateway/siteConfig.xml" filtering="true" overwrite="true"/>
-  </target>
-
-   <target name="compile-extra" depends="init">
-    <javac srcdir="${web.home}/WEB-INF/classes"
-      destdir="${web.home}/WEB-INF/classes"
+    <copy file="${web.home}/sites/localsite/siteConfig.xml.in" tofile="${web.home}/sites/localsite/siteConfig.xml" filtering="true" overwrite="true"/>
+    <copy file="${web.home}/sites/gateway/siteConfig.xml.in" tofile="${web.home}/sites/gateway/siteConfig.xml" filtering="true" overwrite="true"/>
+  </target>
+
+   <target name="compile-web" depends="init">
+    <javac srcdir="${web.classes}"
+      destdir="${web.classes}"
       debug="${compile.debug}"
       deprecation="${compile.deprecation}"
@@ -373 +397 @@
   </target>
 
- 
-
+  <target name="cvsupdate-web">
+    <cvs command="update -dP" dest="${web.home}"/>
+  </target>
+
+  <target name="update-web" depends="init,cvsupdate-web,configure-web"/>
 
 <!-- ======================= Tomcat Targets ========================== -->
@@ -412 +439 @@
       dest="${basedir}/comms/jakarta"/>
     <copy file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7/common/endorsed/xml-apis.jar"
-      tofile="${basedir}/web/lib/xml-apis.jar"/>
+      tofile="${web.applet}/xml-apis.jar"/>
     <copy file="${basedir}/comms/jakarta/jakarta-tomcat-5.5.7/common/endorsed/xercesImpl.jar"
-      tofile="${basedir}/web/lib/xercesImpl.jar"/>
-  </target>
-  
-  <target name="configure-tomcat" depends="init" if="tomcat.islocal">
+      tofile="${web.applet}/xercesImpl.jar"/>
+  </target>
+  
+  <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/>
+  
+  <target name="configure-tomcat-local" depends="init" if="tomcat.islocal">
     <!-- re-setup the server.xml file -->
     <copy file="${basedir}/comms/jakarta/server.xml.in" tofile="${basedir}/comms/jakarta/tomcat/conf/server.xml" overwrite="true">
@@ -427 +456 @@
   </target>
 
+  <target name="configure-tomcat-external" depends="init" unless="tomcat.islocal">
+    <!-- re-setup the server.xml file -->
+    <!-- need to edit the config file, or do we get the user to do this???-->
+  </target>
+  
   <target name="reload" description="Reload web application"
           depends="init,setup-catalina-ant-tasks">
@@ -434 +468 @@
   
   <target name="start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal">
-    <property name="tomcat.classpath" refid="compile.classpath"/>
-    <property name="tomcat.path" refid="running.path"/>
+   <property name="tomcat.classpath" refid="local.tomcat.classpath"/>
+    <property name="tomcat.path" refid="local.tomcat.path"/>
     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
     <exec executable="${catalina.home}/bin/startup.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
@@ -577 +611 @@
     </exec>
     <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}"
-      input="${basedir}/web/sites/localsite/collect/gs3mgdemo/mysqldatadump.sql">
+      input="${web.home}/sites/localsite/collect/gs3mgdemo/mysqldatadump.sql">
       <arg value="--user=root"/>
       <arg value="localsite_gs3mgdemo"/>
@@ -642 +676 @@
     </move>
     <!-- install the webapp into tomcat -->
-    <copy todir="${basedir}/comms/jakarta/tomcat/webapps/axis">
+    <copy todir="${catalina.home}/webapps/axis">
       <fileset dir="${basedir}/comms/soap/axis/webapps/axis"/>
     </copy>
@@ -724 +758 @@
       </manifest>
     </jar>
-    <copy file="${build.home}/gsdl3.jar" todir="${javalib}"/>
     <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
   </target>
@@ -736 +769 @@
     <cvs command="update -P"/>
   </target>
+  
   <target name="configure-core"/>
   <target name="update-core" depends="init,cvsupdate-core,clean-core,compile-core"
@@ -742 +776 @@
   <target name="cvsupdate-core">
     <cvs command="update -l"/>
-    <cvs command="update -dP bin comms dist-resources docs interfaces lib resources src web winutil"/>
+    <cvs command="update -dP bin comms dist-resources docs lib resources src winutil"/>
   </target>
 
@@ -771 +805 @@
       </manifest>
     </jar>
-    <copy file="${build.home}/gsdl3.jar" todir="${javalib}"/>
     <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
-    <mkdir dir="${web.classes}/org/greenstone/gsdl3"/>
-    <copy file="${build.home}/org/greenstone/gsdl3/LibraryServlet.class"
-      todir="${web.classes}/org/greenstone/gsdl3"/>
     <jar destfile="${build.home}/phind.jar">
       <fileset dir="${build.home}">
@@ -784 +814 @@
       </manifest>
     </jar>
-    <copy file="${build.home}/phind.jar" todir="${javalib}"/>
-    <copy file="${build.home}/phind.jar" todir="${web.lib}"/>
+    <copy file="${build.home}/phind.jar" todir="${web.applet}"/>
     <jar destfile="${build.home}/anttasks.jar">
       <fileset dir="${build.home}">
@@ -794 +823 @@
       </manifest>
     </jar>
-    <copy file="${build.home}/anttasks.jar" todir="${javalib}"/>
+    <copy file="${build.home}/anttasks.jar" todir="${basedir}/lib/java"/>
     <jar destfile="${build.home}/gsdl3test.jar">
       <fileset dir="${build.home}">
@@ -860 +889 @@
     <!-- gsdl-as : just call the ant target-->
     <ant antfile="${gsdl-as.home}/build.xml" dir="${gsdl-as.home}"
-      inheritall="false" target="clean"/>
+      inheritall="false" target="clean">
+      <property name="catalina.home" value="${catalina.home}"/>
+    </ant>
   </target>
 
@@ -921 +952 @@
     <echo>Compiling Vishnu</echo>
     <ant antfile="${vishnu.home}/build.xml" dir="${vishnu.home}"
-      inheritall="false" target="compile"/>
+      inheritall="false" target="compile">
+      <property name="catalina.dir" value="${catalina.home}"/>
+    </ant>
 
     <!-- gsdl-as -->
     <echo>Compiling GSDL-AS</echo>
     <ant antfile="${gsdl-as.home}/build.xml" dir="${gsdl-as.home}"
-      inheritall="false" target="compile"/>
+      inheritall="false" target="compile">
+      <property name="catalina.home" value="${catalina.home}"/>
+    </ant>
   </target>
 
@@ -1150 +1185 @@
 
 
-  <target name="reconfigure-server-settings" depends="init,configure-tomcat,configure-files-server"
+  <target name="reconfigure-server-settings" depends="init,configure-tomcat,configure-web-server"
     description="If you have changed any of the Tomcat properties in the build.properties file, run this target to update the Tomcat configuration, and any Greenstone configuration files that specify the server address">
   </target>