perfsonar development work

Author: roman
Date: 2006-10-20 04:28:22 -0400 (Fri, 20 Oct 2006)
New Revision: 1704

Modified:
   branches/romradz-ant4rel-20061017/ant/configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
Log:
configuration and deployment is still being improved and polished

(remember it's a branch)

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-19 
16:57:42 UTC (rev 1703)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-20 
08:28:22 UTC (rev 1704)
@@ -22,22 +22,26 @@
 
 
     <target name="_get-java-path">
+
         <exec executable="which"
             os="Linux"
             errorproperty="java.path.error"
             outputproperty="full.java.path">
             <arg line="java"/>
         </exec>
+
     </target>
 
 
     <target name="get-java-path" depends="_get-java-path">
+
         <dirname property="__java.path" file="${full.java.path}"/>
         <dirname property="_java.path" file="${__java.path}"/>
         <input message="Enter the path of Java [${_java.path}]:"
             addproperty="java.path"
             defaultvalue="${_java.path}"
             />
+
     </target>
 
 
@@ -45,10 +49,12 @@
 
 
     <target name="get-server-address">
+
         <input message="Enter the address of host (perfSONAR service 
location) [localhost]:"
             addproperty="server.address"
             defaultvalue="localhost"
             />
+
     </target>
 
 
@@ -56,10 +62,15 @@
 
 
     <target name="get-server-port">
+
         <input message="Enter the port of server [8080]:"
             addproperty="server.port"
             defaultvalue="8080"
         />
+
+        <echo message="Make sure that your application server Tomcat has the 
same port for the http communication. If not then configure the Tomcat in 
order to use this port number."/>
+        <input message="Press Return key ..."/>
+
     </target>
 
 
@@ -170,9 +181,11 @@
 
 
     <target name="remove-properties">
+
       <delete file="ant/const.properties"    failonerror="false"/>
       <delete file="conf/service.properties" failonerror="false"/>
       <delete file="conf/log4j.properties"   failonerror="false"/>
+
     </target>
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-10-19 16:57:42 UTC (rev 1703)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-10-20 08:28:22 UTC (rev 1704)
@@ -95,6 +95,43 @@
     </target>
 
 
+    <target name="tomcat-start-for-rrdma-true"
+        depends="tomcat-start-question"
+        if="tomcat.start.decision">
+        
+        <exec dir="${tomcat.home}/bin"
+            executable="sh"
+            output="${basedir}/log/tomcat.log"
+            error="${basedir}/log/tomcat.log">
+            <arg line="startup.sh"/>
+            <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+            <env key="LD_LIBRARY_PATH" 
path="${env.LD_LIBRARY_PATH}:${rrd_lib_path}:${rrdjdir}/build"/>
+        </exec>
+        
+    </target>
+
+
+    <target name="tomcat-start-for-rrdma-false"
+        unless="tomcat.start.decision">
+
+        <echo>${line.separator}You have to manually set up the env variable 
LD_LIBRARY_PATH which should be seen by the Tomcat instance.</echo>
+        <echo>After setting up the variable restart the Tomcat.</echo>
+        
+        <echo>${line.separator}Example:</echo>
+        <echo>  export 
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${rrdtool_path}/lib:${rrdjdir}/build</echo>
+        <echo>${line.separator} Please, do it now.</echo>
+
+        <input message="Press Return key ..."/>
+
+    </target>
+
+
+    <target name="tomcat-start-for-rrdma"
+        depends="tomcat-start-for-rrdma-true,tomcat-start-for-rrdma-false">
+
+    </target>
+
+
     <target name="deploy-adminclient">
 
         <java classname="org.apache.axis.client.AdminClient">
@@ -108,7 +145,7 @@
     <target name="deploy" depends="copy-rrdma-jar, add-context-listener"
                 description="Deploys RRD MA service">
 
-        <antcall target="tomcat-start" />
+        <antcall target="tomcat-start-for-rrdma" />
         <antcall target="deploy-adminclient" />
         
     </target>

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-19 16:57:42 UTC (rev 1703)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-20 08:28:22 UTC (rev 1704)
@@ -49,8 +49,7 @@
 
 
     <target name="set-const-properties-for-rrdma"
-            depends="get-java-path,
-                     get-server-address,
+            depends="get-server-address,
                      get-server-port,
                      get-tomcat-directory">