Author: jim.ma Date: 2015-03-15 23:28:34 -0400 (Sun, 15 Mar 2015) New Revision: 19566 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java Log: Enable test Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2015-03-16 03:27:45 UTC (rev 19565) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/EndpointImpl.java 2015-03-16 03:28:34 UTC (rev 19566) @@ -224,7 +224,6 @@ String epurl = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(ei.getAddress(), metadata); ei.setAddress(epurl); } - } } } } Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2015-03-16 03:27:45 UTC (rev 19565) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2015-03-16 03:28:34 UTC (rev 19566) @@ -38,7 +38,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -210,7 +209,6 @@ @Test @RunAsClient @OperateOnDeployment(DEPLOYMENT1) - @Ignore(value="Wait for [WFLY-2129][WFLY-3988] merge") public void testOneWay() throws Exception { //test unthenticated @@ -245,7 +243,6 @@ @Test @RunAsClient @OperateOnDeployment(DEPLOYMENT2) - @Ignore(value="Wait for [WFLY-2129][WFLY-3988] merge") public void testEjbSecurityAuth() throws Exception { URL wsdlURL = new URL(baseURL + "/jaxws-securityDomain2/authz?wsdl");