Author: veithen
Date: Sun Jul 13 19:46:29 2014
New Revision: 1610285
URL: http://svn.apache.org/r1610285
Log:
Reorganize the modules related to testing.
Added:
webservices/axiom/trunk/systests/integration-tests/
- copied from r1609263, webservices/axiom/trunk/modules/axiom-integration/
webservices/axiom/trunk/systests/old-tests/
- copied from r1609263, webservices/axiom/trunk/modules/axiom-tests/
webservices/axiom/trunk/testing/axiom-testsuite/
- copied from r1609263, webservices/axiom/trunk/modules/axiom-testsuite/
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/
- copied from r1609587,
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/
- copied from r1609868,
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/
webservices/axiom/trunk/testing/testutils/
- copied from r1609263, webservices/axiom/trunk/modules/axiom-testutils/
Removed:
webservices/axiom/trunk/modules/axiom-integration/
webservices/axiom/trunk/modules/axiom-tests/
webservices/axiom/trunk/modules/axiom-testsuite/
webservices/axiom/trunk/modules/axiom-testutils/
Modified:
webservices/axiom/trunk/axiom-spring-ws/pom.xml
webservices/axiom/trunk/code-coverage/pom.xml
webservices/axiom/trunk/modules/axiom-api/pom.xml
webservices/axiom/trunk/modules/axiom-compat/pom.xml
webservices/axiom/trunk/modules/axiom-dom/pom.xml
webservices/axiom/trunk/modules/axiom-impl/pom.xml
webservices/axiom/trunk/modules/axiom-samples/pom.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/systests/integration-tests/pom.xml
webservices/axiom/trunk/systests/old-tests/pom.xml
webservices/axiom/trunk/systests/pom.xml
webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
webservices/axiom/trunk/testing/dom-testsuite/pom.xml
webservices/axiom/trunk/testing/pom.xml
webservices/axiom/trunk/testing/saaj-testsuite/pom.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
webservices/axiom/trunk/testing/testutils/pom.xml
Modified: webservices/axiom/trunk/axiom-spring-ws/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/pom.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/pom.xml Sun Jul 13 19:46:29 2014
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Sun Jul 13 19:46:29 2014
@@ -154,7 +154,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-tests</artifactId>
+ <artifactId>old-tests</artifactId>
<version>${project.version}</version>
<classifier>jacoco</classifier>
<type>exec</type>
@@ -162,7 +162,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-integration</artifactId>
+ <artifactId>integration-tests</artifactId>
<version>${project.version}</version>
<classifier>jacoco</classifier>
<type>exec</type>
Modified: webservices/axiom/trunk/modules/axiom-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-api/pom.xml Sun Jul 13 19:46:29 2014
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: webservices/axiom/trunk/modules/axiom-compat/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-compat/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-compat/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-compat/pom.xml Sun Jul 13 19:46:29
2014
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: webservices/axiom/trunk/modules/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-dom/pom.xml Sun Jul 13 19:46:29 2014
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: webservices/axiom/trunk/modules/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-impl/pom.xml Sun Jul 13 19:46:29 2014
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: webservices/axiom/trunk/modules/axiom-samples/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-samples/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-samples/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-samples/pom.xml Sun Jul 13 19:46:29
2014
@@ -62,7 +62,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Jul 13 19:46:29 2014
@@ -894,17 +894,13 @@
<modules>
<module>buildutils</module>
<module>modules/axiom-buildutils</module>
- <module>modules/axiom-testutils</module>
<module>modules/axiom-api</module>
- <module>modules/axiom-testsuite</module>
<module>modules/axiom-common-impl</module>
<module>modules/axiom-impl</module>
<module>modules/axiom-dom</module>
<module>modules/axiom-compat</module>
<module>modules/axiom-jaxb</module>
<module>modules/axiom-c14n</module>
- <module>modules/axiom-tests</module>
- <module>modules/axiom-integration</module>
<module>modules/axiom-all</module>
<module>modules/axiom-samples</module>
<module>axiom-spring-ws</module>
Modified: webservices/axiom/trunk/systests/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/integration-tests/pom.xml?rev=1610285&r1=1609263&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/integration-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/integration-tests/pom.xml Sun Jul 13
19:46:29 2014
@@ -21,24 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>systests</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axiom-integration</artifactId>
+ <artifactId>integration-tests</artifactId>
<name>Axiom Integration Test Suite</name>
<description>
This module contains tests that validate the interoperability of Axiom
with
other libraries.
</description>
- <!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-integration</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-integration</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-integration</url>
- </scm>
- <!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
- <url>http://ws.apache.org/axiom/</url>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -86,20 +77,13 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
<version>2.3.1</version>
@@ -111,19 +95,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/trunk/systests/old-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/pom.xml?rev=1610285&r1=1609263&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/old-tests/pom.xml Sun Jul 13 19:46:29 2014
@@ -21,26 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>systests</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axiom-tests</artifactId>
- <name>Axiom Test Suite</name>
+ <artifactId>old-tests</artifactId>
+ <name>Axiom Test Suite (old)</name>
<description>
- The Axiom test suite. This ought to be split into several parts and be
made
- a part of axiom-api, axiom-impl and axiom-dom. However, that's not as
easy
- as it seems. The intention is to start with axiom-test and continuosly
move
- parts to the actual projects.
+ Legacy test suite. The tests in this module will be moved to other
places. See AXIOM-311.
</description>
- <!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-tests</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-tests</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests</url>
- </scm>
- <!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
- <url>http://ws.apache.org/axiom/</url>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -99,7 +87,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -109,21 +97,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: webservices/axiom/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/pom.xml (original)
+++ webservices/axiom/trunk/systests/pom.xml Sun Jul 13 19:46:29 2014
@@ -55,7 +55,9 @@
<modules>
<module>cross-om-tests</module>
<module>eclipse-tests</module>
+ <module>integration-tests</module>
<module>jboss-tests</module>
+ <module>old-tests</module>
<module>osgi-tests</module>
<module>spring-ws-tests</module>
<module>wss4j-tests</module>
Modified: webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/pom.xml?rev=1610285&r1=1609263&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/pom.xml Sun Jul 13 19:46:29
2014
@@ -21,9 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>testing</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-testsuite</artifactId>
<name>Axiom Implementation Test Suite</name>
@@ -31,14 +30,6 @@
The Axiom implementation test suite. This test suite can be used to
check conformance of a
particular Axiom implementation.
</description>
- <!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite</url>
- </scm>
- <!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
- <url>http://ws.apache.org/axiom/</url>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -55,7 +46,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -87,24 +78,6 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>apache-release</id>
Modified: webservices/axiom/trunk/testing/dom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/pom.xml Sun Jul 13 19:46:29
2014
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: webservices/axiom/trunk/testing/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/pom.xml (original)
+++ webservices/axiom/trunk/testing/pom.xml Sun Jul 13 19:46:29 2014
@@ -28,11 +28,13 @@
<name>Testing</name>
<packaging>pom</packaging>
<modules>
+ <module>axiom-testsuite</module>
<module>dom-testsuite</module>
<module>jaxen-testsuite</module>
<module>saaj-testsuite</module>
<module>soap-testsuite</module>
<module>spring-ws-testsuite</module>
+ <module>testutils</module>
</modules>
<build>
<plugins>
@@ -54,6 +56,13 @@
</signature>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: webservices/axiom/trunk/testing/saaj-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/saaj-testsuite/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/saaj-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/saaj-testsuite/pom.xml Sun Jul 13 19:46:29
2014
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1610285&r1=1610284&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Sun Jul 13
19:46:29 2014
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: webservices/axiom/trunk/testing/testutils/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/testutils/pom.xml?rev=1610285&r1=1609263&r2=1610285&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/testutils/pom.xml (original)
+++ webservices/axiom/trunk/testing/testutils/pom.xml Sun Jul 13 19:46:29 2014
@@ -21,23 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>testing</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axiom-testutils</artifactId>
+ <artifactId>testutils</artifactId>
<name>Axiom Test Utilities</name>
<description>
Contains utility classes used by the test suites in Axiom.
</description>
- <!-- This needs to be set explicitly because the project structure implies
that the Maven calculated defaults are wrong -->
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-testutils</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-testutils</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testutils</url>
- </scm>
- <!-- This also needs to be set explicitly because the Maven calculated URL
would point to nowhere -->
- <url>http://ws.apache.org/axiom/</url>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -124,13 +115,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
