perfsonar development work

Author: roman
Date: 2007-03-05 06:16:42 -0500 (Mon, 05 Mar 2007)
New Revision: 2182

Modified:
   trunk/perfsonar/ant/configure-targets.xml
   trunk/perfsonar/ant/pre-install-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
Log:

The problem pointed by Guilherme that Axis AdminClient can't handle correctly 
with remote deployment has been overcome (according 
to Guilherme's suggestion). Now, AdminClient uses localhost address for 
deployment and for sending real address of the host to the 
LS service a new question is asked by the script in configure step.




Modified: trunk/perfsonar/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/configure-targets.xml   2007-03-02 15:49:45 UTC (rev 
2181)
+++ trunk/perfsonar/ant/configure-targets.xml   2007-03-05 11:16:42 UTC (rev 
2182)
@@ -72,6 +72,9 @@
             addproperty="functionality.register.interval"
             defaultvalue="30000"/>
 
+       <input message="Enter IP or DNS address of the host you are using now 
to deploy the service []:"
+           addproperty="functionality.register.access_point"/>
+
         <input message="Enter the descirption of service that will be send 
to the LS [perfSONAR service]:"
             addproperty="functionality.register.description"
             defaultvalue="perfSONAR service"/>
@@ -79,7 +82,7 @@
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
 
-            <entry  key="service.r.access_point"         
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
+            <entry  key="service.r.access_point"         
value="http://${functionality.register.access_point}:${target.port}/${deploy.root}/services/${webservice.name}"/>
             <entry  key="service.r.service_description"  
value="${functionality.register.description}"/>
             <entry  key="service.r.ls_url"               
value="${functionality.register.ls_address}"/>
             <entry  key="component.registrator.interval" 
value="${functionality.register.interval}"/>

Modified: trunk/perfsonar/ant/pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/pre-install-targets.xml 2007-03-02 15:49:45 UTC (rev 
2181)
+++ trunk/perfsonar/ant/pre-install-targets.xml 2007-03-05 11:16:42 UTC (rev 
2182)
@@ -251,7 +251,7 @@
 
     <!-- getting the server address -->
 
-
+<!--
     <target name="get-server-address">
 
         <input message="Enter the address (ip or hostname) of your 
application server Tomcat [localhost]:"
@@ -267,8 +267,20 @@
         </propertyfile>
 
     </target>
+-->
 
+    <target name="get-server-address">
 
+        <propertyfile file="ant/const.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="target.server" value="127.0.0.1"/>
+
+        </propertyfile>
+
+    </target>
+
+
     <!-- getting the server port -->
 
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-03-02 
15:49:45 UTC (rev 2181)
+++ trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-03-05 
11:16:42 UTC (rev 2182)
@@ -94,7 +94,6 @@
                       comment="This file was created by the Ant 
configuration script.">
 
             <entry  key="service.r.type"                value="ma"/>
-            <entry  key="service.r.access_point"        
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
             <entry  key="service.r.service_name"        value="Java RRD MA"/>
             <entry  key="service.r.service_type"        value="RRD MA"/>
             <entry  key="service.r.service_description" value="Java RRD MA, 
perfSONAR project"/>