perfsonar development work

Author: roman
Date: 2007-03-05 10:14:45 -0500 (Mon, 05 Mar 2007)
New Revision: 2185

Modified:
   branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
   
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc
   branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Functional_Specification.doc
   
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc
   branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Interface_Specification.doc
   
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
Log:

 the trunk and the branch merged

   svn merge -r 2175:2184 https://207.75.165.117/svn/perfsonar/trunk/perfsonar




Modified: branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml       2007-03-05 
13:08:05 UTC (rev 2184)
+++ branches/JAVA-RRD-MA-STABLE/ant/configure-targets.xml       2007-03-05 
15:14:45 UTC (rev 2185)
@@ -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/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml     2007-03-05 
13:08:05 UTC (rev 2184)
+++ branches/JAVA-RRD-MA-STABLE/ant/pre-install-targets.xml     2007-03-05 
15:14:45 UTC (rev 2185)
@@ -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/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml   
2007-03-05 13:08:05 UTC (rev 2184)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-configure-targets.xml   
2007-03-05 15:14:45 UTC (rev 2185)
@@ -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"/>

Modified: 
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Configuration_Files_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Functional_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Installation_Actions_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Interface_Specification.doc
===================================================================
(Binary files differ)

Modified: 
branches/JAVA-RRD-MA-STABLE/doc/ma/rrdTypeMA/Metadata_Configuration_Specification.doc
===================================================================
(Binary files differ)