January 2015 - jbossws-commits - Jboss List Archives

JBossWS SVN: r19384 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-19 01:54:04 -0500 (Mon, 19 Jan 2015) New Revision: 19384 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java Log: Move maven-surefire-plugin's tests exclusion to junit @Igore;Update the deprecated systemProperties with systemPropertyVariables Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -42,6 +42,7 @@ import org.jboss.wsf.stack.cxf.client.UseThreadBusFeature; 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; @@ -49,6 +50,7 @@ * @author ema(a)redhat.com * @author alessio.soldano(a)jboss.com */ +@Ignore(value="[JBWS-3620] Authentication failures w/ Undertow") @RunWith(Arquillian.class) public class HelloDigestTestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3813/JBWS3813AnnotationTestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -31,6 +31,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; 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; @@ -39,6 +40,7 @@ * * @author rsearls(a)redhat.com */ +@Ignore(value="[JBWS-3813] Add exception name to faultstring/detail/stackTrace") @RunWith(Arquillian.class) public class JBWS3813AnnotationTestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-19 06:54:04 UTC (rev 19384) @@ -275,6 +275,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <skip>true</skip> <failIfNoTests>false</failIfNoTests> <runOrder>alphabetical</runOrder> @@ -294,104 +295,32 @@ <include>**/*Test.java</include> <include>**/*TestCase.java</include> </includes> - <systemProperties> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>javax.net.ssl.trustStore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>javax.net.ssl.trustStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.trustStoreType</name> - <value>jks</value> - </property> - <property> - <name>javax.net.ssl.keyStore</name> - <value>${project.build.directory}/test-classes/client.keystore</value> - </property> - <property> - <name>javax.net.ssl.keyStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.security.ignoreHttpsHost</name> - <value>true</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>test.disable.deployment</name> - <value>false</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${log4j.output.dir}</value> - </property> - <property> - <name>appclient.output.dir</name> - <value>${appclient.output.dir}</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-users.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.roles.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.keystore</name> - <value>${project.build.directory}/test-classes/test.keystore</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.truststore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${test.archive.directory}</value> - </property> - <property> - <name>test.classes.directory</name> - <value>${test.classes.directory}</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${test.resources.directory}</value> - </property> - <property> - <name>test.username</name> - <value>${test.username}</value> - </property> - <property> - <name>test.password</name> - <value>${test.password}</value> - </property> - <property> - <name>wsdl.publish.location</name> - <value>${wsdl.publish.location}</value> - </property> - </systemProperties> + <systemPropertyVariables> + <jboss.bind.address>${jboss.bind.address}</jboss.bind.address> + <java.protocol.handler.pkgs>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</java.protocol.handler.pkgs> + <javax.net.ssl.trustStore>${project.build.directory}/test-classes/test.truststore</javax.net.ssl.trustStore> + <javax.net.ssl.trustStorePassword>changeit</javax.net.ssl.trustStorePassword> + <javax.net.ssl.trustStoreType>jks</javax.net.ssl.trustStoreType> + <javax.net.ssl.keyStore>${project.build.directory}/test-classes/client.keystore</javax.net.ssl.keyStore> + <javax.net.ssl.keyStorePassword>changeit</javax.net.ssl.keyStorePassword> + <javax.net.ssl.keyStoreType>jks</javax.net.ssl.keyStoreType> + <org.jboss.security.ignoreHttpsHost>true</org.jboss.security.ignoreHttpsHost> + <jboss.home>${jboss.home}</jboss.home> + <jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target> + <test.disable.deployment>false</test.disable.deployment> + <log4j.output.dir>${log4j.output.dir}</log4j.output.dir> + <appclient.output.dir>${appclient.output.dir}</appclient.output.dir> + <org.jboss.ws.testsuite.securityDomain.users.propfile>${project.build.directory}/test-classes/jbossws-users.properties</org.jboss.ws.testsuite.securityDomain.users.propfile> + <org.jboss.ws.testsuite.securityDomain.roles.propfile>${project.build.directory}/test-classes/jbossws-roles.properties</org.jboss.ws.testsuite.securityDomain.roles.propfile> + <org.jboss.ws.testsuite.server.keystore>${project.build.directory}/test-classes/test.keystore</org.jboss.ws.testsuite.server.keystore> + <org.jboss.ws.testsuite.server.truststore>${project.build.directory}/test-classes/test.truststore</org.jboss.ws.testsuite.server.truststore> + <test.archive.directory>${test.archive.directory}</test.archive.directory> + <test.classes.directory>${test.classes.directory}</test.classes.directory> + <test.resources.directory>${test.resources.directory}</test.resources.directory> + <test.username>test.username</test.username> + <test.password>${test.password}</test.password> + <wsdl.publish.location>${wsdl.publish.location}</wsdl.publish.location> + </systemPropertyVariables> </configuration> </execution> @@ -408,96 +337,30 @@ <include>**/*TestCaseForked.java</include> <include>**/*TestForked.java</include> </includes> - <systemProperties> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>javax.net.ssl.trustStore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>javax.net.ssl.trustStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.trustStoreType</name> - <value>jks</value> - </property> - <property> - <name>javax.net.ssl.keyStore</name> - <value>${project.build.directory}/test-classes/client.keystore</value> - </property> - <property> - <name>javax.net.ssl.keyStorePassword</name> - <value>changeit</value> - </property> - <property> - <name>javax.net.ssl.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.security.ignoreHttpsHost</name> - <value>true</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>test.disable.deployment</name> - <value>false</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${log4j.output.dir}</value> - </property> - <property> - <name>appclient.output.dir</name> - <value>${appclient.output.dir}</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.users.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-users.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.securityDomain.roles.propfile</name> - <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.keystore</name> - <value>${project.build.directory}/test-classes/test.keystore</value> - </property> - <property> - <name>org.jboss.ws.testsuite.server.truststore</name> - <value>${project.build.directory}/test-classes/test.truststore</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${test.archive.directory}</value> - </property> - <property> - <name>test.classes.directory</name> - <value>${test.classes.directory}</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${test.resources.directory}</value> - </property> - <property> - <name>wsdl.publish.location</name> - <value>${wsdl.publish.location}</value> - </property> - </systemProperties> + <systemPropertyVariables> + <jboss.bind.address>${jboss.bind.address}</jboss.bind.address> + <java.protocol.handler.pkgs>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</java.protocol.handler.pkgs> + <javax.net.ssl.trustStore>${project.build.directory}/test-classes/test.truststore</javax.net.ssl.trustStore> + <javax.net.ssl.trustStorePassword>changeit</javax.net.ssl.trustStorePassword> + <javax.net.ssl.trustStoreType>jks</javax.net.ssl.trustStoreType> + <javax.net.ssl.keyStore>${project.build.directory}/test-classes/client.keystore</javax.net.ssl.keyStore> + <javax.net.ssl.keyStorePassword>changeit</javax.net.ssl.keyStorePassword> + <javax.net.ssl.keyStoreType>jks</javax.net.ssl.keyStoreType> + <org.jboss.security.ignoreHttpsHost>true</org.jboss.security.ignoreHttpsHost> + <jboss.home>${jboss.home}</jboss.home> + <jbossws.integration.target>${jbossws.integration.target}</jbossws.integration.target> + <test.disable.deployment>false</test.disable.deployment> + <log4j.output.dir>${log4j.output.dir}</log4j.output.dir> + <appclient.output.di>${appclient.output.dir}</appclient.output.di> + <org.jboss.ws.testsuite.securityDomain.users.propfile>${project.build.directory}/test-classes/jbossws-users.properties</org.jboss.ws.testsuite.securityDomain.users.propfile> + <org.jboss.ws.testsuite.securityDomain.roles.propfile>${project.build.directory}/test-classes/jbossws-roles.properties</org.jboss.ws.testsuite.securityDomain.roles.propfile> + <org.jboss.ws.testsuite.server.keystore>${project.build.directory}/test-classes/test.keystore</org.jboss.ws.testsuite.server.keystore> + <org.jboss.ws.testsuite.server.truststore>${project.build.directory}/test-classes/test.truststore</org.jboss.ws.testsuite.server.truststore> + <test.archive.directory>${test.archive.directory}</test.archive.directory> + <test.classes.directory>${test.classes.directory}</test.classes.directory> + <test.resources.directory>${test.resources.directory}</test.resources.directory> + <wsdl.publish.location>${wsdl.publish.location}</wsdl.publish.location> + </systemPropertyVariables> </configuration> </execution> @@ -773,31 +636,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes combine.children="append"> -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3813/*TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> @@ -860,31 +698,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes combine.children="append"> -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3813/*TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> @@ -947,31 +760,6 @@ </compilerArguments> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> - <excludes combine.children="append"> -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3813/*TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> </profile> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -36,6 +36,7 @@ import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.soap.SOAPMessageContext; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.jboss.arquillian.container.test.api.Deployment; @@ -45,7 +46,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; - import org.jboss.ws.api.handler.GenericSOAPHandler; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; @@ -55,6 +55,7 @@ /** * [JBWS-1283] Attachment dropped on outbound messages if they have been added through a handler */ +@Ignore(value="[JBWS-2480] Soap attachments are dropped on server response") @RunWith(Arquillian.class) public class JBWS1283TestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -40,6 +40,7 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; 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; @@ -48,6 +49,7 @@ * * @author <a href="ema(a)redhat.com">Jim Ma</a> */ +@Ignore(value="Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed") @RunWith(Arquillian.class) public class JBWS2978TestCase extends JBossWSTest { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2015-01-19 06:54:04 UTC (rev 19384) @@ -38,6 +38,7 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,6 +55,7 @@ * @author Heiko Braun <heiko.braun(a)jboss.com> * @since 05.12.2006 */ +@Ignore(value="[JBWS-2561] XOP request not properly inlined") @RunWith(Arquillian.class) public class XOPHandlerTestCase extends XOPBase {

10 years

1
0
0 / 0

JBossWS SVN: r19383 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws: samples/serviceref and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-18 22:39:10 -0500 (Sun, 18 Jan 2015) New Revision: 19383 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java Log: Fix appclient test;Refactor JBWS1843TestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2015-01-16 17:21:13 UTC (rev 19382) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2015-01-19 03:39:10 UTC (rev 19383) @@ -39,6 +39,7 @@ import org.jboss.test.ws.jaxws.jbws1843.generated.Service; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,8 +74,8 @@ return archive; } - @Override - protected void setUp() throws Exception + @Before + public void setUp() throws Exception { super.setUp(); @@ -89,7 +90,6 @@ @RunAsClient public void testCountryCodes() throws Exception { - setUp(); Response response = proxy.getCountryCodes(); List<CountryCodeType> countryCodes = response.getCountry(); assertEquals(countryCodes.get(0), CountryCodeType.CZ); @@ -100,7 +100,6 @@ @RunAsClient public void testCurrencyCodes() throws Exception { - setUp(); org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); List<CurrencyCodeType> currencyCodes = response.getCurrency(); assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); @@ -111,7 +110,6 @@ @RunAsClient public void test() throws Exception { - setUp(); assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java 2015-01-16 17:21:13 UTC (rev 19382) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) @@ -97,10 +97,8 @@ .addAsManifestResource( new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl"); - JBossWSTestHelper.writeToFile(archive1); - EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, APPCLIENT_DEPLOYMENT + ".ear"); - archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-serviceref-appclient.jar")); + archive.addAsModule(archive1); JBossWSTestHelper.writeToFile(archive); fullAppclientDepName = archive.getName() + "#" + archive1.getName(); return archive; @@ -179,10 +177,6 @@ @OperateOnDeployment("jaxws-samples-serviceref") public void testApplicationClient() throws Exception { - if (true) { - System.out.println("FIXME: Arquillian and appclient failures"); - return; - } try { final OutputStream appclientOS = new ByteArrayOutputStream(); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-16 17:21:13 UTC (rev 19382) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-19 03:39:10 UTC (rev 19383) @@ -92,11 +92,8 @@ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss-client.xml"), "jboss-client.xml") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl"); - JBossWSTestHelper.writeToFile(jarArchive); EnterpriseArchive earArchive = ShrinkWrap.create(EnterpriseArchive.class, DEP_APPCLIENT_EAR + ".ear"); - earArchive - .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-webserviceref-appclient.jar")); + earArchive.addAsModule(jarArchive); JBossWSTestHelper.writeToFile(earArchive); fullAppclientDepName = earArchive.getName() + "#" + jarArchive.getName(); return earArchive; @@ -173,10 +170,6 @@ @OperateOnDeployment(DEP_WAR) public void testApplicationClient() throws Throwable { - if (true) { - System.out.println("FIXME: Arquillian and appclient tests"); - return; - } try { final String appclientArg = "Hello World!";

10 years

1
0
0 / 0

JBossWS SVN: r19382 - stack/cxf/branches/arquillian/modules/test-utils.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-16 12:21:13 -0500 (Fri, 16 Jan 2015) New Revision: 19382 Modified: stack/cxf/branches/arquillian/modules/test-utils/pom.xml Log: Ensure distribution module is not run after test modules, just in case someone tries using the multithread maven execution (-T x) Modified: stack/cxf/branches/arquillian/modules/test-utils/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/test-utils/pom.xml 2015-01-15 17:29:00 UTC (rev 19381) +++ stack/cxf/branches/arquillian/modules/test-utils/pom.xml 2015-01-16 17:21:13 UTC (rev 19382) @@ -37,6 +37,13 @@ <artifactId>jboss-logging</artifactId> <scope>provided</scope> </dependency> + <dependency>  + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-dist</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>provided</scope> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>

10 years

1
0
0 / 0

JBossWS SVN: r19381 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-15 12:29:00 -0500 (Thu, 15 Jan 2015) New Revision: 19381 Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/AbstractExceptionTests.java Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java Log: Fixing failure w/ -Pfast Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/AbstractExceptionTests.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/AbstractExceptionTests.java (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/AbstractExceptionTests.java 2015-01-15 17:29:00 UTC (rev 19381) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.exception; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.wsf.test.JBossWSTest; +import org.junit.Test; + +/** + * Test JAX-WS exception handling + * + * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> + */ +public abstract class AbstractExceptionTests extends JBossWSTest +{ + @Test + @RunAsClient + public void testRuntimeException() throws Exception + { + try + { + getHelper().testRuntimeException(); + } + catch (Exception e) + { + fail(e); + } + } + + @Test + @RunAsClient + public void testSoapFaultException() throws Exception + { + try + { + getHelper().testSoapFaultException(); + } + catch (Exception e) + { + fail(e); + } + } + + @Test + @RunAsClient + public void testApplicationException() throws Exception + { + try + { + getHelper().testApplicationException(); + } + catch (Exception e) + { + fail(e); + } + } + + @Test + @RunAsClient + public void testSOAP12RuntimeException() throws Exception + { + try + { + getSOAP12Helper().testRuntimeException(); + } + catch (Exception e) + { + fail(e); + } + } + + @Test + @RunAsClient + public void testSOAP12SoapFaultException() throws Exception + { + try + { + getSOAP12Helper().testSoapFaultException(); + } + catch (Exception e) + { + fail(e); + } + } + + @Test + @RunAsClient + public void testSOAP12ApplicationException() throws Exception + { + try + { + getSOAP12Helper().testApplicationException(); + } + catch (Exception e) + { + fail(e); + } + } + + private static void fail(Exception e) { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(bos); + e.printStackTrace(ps); + fail(bos.toString()); + ps.close(); + } + + abstract protected ExceptionHelper getHelper(); + + abstract protected SOAP12ExceptionHelper getSOAP12Helper(); +} Property changes on: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/AbstractExceptionTests.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2015-01-15 15:18:23 UTC (rev 19380) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2015-01-15 17:29:00 UTC (rev 19381) @@ -37,7 +37,7 @@ * @author alessio.soldano(a)jboss.com */ @RunWith(Arquillian.class) -public class ExceptionEJB3TestCase extends ExceptionTestCase +public class ExceptionEJB3TestCase extends AbstractExceptionTests { @Deployment(name="jaxws-samples-exception", testable = false) public static JavaArchive createDeployment() { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2015-01-15 15:18:23 UTC (rev 19380) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2015-01-15 17:29:00 UTC (rev 19381) @@ -21,18 +21,13 @@ */ package org.jboss.test.ws.jaxws.samples.exception; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.PrintStream; 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.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.junit.Test; import org.junit.runner.RunWith; /** @@ -41,7 +36,7 @@ * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a> */ @RunWith(Arquillian.class) -public class ExceptionTestCase extends JBossWSTest +public class ExceptionTestCase extends AbstractExceptionTests { @Deployment(name="jaxws-samples-exception-jse-plain", testable = false) public static WebArchive createDeployments() { @@ -67,99 +62,7 @@ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/exception/WEB-INF/web.xml")); return archive; } - - @Test - @RunAsClient - public void testRuntimeException() throws Exception - { - try - { - getHelper().testRuntimeException(); - } - catch (Exception e) - { - fail(e); - } - } - - @Test - @RunAsClient - public void testSoapFaultException() throws Exception - { - try - { - getHelper().testSoapFaultException(); - } - catch (Exception e) - { - fail(e); - } - } - - @Test - @RunAsClient - public void testApplicationException() throws Exception - { - try - { - getHelper().testApplicationException(); - } - catch (Exception e) - { - fail(e); - } - } - - @Test - @RunAsClient - public void testSOAP12RuntimeException() throws Exception - { - try - { - getSOAP12Helper().testRuntimeException(); - } - catch (Exception e) - { - fail(e); - } - } - - @Test - @RunAsClient - public void testSOAP12SoapFaultException() throws Exception - { - try - { - getSOAP12Helper().testSoapFaultException(); - } - catch (Exception e) - { - fail(e); - } - } - - @Test - @RunAsClient - public void testSOAP12ApplicationException() throws Exception - { - try - { - getSOAP12Helper().testApplicationException(); - } - catch (Exception e) - { - fail(e); - } - } - private static void fail(Exception e) { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - PrintStream ps = new PrintStream(bos); - e.printStackTrace(ps); - fail(bos.toString()); - ps.close(); - } - protected ExceptionHelper getHelper() { return new ExceptionHelper("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-exception-jse-plain/ExceptionEndpointService");

10 years

1
0
0 / 0

JBossWS SVN: r19380 - stack/cxf/branches/arquillian.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-15 10:18:23 -0500 (Thu, 15 Jan 2015) New Revision: 19380 Modified: stack/cxf/branches/arquillian/pom.xml Log: Move to wildfly-arquillian-container-managed 1.0.0.Alpha5-SNAPSHOT which has a fix for solving most of the transient failures when running with -Pfast Modified: stack/cxf/branches/arquillian/pom.xml =================================================================== --- stack/cxf/branches/arquillian/pom.xml 2015-01-15 08:47:31 UTC (rev 19379) +++ stack/cxf/branches/arquillian/pom.xml 2015-01-15 15:18:23 UTC (rev 19380) @@ -107,6 +107,7 @@ <spring.version>3.2.8.RELEASE</spring.version> <shrinkwrap.version>1.1.3</shrinkwrap.version> <arquillian.version>1.1.2.Final</arquillian.version> + <arquillian-wildfly-container.version>1.0.0.Alpha5-SNAPSHOT</arquillian-wildfly-container.version> <jaspi.api.version>1.0.0.Alpha1</jaspi.api.version> <javax.inject.version>1</javax.inject.version> </properties> @@ -1264,7 +1265,7 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <version>1.0.0.Alpha4</version> + <version>${arquillian-wildfly-container.version}</version> <scope>test</scope> <exclusions> <exclusion>

10 years

1
0
0 / 0

JBossWS SVN: r19379 - stack/cxf/branches/arquillian/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-15 03:47:31 -0500 (Thu, 15 Jan 2015) New Revision: 19379 Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml Log: More cleanup Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-15 08:32:12 UTC (rev 19378) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-15 08:47:31 UTC (rev 19379) @@ -730,12 +730,6 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.arquillian.protocol</groupId> @@ -823,12 +817,6 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.arquillian.protocol</groupId> @@ -916,12 +904,6 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.arquillian.protocol</groupId>

10 years

1
0
0 / 0

JBossWS SVN: r19378 - in stack/cxf/branches/arquillian: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-15 03:32:12 -0500 (Thu, 15 Jan 2015) New Revision: 19378 Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/pom.xml Log: Upgrade wildfly-arquillian-container-managed to 1.0.0.Alpha4 Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 17:59:46 UTC (rev 19377) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-15 08:32:12 UTC (rev 19378) @@ -730,8 +730,6 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <version>1.0.0.Alpha2</version> - <scope>test</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId> @@ -825,8 +823,6 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <version>1.0.0.Alpha2</version> - <scope>test</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId> @@ -906,7 +902,6 @@ </profile>  <profile> @@ -921,8 +916,6 @@ <dependency> <groupId>org.wildfly.arquillian</groupId> <artifactId>wildfly-arquillian-container-managed</artifactId> - <version>1.0.0.Alpha2</version> - <scope>test</scope> <exclusions> <exclusion> <groupId>org.jboss.slf4j</groupId> Modified: stack/cxf/branches/arquillian/pom.xml =================================================================== --- stack/cxf/branches/arquillian/pom.xml 2015-01-14 17:59:46 UTC (rev 19377) +++ stack/cxf/branches/arquillian/pom.xml 2015-01-15 08:32:12 UTC (rev 19378) @@ -1260,6 +1260,19 @@ <version>${shrinkwrap.version}</version> <type>pom</type> </dependency> + + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-managed</artifactId> + <version>1.0.0.Alpha4</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.slf4j</groupId> + <artifactId>slf4j-jboss-logmanager</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement>

10 years

1
0
0 / 0

JBossWS SVN: r19377 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-14 12:59:46 -0500 (Wed, 14 Jan 2015) New Revision: 19377 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml Log: Use portoffsets values closer to each other (to save port range for the cxf-spring testsuite) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-14 17:37:16 UTC (rev 19376) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-14 17:59:46 UTC (rev 19377) @@ -293,7 +293,7 @@ <jbossHome>${jboss.home}</jbossHome>  - <port>19990</port>  + <port>14990</port>  </configuration> </execution> <execution> @@ -308,7 +308,7 @@ <jbossHome>${jboss.home}</jbossHome>  - <port>29990</port>  + <port>19990</port>  </configuration> </execution> </executions> Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 17:37:16 UTC (rev 19376) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 17:59:46 UTC (rev 19377) @@ -33,10 +33,10 @@ <resources-plugin-filters.version>1.0.0-SNAPSHOT</resources-plugin-filters.version> <log4j.version>1.2.14</log4j.version> <port-offset.cxf-tests.jboss>0</port-offset.cxf-tests.jboss> - <port-offset.cxf-tests.ssl-mutual-auth>10000</port-offset.cxf-tests.ssl-mutual-auth> - <port-offset.cxf-tests.default-config-tests>20000</port-offset.cxf-tests.default-config-tests> - <port-offset.shared-tests.jboss>30000</port-offset.shared-tests.jboss> - <port-offset.shared-tests.default-config-tests>40000</port-offset.shared-tests.default-config-tests> + <port-offset.cxf-tests.ssl-mutual-auth>5000</port-offset.cxf-tests.ssl-mutual-auth> + <port-offset.cxf-tests.default-config-tests>10000</port-offset.cxf-tests.default-config-tests> + <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> </properties>  Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-14 17:37:16 UTC (rev 19376) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-14 17:59:46 UTC (rev 19377) @@ -214,7 +214,7 @@ <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-shared-default.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> - <port>39990</port>  + <port>24990</port>  </configuration> </execution> <execution> @@ -227,7 +227,7 @@ <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-shared-default-config-tests.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> - <port>49990</port>  + <port>29990</port>  </configuration> </execution> </executions>

10 years

1
0
0 / 0

JBossWS SVN: r19376 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy: oasis/WEB-INF/wsdl and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-14 12:37:16 -0500 (Wed, 14 Jan 2015) New Revision: 19376 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl Log: More port updates Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 17:37:16 UTC (rev 19376) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-username"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8443)@/jaxws-samples-wsse-policy-username"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl 2015-01-14 15:36:15 UTC (rev 19375) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl 2015-01-14 17:37:16 UTC (rev 19376) @@ -120,7 +120,7 @@ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2113"/> </wsdl:port> <wsdl:port name="SecurityService2121Port" binding="tns:SecurityService2121PortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2121"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8443)@/jaxws-samples-wsse-policy-oasis/SecurityService2121"/> </wsdl:port> <wsdl:port name="SecurityService213Port" binding="tns:SecurityService213PortBinding"> <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService213"/> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl 2015-01-14 15:36:15 UTC (rev 19375) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl 2015-01-14 17:37:16 UTC (rev 19376) @@ -152,31 +152,31 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService2311Port" binding="tns:SecurityService2311PortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2311"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2311"/> </wsdl:port> <wsdl:port name="SecurityService2312Port" binding="tns:SecurityService2312PortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2312"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8443)@/jaxws-samples-wsse-policy-oasis/SecurityService2312"/> </wsdl:port> <wsdl:port name="SecurityService2313Port" binding="tns:SecurityService2313PortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2313"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8443)@/jaxws-samples-wsse-policy-oasis/SecurityService2313"/> </wsdl:port> <wsdl:port name="SecurityService2314Port" binding="tns:SecurityService2314PortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2314"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2314"/> </wsdl:port> <wsdl:port name="SecurityService2315Port" binding="tns:SecurityService2315PortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2315"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2315"/> </wsdl:port> <wsdl:port name="SecurityService2321Port" binding="tns:SecurityService2321PortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2321"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2321"/> </wsdl:port> <wsdl:port name="SecurityService2322Port" binding="tns:SecurityService2322PortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2322"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8443)@/jaxws-samples-wsse-policy-oasis/SecurityService2322"/> </wsdl:port> <wsdl:port name="SecurityService2323Port" binding="tns:SecurityService2323PortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2323"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8443)@/jaxws-samples-wsse-policy-oasis/SecurityService2323"/> </wsdl:port> <wsdl:port name="SecurityService2324Port" binding="tns:SecurityService2324PortBinding"> - <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2324"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.ssl-mutual-auth,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2324"/> </wsdl:port> </wsdl:service>  @@ -595,4 +595,4 @@ </wsp:All> </wsp:ExactlyOne> </wsp:Policy> -</wsdl:definitions> \ No newline at end of file +</wsdl:definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2015-01-14 17:37:16 UTC (rev 19376) @@ -46,7 +46,7 @@ </binding> <service name="BearerService"> <port name="BearerServicePort" binding="tns:BearerServicePortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-bearer/BearerService"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8443)@/jaxws-samples-wsse-policy-trust-bearer/BearerService"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl 2015-01-14 17:37:16 UTC (rev 19376) @@ -46,7 +46,7 @@ </binding> <service name="HolderOfKeyService"> <port name="HolderOfKeyServicePort" binding="tns:HolderOfKeyServicePortBinding"> - <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService"/> + <soap:address location="https://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8443)@/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService"/> </port> </service>

10 years

1
0
0 / 0

JBossWS SVN: r19375 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/cxf/clientConfig and 40 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-14 10:36:15 -0500 (Wed, 14 Jan 2015) New Revision: 19375 Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/ValidAddressEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl Log: Use maven-resources-plugin filter to avoid hardcoding port numbers including offsets Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -150,7 +150,7 @@ protected static String getEndpointURL(String host) { - return "http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint"; + return "http://" + host + "/jaxws-cxf-bus/EndpointService/Endpoint"; } protected static void performSOAPCall(String endpointAddress) throws SOAPException, MalformedURLException Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -218,8 +218,8 @@ deployer.deploy(SERVLET_CLIENT_DEP); try { - final String host = baseURL.getHost(); - final String clientAddress = baseURL.getProtocol() + "://" + host + ":" + baseURL.getPort() + "/jaxws-cxf-bus-servlet-client"; + final String host = baseURL.getHost() + ":" + baseURL.getPort(); + final String clientAddress = baseURL.getProtocol() + "://" + host + "/jaxws-cxf-bus-servlet-client"; URL url = new URL(clientAddress + "?method=testBusCreation"); assertEquals("OK testBusCreation", IOUtils.readAndCloseStream(url.openStream())); @@ -247,7 +247,7 @@ InitialContext iniCtx = null; try { - String host = getServerHost(); + String host = getServerHost() + ":" + getServerPort(); iniCtx = getServerInitialContext(); Object obj = iniCtx.lookup("jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj; @@ -272,7 +272,7 @@ public void testClient() throws Exception { ClientEndpoint port = getPort(); - assertEquals("Foo", port.testClient("Foo", getServerHost())); + assertEquals("Foo", port.testClient("Foo", getServerHost() + ":" + getServerPort())); } @Test @@ -281,7 +281,7 @@ public void testCachedPort() throws Exception { ClientEndpoint port = getPort(); - assertEquals("Foo", port.testCachedPort("Foo", getServerHost())); + assertEquals("Foo", port.testCachedPort("Foo", getServerHost() + ":" + getServerPort())); } @Test @@ -290,7 +290,7 @@ public void testCachedService() throws Exception { ClientEndpoint port = getPort(); - assertEquals("Foo", port.testCachedService("Foo", getServerHost())); + assertEquals("Foo", port.testCachedService("Foo", getServerHost() + ":" + getServerPort())); } private ClientEndpoint getPort() throws Exception { Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/ClientEndpointImpl.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -68,7 +68,7 @@ private static URL getWsdlURL(String host) throws Exception { - return new URL("http://" + host + ":8080/jaxws-cxf-bus/EndpointService/Endpoint?wsdl"); + return new URL("http://" + host + "/jaxws-cxf-bus/EndpointService/Endpoint?wsdl"); } private static Endpoint getPort(URL wsdlURL) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -151,7 +151,7 @@ private String runTestInContainer(String test) throws Exception { URL url = new URL("http://" + getServerHost() - + ":28080/jaxws-cxf-clientConfig-inContainer-def-client?path=/jaxws-cxf-clientConfig-def/EndpointImpl&method=" + test + + ":" + getServerPort(CXF_TESTS_GROUP_QUALIFIER, DEFAULT_CONFIG_TESTS_SERVER) + "/jaxws-cxf-clientConfig-inContainer-def-client?path=/jaxws-cxf-clientConfig-def/EndpointImpl&method=" + test + "&helper=" + Helper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/httpproxy/HTTPProxyTestCaseForked.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -221,7 +221,7 @@ @Override public InetSocketAddress getChainedProxyAddress() { - return new InetSocketAddress(getServerHost(), 8080); + return new InetSocketAddress(getServerHost(), getServerPort()); } }); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3516/JBWS3516TestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -79,13 +79,15 @@ AddressingProperties addrProperties = new AddressingProperties(); EndpointReferenceType faultTo = new EndpointReferenceType(); AttributedURIType epr = new AttributedURIType(); - epr.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/faultTo"); + String serverHost = getServerHost(); + int serverPort = getServerPort(); + epr.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/faultTo"); faultTo.setAddress(epr); addrProperties.setFaultTo(faultTo); EndpointReferenceType replyTo = new EndpointReferenceType(); AttributedURIType replyToURI = new AttributedURIType(); - replyToURI.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/replyTo"); + replyToURI.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/replyTo"); replyTo.setAddress(replyToURI); addrProperties.setReplyTo(replyTo); @@ -111,13 +113,15 @@ EndpointReferenceType faultTo = new EndpointReferenceType(); AttributedURIType epr = new AttributedURIType(); - epr.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/faultTo"); + String serverHost = getServerHost(); + int serverPort = getServerPort(); + epr.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/faultTo"); faultTo.setAddress(epr); addrProperties.setFaultTo(faultTo); EndpointReferenceType replyTo = new EndpointReferenceType(); AttributedURIType replyToURI = new AttributedURIType(); - replyToURI.setValue("http://" + getServerHost() + ":8080/jaxws-cxf-jbws3516/target/replyTo"); + replyToURI.setValue("http://" + serverHost + ":" + serverPort + "/jaxws-cxf-jbws3516/target/replyTo"); replyTo.setAddress(replyToURI); addrProperties.setReplyTo(replyTo); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/udp/UDPEndpointAPITestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -86,7 +86,7 @@ @RunAsClient public void testServerSide() throws Exception { - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-udp-api"); + URL url = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-cxf-udp-api"); assertEquals("true", IOUtils.readAndCloseStream(url.openStream())); } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/session/SessionEndpointTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -65,12 +65,11 @@ { SessionEndpoint proxy = this.createPort(); SessionEndpoint proxy2 = this.createPort(); + String addr = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-session/session"; ((BindingProvider) proxy).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); - ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - "http://localhost:8080/jaxws-samples-session/session"); + ((BindingProvider) proxy).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addr); ((BindingProvider) proxy2).getRequestContext().put(BindingProvider.SESSION_MAINTAIN_PROPERTY, true); - ((BindingProvider) proxy2).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, - "http://localhost:8080/jaxws-samples-session/session"); + ((BindingProvider) proxy2).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addr); proxy.setNumber(10); assertEquals("Number is 10", proxy.getNumber()); proxy2.setNumber(20); @@ -81,7 +80,7 @@ public SessionEndpoint createPort() throws Exception { QName serviceName = new QName("http://jboss.org/jaxws-samples-session", "SessionService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-session/session?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-session/session?wsdl"); Service service = Service.create(wsdlURL, serviceName); SessionEndpoint proxy = (SessionEndpoint) service.getPort(SessionEndpoint.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -104,9 +104,11 @@ } final QName typeName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsdd", "ServiceIface"); - checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd/WSDDService", typeName); - checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd2/WSDDService", typeName); - checkResolveMatches(rmts, "http://" + getServerHost() + ":8080/jaxws-samples-wsdd2/AnotherWSDDService", typeName); + final String serverHost = getServerHost(); + final int serverPort = getServerPort(); + checkResolveMatches(rmts, "http://" + serverHost + ":" + serverPort + "/jaxws-samples-wsdd/WSDDService", typeName); + checkResolveMatches(rmts, "http://" + serverHost + ":" + serverPort + "/jaxws-samples-wsdd2/WSDDService", typeName); + checkResolveMatches(rmts, "http://" + serverHost + ":" + serverPort + "/jaxws-samples-wsdd2/AnotherWSDDService", typeName); client.close(); } finally { bus.shutdown(true); Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/SignEncryptGCMTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -127,8 +127,8 @@ // public void testServerSide() throws Exception // { -// URL url = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-sign-encrypt-client?" + -// "path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName()); +// URL url = new URL(baseURL + +// "?path=/jaxws-samples-wsse-policy-sign-encrypt-gcm&method=testSignEncrypt&helper=" + SignEncryptHelper.class.getName()); // BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); // assertEquals("1", br.readLine()); // } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2015-01-14 15:36:15 UTC (rev 19375) @@ -65,14 +65,10 @@ private static final String SSL_MUTUAL_AUTH_SERVER = "ssl-mutual-auth"; private final String NS = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy/oasis-samples"; - //TODO use a proper mechanism for figuring out host/port - private final String serviceURL = "http://" + getServerHost() + ":18080/jaxws-samples-wsse-policy-oasis-23x/"; - private final String serviceURLHttps = "https://" + getServerHost() + ":18443/jaxws-samples-wsse-policy-oasis-23x/"; + private final String serviceURL = "http://" + getServerHost() + ":" + getServerPort(CXF_TESTS_GROUP_QUALIFIER, SSL_MUTUAL_AUTH_SERVER) + "/jaxws-samples-wsse-policy-oasis-23x/"; + private final String serviceURLHttps = "https://" + getServerHost() + ":" + (getServerPort(CXF_TESTS_GROUP_QUALIFIER, SSL_MUTUAL_AUTH_SERVER) + 363) + "/jaxws-samples-wsse-policy-oasis-23x/"; private final QName serviceName = new QName(NS, "SecurityService"); -// @ArquillianResource -// private URL baseURL; - @ArquillianResource private Deployer deployer; Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/InvalidAddressEndpoint.wsdl =================================================================== (Binary files differ) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/META-INF/wsdl/Endpoint.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -50,7 +50,7 @@ </wsdl:binding> <wsdl:service name="EndpointService"> <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/ValidAddressEndpoint.wsdl =================================================================== (Binary files differ) Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/bus/WEB-INF-client/wsdl/Endpoint.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -50,7 +50,7 @@ </wsdl:binding> <wsdl:service name="EndpointService"> <wsdl:port binding="tns:EndpointServiceSoapBinding" name="EndpointPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-bus/EndpointService/Endpoint" /> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-bus/EndpointService/Endpoint" /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/httpauth/WEB-INF/wsdl/hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -55,7 +55,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/jaxws-cxf-sec" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-sec" /> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3516/WEB-INF/wsdl/hello_world.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -82,7 +82,7 @@ <wsdl:service name="SOAPService"> <wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding"> - <soap:address location="http://localhost:8080/helloworld" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/helloworld" /> </wsdl:port> </wsdl:service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3628/WEB-INF/wsdl/service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -30,7 +30,7 @@ </wsdl:binding> <wsdl:service name="ServiceOne"> <wsdl:port binding="tns:ServiceOneSoapBinding" name="EndpointOnePort"> - <soap:address location="http://localhost:8080/jaxws-cxf-jbws3628/ServiceOne"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-jb..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/WEB-INF/wsdl/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloService..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/externalWsdl/WEB-INF/wsdl/jbws3792.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -4,6 +4,6 @@ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> <wsdl:import namespace="http://test.jbws3792/" - location="http://localhost:8080/jbws3792-external-wsdl/import.wsdl"/> + location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-ext..."/> </wsdl:definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -18,7 +18,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsSer..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportAlpha/WEB-INF/wsdl/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloService..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -18,7 +18,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsSer..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportBeta/WEB-INF/wsdl/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloService..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloService..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportDelta/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -17,7 +17,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsSer..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportEpsilon/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -6,7 +6,7 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" > <wsdl:import namespace="http://hello/test" - location="http://localhost:8080/jbws3792-hello/HelloService?wsdl" /> + location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/jbws3792-hel..." /> <wsdl:portType name="GreetingsService"> </wsdl:portType> @@ -17,7 +17,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsSer..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/A/b/Hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ <wsdl:service name="HelloService"> <wsdl:port name="HelloServicePort" binding="tns:HelloServiceSoapBinding"> - <soap:address location="http://localhost:8080/HelloServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/HelloService..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3792/wsdlImportGamma/WEB-INF/wsdl/Greeting_Simplest.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -18,7 +18,7 @@ <wsdl:service name="GreetingsService"> <wsdl:port name="GreetingsServicePort" binding="tns:GreetingsServiceSoapBinding"> - <soap:address location="http://localhost:8080/GreetingsServicePort"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/GreetingsSer..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/mtom/WEB-INF/wsdl/MtomService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -48,7 +48,7 @@ </wsdl:binding> <wsdl:service name="MtomService"> <wsdl:port name="MtomServicePort" binding="tns:MtomServiceSoapBinding"> - <soap:address location="http://localhost:8080/MtomService"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/MtomService"/> </wsdl:port> </wsdl:service> </wsdl:definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/WEB-INF/wsdl/hello.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -56,10 +56,10 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/hello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalida..." /> </port> <port name="ValidatingHelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/validatingHello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalida..." /> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/client.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -49,7 +49,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/hello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalida..." /> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/validatingClient.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -56,7 +56,7 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://localhost:8080/schemavalidation/hello" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/schemavalida..." /> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/META-INF-server/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-sign"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-sign"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-sign"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -40,7 +40,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wssePolicy-sign-encrypt"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wssePolicy-sign-encrypt"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/username-unsecure-transport/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -38,7 +38,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-unsecure-transport"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-unsecure-transport"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/auth/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas-digest"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas-digest"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb/META-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas-ejb"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas-ejb"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/ejb-digest/META-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas-ejb"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas-ejb"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF2/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -58,7 +58,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-username-jaas"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-username-jaas"/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -89,16 +89,16 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService221Port" binding="tns:SecurityService221PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService221"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService221"/> </wsdl:port> <wsdl:port name="SecurityService222Port" binding="tns:SecurityService222PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService222"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService222"/> </wsdl:port> <wsdl:port name="SecurityService223Port" binding="tns:SecurityService223PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService223"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService223"/> </wsdl:port> <wsdl:port name="SecurityService224Port" binding="tns:SecurityService224PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService224"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService224"/> </wsdl:port> </wsdl:service>  Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService21x.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -111,22 +111,22 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService2111Port" binding="tns:SecurityService2111PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2111"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2111"/> </wsdl:port> <wsdl:port name="SecurityService2112Port" binding="tns:SecurityService2112PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2112"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2112"/> </wsdl:port> <wsdl:port name="SecurityService2113Port" binding="tns:SecurityService2113PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2113"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2113"/> </wsdl:port> <wsdl:port name="SecurityService2121Port" binding="tns:SecurityService2121PortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2121"/> </wsdl:port> <wsdl:port name="SecurityService213Port" binding="tns:SecurityService213PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService213"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService213"/> </wsdl:port> <wsdl:port name="SecurityService214Port" binding="tns:SecurityService214PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService214"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService214"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/oasis/WEB-INF/wsdl/SecurityService23x.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -152,7 +152,7 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityService2311Port" binding="tns:SecurityService2311PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2311"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2311"/> </wsdl:port> <wsdl:port name="SecurityService2312Port" binding="tns:SecurityService2312PortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2312"/> @@ -161,13 +161,13 @@ <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2313"/> </wsdl:port> <wsdl:port name="SecurityService2314Port" binding="tns:SecurityService2314PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2314"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2314"/> </wsdl:port> <wsdl:port name="SecurityService2315Port" binding="tns:SecurityService2315PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2315"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2315"/> </wsdl:port> <wsdl:port name="SecurityService2321Port" binding="tns:SecurityService2321PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2321"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2321"/> </wsdl:port> <wsdl:port name="SecurityService2322Port" binding="tns:SecurityService2322PortBinding"> <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2322"/> @@ -176,7 +176,7 @@ <soap:address location="https://@jboss.bind.address@:8443/jaxws-samples-wsse-policy-oasis/SecurityService2323"/> </wsdl:port> <wsdl:port name="SecurityService2324Port" binding="tns:SecurityService2324PortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-oasis/SecurityService2324"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-oasis/SecurityService2324"/> </wsdl:port> </wsdl:service>  Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/secconv/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -45,7 +45,7 @@ </wsdl:binding> <wsdl:service name="SecurityService"> <wsdl:port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-secconv"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-secconv"/> </wsdl:port> </wsdl:service>  Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -45,7 +45,7 @@ </binding> <service name="ActAsService"> <port name="ActAsServicePort" binding="tns:ActAsServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-actas/ActAsService"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-actas/ActAsService"/> </port> </service> @@ -69,9 +69,9 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/BearerService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -96,10 +96,10 @@ </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -96,10 +96,10 @@ </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -45,7 +45,7 @@ </binding> <service name="OnBehalfOfService"> <port name="OnBehalfOfServicePort" binding="tns:OnBehalfOfServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/> </port> </service> @@ -69,9 +69,9 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -66,7 +66,7 @@ </wsdl:binding> <wsdl:service name="PicketLinkSTS"> <wsdl:port name="PicketLinkSTSPort" binding="tns:STSBinding"> - <soap12:address location="http://@jboss.bind.address@:8080/picketlink-sts/PicketLinkSTS"/> + <soap12:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/picketlink-sts/PicketLinkSTS"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/SecurityService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -44,7 +44,7 @@ </binding> <service name="SecurityService"> <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust/SecurityService"/> + <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust/SecurityService"/> </port> </service> @@ -68,9 +68,9 @@ <sp:RequireInternalReference /> </wsp:Policy> <sp:Issuer> - <wsaws:Address>http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> + <wsaws:Address>http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address> <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - wsdli:wsdlLocation="http://@jboss.bind.address@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> + wsdli:wsdlLocation="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl"> <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" EndpointName="UT_Port">stsns:SecurityTokenService</wsaw:ServiceName> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -210,7 +210,7 @@ <wsdl:service name="SecurityTokenService"> <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityToke..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -210,7 +210,7 @@ <wsdl:service name="SecurityTokenService"> <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityToke..."/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -181,7 +181,7 @@ <wsdl:service name="SecurityTokenService"> <wsdl:port name="UT_Port" binding="tns:UT_Binding"> - <soap:address location="http://localhost:8080/SecurityTokenService/UT" /> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SecurityToke..." /> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14 14:22:53 UTC (rev 19374) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14 15:36:15 UTC (rev 19375) @@ -46,7 +46,7 @@ <wsdl:service name="SaajService"> <wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding"> - <soap:address location="http://localhost:8080/SaajService"/> + <soap:address location="http://localhost:@add_int(port-offset.cxf-tests.jboss,8080)@/SaajService"/> </wsdl:port> </wsdl:service>

10 years

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2015