Author: asoldano
Date: 2015-01-22 05:51:29 -0500 (Thu, 22 Jan 2015)
New Revision: 19415
Added:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
Removed:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default-config-tests.groovy
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default.groovy
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
Log:
Preliminary cleanup on top of Rebecca's changes in r19411:
- do not enable spring tests by default, the -Pspring profile is meant to be used
- remove jbws-testsuite-spring-default-config-tests configuration which is not used
- rename jbws-testsuite-spring-default configuration to please gmaven plugin
- fix few port number and configuration names here and there (cut & paste... ;-) )
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-22
08:08:45 UTC (rev 19414)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-22
10:51:29 UTC (rev 19415)
@@ -84,7 +84,7 @@
<goal>execute</goal>
</goals>
<configuration>
-
<source>${basedir}/src/test/scripts/jbws-testsuite-spring-default.groovy</source>
+
<source>${basedir}/src/test/scripts/jbws_testsuite_spring_default.groovy</source>
<properties>
<inputFile>${jboss.home}/standalone/configuration/standalone-full.xml</inputFile>
<outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-spring-default.xml</outputFile>
@@ -98,21 +98,6 @@
</properties>
</configuration>
</execution>
- <execution>
- <id>testsuite-default-config-tests</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
-
<source>${basedir}/src/test/scripts/jbws-testsuite-spring-default-config-tests.groovy</source>
- <properties>
-
<inputFile>${jboss.home}/standalone/configuration/standalone-full.xml</inputFile>
-
<outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-spring-default-config-tests.xml</outputFile>
-
<serverLog>jbws-testsuite-spring-default-config-tests.log</serverLog>
- </properties>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -166,16 +151,10 @@
<goal>start</goal>
</goals>
<configuration>
- <jvmArgs>-server -XX:+UseCompressedOops -Xms64m
- -Xmx512m -XX:MaxPermSize=256m
-
-Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss}
- ${additionalJvmArgs}
- </jvmArgs>
- <serverConfig>jbws-testsuite-spring-default.xml
- </serverConfig>
+ <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m
-XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.spring-tests.jboss}
${additionalJvmArgs}</jvmArgs>
+
<serverConfig>jbws-testsuite-spring-default.xml</serverConfig>
<jbossHome>${jboss.home}</jbossHome>
- <port>34990</port>
- <!-- Keep in sync with the port-offset -->
+ <port>39990</port><!-- Keep in sync with the
port-offset -->
</configuration>
</execution>
<execution>
@@ -185,41 +164,9 @@
<goal>shutdown</goal>
</goals>
<configuration>
- <port>34990</port>
- <!-- Keep in sync with the port-offset -->
+ <port>39990</port><!-- Keep in sync with the
port-offset -->
</configuration>
</execution>
- <execution>
- <id>default-config-tests</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- <configuration>
- <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-spring-default-config-tests.xml
- </serverConfig>
- <jbossHome>${jboss.home}</jbossHome>
- <port>39990</port>
- <!-- Keep in sync with the port-offset -->
- </configuration>
- </execution>
- <execution>
- <id>default-config-tests-shutdown</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>shutdown</goal>
- </goals>
- <configuration>
- <port>39990</port>
- <!-- Keep in sync with the port-offset -->
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-01-22
08:08:45 UTC (rev 19414)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-01-22
10:51:29 UTC (rev 19415)
@@ -6,32 +6,15 @@
<container qualifier="jboss" default="true">
<configuration>
<property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m
${additionalJvmArgs}</property>
+ <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m
-Djboss.socket.binding.port-offset=${port-offset.spring-tests.jboss}
-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
<property
name="serverConfig">jbws-testsuite-spring-default.xml</property>
<property
name="allowConnectingToRunningServer">true</property>
- <property
name="managementAddress">${jboss.bind.address:localhost}</property>
- <property
name="jbossArguments">${jbossArguments}</property>
- <property
name="managementPort">${add_int(port-offset.spring-tests.jboss,9990)}</property>
<!-- Keep in sync with the port-offset -->
+ <property
name="managementPort">${add_int(port-offset.spring-tests.jboss,9990)}</property>
<!-- AS7-4070 -->
- <property
name="waitForPorts">${add_int(port-offset.spring-tests.jboss,8787)}
${add_int(port-offset.spring-tests.jboss,9990)}</property> <!-- Keep in sync with
the port-offset -->
+ <property
name="waitForPorts">${add_int(port-offset.spring-tests.jboss,8787)}
${add_int(port-offset.spring-tests.jboss,9990)}</property>
<property
name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
- <container qualifier="default-config-tests" mode="manual">
- <configuration>
- <property name="jbossHome">${jboss.home}</property>
- <property name="javaVmArguments">-server
-XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m
-Djboss.socket.binding.port-offset=${port-offset.cxf-tests.default-config-tests}
${additionalJvmArgs}</property>
- <property
name="serverConfig">jbws-testsuite-spring-default-config-tests.xml</property>
- <property
name="allowConnectingToRunningServer">true</property>
- <property
name="managementAddress">${jboss.bind.address:localhost}</property>
- <property
name="jbossArguments">${jbossArguments}</property>
- <property
name="managementPort">${add_int(port-offset.spring-tests.default-config-tests,9990)}</property>
- <!-- AS7-4070 -->
- <property
name="waitForPorts">${add_int(port-offset.spring-tests.default-config-tests,8787)}
${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
- <property
name="waitForPortsTimeoutInSeconds">8</property>
- </configuration>
- </container>
-
</group>
</arquillian>
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties 2015-01-22
08:08:45 UTC (rev 19414)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/etc/container.properties 2015-01-22
10:51:29 UTC (rev 19415)
@@ -6,4 +6,3 @@
port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@
port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@
port-offset.spring-tests.jboss=(a)port-offset.spring-tests.jboss@
-port-offset.spring-tests.default-config-tests=(a)port-offset.spring-tests.default-config-tests@
\ No newline at end of file
Deleted:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default-config-tests.groovy
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default-config-tests.groovy 2015-01-22
08:08:45 UTC (rev 19414)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default-config-tests.groovy 2015-01-22
10:51:29 UTC (rev 19415)
@@ -1,20 +0,0 @@
-def root = new XmlParser().parse(project.properties['inputFile'])
-
-/**
- * Fix logging: remove CONSOLE handler and set a specific log file
- *
- */
-def logHandlers = root.profile.subsystem.'root-logger'.handlers[0]
-def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'}
-logHandlers.remove(consoleHandler)
-def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
-file.attributes()['path'] = project.properties['serverLog']
-
-/**
- * Save the configuration to a new file
- */
-def writer = new StringWriter()
-writer.println('<?xml version="1.0"
encoding="UTF-8"?>')
-new XmlNodePrinter(new PrintWriter(writer)).print(root)
-def f = new File(project.properties['outputFile'])
-f.write(writer.toString())
Deleted:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default.groovy
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default.groovy 2015-01-22
08:08:45 UTC (rev 19414)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws-testsuite-spring-default.groovy 2015-01-22
10:51:29 UTC (rev 19415)
@@ -1,20 +0,0 @@
-def root = new XmlParser().parse(project.properties['inputFile'])
-
-/**
- * Fix logging: remove CONSOLE handler and set a specific log file
- *
- */
-def logHandlers = root.profile.subsystem.'root-logger'.handlers[0]
-def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'}
-logHandlers.remove(consoleHandler)
-def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
-file.attributes()['path'] = project.properties['serverLog']
-
-/**
- * Save the configuration to a new file
- */
-def writer = new StringWriter()
-writer.println('<?xml version="1.0"
encoding="UTF-8"?>')
-new XmlNodePrinter(new PrintWriter(writer)).print(root)
-def f = new File(project.properties['outputFile'])
-f.write(writer.toString())
Added:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy
(rev 0)
+++
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/src/test/scripts/jbws_testsuite_spring_default.groovy 2015-01-22
10:51:29 UTC (rev 19415)
@@ -0,0 +1,20 @@
+def root = new XmlParser().parse(project.properties['inputFile'])
+
+/**
+ * Fix logging: remove CONSOLE handler and set a specific log file
+ *
+ */
+def logHandlers = root.profile.subsystem.'root-logger'.handlers[0]
+def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'}
+logHandlers.remove(consoleHandler)
+def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0]
+file.attributes()['path'] = project.properties['serverLog']
+
+/**
+ * Save the configuration to a new file
+ */
+def writer = new StringWriter()
+writer.println('<?xml version="1.0"
encoding="UTF-8"?>')
+new XmlNodePrinter(new PrintWriter(writer)).print(root)
+def f = new File(project.properties['outputFile'])
+f.write(writer.toString())
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-22 08:08:45 UTC (rev
19414)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-22 10:51:29 UTC (rev
19415)
@@ -38,15 +38,13 @@
<port-offset.shared-tests.jboss>15000</port-offset.shared-tests.jboss>
<port-offset.shared-tests.default-config-tests>20000</port-offset.shared-tests.default-config-tests>
<port-offset.shared-tests.address-rewrite>25000</port-offset.shared-tests.address-rewrite>
-
<port-offset.spring-tests.default-config-tests>30000</port-offset.spring-tests.default-config-tests>
- <port-offset.spring-tests.jboss>35000</port-offset.spring-tests.jboss>
+ <port-offset.spring-tests.jboss>30000</port-offset.spring-tests.jboss>
</properties>
<!-- Modules -->
<modules>
<module>cxf-tests</module>
<module>shared-tests</module>
- <module>cxf-spring-tests</module>
</modules>
<!-- Dependencies -->
Show replies by date