Author: rsvoboda(a)redhat.com Date: 2014-11-19 08:50:36 -0500 (Wed, 19 Nov 2014) New Revision: 19108 Added: projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java Modified: projects/wsi-bp-test/branches/jboss7x/bsp11-tests/scripts/cxf-samples-jars-jaxws.xml projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java Log: WSI BSP update for WSS-512 changes, details in BZ 1165622 and BZ 1153968 Modified: projects/wsi-bp-test/branches/jboss7x/bsp11-tests/scripts/cxf-samples-jars-jaxws.xml =================================================================== --- projects/wsi-bp-test/branches/jboss7x/bsp11-tests/scripts/cxf-samples-jars-jaxws.xml 2014-11-17 17:09:53 UTC (rev 19107) +++ projects/wsi-bp-test/branches/jboss7x/bsp11-tests/scripts/cxf-samples-jars-jaxws.xml 2014-11-19 13:50:36 UTC (rev 19108) @@ -89,6 +89,7 @@ <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service23*Impl.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/Say*.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/KeystorePasswordCallback.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.class"/> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/oasis/WEB-INF"> <include name="wsdl/*.xsd"/> Added: projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java =================================================================== --- projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java (rev 0) +++ projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/SAMLValidator.java 2014-11-19 13:50:36 UTC (rev 19108) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse.policy.oasis; + +public class SAMLValidator extends org.apache.ws.security.validate.SamlAssertionValidator { + + public SAMLValidator() { + super(); + setRequireBearerSignature(false); + } +} Modified: projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java =================================================================== --- projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java 2014-11-17 17:09:53 UTC (rev 19107) +++ projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2311Impl.java 2014-11-19 13:50:36 UTC (rev 19108) @@ -24,6 +24,8 @@ import javax.ejb.Stateless; import javax.jws.WebService; +import org.apache.cxf.annotations.EndpointProperties; +import org.apache.cxf.annotations.EndpointProperty; import org.jboss.ws.api.annotation.WebContext; @WebService @@ -35,6 +37,10 @@ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.ServiceIface" ) @Stateless +@EndpointProperties(value = { + @EndpointProperty(key = "ws-security.saml1.validator", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator") + } +) @WebContext(urlPattern = "SecurityService2311") public class Service2311Impl implements ServiceIface { Modified: projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java =================================================================== --- projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java 2014-11-17 17:09:53 UTC (rev 19107) +++ projects/wsi-bp-test/branches/jboss7x/bsp11-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/Service2321Impl.java 2014-11-19 13:50:36 UTC (rev 19108) @@ -41,6 +41,7 @@ @EndpointProperty(key = "ws-security.signature.username", value = "bob"), @EndpointProperty(key = "ws-security.encryption.properties", value = "bob.properties"), @EndpointProperty(key = "ws-security.encryption.username", value = "useReqSigCert"), + @EndpointProperty(key = "ws-security.saml2.validator", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.SAMLValidator"), @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.oasis.KeystorePasswordCallback") } )