perfsonar development work

Author: roman
Date: 2006-10-19 09:44:09 -0400 (Thu, 19 Oct 2006)
New Revision: 1700

Added:
   branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/classes/
   
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/classes/i18n.properties
Modified:
   branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
Log:
i18n.properties file was missing

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-19 13:42:40 UTC (rev 1699)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-19 13:44:09 UTC (rev 1700)
@@ -22,7 +22,7 @@
     <taskdef resource="axis-tasks.properties" classpathref="classpath" 
onerror="ignore"/>
 
 
-    <property name="adminService" 
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
+    <property name="adminService" 
value="http://${target.server}:${target.port}/${deploy.root}/services/AdminService";
 />
     <property name="deployFile"   
value="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.deploy}" />
     <property name="undeployFile" 
value="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
     <property name="axisWebXml"   
value="${tomcat.home}/webapps/${deploy.root}/WEB-INF/web.xml" />
@@ -57,6 +57,8 @@
         <copy file="./conf/axis-1.4/WEB-INF/users.lst"   
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF"/>
         <copy file="./conf/axis-1.4/WEB-INF/web.xml"     
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF"/>
         
+        <copy file="./conf/axis-1.4/WEB-INF/classes/i18n.properties"     
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes"/>
+        
         <copy file="./conf/service.properties"           
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
         <copy file="./conf/components.properties"        
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
 
@@ -66,7 +68,13 @@
     <target name="copy-jars-for-service" depends="copy-axis-for-service">
 
         <copy file="./lib/repository/axis/axis/1.4/axis-1.4.jar"             
                  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"              
   todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy file="./lib/repository/axis/axis-saaj/1.4/axis-saaj-1.4.jar"   
                  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"          
   todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
 todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
 
+
         <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
                  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
         <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
                  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"          
   todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
@@ -86,6 +94,11 @@
     <target name="delete-jars-for-service"  
depends="delete-axis-for-service">
 
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-1.4.jar"/>
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-jaxrpc-1.4.jar"/>
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-saaj-1.4.jar"/>
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
 
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
@@ -116,6 +129,8 @@
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/users.lst"/>
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/web.xml"/>
 
+        <delete 
file=".${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/i18n.properties"/>
+
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/service.properties"/>
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/components.properties"/>
 
@@ -175,7 +190,7 @@
 
     <target name="tomcat-start-question">
 
-        <input message="Do you want to start the application server Tomcat? "
+        <input message="Do you want me to start the application server 
Tomcat for you? "
             addproperty="_tomcat.start.decision"
             validargs="y,n"
             defaultvalue="y" />
@@ -204,7 +219,7 @@
 
     <target name="tomcat-shutdown-question">
 
-        <input message="Do you want to shutdown the application server 
Tomcat? "
+        <input message="Do you want me to shutdown the application server 
Tomcat for you? "
             addproperty="_tomcat.shutdown.decision"
             validargs="y,n"
             defaultvalue="y" />

Modified: branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml    
2006-10-19 13:42:40 UTC (rev 1699)
+++ branches/romradz-ant4rel-20061017/ant/webservice-env-targets.xml    
2006-10-19 13:44:09 UTC (rev 1700)
@@ -54,7 +54,7 @@
 
     <target name="webservice-container-question">
 
-        <input message="Do you want to install the application server 
Tomcat? "
+        <input message="Do you want me to install the application server 
Tomcat for you? "
             addproperty="_tomcat.install.decision"
             validargs="y,n"
             defaultvalue="n" />

Added: 
branches/romradz-ant4rel-20061017/conf/axis-1.4/WEB-INF/classes/i18n.properties