perfsonar development work

Author: uros
Date: 2007-01-10 16:18:18 -0500 (Wed, 10 Jan 2007)
New Revision: 1902

Modified:
   trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml
   trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
Log:
Fixed some build target details.

Modified: trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml       2007-01-10 
17:46:52 UTC (rev 1901)
+++ trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml       2007-01-10 
21:18:18 UTC (rev 1902)
@@ -91,9 +91,7 @@
     </target>
 
 
-    <target name="tomcat-start-for-tcmp-true"
-        depends="tomcat-start-question"
-        if="tomcat.start.decision">
+    <target name="create-tomcat-context-for-tcmp">
 
         <copy file="conf/tomcat-tcmp-tmpl.xml" 
tofile="${tomcat.home}/conf/Catalina/localhost/tcmp.xml" overwrite="true" 
failonerror="false"/>
         <replace file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml">
@@ -118,45 +116,12 @@
     </target>
 
 
-    <target name="tomcat-start-for-tcmp-false"
-        unless="tomcat.start.decision">
-
-        <echo>Please, create the following configuration file </echo>
-        <echo>'${tomcat.home}/conf/Catalina/localhost/tcmp.xml'</echo>
-        <echo>containing the following text:</echo>
-        <echo></echo>
-        <echo message="    &lt;Context path='/${deploy.root}'"/>
-        <echo message="        
docBase='${service.home}/${service.name}'&gt;"/>
-        <echo message="    &lt;/Context&gt;"/>
-        <echo></echo>
-        <echo>Please, do it now. I will wait for you.</echo>
-        <input message="Press Return key ..."/>
-
-
-        <echo>${line.separator}You have to manually set up the env variable 
LD_LIBRARY_PATH</echo>
-        <echo>which should be seen by the Tomcat instance.</echo>
-        <echo></echo>
-        <echo>After setting up the variable (re)start the Tomcat.</echo>
-
-        <echo>${line.separator}Example:</echo>
-        <echo>  export 
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${mapi_lib_path}</echo>
-        <echo>${line.separator} Please, do it now. I will wait for 
you.</echo>
-
-        <input message="Press Return key ..."/>
-
-    </target>
-
-
-    <target name="tomcat-start-for-tcmp"
-            depends="tomcat-start-for-tcmp-true,tomcat-start-for-tcmp-false" 
/>
-
-
     <target name="deploy" depends="copy-tcmp-jar, add-context-listener"
                 description="Deploys TC MP service">
 
         <echo>Deploying the service...</echo>
 
-        <antcall target="tomcat-start-for-tcmp" />
+        <antcall target="create-tomcat-context-for-tcmp" />
 
         <antcall target="deploy-adminclient" />
 

Modified: trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2007-01-10 17:46:52 
UTC (rev 1901)
+++ trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2007-01-10 21:18:18 
UTC (rev 1902)
@@ -123,7 +123,7 @@
             <entry  key="service.r.service_type" value="TC MP"/>
             <entry  key="service.r.service_description" value="Java TC MP, 
perfSONAR project"/>
             
-            <entry  key="service.mp.conf_file" value="${tcmp.config.file}"/>
+            <entry  key="service.conf_file" value="${tcmp.config.file}"/>
 
             <entry  key="service.log.log4j.config" 
value="${basedir}/conf/log4j.properties"/>
             <entry  key="service.sax_parser.config" 
value="${basedir}/src/objects.config"/>