perfsonar development work

Author: rodriguez
Date: 2008-08-19 07:04:53 -0400 (Tue, 19 Aug 2008)
New Revision: 4359

Added:
   trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20080416.jar
   trunk/geant2_java-as/pom.xml
   trunk/geant2_java-as/samples/requests/
   trunk/geant2_java-as/samples/requests/EchoRequest-self-test.xml
   trunk/geant2_java-as/samples/requests/EchoRequest.xml
   trunk/geant2_java-as/samples/responses/
   trunk/geant2_java-as/samples/responses/EchoResponse.xml
Removed:
   trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20071008.jar
   trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20080331.jar
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/webapp-package-targets.xml
   trunk/geant2_java-as/conf/axis-1.4/WEB-INF/web.xml
   trunk/geant2_java-as/conf/service.properties.template-2
   trunk/geant2_java-as/conf/servlet.properties.template
   trunk/geant2_java-as/conf/wizard.properties.template
Log:
- Update ant scripts
- Update web.xml: first the index.jsp
- Update some config files
- Add samples messages
- Add maven file

Modified: trunk/geant2_java-as/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-08-18 14:17:19 
UTC (rev 4358)
+++ trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-08-19 11:04:53 
UTC (rev 4359)
@@ -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.3b/perfsonar-web-admin-0.8.3b.jar"
           todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.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-08-18 14:17:19 
UTC (rev 4358)
+++ trunk/geant2_java-as/ant/const.properties.template  2008-08-19 11:04:53 
UTC (rev 4359)
@@ -11,13 +11,13 @@
 service.name=geant2-java-as
 
 jarfilename=perfsonar-as
-version=1.0
+version=1.1
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080331.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar
 
 api.location=doc/api
 api.title=perfSONAR

Modified: trunk/geant2_java-as/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/libs-download-targets.xml  2008-08-18 14:17:19 
UTC (rev 4358)
+++ trunk/geant2_java-as/ant/libs-download-targets.xml  2008-08-19 11:04:53 
UTC (rev 4359)
@@ -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.3b"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.9b"/>
       <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.3b"/>
+      <dependency groupId="perfsonar"                          
artifactId="perfsonar-web-admin"    version="0.9b"/>
 
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>

Modified: trunk/geant2_java-as/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-08-18 14:17:19 
UTC (rev 4358)
+++ trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-08-19 11:04:53 
UTC (rev 4359)
@@ -57,6 +57,7 @@
 
     <!-- prepare conf files -->
     <copy file="${basedir}/conf/service.properties.template-2"    
tofile="${basedir}/conf/service.properties"/>
+    <copy file="${basedir}/conf/servlet.properties.template"      
tofile="${basedir}/conf/servlet.properties"/>
     <copy file="${basedir}/conf/components.properties.template"   
tofile="${basedir}/conf/components.properties"/>
     <copy file="${basedir}/conf/log4j.properties.template"        
tofile="${basedir}/conf/log4j.properties"/>
     <copy file="${basedir}/conf/log4j.syslog.properties.template" 
tofile="${basedir}/conf/log4j.syslog.properties"/>
@@ -65,7 +66,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.3b/perfsonar-web-admin-0.8.3b.jar"
    todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9b/perfsonar-web-admin-0.9b.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/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/WEB-INF/web.xml  2008-08-18 14:17:19 
UTC (rev 4358)
+++ trunk/geant2_java-as/conf/axis-1.4/WEB-INF/web.xml  2008-08-19 11:04:53 
UTC (rev 4359)
@@ -128,8 +128,8 @@
   </mime-mapping>
 
   <welcome-file-list id="WelcomeFileList">
+    <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.html</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.jws</welcome-file>
   </welcome-file-list>
 

Modified: trunk/geant2_java-as/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template-2     2008-08-18 
14:17:19 UTC (rev 4358)
+++ trunk/geant2_java-as/conf/service.properties.template-2     2008-08-19 
11:04:53 UTC (rev 4359)
@@ -19,11 +19,11 @@
 
 # Group=Internal
 # Description=The location of the SAX parser configuration.
-service.sax_parser.config=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/objects.config
+service.sax_parser.config=/var/lib/tomcat5.5/webapps/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=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/var/lib/tomcat5.5/webapps/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=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
+service.as.truststore_file=/var/lib/tomcat5.5/webapps/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=/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
+service.as.valid_components=/var/lib/tomcat5.5/webapps/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/servlet.properties.template
===================================================================
--- trunk/geant2_java-as/conf/servlet.properties.template       2008-08-18 
14:17:19 UTC (rev 4358)
+++ trunk/geant2_java-as/conf/servlet.properties.template       2008-08-19 
11:04:53 UTC (rev 4359)
@@ -8,4 +8,7 @@
 servlet.username=perfsonaruser
 
 #The password used for authentication reasons when accessing properties 
configuration and Wizard servlets
-servlet.password=perfsonarpass
\ No newline at end of file
+servlet.password=perfsonarpass
+
+#Controls the use of advanced features in the properties management servlet. 
Default value is �off�
+servlet.extra_functionalities=off

Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template        2008-08-18 
14:17:19 UTC (rev 4358)
+++ trunk/geant2_java-as/conf/wizard.properties.template        2008-08-19 
11:04:53 UTC (rev 4359)
@@ -84,9 +84,9 @@
   </property>
 
   <property>
-    <entry key="service.as.truststore_file" 
required="true">/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
+    <entry key="service.as.truststore_file" 
required="true">/var/lib/tomcat5.5/webapps/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>/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
+    
<ProposedValue>/var/lib/tomcat5-5/webapps/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">/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
+    <entry key="service.as.valid_components" 
required="true">/var/lib/tomcat5.5/webapps/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>/opt/perfsonar/services/geant2_java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
+    
<ProposedValue>/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
     <Group order="3">Authentication</Group>
   </property>
   

Deleted: trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20071008.jar

Deleted: trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20080331.jar

Added: trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20080416.jar


Property changes on: 
trunk/geant2_java-as/lib/misc/perfsonar-base-ant-1.0.20080416.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/pom.xml

Added: trunk/geant2_java-as/samples/requests/EchoRequest-self-test.xml

Added: trunk/geant2_java-as/samples/requests/EchoRequest.xml

Added: trunk/geant2_java-as/samples/responses/EchoResponse.xml