Author: rsearls Date: 2014-03-02 17:41:05 -0500 (Sun, 02 Mar 2014) New Revision: 18448 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3738] BearerService.wsdl supports STS being called when proxy endpoint called. Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-02 19:52:31 UTC (rev 18447) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-03-02 22:41:05 UTC (rev 18448) @@ -63,7 +63,7 @@ /** * @throws Exception */ - public void TMP_DISABLE_testBearer() throws Exception + public void testBearer() throws Exception { Bus bus = BusFactory.newInstance().createBus(); try @@ -89,7 +89,7 @@ * TMEP: Just for isolating testing of STS' generation of Bearer security token * @throws Exception */ - public void testSTSBearer() throws Exception + public void TMP_DISABLE_testSTSBearer() throws Exception { final QName stsServiceName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/";, "SecurityTokenService"); final QName stsPortName = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/";, "UT_Port"); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-02 19:52:31 UTC (rev 18447) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/stsbearer/SampleSTSBearer.java 2014-03-02 22:41:05 UTC (rev 18448) @@ -72,7 +72,13 @@ List<ServiceMBean> services = new LinkedList<ServiceMBean>(); StaticService service = new StaticService(); service.setEndpoints(Arrays.asList( - "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/myBearerService.*" + // for STS testing only + "https://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/myBearerService.*", + + // bearer serivce addresses + "http://localhost:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService", + "http://\\[::1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService", + "http://\\[0:0:0:0:0:0:0:1\\]:(\\d)*/jaxws-samples-wsse-policy-trust-bearer/BearerService" )); services.add(service); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-02 19:52:31 UTC (rev 18447) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2014-03-02 22:41:05 UTC (rev 18448) @@ -57,8 +57,14 @@ <wsp:Policy> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token - sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/... + + <sp:IssuedToken + IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200... + <sp:RequestSecurityTokenTemplate> + <wsp:Policy> + <sp:WssX509V3Token10 /> + </wsp:Policy> + </sp:RequestSecurityTokenTemplate> <wsp:Policy> <sp:WssX509V3Token10 /> </wsp:Policy> @@ -71,7 +77,8 @@ EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> </wsaws:Metadata> </sp:Issuer> - </sp:X509Token> + </sp:IssuedToken> + </wsp:Policy> </sp:InitiatorToken> <sp:RecipientToken> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-02 19:52:31 UTC (rev 18447) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-03-02 22:41:05 UTC (rev 18448) @@ -701,6 +701,9 @@ <!--There is no jbossws-cxf-jaspi installed in as720--> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Jaspi*TestCase*</exclude> + + <!-- test still under development --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude> </excludes> </configuration> </plugin> @@ -789,6 +792,9 @@ <!-- Manually setup KDC before run this test--> <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> + + <!-- test still under development --> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase*</exclude> </excludes> </configuration> </plugin>