Changeset 10301

Timestamp:

2005-07-25T16:47:29+12:00 (19 years ago)

Author:

kjdon

Message:

changed the configure stuff for web - only need to update global.properties.

File:

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

trunk/gsdl3/build.xml

@@ -363 +363 @@
       </or>
     </condition>
-    <getuserandpassword message="Using proxy: ${proxy.host}:${proxy.port}" if="ask.user" username="${proxy.user}"/>
-    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.user}" proxypassword="${proxy.password}"/>
+    <getuserandpassword message="Using proxy: ${proxy.host}:${proxy.port}" if="ask.user" username="${proxy.user}" userproperty="proxy.username" pwordproperty="proxy.password"/>
+    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
   </target>
  
@@ -407 +407 @@
     <copy file="${web.lib}/xercesImpl.jar.tmp" tofile="${web.lib}/xercesImpl.jar"/>
   </target>
-  <target name="configure-web" depends="configure-web-gsdl3,configure-web-server"
-    description="Configure only the web app config files"/>
-  
-  <target name="configure-web-gsdl3" depends="init">
+  
+  <target name="configure-web" depends="init"
+    description="Configure only the web app config files">
     <filter token="gsdl3home" value="${web.home}"/>
-    <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="${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">
+    <filter token="mysql.port" value="${mysql.port}"/>
+    <filter token="mysql.server" value="${mysql.server}"/>
+     <!-- need to prompt for passwords -->
+    <filter token="mysql.admin.pword" value="greenstone"/>
+    <filter token="mysql.reader.pword" value="greenstone"/>
+    <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/>  
+  </target>
+
+  <target name="compile-web" depends="init">
     <javac srcdir="${web.classes}"
       destdir="${web.classes}"
@@ -444 +440 @@
 
 <!-- ======================= Tomcat Targets ========================== -->
-
+  
   <!-- this target sets up tomcat for the first time, or resets it any subsequent times -->
   <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal">
@@ -521 +517 @@
       <env key="CATALINA_HOME" value="${catalina.home}"/>
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
-      <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}:${mysql.home}/lib/mysql"/>
-      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${mysql.home}/lib/mysql"/> <!-- for mac-->
+      <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}"/>
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}"/>
+<!--      <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}:${mysql.home}/lib/mysql"/>
+      
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${mysql.home}/lib/mysql"/>--> <!-- for mac-->
     </exec>
     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">