perfsonar development work

Author: roman
Date: 2007-04-13 09:04:24 -0400 (Fri, 13 Apr 2007)
New Revision: 2329

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

support of new properties:
- service.r.service_version
- service.r.contact_email
- service.r.organization_name

Now configure script for RRD MA asks for service description, contact email 
and organization name.




Modified: trunk/perfsonar/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/configure-targets.xml   2007-04-13 11:38:24 UTC (rev 
2328)
+++ trunk/perfsonar/ant/configure-targets.xml   2007-04-13 13:04:24 UTC (rev 
2329)
@@ -107,6 +107,35 @@
     </target>
 
 
+       <!-- service description, contact email and organization name -->
 
+
+    <target name="set-service-descr-email-organization">
+
+       <input message="Enter the service description:"
+                   addproperty="service.description"
+                   defaultvalue="perfSONAR service"/>
+
+       <input message="Enter the contact email address of service owner:"
+                   addproperty="service.contact.email"
+                   defaultvalue=""/>
+
+       <input message="Enter the organization name where the service is 
being installed:"
+                   addproperty="service.organization.name"
+                   defaultvalue=""/>
+
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="service.r.service_description"  
value="${service.description}"/>
+            <entry  key="service.r.contact_email"        
value="${service.contact.email}"/>
+            <entry  key="service.r.organization_name"    
value="${service.organization.name}"/>
+
+        </propertyfile>
+
+    </target>
+
+
+
 </project>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-04-13 
11:38:24 UTC (rev 2328)
+++ trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-04-13 
13:04:24 UTC (rev 2329)
@@ -93,10 +93,13 @@
         <propertyfile file="conf/service.properties" 
                       comment="This file was created by the Ant 
configuration script.">
 
+               <!-- first two properties:                                    
 -->
+               <!-- do want to keep both properties which are almost the 
same -->
+               <!-- needs to be checked                                      
 -->
             <entry  key="service.r.type"                value="ma"/>
-            <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"/>
+            <entry  key="service.r.service_name"        
value="${service.name}"/>
+            <entry  key="service.r.service_version"     
value="${service.version}${service.version.candidate}"/>
 
             <entry  key="service.log.log4j.config"  
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
             <entry  key="service.sax_parser.config" 
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
@@ -262,6 +265,7 @@
         <antcall target="exist-init"/>
         <antcall target="store-fuctionality-for-rrdma"/>
         <antcall target="register-fuctionality-for-rrdma"/>
+       <antcall target="set-service-descr-email-organization"/>
 
     </target>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2007-04-13 
11:38:24 UTC (rev 2328)
+++ trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2007-04-13 
13:04:24 UTC (rev 2329)
@@ -21,7 +21,10 @@
        <!-- properties -->
 
 
-    <property name="service.name" value="perfSONAR-RRD-MA-2.0-beta" />
+       <property name="service.base.name"         value="RRD-MA" />
+       <property name="service.version"           value="2.1" />
+       <property name="service.version.candidate" value="-beta" />
+    <property name="service.name" 
value="perfSONAR-${service.base.name}-${service.version}${service.version.candidate}"
 />
 
 
     <property name="_exist.war.download.url"