[jboss-svn-commits] JBL Code SVN: r29268 - in labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth: ws and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-09-09 02:04:58 -0400 (Wed, 09 Sep 2009)
New Revision: 29268

Modified:
   labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java
   labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java
Log:
Minor cleanup


Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java	2009-09-09 05:57:40 UTC (rev 29267)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/login/JBossSTSLoginModule.java	2009-09-09 06:04:58 UTC (rev 29268)
@@ -165,7 +165,7 @@
     {
         try
         {
-            // See if the Subject already has a Saml Token associated with it.
+            // See if the AuthenticationRequest has a Saml Token associated with it.
             samlToken = getSamlTokenFromCaller();
             if (samlToken == null)
             {
@@ -201,7 +201,7 @@
     private Element getSamlTokenFromCaller() throws UnsupportedCallbackException, LoginException, IOException
     {
         final ObjectCallback objectCallback = new ObjectCallback("SamlToken: ");
-        // Retrieve information from callback.
+        
         callbackHandler.handle(new Callback[] { objectCallback });
 
         final AuthenticationRequest authRequest = (AuthenticationRequest) objectCallback.getCredential();
@@ -214,6 +214,7 @@
 
         throw new LoginException("Could not locate a SamplPrincipal in the AuthenticationRequest.");
     }
+    
 
     public boolean commit() throws LoginException
     {

Modified: labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java	2009-09-09 05:57:40 UTC (rev 29267)
+++ labs/jbossesb/workspace/dbevenius/saml_support/product/rosetta/src/org/jboss/soa/esb/services/security/auth/ws/SamlAssertionExtractor.java	2009-09-09 06:04:58 UTC (rev 29268)
@@ -23,12 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
-import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamSource;
 
 import org.jboss.soa.esb.lifecycle.LifecycleResourceException;
@@ -36,18 +31,11 @@
 import org.jboss.soa.esb.services.security.auth.AuthenticationRequestImpl;
 import org.jboss.soa.esb.services.security.auth.SecurityInfoExtractor;
 import org.jboss.soa.esb.services.security.auth.login.SamlPrincipal;
-import org.jboss.soa.esb.services.security.principals.User;
 import org.jboss.soa.esb.smooks.resource.SmooksResource;
 import org.jboss.soa.esb.util.ClassUtil;
 import org.milyn.Smooks;
-import org.milyn.container.ApplicationContext;
 import org.milyn.container.ExecutionContext;
-import org.milyn.delivery.ContentDeliveryConfig;
 import org.milyn.delivery.DOMModel;
-import org.milyn.event.ExecutionEventListener;
-import org.milyn.payload.JavaResult;
-import org.milyn.payload.StringResult;
-import org.milyn.profile.ProfileSet;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
@@ -95,10 +83,11 @@
         {
             return null;
         }
-        // final DOMResult result = new DOMResult();
-        ExecutionContext execContext = smooks.createExecutionContext();
+        
+        final ExecutionContext execContext = smooks.createExecutionContext();
         smooks.filterSource(execContext, new StreamSource(new StringReader(soap)));
-        DOMModel nodeModel = DOMModel.getModel(execContext);
+
+        final DOMModel nodeModel = DOMModel.getModel(execContext);
         return nodeModel.getModels().get("Assertion");
     }