ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1728854 - in /webservices/axiom/trunk: code-coverage/ systests/ systests/jboss-tests/ systests/wildfly-tests/ systests/wildfly-tests/src/test/conf/ systests/wildfly-tests/src/test/java/org/apache/axiom/systest/jboss/ systests/wildfly-tests...
Date Sat, 06 Feb 2016 17:25:49 GMT
Author: veithen
Date: Sat Feb  6 17:25:48 2016
New Revision: 1728854

URL: http://svn.apache.org/viewvc?rev=1728854&view=rev
Log:
Remove references to JBoss since we are now testing with Wildfly.

Added:
    webservices/axiom/trunk/systests/wildfly-tests/
      - copied from r1728853, webservices/axiom/trunk/systests/jboss-tests/
    webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/wildfly/
      - copied from r1728853, webservices/axiom/trunk/systests/jboss-tests/src/test/java/org/apache/axiom/systest/jboss/
Removed:
    webservices/axiom/trunk/systests/jboss-tests/
    webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/jboss/
Modified:
    webservices/axiom/trunk/code-coverage/pom.xml
    webservices/axiom/trunk/systests/pom.xml
    webservices/axiom/trunk/systests/wildfly-tests/pom.xml
    webservices/axiom/trunk/systests/wildfly-tests/src/test/conf/standalone.xml
    webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/wildfly/DialectTest.java
    webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml

Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1728854&r1=1728853&r2=1728854&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Sat Feb  6 17:25:48 2016
@@ -208,7 +208,7 @@
         
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>jboss-tests</artifactId>
+            <artifactId>wildfly-tests</artifactId>
             <version>${project.version}</version>
             <classifier>jacoco</classifier>
             <type>exec</type>

Modified: webservices/axiom/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/pom.xml?rev=1728854&r1=1728853&r2=1728854&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/pom.xml (original)
+++ webservices/axiom/trunk/systests/pom.xml Sat Feb  6 17:25:48 2016
@@ -34,7 +34,7 @@
     <modules>
         <module>cross-om-tests</module>
         <module>eclipse-tests</module>
-        <module>jboss-tests</module>
+        <module>wildfly-tests</module>
         <module>old-tests</module>
         <module>osgi-tests</module>
         <module>spring-ws-tests</module>

Modified: webservices/axiom/trunk/systests/wildfly-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/pom.xml?rev=1728854&r1=1728853&r2=1728854&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/wildfly-tests/pom.xml Sat Feb  6 17:25:48 2016
@@ -26,14 +26,14 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jboss-tests</artifactId>
+    <artifactId>wildfly-tests</artifactId>
     <packaging>jar</packaging>
 
-    <name>JBoss Tests</name>
+    <name>Wildfly Tests</name>
 
     <properties>
-        <jboss.version>8.2.1.Final</jboss.version>
-        <jboss.home>${project.build.directory}/wildfly-${jboss.version}</jboss.home>
+        <wildfly.version>8.2.1.Final</wildfly.version>
+        <wildfly.home>${project.build.directory}/wildfly-${wildfly.version}</wildfly.home>
         <hermeticTests>false</hermeticTests>
     </properties>
 
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-arquillian-container-managed</artifactId>
-            <version>${jboss.version}</version>
+            <version>${wildfly.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -82,7 +82,7 @@
                 <executions>
                     <execution>
                         <!-- Copy the dependencies that will be included in the WAR deployed
-                             to JBoss. This is necessary because Arquillian's Maven dependency
+                             to Wildfly. This is necessary because Arquillian's Maven dependency
                              resolution doesn't work correctly if some of the dependencies
are
                              snapshots from the current reactor. -->
                         <id>copy-deps</id>
@@ -102,10 +102,10 @@
                     </execution>
                     <execution>
                         <!-- We would prefer using wildfly-server-provisioning-maven-plugin
to
-                             provision the server, but unfortunately the JBoss community
is still
+                             provision the server, but unfortunately the Wildfly community
is still
                              unable to ensure that all required artifacts are available from
Maven
                              central and the JBoss Maven repository isn't stable. -->
-                        <id>unpack-jboss</id>
+                        <id>unpack-wildfly</id>
                         <phase>pre-integration-test</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -115,7 +115,7 @@
                                 <artifactItem>
                                     <groupId>org.wildfly</groupId>
                                     <artifactId>wildfly-dist</artifactId>
-                                    <version>${jboss.version}</version>
+                                    <version>${wildfly.version}</version>
                                     <type>zip</type>
                                     <overWrite>false</overWrite>
                                     <outputDirectory>target</outputDirectory>
@@ -141,8 +141,8 @@
                         <phase>initialize</phase>
                         <configuration>
                             <portNames>
-                                <portName>jboss.managementPort</portName>
-                                <portName>jboss.httpPort</portName>
+                                <portName>wildfly.managementPort</portName>
+                                <portName>wildfly.httpPort</portName>
                             </portNames>
                         </configuration>
                     </execution>
@@ -152,13 +152,13 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-jboss-configuration</id>
+                        <id>copy-wildfly-configuration</id>
                         <phase>pre-integration-test</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${jboss.home}/standalone/configuration</outputDirectory>
+                            <outputDirectory>${wildfly.home}/standalone/configuration</outputDirectory>
                             <resources>          
                                 <resource>
                                     <directory>src/test/conf</directory>
@@ -173,14 +173,14 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>prepare-agent-for-jboss</id>
+                        <id>prepare-agent-for-wildfly</id>
                         <phase>initialize</phase>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
                         <configuration>
-                            <propertyName>jacoco.jbossArgLine</propertyName>
-                            <sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:jboss</sessionId>
+                            <propertyName>jacoco.wildflyArgLine</propertyName>
+                            <sessionId>mvn:${project.groupId}:${project.artifactId}:${project.version}:wildfly</sessionId>
                         </configuration>
                     </execution>
                 </executions>

Modified: webservices/axiom/trunk/systests/wildfly-tests/src/test/conf/standalone.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/src/test/conf/standalone.xml?rev=1728854&r1=1728853&r2=1728854&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/src/test/conf/standalone.xml (original)
+++ webservices/axiom/trunk/systests/wildfly-tests/src/test/conf/standalone.xml Sat Feb  6
17:25:48 2016
@@ -360,10 +360,10 @@
         </interface>
     </interfaces>
     <socket-binding-group name="standard-sockets" default-interface="localhost">
-        <socket-binding name="management-http" port="${jboss.management.port}"/>
+        <socket-binding name="management-http" port="${wildfly.management.port}"/>
         <socket-binding name="management-https" port="0"/>
         <socket-binding name="ajp" port="0"/>
-        <socket-binding name="http" port="${jboss.http.port}"/>
+        <socket-binding name="http" port="${wildfly.http.port}"/>
         <socket-binding name="https" port="0"/>
         <socket-binding name="txn-recovery-environment" port="0"/>
         <socket-binding name="txn-status-manager" port="0"/>

Modified: webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/wildfly/DialectTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/wildfly/DialectTest.java?rev=1728854&r1=1728853&r2=1728854&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/wildfly/DialectTest.java
(original)
+++ webservices/axiom/trunk/systests/wildfly-tests/src/test/java/org/apache/axiom/systest/wildfly/DialectTest.java
Sat Feb  6 17:25:48 2016
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.systest.jboss;
+package org.apache.axiom.systest.wildfly;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

Modified: webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml?rev=1728854&r1=1728853&r2=1728854&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml (original)
+++ webservices/axiom/trunk/systests/wildfly-tests/src/test/resources/arquillian.xml Sat Feb
 6 17:25:48 2016
@@ -22,11 +22,11 @@
             xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
     <container qualifier="jbossas-managed" default="true">
         <configuration>
-            <property name="jbossHome">${jboss.home}</property>
+            <property name="jbossHome">${wildfly.home}</property>
             <!-- Arquillian gets confused if there is an extra space at the beginning
of the arg line.
                  Therefore we need to add a dummy argument to avoid that problem if JaCoCo
is skipped. -->
-            <property name="javaVmArguments">-Ddummy ${jacoco.jbossArgLine} -Djboss.management.port=${jboss.managementPort}
-Djboss.http.port=${jboss.httpPort}</property>
-            <property name="managementPort">${jboss.managementPort}</property>
+            <property name="javaVmArguments">-Ddummy ${jacoco.wildflyArgLine} -Dwildfly.management.port=${wildfly.managementPort}
-Dwildfly.http.port=${wildfly.httpPort}</property>
+            <property name="managementPort">${wildfly.managementPort}</property>
         </configuration>
     </container>
 </arquillian>



Mime
View raw message