perfsonar development work

Author: roman
Date: 2007-02-14 08:23:59 -0500 (Wed, 14 Feb 2007)
New Revision: 2073

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

Changes in the installation procedure (core Ant scripts and SQL 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/axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/axis-deploy-targets.xml 2007-02-14 13:15:29 UTC (rev 
2072)
+++ trunk/perfsonar/ant/axis-deploy-targets.xml 2007-02-14 13:23:59 UTC (rev 
2073)
@@ -34,6 +34,7 @@
         <mkdir dir="${service.home}/${deploy.root}/wsdd"/>
         <mkdir dir="${service.home}/${deploy.root}/WEB-INF"/>
         <mkdir dir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <mkdir dir="${service.home}/${deploy.root}/WEB-INF/logs"/>
         <mkdir dir="${service.home}/${deploy.root}/WEB-INF/classes"/>
         <mkdir 
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar"/>
         <mkdir 
dir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
@@ -61,6 +62,8 @@
 
         <copy file="./conf/service.properties"           
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
         <copy file="./conf/components.properties"        
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+        <copy file="./conf/log4j.properties"             
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
+        <copy file="./src/objects.config"                
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
 
     </target>
 
@@ -133,6 +136,7 @@
 
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/components.properties"/>
+        <delete 
file="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
 
     </target>
 
@@ -300,9 +304,9 @@
 
 
     <target name="start">
-        
+
         <antcall target="deploy-adminclient" />
-        
+
     </target>
 
 

Modified: trunk/perfsonar/ant/configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/configure-targets.xml   2007-02-14 13:15:29 UTC (rev 
2072)
+++ trunk/perfsonar/ant/configure-targets.xml   2007-02-14 13:23:59 UTC (rev 
2073)
@@ -23,64 +23,11 @@
 
     <target name="set-log4j-properties">
 
-        <property name="logDir" value="${basedir}/log"/>
+        <property name="logDir" 
value="${service.home}/${deploy.root}/WEB-INF/logs"/>
 
-        <propertyfile file="conf/log4j.properties"
-                        comment="This file was created by the ant script.">
+        <copy file="${basedir}/conf/log4j.properties.template"     
tofile="${basedir}/conf/log4j.properties"/>
+        <replace file="${basedir}/conf/log4j.properties"           
token="_LOGPATH_" value="${logDir}"/>
 
-            <entry  key="logDir" value="${logDir}"/>
-
-            <entry  key="log4j.rootLogger" value="INFO, rootAppender"/>
-            <entry  key="log4j.logger.perfsonar-debug" value="DEBUG, 
debugAppender"/>
-            <entry  key="log4j.logger.perfsonar-info"  value="INFO, 
infoAppender"/>
-            <entry  key="log4j.logger.perfsonar-warn"  value="WARN, 
warnAppender"/>
-            <entry  key="log4j.logger.perfsonar-error" value="ERROR, 
errorAppender"/>
-            <entry  key="log4j.logger.perfsonar-fatal" value="FATAL, 
fatalAppender"/>
-
-            <entry  key="log4j.appender.rootAppender"                        
  value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.rootAppender.File"                   
  value="${logDir}/perfsonar.log"/>
-            <entry  key="log4j.appender.rootAppender.MaxFileSize"            
  value="500KB"/>
-            <entry  key="log4j.appender.rootAppender.MaxBackupIndex"         
  value="1000"/>
-            <entry  key="log4j.appender.rootAppender.layout"                 
  value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.rootAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.debugAppender"                       
   value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.debugAppender.File"                  
   value="${logDir}/perfsonar_debug.log"/>
-            <entry  key="log4j.appender.debugAppender.MaxFileSize"           
   value="500KB"/>
-            <entry  key="log4j.appender.debugAppender.MaxBackupIndex"        
   value="1000"/>
-            <entry  key="log4j.appender.debugAppender.layout"                
   value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.debugAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.infoAppender"                        
  value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.infoAppender.File"                   
  value="${logDir}/perfsonar_info.log"/>
-            <entry  key="log4j.appender.infoAppender.MaxFileSize"            
  value="500KB"/>
-            <entry  key="log4j.appender.infoAppender.MaxBackupIndex"         
  value="1000"/>
-            <entry  key="log4j.appender.infoAppender.layout"                 
  value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.infoAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.warnAppender"                        
  value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.warnAppender.File"                   
  value="${logDir}/perfsonar_warn.log"/>
-            <entry  key="log4j.appender.warnAppender.MaxFileSize"            
  value="500KB"/>
-            <entry  key="log4j.appender.warnAppender.MaxBackupIndex"         
  value="1000"/>
-            <entry  key="log4j.appender.warnAppender.layout"                 
  value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.warnAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.errorAppender"                       
   value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.errorAppender.File"                  
   value="${logDir}/perfsonar_error.log"/>
-            <entry  key="log4j.appender.errorAppender.MaxFileSize"           
   value="500KB"/>
-            <entry  key="log4j.appender.errorAppender.MaxBackupIndex"        
   value="1000"/>
-            <entry  key="log4j.appender.errorAppender.layout"                
   value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.errorAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-            <entry  key="log4j.appender.fatalAppender"                       
   value="org.apache.log4j.RollingFileAppender"/>
-            <entry  key="log4j.appender.fatalAppender.File"                  
   value="${logDir}/perfsonar_fatal.log"/>
-            <entry  key="log4j.appender.fatalAppender.MaxFileSize"           
   value="500KB"/>
-            <entry  key="log4j.appender.fatalAppender.MaxBackupIndex"        
   value="1000"/>
-            <entry  key="log4j.appender.fatalAppender.layout"                
   value="org.apache.log4j.PatternLayout"/>
-            <entry  
key="log4j.appender.fatalAppender.layout.ConversionPattern" value="%d %5p - 
%m%n"/>
-
-        </propertyfile>
-
     </target>
 
 
@@ -103,7 +50,8 @@
 
         <input message="Turn on service registration to Lookup Service? "
             addproperty="_functionality.register.decision"
-            validargs="y,n" />
+            validargs="y,n"
+            defaultvalue="n"/>
 
         <condition property="functionality.register.decision">
             <equals arg1="y" arg2="${_functionality.register.decision}"/>

Modified: trunk/perfsonar/ant/pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/pre-install-targets.xml 2007-02-14 13:15:29 UTC (rev 
2072)
+++ trunk/perfsonar/ant/pre-install-targets.xml 2007-02-14 13:23:59 UTC (rev 
2073)
@@ -18,7 +18,7 @@
 
 
     <!-- Download URLs -->
-    
+
     <property name="_tomcat.download.url"
         
value="http://apache.forall.pl/tomcat/tomcat-6/v6.0.7/bin/apache-tomcat-6.0.7.tar.gz";
 />
     <property name="tomcat.dir" value="apache-tomcat-6.0.7" />
@@ -72,7 +72,8 @@
 
     <target name="_get-service-home">
 
-        <dirname property="__service.home" file="${basedir}"/>
+        <dirname property="___service.home" file="${basedir}"/>
+        <dirname property="__service.home" file="${___service.home}"/>
 
         <input message="Enter the path where you want to install the service 
[${__service.home}/webapps]:"
             addproperty="_service.home"
@@ -199,7 +200,7 @@
         unless="tomcat.install.decision">
 
         <antcall target="get-tomcat-directory"/>
-        
+
     </target>
 
 
@@ -214,7 +215,7 @@
             <isset property="tomcat.home"/>
         </condition>
 
-    </target>    
+    </target>
 
 
     <target name="_get-tomcat-directory_1" depends="__get-tomcat-directory" 
if="tomcat.home.present">

Modified: trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml     2007-02-14 
13:15:29 UTC (rev 2072)
+++ trunk/perfsonar/ant/sqlma/sqlma-axis-deploy-targets.xml     2007-02-14 
13:23:59 UTC (rev 2073)
@@ -42,6 +42,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="sql.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/${sql.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"/>
 
@@ -138,7 +146,7 @@
 
     <target name="tomcat-start-for-sqlma-false"
         unless="tomcat.start.decision">
-        
+
         <echo>Please, insert now the following xml tag 'Context'</echo>
         <echo>into Tomcat configuration file server.xml</echo>
         <echo>(${tomcat.home}/conf/server.xml)</echo>
@@ -155,10 +163,10 @@
 
         <echo></echo>
         <echo>Please, make sure that Tomcat is running.</echo>
-        
+
         <echo></echo>
         <input message="Please do it now and press Enter when finished"/>
-        
+
     </target>
 
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-02-14 
13:15:29 UTC (rev 2072)
+++ trunk/perfsonar/ant/sqlma/sqlma-configure-targets.xml       2007-02-14 
13:23:59 UTC (rev 2073)
@@ -102,8 +102,8 @@
             <entry  key="service.r.service_type" value="SQL MA"/>
             <entry  key="service.r.service_description" value="Java SQL 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.ma.conf_file"     
value="${sql.config.file}"/>
             <entry  key="service.ma.message_types" 
value="MetadataKeyRequest,SetupDataRequest,MeasurementArchiveStoreRequest,EchoRequest"/>
@@ -137,7 +137,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}"/>
@@ -245,11 +246,11 @@
         <echo>Each parameter in these files is represented by property 
element.</echo>
         <echo>Check value attribute of each property and if it is needed 
alter it</echo>
         <echo>to have correct connection with the database.</echo>
-        
+
         <echo></echo>
         <input message="Please do it now and press Enter when finished"/>
 
-    </target>        
+    </target>
 
 
     <!-- the main target -->

Modified: trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml     2007-02-14 
13:15:29 UTC (rev 2072)
+++ trunk/perfsonar/ant/sqlma/sqlma-pre-install-targets.xml     2007-02-14 
13:23:59 UTC (rev 2073)
@@ -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" />
@@ -44,7 +44,7 @@
             <entry  key="component.ma.xmldb.db_username"   
value="sqlmaservice"/>
             <entry  key="component.ma.xmldb.db_password"   
value="sqlmaservice"/>
 
-        </propertyfile>            
+        </propertyfile>
 
     </target>
 
@@ -72,7 +72,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}"/>
@@ -84,7 +84,7 @@
     <target name="exist-war-question"
         depends="_exist-war-question"
         if="exist.war.install.decision">
-        
+
         <input message="Do you want me to download eXist web application 
package (if not you have to do it manually)? "
             addproperty="exist.war.install.type.decision"
             validargs="y,n"
@@ -121,7 +121,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"
@@ -149,7 +150,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"
@@ -365,7 +367,7 @@
 
         <propertyfile file="conf/service.properties" 
             comment="This file was created by the Ant configuration script.">
-            
+
             <entry  key="component.ma.xmldb.db_username" 
value="${_exist.username}"/>
             <entry  key="component.ma.xmldb.db_password" 
value="${_exist.password}"/>
 

Modified: trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml        2007-02-14 
13:15:29 UTC (rev 2072)
+++ trunk/perfsonar/ant/sqlma/sqlma-test-run-targets.xml        2007-02-14 
13:23:59 UTC (rev 2073)
@@ -51,6 +51,7 @@
             print="true"
             classpathref="classpath">
           select version();
+         select * from domain_link;
         </sql>
     </target>