perfsonar development work

Author: rodriguez
Date: 2008-03-12 09:50:40 -0400 (Wed, 12 Mar 2008)
New Revision: 3504

Added:
   trunk/geant2_java-as/conf/axis-1.4/Service_Admin.js
   trunk/geant2_java-as/conf/axis-1.4/b.gif
   trunk/geant2_java-as/conf/axis-1.4/background.gif
   trunk/geant2_java-as/conf/axis-1.4/l.gif
   trunk/geant2_java-as/conf/axis-1.4/lb.gif
   trunk/geant2_java-as/conf/axis-1.4/lt.gif
   trunk/geant2_java-as/conf/axis-1.4/r.gif
   trunk/geant2_java-as/conf/axis-1.4/rb.gif
   trunk/geant2_java-as/conf/axis-1.4/rt.gif
   trunk/geant2_java-as/conf/axis-1.4/stemb.gif
   trunk/geant2_java-as/conf/axis-1.4/stemt.gif
   trunk/geant2_java-as/conf/axis-1.4/t.gif
   trunk/geant2_java-as/conf/axis-1.4/tip_balloon.js
   trunk/geant2_java-as/conf/axis-1.4/top_slice.gif
   trunk/geant2_java-as/conf/axis-1.4/wz_tooltip.js
Modified:
   trunk/geant2_java-as/ant/axis-deploy-targets.xml
   trunk/geant2_java-as/ant/configure-targets.xml
   trunk/geant2_java-as/ant/const.properties.template
   trunk/geant2_java-as/ant/libs-download-targets.xml
   trunk/geant2_java-as/ant/pre-install-targets.xml
   trunk/geant2_java-as/conf/axis-1.4/default.css
   trunk/geant2_java-as/conf/axis-1.4/index.html
   trunk/geant2_java-as/conf/components.properties.template
   trunk/geant2_java-as/conf/service.properties.template
   trunk/geant2_java-as/doc/ChangeLog.txt
   
trunk/geant2_java-as/src/main/java/org/perfsonar/service/authService/AuthNAction.java
   
trunk/geant2_java-as/src/main/java/org/perfsonar/service/testHarness/authService/AuthNRequestTest.java
Log:
- Fixing a bug validating signatures in SAML assertions
- Preparing the system of the upcoming version of perfsonar-web-admin

Modified: trunk/geant2_java-as/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/ant/axis-deploy-targets.xml    2008-03-12 13:50:40 
UTC (rev 3504)
@@ -36,8 +36,8 @@
           depends="copy-dep-base-service-jars">
 
     <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.20080226/perfsonar-base-1.0.20080226.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.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.5b/perfsonar-web-admin-0.5b.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/configure-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/configure-targets.xml      2008-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/ant/configure-targets.xml      2008-03-12 13:50:40 
UTC (rev 3504)
@@ -36,17 +36,17 @@
         <antcontrib:then>
 
           <propertyfile file="${basedir}/conf/service.properties">
-            <entry  key="service.r.service_type"                    
value="AS"/>
-            <entry  key="component.registrator.scheduler_component" 
value="as_scheduler"/>
+            <entry  key="service.r.service_type"                    
value="as"/>
+            <entry  key="component.registrator.scheduler_component" 
value="scheduler"/>
           </propertyfile>
 
-        <replace file="${basedir}/conf/components.properties"
-                 
token="#ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler"
-                 
value="ma_scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler"/>
+            <replace file="${basedir}/conf/components.properties"
+                     
token="#scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+                     
value="scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
 
-        <replace file="${basedir}/conf/components.properties"
-                 
token="#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"
-                 
value="registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+            <replace file="${basedir}/conf/components.properties"
+                     
token="#registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent"
+                     
value="registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent"/>
 
         </antcontrib:then>
     </antcontrib:if>
@@ -63,7 +63,7 @@
       <entry  key="service.as.valid_components"  
value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile"/>
        
       <!-- for LookupInfoRequest message -->
-      <entry  key="service.r.service_type"    value="AS"/>
+      <entry  key="service.r.service_type"    value="as"/>
       <entry  key="service.r.service_name"    value="${service.name}"/>
       <entry  key="service.r.service_version" value="${version}"/>
 

Modified: trunk/geant2_java-as/ant/const.properties.template
===================================================================
--- trunk/geant2_java-as/ant/const.properties.template  2008-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/ant/const.properties.template  2008-03-12 13:50:40 
UTC (rev 3504)
@@ -6,12 +6,12 @@
 
 build=build
 
-target.server=homer.rediris.es
+target.server=127.0.0.1
 
-service.name=perfSONAR-AS
+service.name=geant2_java-as
 
 jarfilename=perfsonar-as
-version=1.0-dev
+version=1.0rc3
 
 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-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/ant/libs-download-targets.xml  2008-03-12 13:50:40 
UTC (rev 3504)
@@ -54,15 +54,15 @@
 
     <artifact:dependencies>
 
-      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20080226"/>
-      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.6b"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-base" 
version="1.0.20080310"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-web-admin" 
version="0.5b"/>
       <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.6b"/>
+      <dependency groupId="perfsonar"                          
artifactId="perfsonar-web-admin"    version="0.5b"/>
 
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>

Modified: trunk/geant2_java-as/ant/pre-install-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/pre-install-targets.xml    2008-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/ant/pre-install-targets.xml    2008-03-12 13:50:40 
UTC (rev 3504)
@@ -27,7 +27,7 @@
 
     <psbase:template-use template-file="ant/const.properties.template"
                          dest-file="ant/const.properties"/>
-    <psbase:template-use template-file="conf/service.properties.template"
+    <psbase:template-use template-file="conf/service.properties.template-2"
                          dest-file="conf/service.properties"/>
 
     <property file="${basedir}/ant/const.properties"/>  <!-- loading 
service.name property -->

Added: trunk/geant2_java-as/conf/axis-1.4/Service_Admin.js

Added: trunk/geant2_java-as/conf/axis-1.4/b.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/b.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/background.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/background.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/geant2_java-as/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/default.css      2008-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/conf/axis-1.4/default.css      2008-03-12 13:50:40 
UTC (rev 3504)
@@ -1,162 +1,181 @@
-/* standard elements */
-
-html {min-height: 100%;}
-
-
-* {
-       margin: 0;
-       padding: 0;
-}
-
-
-body{
-     background-color: #ffffff;
-        font-family: arial;
-}
-
-
-/* title */
-
-.top {
-       display: block;
-       font-family: arial;
-       font-weight: bold;
-       margin: 2% 1% 0 1%;
-       border-top: 1px solid green;
-       border-right: 1px solid green;
-       border-left: 1px solid green;
-       padding: 7px;
-       background: #afdfc0;
-}
-
-.properties{
-
-    font-family: arial;
-       border: 1px solid green;
-       padding: 10px;
-       margin: 0% 1% 0 1%;
-}
- .properties p{
-    font-size: 120%;
-       
-}
-
-.properties table{
-       border-bottom: 1px solid green;
-       margin-bottom: 20px;
-}
-
-.properties td{
-       padding: 15px;
-}
-
-.properties em{  
-       display: block;  
-       color: red;  
-       font-size: 95%;  
-}
-
-.info {
-
-       font-family: arial;
-       font-size: 120%;
-}
-
-.info p{
-   position: relative;
-   left: -230px;  
-}
-
-.content{
-       font-family: arial;
-       font-size: 120%;
-       margin:2% 1% 0 1%;
-       background: #ffffff;
-       }
-       
-.content ul {
-       margin-top: 5px;
-       display: block;
-       list-style: none outside;
-       padding: 5px;
-       border-top: 1px solid green;
-       border-left: 1px solid green;
-       border-right: 1px solid green;
-       }
-       
-.content li {
-       margin: 0 0 0 0;
-       padding: 0px;
-       display: block;
-       float: left;
-       position: relative;
-       top: -1.32em;
-       }
-       
-.content a {
-       padding: 5px;
-       text-decoration: none;
-       color: green;
-       background: #ffffff;
-       }
-       
-.content a:hover {
-       background: #3CB371;
-       color: green;
-       }
-       
-.content #selected {
-       }
-       
-.content #selected a {
-               
-       font-weight: bold;
-       color: green;
-       background: #3CB3A1;
-       }
-       
-.manage {
-
-       background: #ffffff;
-       border-bottom: 1px solid green;
-       border-left: 1px solid green;
-       border-right: 1px solid green;
-       margin:0 1% 0 1%;
-       padding: 1em;
-       }
-
-.showResource{ 
-       font-weight: bold;
-       text-indent: 0%;
-       text-align:inherit;
-       background: #ffffff;
-       
-}
-
-.showResource td{
-       padding: 7px;  
-       
-}
-
-.input {
-       padding: 1em;
-       font-size: 110%;
-       font-family: arial;   
-
-}
-
-.input table{
-       padding: 5px;
-
-}
-.input td{
-       padding: 5px; 
-}
-
-.input th{
-       padding: 5px;
-       text-align: left;
-
-}
-
-
+/* standard elements */
+html {
+    min-height: 100%;
+}
+
+* {
+    margin: 0;
+    padding: 0;
+}
+
+body {
+    background-color: #ffffff;
+    font-family: arial;
+}
+/* title */
+.top {
+    display: block;
+    font-family: arial;
+    font-weight: bold;
+    margin: 2% 1% 0 1%;
+    border-top: 1px solid green;
+    border-right: 1px solid green;
+    border-left: 1px solid green;
+    padding: 7px;
+    background: #afdfc0;
+}
+
+.properties {
+    font-family: arial;
+    font-size: 15px;
+    border: 1px solid green;
+    padding: 10px;
+    margin: 0% 1% 0 1%;
+}
+
+.properties p {
+    font-size: 120%;
+}
+
+.properties div{
+ 
+}
+.properties table {
+    margin-bottom: 20px;
+    border-bottom: 1px solid green;
+}
+
+.properties td {
+    padding: 15px;
+    width: 27%;
+}
+
+.properties em {
+    display: block;
+    color: red;
+    font-size: 95%;
+}
+
+.main{
+   padding: 10px;
+}
+.info {
+    font-family: arial;
+    font-size: 120%;
+    padding: 10px;
+    border: 1px solid green;
+}
+
+.info p {
+    position: relative;
+    #left: -30px;
+}
+
+.tablessContent {
+    margin: 2% 1% 0 1%;
+    background: #ffffff;
+    border-top: 1px solid green;
+    border-left: 1px solid green;
+    border-right: 1px solid green;
+}
+
+.content {
+    font-family: arial;
+    font-size: 120%;
+    margin: 2% 1% 0 1%;
+    background: #ffffff;
+}
+
+.content ul {
+    margin-top: 5px;
+    display: block;
+    list-style: none outside;
+    padding: 5px;
+    border-top: 1px solid green;
+    border-left: 1px solid green;
+    border-right: 1px solid green;
+}
+
+.content li {
+    margin: 0 0 0 0;
+    padding: 0px;
+    display: block;
+    float: left;
+    position: relative;
+    top: -1.32em;
+}
+
+.content a {
+    padding: 5px;
+    text-decoration: none;
+    color: green;
+    background: #ffffff;
+}
+
+.content a:hover {
+    background: #3CB371;
+    color: green;
+}
+
+.content #selected {
+}
+
+.content #selected a {
+    font-weight: bold;
+    color: green;
+    background: #3CB3A1;
+}
+
+.manage {
+    background: #ffffff;
+    border-bottom: 1px solid green;
+    border-left: 1px solid green;
+    border-right: 1px solid green;
+    margin: 0 1% 0 1%;
+    padding: 1em;
+}
+
+.manage table {
+    padding: 5px;
+}
+
+.manage td {
+    padding: 5px;
+}
+
+.manage th {
+    padding: 5px;
+    text-align: left;
+}
+
+.showResource {
+    font-weight: bold;
+    text-indent: 0%;
+    text-align: inherit;
+    background: #ffffff;
+}
+
+.showResource td {
+    padding: 7px;
+}
+
+.input {
+    padding: 1em;
+    font-size: 110%;
+    font-family: arial;
+}
+
+.input table {
+    padding: 5px;
+}
+
+.input td {
+    padding: 5px;
+}
+
+.input th {
+    padding: 5px;
+    text-align: left;
+}
+
+

Modified: trunk/geant2_java-as/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/index.html       2008-03-12 13:45:34 
UTC (rev 3503)
+++ trunk/geant2_java-as/conf/axis-1.4/index.html       2008-03-12 13:50:40 
UTC (rev 3504)
@@ -1,74 +1,75 @@
-<html>
-
-  <head>
-  <title>perfSONAR Service Web Administration page</title>
-   <link rel="stylesheet" type="text/css" href="main.css" />
-  <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"><style type="text/css">
-<!--
-body,td,th {
-       font-family: arial;
-}
-a:hover {
-       color: #000000;
-}
--->
-</style></head>
-  <body>
-<div class="adminPanel" >
-       
-<div class="banner">
-<table border="0" align="left" cellpadding="0" cellspacing="0">
-<tr>
-  <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" 
border="0" align="right"></td>
-</tr>
-</table>
-
-</div>
-
-<div class="mainWindow" >
-
-<div class="sidebar" >
-<table border="0" cellpadding="0" cellspacing="0">
-<tr >
-<th>Administration</th>
-</tr>
-<tr>
-  <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
-    <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
-    <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
-</tr>
-<tr>
-  <td><p><a href="ServiceAdmin?serviceProperties" target="main" 
class="navtex" >Service</a></p>
-    <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex" 
>configuration</a></p></td>
-</tr>
-<tr>
-  <td>
-    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>logging</a></p>
-    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>configuration</a>
-      </p>
-    </p></td>
-</tr>
-</table>
-<a href="http://www.perfsonar.net/partners.html";></a> <br>
-<img src="partners.gif" alt="perfSONAR project partners" border="0"/> 
</a></div>
-
-<div class="centerWindow" >
-  <object data="http://www.perfsonar.net"; type="text/html" name="main" 
width="101%" height="106%" class="main" >
-    <p>Sorry for the inconvenience we are having connectiong to the main 
page...</p>
-  </object>
-</div>
-
-
-</div>
-
-<div class="footer" >PERFormance Service-Oriented Network monitoring 
ARchitecture &nbsp;</div>
-
-
-
-
-       
-</div>
-       
-
-  </body>
-</html>
\ No newline at end of file
+<html>
+
+  <head>
+  <title>perfSONAR Service Web Administration page</title>
+   <link rel="stylesheet" type="text/css" href="main.css" />
+  <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"><style type="text/css">
+<!--
+body,td,th {
+       font-family: arial;
+}
+a:hover {
+       color: #000000;
+}
+-->
+</style></head>
+  <body>
+<div class="adminPanel" >
+       
+<div class="banner">
+<table border="0" align="left" cellpadding="0" cellspacing="0">
+<tr>
+  <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" 
border="0" align="right"></td>
+</tr>
+</table>
+
+</div>
+
+<div class="mainWindow" >
+
+<div class="sidebar" >
+<table border="0" cellpadding="0" cellspacing="0">
+<tr >
+<th>Administration</th>
+</tr>
+<tr>
+       <td>
+    <p><a href="Wizard" target="main" class="navtex" >Service Configuration 
Wizard</a></p></td>
+</tr>
+<tr>
+       <td>
+    <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex" 
>Service configuration</a></p></td>
+</tr>
+<tr>
+  <td>
+    <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex" 
>Logging configuration</a></p></td>
+</tr>
+</tr>
+</table>
+
+
+<a href="http://www.perfsonar.net/partners.html";></a> <br>
+<img src="partners.gif" alt="perfSONAR project partners" border="0"/> 
</a></div>
+
+<div class="centerWindow" >
+  <object data="http://www.perfsonar.net"; type="text/html" name="main" 
width="101%" height="106%" class="main" >
+    <p>Sorry for the inconvenience we are having connectiong to the main 
page...</p>
+  </object>
+</div>
+
+
+</div>
+
+<div class="footer" >PERFormance Service-Oriented Network monitoring 
ARchitecture &nbsp;</div>
+
+
+
+
+       
+</div>
+       
+
+  </body>
+</html>
+
+

Added: trunk/geant2_java-as/conf/axis-1.4/l.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/l.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/lb.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/lb.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/lt.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/lt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/r.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/r.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/rb.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/rb.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/rt.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/rt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/stemb.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/stemb.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/stemt.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/stemt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/t.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/t.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/tip_balloon.js

Added: trunk/geant2_java-as/conf/axis-1.4/top_slice.gif


Property changes on: trunk/geant2_java-as/conf/axis-1.4/top_slice.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/geant2_java-as/conf/axis-1.4/wz_tooltip.js

Modified: trunk/geant2_java-as/conf/components.properties.template
===================================================================
--- trunk/geant2_java-as/conf/components.properties.template    2008-03-12 
13:45:34 UTC (rev 3503)
+++ trunk/geant2_java-as/conf/components.properties.template    2008-03-12 
13:50:40 UTC (rev 3504)
@@ -1,14 +1,15 @@
+#Group=PropertiesConfiguration
+#Description=Configuration component - must be the first one!
+config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
 
-# $Id$
+#Group=Logging
+#Description=Logger component - must be the second one!
+logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
 
+#Group=Scheduler
+#Description=Simple scheduler
+#scheduler=org.perfsonar.base.auxiliary.components.simplescheduler.Scheduler
 
-# File contains components to load
-# Config and logger MUST be loaded first!
-
-
-# Configuration component - must be the first one!
-config=org.perfsonar.base.auxiliary.components.configuration.properties.PropertiesConfigurationComponent
-
-
-# Logger component - must be the second one!
-logger=org.perfsonar.base.auxiliary.components.logger.log4j.Log4jLoggerComponent
+#Group=LS
+#Description=Registration in LS
+#registrator=org.perfsonar.service.commons.registration.LSRegistrationComponent

Modified: trunk/geant2_java-as/conf/service.properties.template
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template       2008-03-12 
13:45:34 UTC (rev 3503)
+++ trunk/geant2_java-as/conf/service.properties.template       2008-03-12 
13:50:40 UTC (rev 3504)
@@ -1,7 +1,8 @@
 service.r.type=as
 
 service.as.class_name=org.perfsonar.service.authService.ASEngine
-service.as.message_types=AuthNEERequest
+service.as.message_types=AuthNEERequest,EchoRequest,LookupInfoRequest
 service.as.truststore_password=12345678
 service.as.crypt_provider=SunRsaSign
+component.registrator.interval=43200000
 

Modified: trunk/geant2_java-as/doc/ChangeLog.txt
===================================================================
--- trunk/geant2_java-as/doc/ChangeLog.txt      2008-03-12 13:45:34 UTC (rev 
3503)
+++ trunk/geant2_java-as/doc/ChangeLog.txt      2008-03-12 13:50:40 UTC (rev 
3504)
@@ -1,9 +1,14 @@
 AS ChangeLog
 
-2008-01-14 Version 1.1
+2008-03-12 Version 1.0rc3
+- Using the psBase 20080310
+- Fixing a bug validating signatures in SAML assertions
+- Using services.properties.template-2 as base for installing the service
+
+2008-01-14 Version 1.0rc2
 - Add more log information
 - Workaround of the WE profile
 
-2007-11-21 Version 1.0
+2007-11-21 Version 1.0rc1
 
 - First version of the AS implementing all the authN part of the 
specification of the AS

Modified: 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/authService/AuthNAction.java
===================================================================
--- 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/authService/AuthNAction.java
       2008-03-12 13:45:34 UTC (rev 3503)
+++ 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/authService/AuthNAction.java
       2008-03-12 13:50:40 UTC (rev 3504)
@@ -76,7 +76,7 @@
                        else if (sentSecToken!=null&&
                                        
sentSecToken.getParameterValue()!=null&&
                                        
sentSecToken.getParameterValue().equals(AuthNAction.SAML_ID)) {
-//                             checkWSSecHeader(tsCrypto);
+                               checkWSSecHeader(tsCrypto);
                                checkTimeStampInfo();
                                return processSAMLAuthN(request);
                        }
@@ -105,9 +105,13 @@
                                        long 
end=ts.getExpires().getTimeInMillis();
                                        if 
(now.before(ts.getCreated())||now.after(ts.getExpires())) {
                                                logger.error("AuthNAction: 
security token not valid. The token was created before or after right now");
-                                               logger.error("AuthNAction: 
**** Security token ("+ts.getCreated().toString()+","+ts.getExpires()+")");
-                                               logger.error("AuthNAction: 
**** Now ("+now.toString()+")");
-                                               throw new 
PerfSONARException("error.authn.timestamp","Security token not valid. The 
token was created before or after right now");
+                                               logger.error("AuthNAction: 
**** Security token 
("+ts.getCreated().getTimeInMillis()+","+ts.getExpires().getTimeInMillis()+") 
vs now ("+now.getTimeInMillis()+")");
+                                               if 
(now.before(ts.getCreated())) {
+                                                       throw new 
PerfSONARException("error.authn.timestamp","Security token not valid. The 
token was created after right now");
+                                               }
+                                               else {
+                                                       throw new 
PerfSONARException("error.authn.timestamp","Security token not valid. The 
token was expired before right now");
+                                               }
                                        }
                                        if ((end-start)>max) {
                                                logger.error("AuthNAction: 
security token not valid. The valid period of time of the token is too long. 
Max allowed is "+max);

Modified: 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/testHarness/authService/AuthNRequestTest.java
===================================================================
--- 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/testHarness/authService/AuthNRequestTest.java
      2008-03-12 13:45:34 UTC (rev 3503)
+++ 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/testHarness/authService/AuthNRequestTest.java
      2008-03-12 13:50:40 UTC (rev 3504)
@@ -4,9 +4,13 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URL;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.TimeZone;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
@@ -49,7 +53,7 @@
 import org.xml.sax.SAXException;
 
 public class AuthNRequestTest {
-       
+
        private void testRequest(DocumentBuilder builder, String 
endPoint,String keyFile,String certFile,String saxParser) throws 
PerfSONARException, IOException, SAXException {
                Document request = builder.newDocument();
                Message authnRequest = new 
AuthNEERequestGenerator().generateRequestMessage();
@@ -72,7 +76,7 @@
                AuthNRequest authnReq=new AuthNRequest(st);
                AADispatchManager aadm=new AADispatchManager(new 
AADispatchBasicSOAPProtocol(endPoint,saxParser));
                AuthNResponse authnRes=aadm.getAuthentication(authnReq);
-               
+
             if (authnRes.getStatus()==AuthNResponse.AUTHENTICATED) {
                System.out.println("Result: AUTHENTICATED!");
             }
@@ -107,7 +111,7 @@
                AuthNRequest authnReq=new AuthNRequest(st);
                AADispatchManager aadm=new AADispatchManager(new 
AADispatchBasicSOAPProtocol(endPoint,saxParser));
                AuthNResponse authnRes=aadm.getAuthentication(authnReq);
-               
+
             if (authnRes.getStatus()==AuthNResponse.AUTHENTICATED) {
                System.out.println("Result: AUTHENTICATED!");
             }
@@ -147,7 +151,7 @@
                AuthNRequest authnReq=new AuthNRequest(st);
                AADispatchManager aadm=new AADispatchManager(new 
AADispatchBasicSOAPProtocol(endPoint,saxParser));
                AuthNResponse authnRes=aadm.getAuthentication(authnReq);
-               
+
             if (authnRes.getStatus()==AuthNResponse.AUTHENTICATED) {
                System.out.println("Result: AUTHENTICATED!");
             }
@@ -199,12 +203,16 @@
             System.out.println("Certificate file: " + certFile);
             System.out.println("SAX parser: " + saxParser);
             System.out.println("Type: " + type);
+               DateFormat zulu = new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+               zulu.setTimeZone(TimeZone.getTimeZone("UTC"));
+               Calendar cal=Calendar.getInstance();
+               System.out.println("Date host: "+zulu.format(cal.getTime()));
 
             // read the request into a org.w3c.DOM.Document
             DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             DocumentBuilder builder = factory.newDocumentBuilder();
-            
+
             System.out.println("##########################");
             System.out.println("# Test #1: AuthN request #");
             System.out.println("##########################");
@@ -288,13 +296,13 @@
                                        }
                                }
                        }
-                       
+
                        // build a SOAPBodyElement from the document
                        javax.xml.soap.SOAPHeader 
header=(javax.xml.soap.SOAPHeader)req.getSecurityToken().getSecToken();
                        Iterator<SOAPHeaderElement> 
it=header.examineAllHeaderElements();
                        while (it.hasNext()) {
                                SOAPHeaderElement 
he=(SOAPHeaderElement)it.next();
-                               
+
                                // if there is any assertion, it should be a 
saml security token
                                NodeList nodelist2 = 
org.apache.xpath.XPathAPI.selectNodeList(he, "//wsse:BinarySecurityToken");
                                System.out.println("//// #Assertions: 
"+nodelist2.getLength());
@@ -321,7 +329,7 @@
                                envelope.getHeader().addChildElement(he);
                        }
 
-                       
+
                        StringWriter sw=new StringWriter();
                        
XMLUtils.PrettyElementToWriter(envelope.getAsDOM(),sw);
                        System.out.println("---- Request message");
@@ -355,7 +363,7 @@
                        serial.serialize( result.getDocumentElement() );
 
                        outWriter.close();
-                       
+
                        System.out.println("---- Response message");
                        System.out.println(outWriter.toString());
                        System.out.println("---------------------");