Author: anil.saldhana(a)jboss.com Date: 2009-10-09 16:05:11 -0400 (Fri, 09 Oct 2009) New Revision: 833 Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/XMLEncryptionUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityTokenResponse.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java Log: unused imports; warnings removed Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/XMLEncryptionUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/XMLEncryptionUtil.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/XMLEncryptionUtil.java 2009-10-09 20:05:11 UTC (rev 833) @@ -78,6 +78,7 @@ this.size = size; } + @SuppressWarnings("unused") public String jceName; public String xmlSecName; public int size; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java 2009-10-09 20:05:11 UTC (rev 833) @@ -33,7 +33,6 @@ import org.apache.log4j.Logger; import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil; import org.jboss.identity.federation.core.util.XMLSignatureUtil; -import org.jboss.identity.federation.core.wstrust.plugins.saml.SAMLUtil; import org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityToken; import org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponse; import org.jboss.identity.federation.ws.policy.AppliesTo; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-10-09 20:05:11 UTC (rev 833) @@ -67,6 +67,7 @@ private static Logger logger = Logger.getLogger(SAML20TokenProvider.class); + @SuppressWarnings("unused") private Map<String, String> properties; /* Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java 2009-10-09 20:05:11 UTC (rev 833) @@ -91,6 +91,7 @@ * @return a reference to the unmarshaled {@code AssertionType} instance. * @throws JAXBException if an error occurs while unmarshalling the document. */ + @SuppressWarnings("unchecked") public static AssertionType fromElement(Element assertionElement) throws JAXBException { Unmarshaller unmarshaller = JAXBUtil.getUnmarshaller("org.jboss.identity.federation.saml.v2.assertion"); Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java 2009-10-09 20:05:11 UTC (rev 833) @@ -184,6 +184,7 @@ * * @param delegate the JAXB {@code RequestSecurityTokenType} that represents a WS-Trust token request. */ + @SuppressWarnings("unchecked") public RequestSecurityToken(RequestSecurityTokenType delegate) { this.delegate = delegate; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityTokenResponse.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityTokenResponse.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/wrappers/RequestSecurityTokenResponse.java 2009-10-09 20:05:11 UTC (rev 833) @@ -194,6 +194,7 @@ * * @param delegate the JAXB {@code RequestSecurityTokenResponseType} that represents a WS-Trust response. */ + @SuppressWarnings("unchecked") public RequestSecurityTokenResponse(RequestSecurityTokenResponseType delegate) { this.delegate = delegate; Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2009-10-09 20:05:11 UTC (rev 833) @@ -301,6 +301,7 @@ throw new RuntimeException("This authenticator does not handle encryption"); } + @SuppressWarnings("unchecked") private Principal handleSAMLResponse(ResponseType responseType) throws ProcessingException { Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-09 20:05:11 UTC (rev 833) @@ -224,8 +224,7 @@ LogoutRequestType logOutRequest = (LogoutRequestType) request.getSAML2Object(); String issuer = logOutRequest.getIssuer().getValue(); try - { - SAML2Response saml2Response = new SAML2Response(); + { SAML2Request saml2Request = new SAML2Request(); ServletContext servletCtx = httpContext.getServletContext(); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-09 20:05:11 UTC (rev 833) @@ -206,6 +206,7 @@ } + @SuppressWarnings("unchecked") @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -318,8 +319,7 @@ if(samlRequestMessage != null) { //Get the SAML Request Message - RequestAbstractType requestAbstractType = null; - StatusResponseType statusResponseType = null; + RequestAbstractType requestAbstractType = null; try { Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2009-10-09 19:54:41 UTC (rev 832) +++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2009-10-09 20:05:11 UTC (rev 833) @@ -67,8 +67,8 @@ { private String profile = "saml2/logout"; private ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - private String employee = "http://localhost:8080/employee/"; - private String identity = "http://localhost:8080/idp/"; + private String employee = "http://localhost:8080/employee/"; + private String sales = "http://localhost:8080/sales/"; /** * Test that the SP web filter generates the logout request @@ -117,10 +117,7 @@ Document spHTMLResponse = DocumentUtil.getDocument(spResponse); NodeList nodes = spHTMLResponse.getElementsByTagName("INPUT"); Element inputElement = (Element)nodes.item(0); - String logoutRequest = inputElement.getAttributeNode("VALUE").getValue(); - String relayState = null; - if(nodes.getLength() > 1) - relayState = ((Element)nodes.item(1)).getAttributeNode("VALUE").getValue(); + String logoutRequest = inputElement.getAttributeNode("VALUE").getValue(); byte[] b64Decoded = PostBindingUtil.base64Decode(logoutRequest); SAML2Request saml2Request = new SAML2Request(); @@ -161,9 +158,9 @@ session.setAttribute(GeneralConstants.ROLES_ID, rolesList); MockHttpServletRequest request = new MockHttpServletRequest(session, "POST"); - request.addHeader("Referer", "http://localhost:8080/sales/"); + request.addHeader("Referer", sales); - String samlMessage = Base64.encodeBytes(createLogOutRequest("http://localhost:8080/sales/").getBytes()); + String samlMessage = Base64.encodeBytes(createLogOutRequest(sales).getBytes()); session.setAttribute("SAMLRequest", samlMessage); MockHttpServletResponse response = new MockHttpServletResponse(); @@ -300,8 +297,8 @@ IdentityServer server = new IdentityServer(); server.sessionCreated(new HttpSessionEvent(session)); - server.stack().register(session.getId(), "http://localhost:8080/sales/"); - server.stack().register(session.getId(), "http://localhost:8080/employee/"); + server.stack().register(session.getId(), sales); + server.stack().register(session.getId(), employee); return server; } } \ No newline at end of file