perfsonar development work

Author: roman
Date: 2007-02-14 09:36:36 -0500 (Wed, 14 Feb 2007)
New Revision: 2074

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

Changes in the installation procedure of RRD MA Ant scripts
- log4j config file and log files under webapps dir after deploy action
- objects.config under webapps dir after deploy action
- metadata config file under webapps dir after deploy action
- default service location direcory suggested by the script has changed not 
to be under installation package directory
- log4j config file is now created from the template file





Modified: trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml     2007-02-14 
13:23:59 UTC (rev 2073)
+++ trunk/perfsonar/ant/rrdma/rrdma-axis-deploy-targets.xml     2007-02-14 
14:36:36 UTC (rev 2074)
@@ -39,6 +39,14 @@
         <copy file="./conf/eventType-map.xml"                                
                                   
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
         <copy file="./conf/eventType-rules.xml"                              
                                   
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
 
+        <copy file="${service.ma.conf_file}"                                 
                                   
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+
+        <basename property="rrd.config.file.basename" 
file="${service.ma.conf_file}" />
+        <propertyfile 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"
+                      comment="This file was created by the ant script.">
+          <entry  key="service.ma.conf_file" 
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/${rrd.config.file.basename}"/>
+        </propertyfile>
+
         <copy file="./conf/wsdd/${wsdd.file.deploy}"                         
                                   
todir="${service.home}/${deploy.root}/wsdd"/>
         <copy file="./conf/wsdd/${wsdd.file.undeploy}"                       
                                   
todir="${service.home}/${deploy.root}/wsdd"/>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-02-14 
13:23:59 UTC (rev 2073)
+++ trunk/perfsonar/ant/rrdma/rrdma-configure-targets.xml       2007-02-14 
14:36:36 UTC (rev 2074)
@@ -99,8 +99,8 @@
             <entry  key="service.r.service_type"        value="RRD MA"/>
             <entry  key="service.r.service_description" value="Java RRD MA, 
perfSONAR project"/>
 
-            <entry  key="service.log.log4j.config"  
value="${basedir}/conf/log4j.properties"/>
-            <entry  key="service.sax_parser.config" 
value="${basedir}/src/objects.config"/>
+            <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"/>
 
             <entry  key="service.r.ma.characteristic"   
value="utitlization"/>
             <entry  key="service.r.ma.measurement_tool" 
value="cricket,mrtg,cacti"/>
@@ -112,7 +112,7 @@
 
             <entry  key="service.ma.xmldb.db_store" value="off"/>
 
-            <entry  key="service.ma.rrd.xmldb.db_store.data_dir" 
value="${basedir}/"/>
+            <entry  key="service.ma.rrd.xmldb.db_store.data_dir" 
value="${service.home}/${deploy.root}/WEB-INF/logs/"/>
 
             <entry  
key="service.ma.rrd.rrd_storage_manager_rrd_DS_type_default" 
value="COUNTER:1800:0:10000000000000"/>
             <entry  
key="service.ma.rrd.rrd_storage_manager_rrd_step_default"    value="300"/>
@@ -155,7 +155,8 @@
 
         <input message="Do you want the service to accept messages with 
measurement data and store them? "
             addproperty="_functionality.store.decision"
-            validargs="y,n" />
+            validargs="y,n"
+            defaultvalue="n"/>
 
         <condition property="functionality.store.decision">
             <equals arg1="y" arg2="${_functionality.store.decision}"/>

Modified: trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2007-02-14 
13:23:59 UTC (rev 2073)
+++ trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2007-02-14 
14:36:36 UTC (rev 2074)
@@ -22,7 +22,7 @@
 
 
     <property name="_exist.war.download.url"
-        
value="http://downloads.sourceforge.net/exist/exist-1.0.1.war?modtime=1161732157&amp;big_mirror=1";
 />
+              
value="http://prdownloads.sourceforge.net/exist/exist-1.0.1.war"; />
     <property name="exist.war.file" value="exist-1.0.1.war" />
 
     <property file="ant/const.properties" />
@@ -172,7 +172,7 @@
         <input message="Do you want me to compile rrdjtool library for you 
(if not you will have to do it manually in ${basedir}/contrib/rrdjtool after 
pre-install step)? "
             addproperty="_rrdjtool.build.decision"
             validargs="y,n"
-            defaultvalue="n" />
+            defaultvalue="y" />
 
         <condition property="rrdjtool.build.decision">
             <equals arg1="y" arg2="${_rrdjtool.build.decision}"/>
@@ -242,7 +242,7 @@
         <input message="Usage of eXist xml database is recommended for the 
service. Installing/configuring this database as a web application in your 
Tomcat is also suggested. Do you want me to do this for you? "
             addproperty="_exist.war.install.decision"
             validargs="y,n"
-            defaultvalue="n" />
+            defaultvalue="y" />
 
         <condition property="exist.war.install.decision">
             <equals arg1="y" arg2="${_exist.war.install.decision}"/>
@@ -291,7 +291,8 @@
         </propertyfile>
 
 
-        <dirname property="_exist.war.install.location" file="${basedir}"/>
+        <dirname property="__exist.war.install.location" file="${basedir}"/>
+        <dirname property="_exist.war.install.location" 
file="${__exist.war.install.location}"/>
 
         <input message="Enter the path of directory where downloaded eXist 
war file is located [${_exist.war.install.location}]:"
             addproperty="exist.war.install.location"
@@ -319,7 +320,8 @@
         </propertyfile>
 
 
-        <dirname property="_exist.war.install.location" file="${basedir}"/>
+        <dirname property="__exist.war.install.location" file="${basedir}"/>
+        <dirname property="_exist.war.install.location" 
file="${__exist.war.install.location}"/>
 
         <input message="Enter the path of directory where eXist war file 
will be located [${_exist.war.install.location}]:"
             addproperty="exist.war.install.location"