perfsonar development work

Author: rodriguez
Date: 2008-04-16 11:32:40 -0400 (Wed, 16 Apr 2008)
New Revision: 3713

Modified:
   trunk/geant2_java-as/ant/axis-deploy-targets.xml
   trunk/geant2_java-as/ant/const.properties.template
   trunk/geant2_java-as/ant/libs-download-targets.xml
   trunk/geant2_java-as/ant/test-targets.xml
   trunk/geant2_java-as/ant/webapp-package-targets.xml
   trunk/geant2_java-as/conf/service.properties.template-2
   trunk/geant2_java-as/conf/wizard.properties.template
   trunk/geant2_java-as/doc/ChangeLog.txt
Log:
Preparing the RC7:
- Using the webadmin 0.8.3b
- Preparing the service for /opt/perfsonar

Modified: trunk/geant2_java-as/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-04-16 15:06:33 
UTC (rev 3712)
+++ trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-04-16 15:32:40 
UTC (rev 3713)
@@ -52,7 +52,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar" 
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.1b/perfsonar-web-admin-0.8.1b.jar"
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"
                                      
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
                                 
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
   todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

Modified: trunk/geant2_java-as/ant/const.properties.template
===================================================================
--- trunk/geant2_java-as/ant/const.properties.template  2008-04-16 15:06:33 
UTC (rev 3712)
+++ trunk/geant2_java-as/ant/const.properties.template  2008-04-16 15:32:40 
UTC (rev 3713)
@@ -11,7 +11,7 @@
 service.name=geant2_java-as
 
 jarfilename=perfsonar-as
-version=1.0rc6
+version=1.0rc7
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: trunk/geant2_java-as/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/libs-download-targets.xml  2008-04-16 15:06:33 
UTC (rev 3712)
+++ trunk/geant2_java-as/ant/libs-download-targets.xml  2008-04-16 15:32:40 
UTC (rev 3713)
@@ -55,14 +55,14 @@
     <artifact:dependencies>
 
       <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20080310"/>
-      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.8.1b"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.8.3b"/>
       <dependency groupId="nmwg"      artifactId="nmwg"           
version="1.0.20080124"/>
 
       <!-- dependencies for perfsonar-web-admin -->
       <dependency groupId="commons-io"                                 
artifactId="commons-io"                         version="1.3.2"/>
       <dependency groupId="commons-codec"                      
artifactId="commons-codec"          version="1.3"/>
       <dependency groupId="commons-fileupload"      
artifactId="commons-fileupload"     version="1.2"/>
-      <dependency groupId="perfsonar"                          
artifactId="perfsonar-web-admin"    version="0.8.1b"/>
+      <dependency groupId="perfsonar"                          
artifactId="perfsonar-web-admin"    version="0.8.3b"/>
 
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>

Modified: trunk/geant2_java-as/ant/test-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/test-targets.xml   2008-04-16 15:06:33 UTC (rev 
3712)
+++ trunk/geant2_java-as/ant/test-targets.xml   2008-04-16 15:32:40 UTC (rev 
3713)
@@ -91,14 +91,14 @@
         <java classname="org.perfsonar.client.testHarness.UbCSaslTest"
                 classpathref="classpath" fork="true">
                <jvmarg value="-DuseSubjectCredsOnly=true"/>
-            <arg value="homer.rediris.es"/>
+            <arg value="srv2.ams.nl.geant2.net"/>
             <arg value="4088"/>
                <arg value="${basedir}/conf/handle.jks"/>
             <arg value="petete"/>
             <arg value="jceks"/>
-            <arg value="perfsonar"/>
-            <arg value="perfsonar"/>
-            <arg value="authn"/>
+            <arg value="first_candido-dante.net"/>
+            <arg value="l1nux98"/>
+            <arg value="get"/>
             <arg 
value="http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService"/>
         </java>
 

Modified: trunk/geant2_java-as/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-04-16 15:06:33 
UTC (rev 3712)
+++ trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-04-16 15:32:40 
UTC (rev 3713)
@@ -12,7 +12,7 @@
 
   <target name="war-package-create"
           depends="webapp-package-directory-prepare">
-    <zip destfile="${service.name}-${version}.war"
+    <zip destfile="${service.name}.war"
          basedir="${tmpdir}/"
          excludes=".svn/**" />
     <delete dir="${tmpdir}"/>
@@ -22,7 +22,7 @@
   <target name="webapp-package-create"
           xmlns:psbase="psbase:/base.perfsonar.org"
           depends="webapp-package-directory-prepare">
-    <move todir="${tmpdir}-webapps/webapps/${service.name}-${version}">
+    <move todir="${tmpdir}-webapps/webapps/${service.name}">
       <fileset dir="${tmpdir}"/>
     </move>
   </target>
@@ -64,7 +64,7 @@
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
        <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080124/nmwg-1.0.20080124.jar" 
                          todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.1b/perfsonar-web-admin-0.8.1b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"
                       todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
                  todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
   todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2_java-as/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template-2     2008-04-16 
15:06:33 UTC (rev 3712)
+++ trunk/geant2_java-as/conf/service.properties.template-2     2008-04-16 
15:32:40 UTC (rev 3713)
@@ -19,11 +19,11 @@
 
 # Group=Internal
 # Description=The location of the SAX parser configuration.
-service.sax_parser.config=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/objects.config
 
 # Group=Internal
 # Description=The location of the the log4j logger configuration file.
-service.log.log4j.config=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of LS functionality
@@ -77,7 +77,7 @@
 
 # Group=Authentication
 # Description=The full path to the TrustStore file containing the CA certs.
-service.as.truststore_file=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
+service.as.truststore_file=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
 
 # Group=Authentication
 # Description=The password for the TrustStore file.
@@ -85,7 +85,7 @@
 
 # Group=Authentication
 # Description=The full path to a file containing valid Component IDs in 
eduGAIN.
-service.as.valid_components=/home/perfsonar/webapps/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
+service.as.valid_components=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
 
 # Group=Authentication
 # Description=The crypt provider library for the service.

Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template        2008-04-16 
15:06:33 UTC (rev 3712)
+++ trunk/geant2_java-as/conf/wizard.properties.template        2008-04-16 
15:32:40 UTC (rev 3713)
@@ -84,9 +84,9 @@
   </property>
 
   <property>
-    <entry key="service.as.truststore_file" 
required="true">/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
+    <entry key="service.as.truststore_file" 
required="true">/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
     <Comment>Enter the full path to the TrustStore file containing the CA 
certs:</Comment>
-    
<ProposedValue>/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
+    
<ProposedValue>/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
     <Group order="1">Authentication</Group>
   </property>
   
@@ -98,9 +98,9 @@
   </property>
   
   <property>
-    <entry key="service.as.valid_components" 
required="true">/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
+    <entry key="service.as.valid_components" 
required="true">/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
     <Comment>Enter the full path to a file containing valid Component IDs in 
eduGAIN:</Comment>
-    
<ProposedValue>/home/perfsonar/webapps/geant2_java-as-1.0/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
+    
<ProposedValue>/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
     <Group order="3">Authentication</Group>
   </property>
   

Modified: trunk/geant2_java-as/doc/ChangeLog.txt
===================================================================
--- trunk/geant2_java-as/doc/ChangeLog.txt      2008-04-16 15:06:33 UTC (rev 
3712)
+++ trunk/geant2_java-as/doc/ChangeLog.txt      2008-04-16 15:32:40 UTC (rev 
3713)
@@ -1,5 +1,9 @@
 AS ChangeLog
 
+2008-04-16 Version 1.0rc7
+- Uses the webadmin 0.8.3b
+- Uses the last package_maker.pl so it changes all references to 
/opt/perfsonar/
+
 2008-04-10 Version 1.0rc6
 - Uses the webadmin 0.8.1b
 - Updates the ASHandler for the webadmin