perfsonar development work

Author: rediris.montes
Date: 2010-04-09 10:16:55 +0100 (Fri, 09 Apr 2010)
New Revision: 5589

Removed:
   trunk/perfsonar-java-as/target/test-classes/org/
Modified:
   trunk/perfsonar-java-as/conf/configuration.xml
   trunk/perfsonar-java-as/conf/webAdminConfig.xml
   trunk/perfsonar-java-as/packaging/deb/changelog
   trunk/perfsonar-java-as/packaging/deb/control
   trunk/perfsonar-java-as/packaging/rpm/perfsonar-java-as.specs
   trunk/perfsonar-java-as/pom.xml
Log:
- Fixing configuration file
- Updating wrong values in webAdminConfig.xml
- Updating deb package
- Updating rpm package
- Fixing dependencies in pom.xml

Modified: trunk/perfsonar-java-as/conf/configuration.xml
===================================================================
--- trunk/perfsonar-java-as/conf/configuration.xml      2010-04-08 10:23:09 
UTC (rev 5588)
+++ trunk/perfsonar-java-as/conf/configuration.xml      2010-04-09 09:16:55 
UTC (rev 5589)
@@ -66,13 +66,13 @@
      <extension name="auth-engine">
        <option name="service.as.maxttl"                        
value="900000"/>
        <option name="service.as.crypt_provider"                
value="SunRsaSign"/>
-       <option name="service.as.truststore_file"       
value="WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks"/>
+       <option name="service.as.truststore_file"       
value="/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks"/>
        <option name="service.as.truststore_password"   value="12345678"/>
-       <option name="service.as.valid_components"              
value="WEB-INF/classes/perfsonar/conf/ASValidComponentsFile"/>
+       <option name="service.as.valid_components"              
value="/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile"/>
      </extension>
 
      <extension name="authr-engine">
-       <option name="service.as.authr_policy"                  
value="WEB-INF/classes/perfsonar/conf/basic_policy.xml"/>
+       <option name="service.as.authr_policy"                  
value="/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/perfsonar/conf/basic_policy.xml"/>
      </extension>
 
     <!-- 
....................................................................................
 -->

Modified: trunk/perfsonar-java-as/conf/webAdminConfig.xml
===================================================================
--- trunk/perfsonar-java-as/conf/webAdminConfig.xml     2010-04-08 10:23:09 
UTC (rev 5588)
+++ trunk/perfsonar-java-as/conf/webAdminConfig.xml     2010-04-09 09:16:55 
UTC (rev 5589)
@@ -6,9 +6,9 @@
        
        <!-- service information consists of name and version (only for 
displaying purpose) and accessPoint - selfTest -->
        <wa:serviceInformation>
-               
<wa:accessPoint>http://localhost:8180/perfsonar-java-as-2/services/AuthService</wa:accessPoint>
-               <wa:serviceName>Service Name</wa:serviceName>
-               <wa:version>1.23</wa:version>
+               
<wa:accessPoint>http://localhost:8080/perfsonar-java-as/services/AuthService</wa:accessPoint>
+               <wa:serviceName>Authentication and authorization 
Service</wa:serviceName>
+               <wa:version>1.3</wa:version>
        </wa:serviceInformation>
        
        <!-- credential for WA -->

Modified: trunk/perfsonar-java-as/packaging/deb/changelog
===================================================================
--- trunk/perfsonar-java-as/packaging/deb/changelog     2010-04-08 10:23:09 
UTC (rev 5588)
+++ trunk/perfsonar-java-as/packaging/deb/changelog     2010-04-09 09:16:55 
UTC (rev 5589)
@@ -1,6 +1,7 @@
 perfsonar-java-as (1.3-rc2) stable; urgency=low
 
   * New dependency: sun-java6-jre
+  * New: WebAdmin added
 
  -- Candido Rodriguez 
<>
  Tue, 16 Aug 2009 10:02:03 +0200
 

Modified: trunk/perfsonar-java-as/packaging/deb/control
===================================================================
--- trunk/perfsonar-java-as/packaging/deb/control       2010-04-08 10:23:09 
UTC (rev 5588)
+++ trunk/perfsonar-java-as/packaging/deb/control       2010-04-09 09:16:55 
UTC (rev 5589)
@@ -7,6 +7,6 @@
 
 Package: perfsonar-java-as
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, sun-java5-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, sun-java6-jre
 Description: Authentication and authorization Service of perfSONAR
  This is the Authentication and authorization Service. perfSONAR services 
can use it in order to checking the authentication or the authorization of 
the user/client.

Modified: trunk/perfsonar-java-as/packaging/rpm/perfsonar-java-as.specs
===================================================================
--- trunk/perfsonar-java-as/packaging/rpm/perfsonar-java-as.specs       
2010-04-08 10:23:09 UTC (rev 5588)
+++ trunk/perfsonar-java-as/packaging/rpm/perfsonar-java-as.specs       
2010-04-09 09:16:55 UTC (rev 5589)
@@ -9,7 +9,7 @@
 License: GPL
 
 # Package version. Increment if you create a new package of same microrelease
-Release: rc1
+Release: rc2
 
 # short description of the package
 Summary: perfSONAR Authentication and authorization Service
@@ -30,13 +30,13 @@
 URL: http://www.perfsonar.org
 
 # on what packages should the resulting package depend
-Requires: tomcat5
+Requires: tomcat5, jre >= 1.6.0
 
 # For what architecture is this package ment
 BuildArch: noarch
 
 # What RPM packages are needed during build
-BuildRequires: maven2
+#BuildRequires: maven2
 
 
 #describe your package here
@@ -125,7 +125,11 @@
 
 # Don't forget to add a chanlog entry every time you change the package!
 %changelog
-* Wed Mar 03 2010 Candido Rodriguez 
<>
 1.3-1
+* Tue Apr 08 2010 Candido Rodriguez 
<>
 1.3-rc2
+- New: WebAdmin added
+- Change: Sun JRE 1.6 required
+
+* Wed Mar 03 2010 Candido Rodriguez 
<>
 1.3-rc1
 - New: Use of the new base library (base2)
 - Change: WebAdmin removed
 - Change: Directory structure changed

Modified: trunk/perfsonar-java-as/pom.xml
===================================================================
--- trunk/perfsonar-java-as/pom.xml     2010-04-08 10:23:09 UTC (rev 5588)
+++ trunk/perfsonar-java-as/pom.xml     2010-04-09 09:16:55 UTC (rev 5589)
@@ -163,8 +163,11 @@
                                                        
<targetPath>wa</targetPath>
                                                </resource>
                                                <resource>
-                                                       
<file>${basedir}/resources/index.jsp</file>
-                                                       
<targetPath>index.jsp</targetPath>
+                                                       
<directory>${basedir}/resources/</directory>
+                                                       <includes>
+                                                               
<include>index.jsp</include>
+                                                       </includes>
+                                                       
<targetPath>/</targetPath>
                                                </resource>
                                        </webResources>
                                        
<webXml>${basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>