perfsonar development work

Author: roman
Date: 2006-10-24 09:53:07 -0400 (Tue, 24 Oct 2006)
New Revision: 1711

Added:
   branches/romradz-ant4rel-20061017/conf/components.properties.rrdma
   branches/romradz-ant4rel-20061017/conf/components.properties.sqlma
Modified:
   branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
   branches/romradz-ant4rel-20061017/ant/configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
   branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
Log:
Update of configuration script for RRD MA (more questions). Work for the next 
release.

Modified: branches/romradz-ant4rel-20061017/ant/build-rrdma.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/build-rrdma.xml       2006-10-24 
09:10:01 UTC (rev 1710)
+++ branches/romradz-ant4rel-20061017/ant/build-rrdma.xml       2006-10-24 
13:53:07 UTC (rev 1711)
@@ -44,6 +44,7 @@
     <import file="java-compile-targets.xml"/>
     <import file="axis-deploy-targets.xml"/>
     <import file="libs-download-targets.xml"/>
+    <import file="exist-xmldb-targets.xml"/>
 
 
 
@@ -52,7 +53,7 @@
     <import file="rrdma/rrdma-pre-install-targets.xml"/>
 
     <import file="rrdma/rrdjtool-compile-targets.xml"/>
-    
+
     <import file="rrdma/rrdma-java-compile-targets.xml"/>
     <import file="rrdma/rrdma-axis-deploy-targets.xml"/>
     <import file="rrdma/rrdma-client-run-targets.xml"/>

Modified: branches/romradz-ant4rel-20061017/ant/configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-24 
09:10:01 UTC (rev 1710)
+++ branches/romradz-ant4rel-20061017/ant/configure-targets.xml 2006-10-24 
13:53:07 UTC (rev 1711)
@@ -68,7 +68,11 @@
             defaultvalue="8080"
         />
 
-        <echo message="Make sure that your application server Tomcat has the 
same port for the http communication. If not then configure the Tomcat in 
order to use this port number (Please, do it now. After the change continue 
the installation.)."/>
+        <echo>Make sure that your application server Tomcat has the same 
port</echo>
+        <echo>for the http communication. If not then configure the Tomcat 
in order</echo>
+        <echo>to use this port number.</echo>
+        <echo></echo>
+        <echo>Please, do it now.</echo>
         <input message="Press Return key ..."/>
 
     </target>
@@ -203,6 +207,51 @@
     </target>
 
 
+    <!-- switching on LS registration functionality -->
 
+
+    <target name="register-fuctionality-question">
+
+        <input message="Do you want the service to register in LS? "
+            addproperty="_functionality.register.decision"
+            validargs="y,n" />
+
+        <condition property="functionality.register.decision">
+            <equals arg1="y" arg2="${_functionality.register.decision}"/>
+        </condition>
+
+    </target>
+
+
+    <target name="register-fuctionality"
+        depends="register-fuctionality-question"
+        if="functionality.register.decision">
+
+        <input message="Enter the URL of LS []:"
+            addproperty="functionality.register.ls_address"/>
+
+        <input message="Enter the registration interval [30000]:"
+            addproperty="functionality.register.interval"
+            defaultvalue="30000"/>
+
+        <input message="Enter the descirption of service that will be send 
to the LS [perfSONAR service]:"
+            addproperty="functionality.register.description"
+            defaultvalue="perfSONAR service"/>
+
+        <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.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}"/>
+
+        </propertyfile>
+        
+
+    </target>
+
+
+
 </project>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-24 09:10:01 UTC (rev 1710)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-24 13:53:07 UTC (rev 1711)
@@ -142,6 +142,69 @@
     </target>
 
 
+    <target name="copy-components-properties">
+
+        <copy file="conf/components.properties.rrdma" 
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+    </target>
+
+
+    <target name="store-fuctionality-question-for-rrdma">
+
+        <input message="Do you want the service to accept messages with 
measurement data and store them? "
+            addproperty="_functionality.store.decision"
+            validargs="y,n" />
+
+        <condition property="functionality.store.decision">
+            <equals arg1="y" arg2="${_functionality.store.decision}"/>
+        </condition>
+
+    </target>
+
+
+    <target name="store-fuctionality-for-rrdma"
+        depends="store-fuctionality-question-for-rrdma"
+        if="functionality.store.decision">
+
+        <input message="Enter the path where new rrd files with measearement 
data sent to the service will be located [${service.home}]?"
+            addproperty="functionality.store.path"
+            defaultvalue="${service.home}"/>
+
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="service.ma.xmldb.db_store" value="on"/>
+            <entry  key="service.ma.rrd.xmldb.db_store.data_dir" 
value="${functionality.store.path}/"/>
+
+        </propertyfile>
+
+    </target>
+
+
+    <target name="register-fuctionality-for-rrdma"
+        depends="register-fuctionality"
+        if="functionality.register.decision">
+
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="service.r.service_name" value="${service.name}"/>
+            <entry  key="service.r.service_type" value="MA"/>
+            <entry  key="component.registrator.scheduler_component" 
value="ma_scheduler"/>
+
+        </propertyfile>            
+
+        <propertyfile file="conf/components.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="ma_scheduler" 
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+            <entry  key="registrator" 
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+
+        </propertyfile>            
+
+    </target>        
+
+
     <!-- the main target -->
 
 
@@ -149,10 +212,14 @@
 
         <echo>Configuring...</echo>
 
+        <antcall target="copy-components-properties"/>
         <antcall target="set-const-properties-for-rrdma"/>
         <antcall target="set-service-properties-for-rrdma"/>
         <antcall target="set-log4j-properties"/>
         <antcall target="create-testrrdconfig-for-rrdma"/>
+        <antcall target="exist-use-rrdma"/>
+        <antcall target="store-fuctionality-for-rrdma"/>
+        <antcall target="register-fuctionality-for-rrdma"/>
 
     </target>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml 
  2006-10-24 09:10:01 UTC (rev 1710)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-exist-xmldb-targets.xml 
  2006-10-24 13:53:07 UTC (rev 1711)
@@ -149,5 +149,26 @@
     </target>
 
 
+    <target name="exist-use-rrdma" depends="exist-use" 
if="exist.use.decision">
+
+        <antcall target="exist-adduser"/>
+        <antcall target="exist-datails-question"/>
+
+        <property file="ant/const.properties" />
+
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+            
+            <entry  key="component.ma.xmldb.db_uri" 
value="http://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
+            <entry  key="component.ma.xmldb.db_uri.xmlrpc" 
value="http://${exist.hostname}:${exist.port}/exist/xmlrpc/db/rrdmaconfig"/>
+            
+        </propertyfile>
+
+        <antcall target="xmldb-init-rrdma"/>
+
+    </target>
+
+
+
 </project>
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-10-24 09:10:01 UTC (rev 1710)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-10-24 13:53:07 UTC (rev 1711)
@@ -117,6 +117,8 @@
         <echo>${line.separator}Building the rrdjtool library...</echo>
         <antcall target="rrdjtool"/>
 
+        <antcall target="exist-install"/>
+
     </target>
 
 

Modified: branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml    
2006-10-24 09:10:01 UTC (rev 1710)
+++ branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml    
2006-10-24 13:53:07 UTC (rev 1711)
@@ -91,5 +91,4 @@
 
 
 
-
 </project>
\ No newline at end of file

Added: branches/romradz-ant4rel-20061017/conf/components.properties.rrdma

Added: branches/romradz-ant4rel-20061017/conf/components.properties.sqlma