Changeset 10075 for trunk/greenstone3-extensions

Timestamp:

2005-06-13T15:37:56+12:00 (19 years ago)

Author:

kjdon

Message:

changed the catalina.dir property to catalina.home

File:

• trunk/greenstone3-extensions/vishnu/build.xml (modified) (3 diffs)

trunk/greenstone3-extensions/vishnu/build.xml

@@ -15 +15 @@
 
   <!-- if vishnu is installed as a package inside greenstone -->
-  <property name="prefix" value="../../"/>
+  <property name="prefix" value="../.."/>
   <!-- use if vishnu is standalone -->
   <property name="prefix" value="${basedir}"/>
-  <property name="catalina.dir" value="${prefix}/comms/jakarta/tomcat"/>
-  <property name="web.lib.dir" value="${prefix}/web/lib"/>
-  <property name="web.classes.dir" value="${prefix}/web/WEB-INF/classes"/>
+  <property name="catalina.home" value="${env.CATALINA_HOME}"/>
+  <property name="web.lib" value="${prefix}/web/WEB-INF/lib"/>
+  <property name="web.classes" value="${prefix}/web/WEB-INF/classes"/>
 
 
@@ -45 +45 @@
   make sure all the specified jar files are on the environment CLASSPATH -->
   <path id="compile.classpath">
-    <pathelement location="${prefix}/lib/java/mg.jar"/>
-    <pathelement location="${prefix}/lib/java/lucene-1.4.1.jar"/>
-    <pathelement location="${catalina.dir}/common/lib/servlet-api.jar"/>
-    <pathelement location="${catalina.dir}/common/endorsed/xercesImpl.jar"/>
+    <pathelement location="${prefix}/lib/jni/mg.jar"/>
+    <pathelement location="${web.lib}/lucene-1.4.1.jar"/>
+    <pathelement location="${catalina.home}/common/lib/servlet-api.jar"/>
+    <pathelement location="${catalina.home}/common/endorsed/xercesImpl.jar"/>
     <pathelement path="${env.CLASSPATH}"/>
   </path>
 
   <path id="ld.library.path">
-    <pathelement location="${prefix}/lib"/>
+    <pathelement location="${prefix}/lib/jni"/>
   </path>
   <target name="all" depends="clean,compile"/>
@@ -82 +82 @@
       </manifest>
     </jar>      
-    <copy file="${build.dir}/vishnu.jar" todir="${web.lib.dir}"/>
-    <mkdir dir="${web.classes.dir}/vishnu/server"/>
+    <copy file="${build.dir}/vishnu.jar" todir="${web.lib}"/>
+    <!--<mkdir dir="${web.classes}/vishnu/server"/>
     <copy file="${build.dir}/vishnu/server/VisServlet.class"
-      todir="${web.classes.dir}/vishnu/server"/>
+      todir="${web.classes}/vishnu/server"/>-->