perfsonar development work

Author: roman
Date: 2008-04-15 06:53:24 -0400 (Tue, 15 Apr 2008)
New Revision: 3656

Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-rrd-ma/ant/const.properties.template
   trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
   trunk/geant2_java-rrd-ma/conf/wizard.properties
Log:
Use of new web admin library (0.8.3b) that includes changes needed for the 
wizard. The wizard now contains also AuthN part.




Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-04-15 
07:43:08 UTC (rev 3655)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-04-15 
10:53:24 UTC (rev 3656)
@@ -47,7 +47,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.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.8b/perfsonar-web-admin-0.8b.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
@@ -247,7 +247,7 @@
 
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.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.8b/perfsonar-web-admin-0.8b.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/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                          todir="${tmpdir}/WEB-INF/lib"/>
 

Modified: trunk/geant2_java-rrd-ma/ant/const.properties.template
===================================================================
--- trunk/geant2_java-rrd-ma/ant/const.properties.template      2008-04-15 
07:43:08 UTC (rev 3655)
+++ trunk/geant2_java-rrd-ma/ant/const.properties.template      2008-04-15 
10:53:24 UTC (rev 3656)
@@ -11,10 +11,10 @@
 service.name=geant2_java-rrd-ma
 
 jarfilename=perfsonar-rrd-ma
-version=3.0rc2
+version=3.0rc6
 
-exist.war.file=exist-1.0.1.war
-exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1
+exist.war.file=exist-1.1.1-newcore.war
+exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.1.1
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-04-15 
07:43:08 UTC (rev 3655)
+++ trunk/geant2_java-rrd-ma/ant/libs-download-targets.xml      2008-04-15 
10:53:24 UTC (rev 3656)
@@ -56,7 +56,7 @@
 
       <dependency groupId="rrdjtool"   artifactId="rrdjtool"             
version="1.0"/>
       <dependency groupId="perfsonar"  artifactId="perfsonar-base"       
version="1.0.20080310"/>
-      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8b"/>
+      <dependency groupId="perfsonar"  artifactId="perfsonar-web-admin"  
version="0.8.3b"/>
       <dependency groupId="nmwg"       artifactId="nmwg"                 
version="1.0.20071008"/>
 
 

Modified: trunk/geant2_java-rrd-ma/conf/wizard.properties
===================================================================
--- trunk/geant2_java-rrd-ma/conf/wizard.properties     2008-04-15 07:43:08 
UTC (rev 3655)
+++ trunk/geant2_java-rrd-ma/conf/wizard.properties     2008-04-15 10:53:24 
UTC (rev 3656)
@@ -124,6 +124,8 @@
 
 
 
+
+
   <property>
     <entry key="servlet.username" required="true">perfsonaruser</entry>
     <Comment>Enter the username for logging in to the admin pages:</Comment>
@@ -141,4 +143,31 @@
 
 
 
+
+  <property>
+    <entry key="service.as.authn_active" required="true">no</entry>
+    <Comment>Do you wish to enable authentication?</Comment>
+    <ProposedValue>yes</ProposedValue>
+    <Group order="1" check="true">AuthN</Group>
+    <AcceptedValue>yes</AcceptedValue>
+    <AcceptedValue>no</AcceptedValue>
+  </property>
+
+  <property>
+    <entry key="service.as.point" 
required="true">http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</entry>
+    <Comment>Enter the URL address of the Authentication Service:</Comment>
+    
<ProposedValue>http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService</ProposedValue>
+    <Group order="2">AuthN</Group>
+  </property>
+
+  <property>
+    <entry key="service.as.authn_for_msg_types" 
required="true">SetupDataRequest,MetadataKeyRequest</entry>
+    <Comment>Enter the message types which should be authenticated:</Comment>
+    <ProposedValue>SetupDataRequest,MetadataKeyRequest</ProposedValue>
+    <Group order="3">AuthN</Group>
+  </property>
+
+
+
+
 </properties>