perfsonar development work

Author: roman
Date: 2006-12-22 05:14:14 -0500 (Fri, 22 Dec 2006)
New Revision: 1869

Modified:
   branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
   branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
   branches/JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
Log:
Unfortunately, xslt does not work in Ant script for everyone so for now calls 
of targets that use xslt to add/remove a listener class to/from web.xml have 
been commented. Listener class has been added to web.xml in 
conf/axis-1.4/WEB-INF/. This file is moved to service installation directory 
during deploy action

Modified: branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml     2006-12-22 
09:37:37 UTC (rev 1868)
+++ branches/JAVA-RRD-MA-STABLE/ant/axis-deploy-targets.xml     2006-12-22 
10:14:14 UTC (rev 1869)
@@ -121,7 +121,7 @@
     <target name="delete-axis-for-service">
 
         <delete file="${service.home}/${deploy.root}/fingerprint.jsp"/>
-        <delete file="${service.home}/${deploy.root}happyaxis.jsp"/>
+        <delete file="${service.home}/${deploy.root}/happyaxis.jsp"/>
         <delete file="${service.home}/${deploy.root}/i18nLib.jsp"/>
         <delete file="${service.home}/${deploy.root}/index.html"/>
         <delete file="${service.home}/${deploy.root}/index.jsp"/>

Modified: branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml 
2006-12-22 09:37:37 UTC (rev 1868)
+++ branches/JAVA-RRD-MA-STABLE/ant/rrdma/rrdma-axis-deploy-targets.xml 
2006-12-22 10:14:14 UTC (rev 1869)
@@ -166,7 +166,10 @@
 
     <!-- the main targets -->
 
+    <!--
 
+    xslt does not work for everyone (don't know why) so use of it is 
commented
+
     <target name="deploy" depends="copy-rrdma-jar, add-context-listener"
         description="Deploys RRD MA service">
 
@@ -179,8 +182,22 @@
         <antcall target="deploy-adminclient" />
 
     </target>
+    -->
 
+    <target name="deploy" depends="copy-rrdma-jar"
+        description="Deploys RRD MA service">
 
+        <echo>Deploying the service...</echo>
+
+        <antcall target="tomcat-start-for-rrdma" />
+
+        <antcall target="xmldb-adduser-rrdma" />
+
+        <antcall target="deploy-adminclient" />
+
+    </target>
+
+
     <target name="undeploy"
                 description="Undeploys RRD MA service">
 
@@ -188,7 +205,9 @@
 
         <antcall target="undeploy-adminclient" />
 
-        <antcall target="rem-context-listener" />
+        <!-- xslt does not work for everyone (don't know why) so use of it 
is commented -->
+        <!-- <antcall target="rem-context-listener" /> -->
+
         <antcall target="delete-jars-for-rrdma"/>
 
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>

Modified: branches/JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- branches/JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml   2006-12-22 
09:37:37 UTC (rev 1868)
+++ branches/JAVA-RRD-MA-STABLE/conf/axis-1.4/WEB-INF/web.xml   2006-12-22 
10:14:14 UTC (rev 1869)
@@ -5,11 +5,15 @@
 
 <web-app>
   <display-name>Apache-Axis</display-name>
-    
-    <listener>
-        
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
-    </listener>
-    
+
+  <listener>
+    
<listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+  </listener>
+
+  <listener>
+    
<listener-class>org.perfsonar.commons.container.listeners.StartupInitializer</listener-class>
+  </listener>
+
   <servlet>
     <servlet-name>AxisServlet</servlet-name>
     <display-name>Apache-Axis Servlet</display-name>