perfsonar development work

Author: mac
Date: 2008-02-22 08:11:33 -0500 (Fri, 22 Feb 2008)
New Revision: 3387

Added:
   trunk/geant2_java-xml-ls/ant/rpm-do.sh
   trunk/geant2_java-xml-ls/ant/rpm-structure.sh
Modified:
   trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
   trunk/geant2_java-xml-ls/ant/const.properties.template
   trunk/geant2_java-xml-ls/ant/libs-download-targets.xml
   trunk/geant2_java-xml-ls/ant/release-targets.xml
Log:
generating RPM webapps structure with bash scripts

Modified: trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml        2008-02-22 
12:58:29 UTC (rev 3386)
+++ trunk/geant2_java-xml-ls/ant/axis-deploy-targets.xml        2008-02-22 
13:11:33 UTC (rev 3387)
@@ -43,14 +43,11 @@
     <copy file="${basedir}/samples/requests/LSStore-control.xml"
           
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
     
-    <copy file="${basedir}/conf/axis-1.4/default.css"
-          todir="${service.home}/${deploy.root}"/>
-    <copy file="${basedir}/conf/axis-1.4/main.css"
-          todir="${service.home}/${deploy.root}"/>
-    <copy file="${basedir}/conf/axis-1.4/partners.gif"
-          todir="${service.home}/${deploy.root}"/>
-    <copy file="${basedir}/conf/axis-1.4/perfsonar.png"
-          todir="${service.home}/${deploy.root}"/>
+    <copy todir="${service.home}/${deploy.root}">
+        <fileset dir="${basedir}/conf/axis-1.4" casesensitive="yes">
+          <include name="*.*"/>
+        </fileset>
+    </copy>
     
     
 
@@ -73,7 +70,7 @@
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-io/commons-io/1.2/commons-io-1.2.jar" 
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.5b/perfsonar-web-admin-0.5b.jar"
 
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/${ps-webadmin}/perfsonar-web-admin-${ps-webadmin}.jar"
 
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     
   </target>
@@ -84,7 +81,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/${nmwg-jar-ver}/nmwg-${nmwg-jar-ver}.jar"
                           
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/${ps-antxml-ver}/perfsonar-base-${ps-antxml-ver}.jar"
  
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/${ps-jar-ver}/perfsonar-base-${ps-jar-ver}.jar"
  
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
     <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"    
todir="${service.home}/${deploy.root}/wsdd"/>
@@ -273,8 +270,8 @@
     <antcall target="deploy-adminclient" />
 
   </target>
-
-
+  
+  
   <target name="undeploy">
     
     <property file="${basedir}/ant/const.properties"/>
@@ -284,5 +281,6 @@
 
   </target>
 
+  
 
 </project>
\ No newline at end of file

Modified: trunk/geant2_java-xml-ls/ant/const.properties.template
===================================================================
--- trunk/geant2_java-xml-ls/ant/const.properties.template      2008-02-22 
12:58:29 UTC (rev 3386)
+++ trunk/geant2_java-xml-ls/ant/const.properties.template      2008-02-22 
13:11:33 UTC (rev 3387)
@@ -24,7 +24,8 @@
 api.windowtitle=perfSONAR
 api.bottom=perfSONAR
 
-nmwg-jar-ver=1.0.20071008
-ps-antxml-ver=1.0.20071121
-ps-jar-ver=1.0.20071121
+nmwg-jar-ver=1.0.20080124
+ps-antxml-ver=1.0.20080204
+ps-jar-ver=1.0.20080207
+ps-webadmin=0.6b
 

Modified: trunk/geant2_java-xml-ls/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/libs-download-targets.xml      2008-02-22 
12:58:29 UTC (rev 3386)
+++ trunk/geant2_java-xml-ls/ant/libs-download-targets.xml      2008-02-22 
13:11:33 UTC (rev 3387)
@@ -63,7 +63,7 @@
       <dependency groupId="commons-codec"  artifactId="commons-codec"  
version="1.3"/>
       <dependency groupId="commons-fileupload"  
artifactId="commons-fileupload"  version="1.2"/>
       <dependency groupId="commons-io"  artifactId="commons-io"  
version="1.2"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.5b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="${ps-webadmin}"/>
       
       <!-- /dependency -->
       

Modified: trunk/geant2_java-xml-ls/ant/release-targets.xml
===================================================================
--- trunk/geant2_java-xml-ls/ant/release-targets.xml    2008-02-22 12:58:29 
UTC (rev 3386)
+++ trunk/geant2_java-xml-ls/ant/release-targets.xml    2008-02-22 13:11:33 
UTC (rev 3387)
@@ -29,11 +29,9 @@
   </target>
 
 
-  <target name="release"
+  <target name="release-prepare"
           depends="release-init,jar">
-    
-    
-
+  
     <delete dir="tmp"/>
     
     <mkdir dir="tmp/XML-LS-${release.version}"/>
@@ -57,9 +55,12 @@
       <fileset dir="tmp/XML-LS-${release.version}/samples/requests" 
includes="**/*Response.xml"/>      
     </delete>
     
-    <delete dir="tmp/XML-LS-${release.version}/lib2"/> <!-- temporary -->
+  </target>
+  
+  
+  <target name="release"
+          depends="release-prepare">
 
-
     <tar destfile="XML-LS-${release.version}.tar"
          basedir="tmp/"
          longfile="gnu"
@@ -76,5 +77,6 @@
 
   </target>
 
+ 
 
 </project>

Added: trunk/geant2_java-xml-ls/ant/rpm-do.sh


Property changes on: trunk/geant2_java-xml-ls/ant/rpm-do.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/geant2_java-xml-ls/ant/rpm-structure.sh


Property changes on: trunk/geant2_java-xml-ls/ant/rpm-structure.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native