perfsonar development work

Author: rodriguez
Date: 2007-11-21 06:40:46 -0500 (Wed, 21 Nov 2007)
New Revision: 3064

Modified:
   
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:
AS checks the SAML assertion using the new method provided by eduGAIN-val 
library (the old one has been deprecated)

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
       2007-11-21 10:57:31 UTC (rev 3063)
+++ 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/authService/AuthNAction.java
       2007-11-21 11:40:46 UTC (rev 3064)
@@ -73,7 +73,7 @@
                logger.debug("AuthNAction: Getting the SAML assertion");
                try {
                        SAMLAssertion assertion=(SAMLAssertion)stValue;
-                       val.validate((Element)assertion.toDOM());
+                       val.validate(assertion);
                } catch (Throwable e) {
                        String m = "AuthNAction: the SAML assertion is not 
valid";
                        logger.info(m);

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
      2007-11-21 10:57:31 UTC (rev 3063)
+++ 
trunk/geant2_java-as/src/main/java/org/perfsonar/service/testHarness/authService/AuthNRequestTest.java
      2007-11-21 11:40:46 UTC (rev 3064)
@@ -20,7 +20,7 @@
 import org.ggf.ns.nmwg.base.v2_0.Message;
 
 import org.perfsonar.base.exceptions.PerfSONARException;
-import org.perfsonar.client.base.authn.AuthNData;
+import org.perfsonar.client.base.authn.AuthNX509Data;
 import org.perfsonar.client.base.authn.AuthNDataFactory;
 import 
org.perfsonar.client.base.requests.authService.AuthNEERequestGenerator;
 import org.perfsonar.service.base.authn.AADispatchManager;
@@ -46,7 +46,7 @@
         SOAPBodyElement requestMessage =
             new SOAPBodyElement(request.getDocumentElement());
 
-        AuthNData data=AuthNDataFactory.getDefaultAuthNData();
+        AuthNX509Data data=AuthNDataFactory.getDefaultAuthNX509Data();
         Object newRequest=data.addX509STInMessage(requestMessage, keyFile, 
certFile);
         SOAPEnvelope envelope = (SOAPEnvelope)newRequest;