Author: asoldano
Date: 2015-01-14 06:43:33 -0500 (Wed, 14 Jan 2015)
New Revision: 19371
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl
Log:
Initial changes for using the custom maven-resources-plugin filter extension to
automatically sum port numbers with proper port offsets and avoid manually keeping in sych
port numbers in the various descriptors
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2015-01-14
11:39:24 UTC (rev 19370)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2015-01-14
11:43:33 UTC (rev 19371)
@@ -25,9 +25,9 @@
<property
name="allowConnectingToRunningServer">true</property>
<property
name="managementAddress">${jboss.bind.address:localhost}</property>
<property
name="jbossArguments">${jbossArguments}</property>
- <property
name="managementPort">${as.managementPort:19990}</property> <!--
Keep in sync with the port-offset -->
+ <property
name="managementPort">${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:18787}
${as.managementPort:19990}</property> <!-- Keep in sync with the port-offset
-->
+ <property
name="waitForPorts">${add_int(port-offset.cxf-tests.ssl-mutual-auth,8787)}
${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)}</property>
<property
name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
@@ -39,9 +39,9 @@
<property
name="allowConnectingToRunningServer">true</property>
<property
name="managementAddress">${jboss.bind.address:localhost}</property>
<property
name="jbossArguments">${jbossArguments}</property>
- <property
name="managementPort">${as.managementPort:29990}</property> <!--
Keep in sync with the port-offset -->
+ <property
name="managementPort">${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:28787}
${as.managementPort:29990}</property> <!-- Keep in sync with the port-offset
-->
+ <property
name="waitForPorts">${add_int(port-offset.cxf-tests.default-config-tests,8787)}
${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
<property
name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 11:39:24 UTC (rev
19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 11:43:33 UTC (rev
19371)
@@ -30,6 +30,7 @@
<org.slf4j.version>1.6.1</org.slf4j.version>
<gnu.getopt.version>1.0.13</gnu.getopt.version>
<bc.version>1.49</bc.version>
+
<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>
@@ -183,6 +184,23 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <mavenFilteringHints>
+ <mavenFilteringHint>custom</mavenFilteringHint>
+ </mavenFilteringHints>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.plugins</groupId>
+ <artifactId>resources-plugin-filters</artifactId>
+ <version>${resources-plugin-filters.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-14
11:39:24 UTC (rev 19370)
+++
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-14
11:43:33 UTC (rev 19371)
@@ -9,9 +9,9 @@
<property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m
-Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss}
-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
<property
name="serverConfig">jbws-testsuite-shared-default.xml</property>
<property
name="allowConnectingToRunningServer">true</property>
- <property
name="managementPort">${as.managementPort:39990}</property> <!--
Keep in sync with the port-offset -->
+ <property
name="managementPort">${add_int(port-offset.shared-tests.jboss,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:38787}
${as.managementPort:39990}</property> <!-- Keep in sync with the port-offset
-->
+ <property
name="waitForPorts">${add_int(port-offset.shared-tests.jboss,8787)}
${add_int(port-offset.shared-tests.jboss,9990)}</property>
<property
name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
@@ -21,9 +21,9 @@
<property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m
-Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests}
-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
<property
name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property>
<property
name="allowConnectingToRunningServer">true</property>
- <property
name="managementPort">${as.managementPort:49990}</property> <!--
Keep in sync with the port-offset -->
+ <property
name="managementPort">${add_int(port-offset.shared-tests.default-config-tests,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:48787}
${as.managementPort:49990}</property> <!-- Keep in sync with the port-offset
-->
+ <property
name="waitForPorts">${add_int(port-offset.shared-tests.default-config-tests,8787)}
${add_int(port-offset.shared-tests.default-config-tests,9990)}</property>
<property
name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2015-01-14
11:39:24 UTC (rev 19370)
+++
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2015-01-14
11:43:33 UTC (rev 19371)
@@ -7,7 +7,7 @@
<import
namespace="http://types.complex.jaxws.ws.test.jboss.org/"
location="Registration_PortType.wsdl"/>
<service name="RegistrationService">
<port name="RegistrationPort"
binding="ns1:RegistrationBinding">
- <soap:address
location="http://@jboss.bind.address@:38080/jaxws-complex/RegistrationService"/>
+ <soap:address
location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-complex/RegistrationService"/>
</port>
</service>
</definitions>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl 2015-01-14
11:39:24 UTC (rev 19370)
+++
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl 2015-01-14
11:43:33 UTC (rev 19371)
@@ -63,7 +63,7 @@
<service name="TestEndpointService">
<port name="MTOMTestPort" binding="tns:MTOMBindind">
- <soap:address
location="http://@jboss.bind.address@:38080/jaxws3140-server"/>
+ <soap:address
location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws3140-server"/>
</port>
</service>
</definitions>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14
11:39:24 UTC (rev 19370)
+++
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14
11:43:33 UTC (rev 19371)
@@ -48,7 +48,7 @@
<wsdl:service name="SaajService">
<wsdl:port name="SaajServicePort"
binding="tns:SaajServiceSoapBinding">
- <soap:address
location="http://@jboss.bind.address@:38080/SaajService"/>
+ <soap:address
location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/SaajService"/>
</wsdl:port>
</wsdl:service>