JBossWS SVN: r19425 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-25 21:43:11 -0500 (Sun, 25 Jan 2015)
New Revision: 19425
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java
Log:
Remove obsolete code
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2015-01-26 02:19:47 UTC (rev 19424)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/kerberos/KerberosTestCase.java 2015-01-26 02:43:11 UTC (rev 19425)
@@ -137,20 +137,7 @@
.addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/kerberos/META-INF/bob.properties"), "bob.properties");
return archive;
}
- /**
- public static Test suite()
- {
- JBossWSCXFTestSetup testSetup;
- testSetup = new JBossWSCXFTestSetup(KerberosTestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
- Map<String, String> sslOptions = new HashMap<String, String>();
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- testSetup.setHttpsConnectorRequirement(sslOptions);
-
- return testSetup;
- }
- ***/
+
@Test
@RunAsClient
public void testKerberosSupport() throws Exception
9 years, 11 months
- 1
- 0
JBossWS SVN: r19424 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-25 21:19:47 -0500 (Sun, 25 Jan 2015)
New Revision: 19424
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java
Log:
Revert to previous code.
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-25 23:43:52 UTC (rev 19423)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-26 02:19:47 UTC (rev 19424)
@@ -40,6 +40,8 @@
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.jboss.wsf.test.WrapThreadContextClassLoader;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.shrinkwrap.api.asset.StringAsset;
@@ -87,36 +89,31 @@
@Test
@RunAsClient
+ @WrapThreadContextClassLoader
+ @OperateOnDeployment("jaxws-samples-wssePolicy-sign-encrypt-client")
public void test() throws Exception
{
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wssePolicy-sign-encrypt?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wssePolicy-sign-encrypt?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ setupWsse(proxy);
try
{
- setupWsse(proxy);
assertEquals("Secure Hello World!", proxy.sayHello());
}
catch (SOAPFaultException e)
{
throw new Exception("Error " + e.getMessage() + " - please check that the Bouncy Castle provider is installed.", e);
}
- catch(MalformedURLException me)
- {
- throw new Exception("setup error: " + me.getMessage());
- }
}
- private void setupWsse(ServiceIface proxy) throws MalformedURLException {
- ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
-
- URL url = new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.properties").toURI().toURL();
- ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, url);
- ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, url);
-
- ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
- ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+ private void setupWsse(ServiceIface proxy)
+ {
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
+ ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
}
-
}
9 years, 11 months
- 1
- 0
JBossWS SVN: r19423 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-25 18:43:52 -0500 (Sun, 25 Jan 2015)
New Revision: 19423
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
Log:
Added default security-domain JBossWS
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-24 03:06:38 UTC (rev 19422)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-25 23:43:52 UTC (rev 19423)
@@ -10,7 +10,30 @@
def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
file.attributes()['path'] = project.properties['serverLog']
+/**
+ * Add a security-domain block like this:
+ *
+ * <security-domain name="JBossWS" cache-type="default">
+ * <authentication>
+ * <login-module code="UsersRoles" flag="required">
+ * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/>
+ * <module-option name="unauthenticatedIdentity" value="anonymous"/>
+ * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/>
+ * </login-module>
+ * </authentication>
+ * </security-domain>
+ *
+ */
+def securityDomainsA = root.profile.subsystem.'security-domains'[0]
+def securityDomainA = securityDomainsA.appendNode('security-domain', ['name':'JBossWS','cache-type':'default'])
+def authenticationA = securityDomainA.appendNode('authentication')
+def loginModuleA = authenticationA.appendNode('login-module', ['code':'UsersRoles','flag':'required'])
+loginModuleA.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous'])
+loginModuleA.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']])
+loginModuleA.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']])
+
+
/**
* Add a https connector like this:
*
9 years, 11 months
- 1
- 0
JBossWS SVN: r19422 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws: cxf/descriptor/WEB-INF and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-23 22:06:38 -0500 (Fri, 23 Jan 2015)
New Revision: 19422
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml
Log:
mapped the port to the new address.
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/configuration/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -24,7 +24,7 @@
</bean>
-<jaxws:endpoint implementor="org.jboss.test.ws.jaxws.cxf.configuration.EndpointImpl" address="http://@jboss.bind.address@:8080/jaxws-cxf-configuration">
+<jaxws:endpoint implementor="org.jboss.test.ws.jaxws.cxf.configuration.EndpointImpl" address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-configuration">
</jaxws:endpoint>
</beans>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -4,7 +4,7 @@
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'>
- <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor'
+ <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-descriptor'
implementor='org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl'>
</jaxws:endpoint>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3497/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -4,7 +4,7 @@
http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'>
- <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:8080/jaxws-cxf-jbws3497/ServiceOne/EndpointOne'
+ <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-jbws3497/ServiceOne/EndpointOne'
implementor='org.jboss.test.ws.jaxws.cxf.jbws3497.EndpointOneImpl'>
</jaxws:endpoint>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jbws3670/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -11,7 +11,7 @@
http://cxf.apache.org/schemas/core.xsd'>
<jaxws:endpoint id="helloWorldServiceEndpoint"
- address="http://@jboss.bind.address@:8080/jaxws-cxf-jbws3670/helloworld"
+ address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-jbws3670/helloworld"
implementor="#helloWorldServiceBean">
</jaxws:endpoint>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -14,7 +14,7 @@
</wsrmp:RMAssertion>
</wsp:Policy>
- <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'>
+ <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'>
<jaxws:features>
<p:policies>
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -14,7 +14,7 @@
</wsrmp:RMAssertion>
</wsp:Policy>
- <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'>
+ <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'>
<jaxws:features>
<p:policies>
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -15,7 +15,7 @@
</bean>
<jaxws:endpoint id="DoubleItKerberosSupport"
- address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport"
+ address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosSupport"
implementor="org.jboss.test.ws.jaxws.samples.wsse.kerberos.DoubleItPortTypeImpl">
<jaxws:properties>
<entry key="ws-security.callback-handler" value="org.jboss.test.ws.jaxws.samples.wsse.kerberos.KeystorePasswordCallback"/>
@@ -39,7 +39,7 @@
<jaxws:endpoint
id="KerberosOverAsymmetric"
- address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosAsymmetric"
+ address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosAsymmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItKerberosAsymmetricPort"
xmlns:s="http://www.example.org/contract/DoubleIt"
@@ -60,7 +60,7 @@
<jaxws:endpoint
id="KerberosOverSymmetric"
- address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosSymmetric"
+ address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosSymmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItKerberosSymmetricPort"
xmlns:s="http://www.example.org/contract/DoubleIt"
@@ -77,7 +77,7 @@
<jaxws:endpoint
id="KerberosOverSymmetricSupporting"
- address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosOverSymmetricSupporting"
+ address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosOverSymmetricSupporting"
serviceName="s:DoubleItService"
endpointName="s:DoubleItKerberosSymmetricSupportingPort"
xmlns:s="http://www.example.org/contract/DoubleIt"
@@ -91,7 +91,7 @@
<jaxws:endpoint
id="KerberosOverAsymmetricSignedEncrypted"
- address="http://@jboss.bind.address@:8080/jaxws-samples-wsse-kerberos/DoubleItKerberosOverAsymmetricSignedEncrypted"
+ address="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-kerberos/DoubleItKerberosOverAsymmetricSignedEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItKerberosAsymmetricSignedEncryptedPort"
xmlns:s="http://www.example.org/contract/DoubleIt"
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -42,7 +42,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign-encrypt'
+ address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-sign-encrypt'
implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'>
<jaxws:outInterceptors>
<bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -32,7 +32,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-authorize/default-config'
+ address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/default-config'
implementor='org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl'
endpointName="ns:SecurityServicePort"
serviceName="ns:SecurityService"
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -36,7 +36,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-digest'
+ address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-digest'
implementor='org.jboss.test.ws.jaxws.samples.wsseDigest.ServiceImpl'
endpointName="ns:SecurityServicePort"
serviceName="ns:SecurityService"
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsseEJB/META-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -24,7 +24,7 @@
<jaxws:endpoint
id='EjbEndpointImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wsseEJB/EjbEndpointService/EjbEndpoint'
+ address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsseEJB/EjbEndpointService/EjbEndpoint'
implementor='org.jboss.test.ws.jaxws.samples.wsseEJB.EjbEndpointImpl'>
<jaxws:inInterceptors>
<ref bean="SecurityContextIn"/>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -12,7 +12,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt'
+ address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt'
implementor='org.jboss.test.ws.jaxws.samples.wssePolicy.ServiceImpl'>
<jaxws:properties>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/jbossws-cxf.xml 2015-01-24 03:06:38 UTC (rev 19422)
@@ -12,7 +12,7 @@
<jaxws:endpoint
id='ServiceImpl'
- address='https://@jboss.bind.address@:8443/jaxws-samples-wssePolicy-username'
+ address='https://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8443)@/jaxws-samples-wssePolicy-username'
implementor='org.jboss.test.ws.jaxws.samples.wssePolicy.ServiceImpl'>
<jaxws:properties>
9 years, 11 months
- 1
- 0
JBossWS SVN: r19421 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-23 21:02:34 -0500 (Fri, 23 Jan 2015)
New Revision: 19421
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml
Log:
mapped the port to the new address.
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2015-01-23 18:51:49 UTC (rev 19420)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml 2015-01-24 02:02:34 UTC (rev 19421)
@@ -5,11 +5,11 @@
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'>
<!-- Please note the context-root / path needs to match the values specified in the web.xml / jboss-web.xml descriptors -->
- <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:8080/mixtype/jaxws-cxf-mixtype'
+ <jaxws:endpoint id='EndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/mixtype/jaxws-cxf-mixtype'
implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl'>
</jaxws:endpoint>
- <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:8080/mixtype/EJBServiceOne/EJBEndpointOne'
+ <jaxws:endpoint id='EJBEndpointService' address='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/mixtype/EJBServiceOne/EJBEndpointOne'
implementor='org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl'>
</jaxws:endpoint>
9 years, 11 months
- 1
- 0
JBossWS SVN: r19420 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-23 13:51:49 -0500 (Fri, 23 Jan 2015)
New Revision: 19420
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java
Log:
Must get properties file from local disk. No longer access to JAR file via classloader.
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-23 17:48:24 UTC (rev 19419)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/SignEncryptTestCase.java 2015-01-23 18:51:49 UTC (rev 19420)
@@ -22,9 +22,9 @@
package org.jboss.test.ws.jaxws.samples.wssePolicy;
import java.io.File;
+import java.lang.Exception;
import java.net.URL;
-import java.util.LinkedList;
-import java.util.List;
+import java.net.MalformedURLException;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -43,10 +43,8 @@
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.wsf.test.JBossWSCXFTestSetup;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
/**
* WS-Security Policy sign & encrypt test case
@@ -95,23 +93,30 @@
URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wssePolicy-sign-encrypt?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
- setupWsse(proxy);
try
{
+ setupWsse(proxy);
assertEquals("Secure Hello World!", proxy.sayHello());
}
catch (SOAPFaultException e)
{
throw new Exception("Error " + e.getMessage() + " - please check that the Bouncy Castle provider is installed.", e);
}
+ catch(MalformedURLException me)
+ {
+ throw new Exception("setup error: " + me.getMessage());
+ }
}
-
- private void setupWsse(ServiceIface proxy)
- {
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, Thread.currentThread().getContextClassLoader().getResource("META-INF/alice.properties"));
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
- ((BindingProvider)proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
+
+ private void setupWsse(ServiceIface proxy) throws MalformedURLException {
+ ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.CALLBACK_HANDLER, new KeystorePasswordCallback());
+
+ URL url = new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wssePolicy/sign-encrypt/META-INF/alice.properties").toURI().toURL();
+ ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.SIGNATURE_PROPERTIES, url);
+ ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.ENCRYPT_PROPERTIES, url);
+
+ ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.SIGNATURE_USERNAME, "alice");
+ ((BindingProvider) proxy).getRequestContext().put(SecurityConstants.ENCRYPT_USERNAME, "bob");
}
+
}
9 years, 11 months
- 1
- 0
JBossWS SVN: r19419 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/configuration and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-23 12:48:24 -0500 (Fri, 23 Jan 2015)
New Revision: 19419
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
Log:
fixed some missing test running setup stmts.
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-23 17:45:35 UTC (rev 19418)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-23 17:48:24 UTC (rev 19419)
@@ -89,11 +89,9 @@
<inputFile>${jboss.home}/standalone/configuration/standalone-full.xml</inputFile>
<outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-spring-default.xml</outputFile>
<serverLog>jbws-testsuite-spring-default.log</serverLog>
- <!--
<usersPropFile>${project.build.directory}/test-classes/jbossws-users.properties</usersPropFile>
<rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile>
<keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath>
- -->
<testResourcesDir>${project.build.directory}/test-resources</testResourcesDir>
</properties>
</configuration>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2015-01-23 17:45:35 UTC (rev 19418)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/configuration/JBossWSCXFConfigurerTestCase.java 2015-01-23 17:48:24 UTC (rev 19419)
@@ -66,6 +66,9 @@
return archive;
}
+
+ @Test
+ @RunAsClient
//JBWS-3033
public void testConfiguration() throws Exception
{
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2015-01-23 17:45:35 UTC (rev 19418)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2015-01-23 17:48:24 UTC (rev 19419)
@@ -103,8 +103,10 @@
@RunAsClient
public void test() throws Exception
{
+ setUp();
assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call
proxy.ping(); // one way call
+ tearDown();
}
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2015-01-23 17:45:35 UTC (rev 19418)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2015-01-23 17:48:24 UTC (rev 19419)
@@ -36,7 +36,7 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,8 +61,8 @@
public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsseEJB/EjbEndpointService/EjbEndpoint";
@Deployment(testable = false)
- public static WebArchive createDeployments() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-wsseEJB.jar");
+ public static JavaArchive createDeployments() {
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-samples-wsseEJB.jar");
archive
.addManifest()
.addClass(org.jboss.test.ws.jaxws.samples.wsseEJB.EjbEndpoint.class)
9 years, 11 months
- 1
- 0
JBossWS SVN: r19418 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-23 12:45:35 -0500 (Fri, 23 Jan 2015)
New Revision: 19418
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
Log:
Added JMS queues to config file
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-22 16:10:08 UTC (rev 19417)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-23 17:45:35 UTC (rev 19418)
@@ -10,7 +10,87 @@
def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
file.attributes()['path'] = project.properties['serverLog']
+
/**
+ * Add a https connector like this:
+ *
+ * <security-realm name="jbws-test-https-realm">
+ * <server-identities>
+ * <ssl>
+ * <keystore path="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/test.keystore" keystore-password="changeit" alias="tomcat"/>
+ * </ssl>
+ * </server-identities>
+ * </security-realm>
+ *
+ */
+ /* security realm for test org.jboss.test.ws.jaxws.samples.wsse.kerberos.KerberosTestCase and
+ * org.jboss.test.ws.jaxws.samples.wssePolicy.UsernameTestCase
+ */
+def securityRealms = root.management.'security-realms'[0]
+def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm'])
+def serverIdentities = securityRealm.appendNode('server-identities')
+def ssl = serverIdentities.appendNode('ssl')
+ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat'])
+
+def server = root.profile.subsystem.server[0]
+server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-binding':'https','security-realm':'jbws-test-https-realm'])
+
+/**
+ * Add a security-domain block like this:
+ *
+ * <security-domain name="JBossWSDigest" cache-type="default">
+ * <authentication>
+ * <login-module code="UsersRoles" flag="required">
+ * <module-option name="hashUserPassword" value="false"/>
+ * <module-option name="hashCharset" value="UTF-8"/>
+ * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties"/>
+ * <module-option name="hashAlgorithm" value="SHA"/>
+ * <module-option name="unauthenticatedIdentity" value="anonymous"/>
+ * <module-option name="hashEncoding" value="BASE64"/>
+ * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties"/>
+ * <module-option name="storeDigestCallback" value="org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback"/>
+ * <module-option name="hashStorePassword" value="true"/>
+ * </login-module>
+ * </authentication>
+ * </security-domain>
+ *
+ */
+ /* security domain for test org.jboss.test.ws.jaxws.samples.wsseDigest.UsernameDigestTestCase */
+def securityDomains = root.profile.subsystem.'security-domains'[0]
+def securityDomainDigest = securityDomains.appendNode('security-domain', ['name':'JBossWSDigest','cache-type':'default'])
+def authenticationDigest = securityDomainDigest.appendNode('authentication')
+def loginModuleDigest = authenticationDigest.appendNode('login-module', ['code':'UsersRoles','flag':'required'])
+loginModuleDigest.appendNode('module-option', ['name':'hashUserPassword','value':'false'])
+loginModuleDigest.appendNode('module-option', ['name':'hashCharset','value':'UTF-8'])
+loginModuleDigest.appendNode('module-option', ['name':'hashAlgorithm','value':'SHA'])
+loginModuleDigest.appendNode('module-option', ['name':'hashEncoding','value':'BASE64'])
+loginModuleDigest.appendNode('module-option', ['name':'storeDigestCallback','value':'org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback'])
+loginModuleDigest.appendNode('module-option', ['name':'hashStorePassword','value':'true'])
+loginModuleDigest.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous'])
+loginModuleDigest.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties'])
+loginModuleDigest.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties'])
+
+/**
+ * Add a JMS queue like this
+ *
+ * <subsystem xmlns="urn:jboss:domain:messaging:2.0">
+ * <hornetq-server>
+ * <jms-destinations>
+ * <jms-queue name="testQueue">
+ * <entry name="queue/test"/>
+ * <entry name="java:jboss/exported/jms/queue/test"/>
+ * </jms-queue>
+ * </jms-destinations>
+ * </hornetq-server>
+ * </subsystem>
+ **/
+def hornetqServer = root.profile.subsystem.'hornetq-server'[0]
+def jmsDestinations = hornetqServer.'jms-destinations'[0]
+def jmsQueue = jmsDestinations.appendNode('jms-queue', ['name':'testQueue'])
+jmsQueue.appendNode('entry', ['name':'queue/test'])
+jmsQueue.appendNode('entry', ['name':'java:jboss/exported/jms/queue/test'])
+
+/**
* Save the configuration to a new file
*/
def writer = new StringWriter()
9 years, 11 months
- 1
- 0
JBossWS SVN: r19417 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-spring-tests and 15 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-22 11:10:08 -0500 (Thu, 22 Jan 2015)
New Revision: 19417
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties
Log:
Fixed port properties
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-22 16:10:08 UTC (rev 19417)
@@ -151,7 +151,7 @@
<goal>start</goal>
</goals>
<configuration>
- <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.spring-tests.jboss} ${additionalJvmArgs}</jvmArgs>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} ${additionalJvmArgs}</jvmArgs>
<serverConfig>jbws-testsuite-spring-default.xml</serverConfig>
<jbossHome>${jboss.home}</jbossHome>
<port>39990</port><!-- Keep in sync with the port-offset -->
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-01-22 16:10:08 UTC (rev 19417)
@@ -6,12 +6,12 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.spring-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
+ <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
<property name="serverConfig">jbws-testsuite-spring-default.xml</property>
<property name="allowConnectingToRunningServer">true</property>
- <property name="managementPort">${add_int(port-offset.spring-tests.jboss,9990)}</property>
+ <property name="managementPort">${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${add_int(port-offset.spring-tests.jboss,8787)} ${add_int(port-offset.spring-tests.jboss,9990)}</property>
+ <property name="waitForPorts">${add_int(port-offset.cxf-spring-tests.jboss,8787)} ${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property>
<property name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties 2015-01-22 16:10:08 UTC (rev 19417)
@@ -5,4 +5,4 @@
port-offset.cxf-tests.default-config-tests=(a)port-offset.cxf-tests.default-config-tests@
port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@
port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@
-port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@
+port-offset.cxf-spring-tests.jboss=(a)port-offset.cxf-spring-tests.jboss@
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -65,7 +65,7 @@
<wsdl:service name="HelloWorldService">
<soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName>
<soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@</soapjms:jndiURL>
+ <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@</soapjms:jndiURL>
<wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
<soap:address location="jms:queue:testQueue"/>
</wsdl:port>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -65,12 +65,12 @@
<wsdl:service name="HelloWorldService">
<soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName>
<soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@</soapjms:jndiURL>
+ <soapjms:jndiURL>http-remoting://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@</soapjms:jndiURL>
<wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort">
<soap:address location="jms:queue:testQueue"/>
</wsdl:port>
<wsdl:port binding="tns:HttpHelloWorldServiceSoapBinding" name="HttpHelloWorldImplPort">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-jms-http-deployment"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-jms-http-deployment"/>
</wsdl:port>
</wsdl:service>
<wsdl:service name="HelloWorldServiceLocal">
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/webserviceref/WEB-INF/wsdl/Endpoint.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -29,7 +29,7 @@
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-webserviceref'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-webserviceref'/>
</port>
</service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -61,7 +61,7 @@
<wsdl:service name="RMService">
<wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-doc"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-doc"/>
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/>
</wsdl:port>
</wsdl:service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -42,7 +42,7 @@
</wsdl:binding>
<wsdl:service name="RMService">
<wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-rpc"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-cxf-wsrm-basic-rpc"/>
<wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/ns/ws-policy"/>
</wsdl:port>
</wsdl:service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -68,7 +68,7 @@
</wsdl:binding>
<wsdl:service name="SimpleService">
<wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9090)@/hello"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9090)@/hello"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/kerberos/WEB-INF/wsdl/DoubleItKerberos.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -294,51 +294,51 @@
</wsdl:port>
<wsdl:port name="DoubleItKerberosSymmetricPort"
binding="tns:DoubleItKerberosSymmetricBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetric" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetric" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosSymmetricSupportingPort"
binding="tns:DoubleItKerberosSymmetricSupportingBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSupporting" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSupporting" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosSupportingPort"
binding="tns:DoubleItKerberosSupportingBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSupporting" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSupporting" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosAsymmetricPort"
binding="tns:DoubleItKerberosAsymmetricBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetric" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetric" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosTransportEndorsingPort"
binding="tns:DoubleItKerberosTransportEndorsingBinding">
- <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9009)@/DoubleItKerberosTransportEndorsing" />
+ <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9009)@/DoubleItKerberosTransportEndorsing" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosAsymmetricEndorsingPort"
binding="tns:DoubleItKerberosAsymmetricEndorsingBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricEndorsing" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricEndorsing" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosSymmetricProtectionPort"
binding="tns:DoubleItKerberosSymmetricProtectionBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricProtection" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricProtection" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosSymmetricDerivedProtectionPort"
binding="tns:DoubleItKerberosSymmetricDerivedProtectionBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricDerivedProtection" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricDerivedProtection" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosAsymmetricSignedEndorsingPort"
binding="tns:DoubleItKerberosAsymmetricSignedEndorsingBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEndorsing" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEndorsing" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosAsymmetricSignedEncryptedPort"
binding="tns:DoubleItKerberosAsymmetricSignedEncryptedBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEncrypted" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosAsymmetricSignedEncrypted" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosSymmetricEndorsingEncryptedPort"
binding="tns:DoubleItKerberosSymmetricEndorsingEncryptedBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricEndorsingEncrypted" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricEndorsingEncrypted" />
</wsdl:port>
<wsdl:port name="DoubleItKerberosSymmetricSignedEndorsingEncryptedPort"
binding="tns:DoubleItKerberosSymmetricSignedEndorsingEncryptedBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSignedEndorsingEncrypted" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,9001)@/DoubleItKerberosSymmetricSignedEndorsingEncrypted" />
</wsdl:port>
</wsdl:service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -35,7 +35,7 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-sign-encrypt"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-sign-encrypt"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-authorize/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -54,10 +54,10 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/default-config"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/default-config"/>
</port>
<port name="SecurityServicePort2" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/custom-config"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-authorize/custom-config"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -54,7 +54,7 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wsse-username-digest"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wsse-username-digest"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -41,7 +41,7 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/>
</port>
</service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wssePolicy/username/WEB-INF/wsdl/SecurityService.wsdl 2015-01-22 16:10:08 UTC (rev 19417)
@@ -41,7 +41,7 @@
</binding>
<service name="SecurityService">
<port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
- <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.spring-tests.jboss,8443)@/jaxws-samples-wssePolicy-username"/>
+ <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-spring-tests.jboss,8443)@/jaxws-samples-wssePolicy-username"/>
</port>
</service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties 2015-01-22 16:10:08 UTC (rev 19417)
@@ -5,5 +5,4 @@
port-offset.cxf-tests.default-config-tests=(a)port-offset.cxf-tests.default-config-tests@
port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@
port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@
-port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@
-port-offset.spring-tests.default-config-tests=(a)port-offset.spring-tests.default-config-tests@
\ No newline at end of file
+port-offset.cxf-spring-tests.jboss=(a)port-offset.cxf-spring-tests.jboss@
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-22 16:10:08 UTC (rev 19417)
@@ -38,7 +38,7 @@
<port-offset.shared-tests.jboss>15000</port-offset.shared-tests.jboss>
<port-offset.shared-tests.default-config-tests>20000</port-offset.shared-tests.default-config-tests>
<port-offset.shared-tests.address-rewrite>25000</port-offset.shared-tests.address-rewrite>
- <port-offset.spring-tests.jboss>30000</port-offset.spring-tests.jboss>
+ <port-offset.cxf-spring-tests.jboss>30000</port-offset.cxf-spring-tests.jboss>
</properties>
<!-- Modules -->
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties 2015-01-22 15:16:34 UTC (rev 19416)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties 2015-01-22 16:10:08 UTC (rev 19417)
@@ -6,5 +6,4 @@
port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@
port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@
port-offset.shared-tests.address-rewrite=(a)port-offset.shared-tests.address-rewrite@
-port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@
-port-offset.spring-tests.default-config-tests=(a)port-offset.spring-tests.default-config-tests@
\ No newline at end of file
+port-offset.cxf-spring-tests.jboss=(a)port-offset.cxf-spring-tests.jboss@
9 years, 11 months
- 1
- 0
JBossWS SVN: r19416 - stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype.
by jbossws-commits＠lists.jboss.org
Author: rsearls
Date: 2015-01-22 10:16:34 -0500 (Thu, 22 Jan 2015)
New Revision: 19416
Added:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java
Log:
give unique name to test
Copied: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java (from rev 19415, stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/MixedTypeTestCase.java)
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java (rev 0)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/mixtype/SpringMixedTypeTestCase.java 2015-01-22 15:16:34 UTC (rev 19416)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.cxf.mixtype;
+
+import java.io.File;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestHelper;
+import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment;
+
+(a)RunWith(Arquillian.class)
+public class SpringMixedTypeTestCase extends JBossWSTest
+{
+ private final String targetNS = "http://org.jboss.ws.jaxws.cxf/mixtype";
+
+ @Deployment(testable = false)
+ public static WebArchive createDeployments() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-cxf-mixtype.war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOne.class)
+ .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneEJB3Impl.class)
+ .addClass(org.jboss.test.ws.jaxws.cxf.mixtype.EndpointOneImpl.class)
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jboss-web.xml"), "jboss-web.xml")
+ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/jbossws-cxf.xml"), "jbossws-cxf.xml")
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/mixtype/WEB-INF/web.xml"));
+ return archive;
+ }
+
+ @Test
+ @RunAsClient
+ public void testEndpoint() throws Exception
+ {
+ URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/mixtype/jaxws-cxf-mixtype?wsdl");
+ QName serviceOneName = new QName(targetNS, "ServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EndpointOnePort"), EndpointOne.class);
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+ assertEquals(1, endpoint.getCount());
+ }
+
+ @Test
+ @RunAsClient
+ public void testEJBEndpoint() throws Exception
+ {
+ URL wsdlOneURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/mixtype/EJBServiceOne/EJBEndpointOne?wsdl");
+ QName serviceOneName = new QName(targetNS, "EJBServiceOne");
+ Service serviceOne = Service.create(wsdlOneURL, serviceOneName);
+ EndpointOne endpoint = (EndpointOne)serviceOne.getPort(new QName(targetNS, "EJBEndpointOnePort"), EndpointOne.class);
+ assertEquals("mixedType", endpoint.echo("mixedType"));
+ assertEquals(1, endpoint.getCount());
+ }
+
+
+}
9 years, 11 months
- 1
- 0