perfsonar development work

Author: stijn
Date: 2007-03-06 04:05:48 -0500 (Tue, 06 Mar 2007)
New Revision: 2191

Modified:
   branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml
   branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
   branches/SSHTelnet-MP-STABLE/doc/mp/sshtelnetTypeMP/Installation Actions 
for SSHTelnet 1.0.doc
Log:
Fix for the general configuration/deploy issue

Modified: branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml      2007-03-05 
19:58:30 UTC (rev 2190)
+++ branches/SSHTelnet-MP-STABLE/ant/configure-targets.xml      2007-03-06 
09:05:48 UTC (rev 2191)
@@ -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: branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml    2007-03-05 
19:58:30 UTC (rev 2190)
+++ branches/SSHTelnet-MP-STABLE/ant/pre-install-targets.xml    2007-03-06 
09:05:48 UTC (rev 2191)
@@ -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: 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml    
  2007-03-05 19:58:30 UTC (rev 2190)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml    
  2007-03-06 09:05:48 UTC (rev 2191)
@@ -49,7 +49,6 @@
                         comment="This file was created by the ant script.">
 
             <entry  key="service.r.type" value="mp"/>
-            <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 SSH 
Telnet MP"/>
             <entry  key="service.r.service_type"        value="SSH/Telnet 
MP"/>
             <entry  key="service.r.service_description" value="Java 
SSH/Telnet MP, perfSONAR project"/>

Modified: branches/SSHTelnet-MP-STABLE/doc/mp/sshtelnetTypeMP/Installation 
Actions for SSHTelnet 1.0.doc
===================================================================
(Binary files differ)