perfsonar development work

Author: roman
Date: 2006-10-18 10:33:17 -0400 (Wed, 18 Oct 2006)
New Revision: 1689

Added:
   branches/romradz-ant4rel-20061017/conf/wsdd/
   branches/romradz-ant4rel-20061017/conf/wsdd/clmp-service-deploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/clmp-service-undeploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/ls-service-deploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/ls-service-undeploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/ma-service-deploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/ma-service-undeploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/mp-service-deploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/mp-service-undeploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/tcmp-service-deploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/tcmp-service-undeploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/tops-service-deploy.wsdd
   branches/romradz-ant4rel-20061017/conf/wsdd/tops-service-undeploy.wsdd
Modified:
   branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
Log:
I moved wsdd files to conf/wsdd directory (they are still under src but I 
think this should be changed; 
but it's still test work on the branch) and updated deploy targets to use 
them.


Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-18 13:45:14 UTC (rev 1688)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-18 14:33:17 UTC (rev 1689)
@@ -23,14 +23,15 @@
 
 
     <property name="adminService" 
value="http://${target.server}:${target.port}/axis/services/AdminService"; />
-    <property name="deployFile" 
value="../${build}/${wsdd.path}/${wsdd.file.deploy}" />
-    <property name="undeployFile" 
value="../${build}/${wsdd.path}/${wsdd.file.undeploy}" />
-    <property name="axisWebXml" 
value="${tomcat.home}/webapps/${deploy.root}/WEB-INF/web.xml" />
+    <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" />
 
 
     <target name="create-deploy-root">
 
         <mkdir dir="${tomcat.home}/webapps/${deploy.root}"/>
+        <mkdir dir="${tomcat.home}/webapps/${deploy.root}/wsdd"/>
         <mkdir dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF"/>
         <mkdir dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
         <mkdir dir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes"/>

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-10-18 13:45:14 UTC (rev 1688)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-10-18 14:33:17 UTC (rev 1689)
@@ -39,6 +39,9 @@
         <copy file="./conf/eventType-map.xml"                                
                                   
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
         <copy file="./conf/eventType-rules.xml"                              
                                   
todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
 
+        <copy file="./conf/wsdd/${wsdd.file.deploy}"                         
                                   
todir="${tomcat.home}/webapps/${deploy.root}/wsdd"/>
+        <copy file="./conf/wsdd/${wsdd.file.undeploy}"                       
                                   
todir="${tomcat.home}/webapps/${deploy.root}/wsdd"/>
+
     </target>
 
 
@@ -62,6 +65,9 @@
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-map.xml"
 />
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/classes/perfsonar/conf/eventType-rules.xml"
 />
 
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.deploy}" />
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/wsdd/${wsdd.file.undeploy}" />
+
     </target>
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-18 13:45:14 UTC (rev 1688)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-configure-targets.xml   
  2006-10-18 14:33:17 UTC (rev 1689)
@@ -65,10 +65,8 @@
             <entry  key="build" value="build"/>
             <entry  key="package.root" value="org/perfsonar"/>
             <entry  key="package.nmwg.root" value="org/ggf"/>
-            <entry  key="wsdd.home" value="service/web/wsdd"/>
             <entry  key="wsdd.file.deploy" value="ma-service-deploy.wsdd"/>
             <entry  key="wsdd.file.undeploy" 
value="ma-service-undeploy.wsdd"/>
-            <entry  key="wsdd.path" value="org/perfsonar/service/web/wsdd"/>
             <entry  key="api.location" value="doc/api"/>
             <entry  key="api.title" value="perfSONAR"/>
             <entry  key="api.windowtitle" value="perfSONAR"/>

Added: branches/romradz-ant4rel-20061017/conf/wsdd/clmp-service-deploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/clmp-service-undeploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/ls-service-deploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/ls-service-undeploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/ma-service-deploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/ma-service-undeploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/mp-service-deploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/mp-service-undeploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/tcmp-service-deploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/tcmp-service-undeploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/tops-service-deploy.wsdd

Added: branches/romradz-ant4rel-20061017/conf/wsdd/tops-service-undeploy.wsdd