perfsonar development work

Author: roman
Date: 2008-02-05 07:51:43 -0500 (Tue, 05 Feb 2008)
New Revision: 3303

Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
Log:

targets for creating webapp directory




Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-02-05 
12:14:53 UTC (rev 3302)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-02-05 
12:51:43 UTC (rev 3303)
@@ -221,59 +221,14 @@
   </target>
 
 
+
   <!-- 
===================================================================================
 -->
-  <!-- main targets -->
+  <!-- targets for web admin installation stuff -->
 
+  <!-- it is assumed that the installation location is /home/perfsonar 
directory (user) -->
 
-  <target name="deploy"
-          xmlns:antcontrib="antlib:net.sf.antcontrib">
 
-    <property file="${basedir}/ant/const.properties"/>
-
-    <antcall target="copy-service-jar"/>
-    <antcall target="tomcat-start"/>
-
-    <antcontrib:if>
-      <equals arg1="${component.ma.xmldb.db_status}" arg2="on" />
-        <antcontrib:then>
-          <antcontrib:if>
-            <equals arg1="${component.ma.xmldb.type}" arg2="webapp" />
-              <antcontrib:then>
-                <antcontrib:trycatch property="errormessage">
-                  <antcontrib:try>
-                    <antcall target="exist-adduser"/>
-                  </antcontrib:try>
-                  <antcontrib:catch>
-                    <echo>The script can not create new user 
${component.ma.xmldb.db_username}.</echo>
-                    <echo>Such user could have been already created or there 
is a problem with eXist.</echo>
-                    <echo>---------- Detailed error message:</echo>
-                    <echo>${errormessage}</echo>
-                    <echo>----------------------------------</echo>
-                  </antcontrib:catch>
-                </antcontrib:trycatch>
-                <antcall target="exist-init"/>
-              </antcontrib:then>
-          </antcontrib:if>
-        </antcontrib:then>
-    </antcontrib:if>
-
-    <antcall target="deploy-adminclient" />
-
-  </target>
-
-
-  <target name="undeploy">
-
-    <property file="${basedir}/ant/const.properties"/>
-
-    <antcall target="undeploy-adminclient" />
-    <antcall target="delete-deploy-root"/>
-    <antcall target="tomcat-shutdown"/>
-
-  </target>
-
-
-  <target name="war-create"
+  <target name="webapp-directory-prepare"
           xmlns:psbase="psbase:/base.perfsonar.org">
 
     <property name="tmpdir" value="tmp" />
@@ -282,6 +237,10 @@
     <mkdir dir="${tmpdir}"/>
 
 
+    <copy file="${basedir}/conf/service.properties.template"     
tofile="${basedir}/conf/service.properties"/>
+    <copy file="${basedir}/conf/components.properties.template"  
tofile="${basedir}/conf/components.properties"/>
+    <copy file="${basedir}/conf/log4j.properties.template"       
tofile="${basedir}/conf/log4j.properties"/>
+
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
@@ -293,44 +252,56 @@
     <copy file="${basedir}/conf/eventType-map.xml"      
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
     <copy file="${basedir}/conf/eventType-rules.xml"    
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
 
+
+    <property name="service.ma.conf_file" 
value="${basedir}/conf/rrd-database_TEST.xml" />
+
     <replace file="${service.ma.conf_file}"
              token="__BASEPATH__"
-             value="/home/perfsonar"/>
+             
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF"/>
 
     <copy file="${service.ma.conf_file}"  
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
 
     <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"    
todir="${tmpdir}/wsdd"/>
     <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"  
todir="${tmpdir}/wsdd"/>
 
+    <copy todir="${tmpdir}/WEB-INF/samples">
+      <fileset dir="${basedir}/samples"/>
+    </copy>
+
     <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
     <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
 
     <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd" 
todir="${tmpdir}/WEB-INF"/>
 
-    <copy file="${basedir}/conf/service.properties.template"      
tofile="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties" 
overwrite="true"/>
-    <copy file="${basedir}/conf/log4j.properties.template"        
tofile="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties" 
overwrite="true"/>
+    <replace 
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+             token="__BASEPATH__"
+             
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF" />
 
     <replace file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
              token="_LOGPATH_"
-             
value="/home/perfsonar/tomcat/webapps/${service.name}-${version}/WEB-INF/logs"/>
+             
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
 
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-          
message="service.sax_parser.config=/home/perfsonar/tomcat/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
+          
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
           append="true" />
 
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-          
message="service.ma.conf_file=/home/perfsonar/tomcat/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
+          
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
           append="true" />
 
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-          
message="service.log.log4j.config=/home/perfsonar/tomcat/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+          
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
           append="true" />
 
-
     <mkdir dir="${tmpdir}/WEB-INF/logs"/>
 
-    <!-- make the war file -->
+  </target>
 
+
+
+  <target name="war-create"
+          depends="webapp-directory-prepare">
+
     <zip destfile="${service.name}-${version}.war"
          basedir="${tmpdir}/"
          excludes=".svn/**" />
@@ -340,5 +311,64 @@
   </target>
 
 
+  <target name="webapp-create"
+          xmlns:psbase="psbase:/base.perfsonar.org"
+          depends="webapp-directory-prepare">
+  </target>
 
+
+
+  <!-- 
===================================================================================
 -->
+  <!-- main targets -->
+
+
+  <target name="deploy"
+          xmlns:antcontrib="antlib:net.sf.antcontrib">
+
+    <property file="${basedir}/ant/const.properties"/>
+
+    <antcall target="copy-service-jar"/>
+    <antcall target="tomcat-start"/>
+
+    <antcontrib:if>
+      <equals arg1="${component.ma.xmldb.db_status}" arg2="on" />
+        <antcontrib:then>
+          <antcontrib:if>
+            <equals arg1="${component.ma.xmldb.type}" arg2="webapp" />
+              <antcontrib:then>
+                <antcontrib:trycatch property="errormessage">
+                  <antcontrib:try>
+                    <antcall target="exist-adduser"/>
+                  </antcontrib:try>
+                  <antcontrib:catch>
+                    <echo>The script can not create new user 
${component.ma.xmldb.db_username}.</echo>
+                    <echo>Such user could have been already created or there 
is a problem with eXist.</echo>
+                    <echo>---------- Detailed error message:</echo>
+                    <echo>${errormessage}</echo>
+                    <echo>----------------------------------</echo>
+                  </antcontrib:catch>
+                </antcontrib:trycatch>
+                <antcall target="exist-init"/>
+              </antcontrib:then>
+          </antcontrib:if>
+        </antcontrib:then>
+    </antcontrib:if>
+
+    <antcall target="deploy-adminclient" />
+
+  </target>
+
+
+  <target name="undeploy">
+
+    <property file="${basedir}/ant/const.properties"/>
+
+    <antcall target="undeploy-adminclient" />
+    <antcall target="delete-deploy-root"/>
+    <antcall target="tomcat-shutdown"/>
+
+  </target>
+
+
+
 </project>
\ No newline at end of file