Author: veithen
Date: Tue Jun 17 22:01:48 2014
New Revision: 1603296
URL: http://svn.apache.org/r1603296
Log:
Move the test suites to a commom folder and make their artifact IDs more
consistent.
Added:
webservices/axiom/trunk/testsuites/dom-testsuite/
- copied from r1603292,
webservices/axiom/trunk/modules/axiom-dom-testsuite/
webservices/axiom/trunk/testsuites/jaxen-testsuite/
- copied from r1603292,
webservices/axiom/trunk/modules/axiom-jaxen-testsuite/
webservices/axiom/trunk/testsuites/spring-ws-testsuite/
- copied from r1603292, webservices/axiom/trunk/axiom-spring-ws-testsuite/
Removed:
webservices/axiom/trunk/axiom-spring-ws-testsuite/
webservices/axiom/trunk/modules/axiom-dom-testsuite/
webservices/axiom/trunk/modules/axiom-jaxen-testsuite/
Modified:
webservices/axiom/trunk/axiom-spring-ws/pom.xml
webservices/axiom/trunk/modules/axiom-dom/pom.xml
webservices/axiom/trunk/modules/axiom-impl/pom.xml
webservices/axiom/trunk/modules/axiom-testsuite/pom.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/testsuites/dom-testsuite/pom.xml
webservices/axiom/trunk/testsuites/jaxen-testsuite/pom.xml
webservices/axiom/trunk/testsuites/pom.xml
webservices/axiom/trunk/testsuites/spring-ws-testsuite/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=1603296&r1=1603295&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/pom.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/pom.xml Tue Jun 17 22:01:48 2014
@@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-spring-ws-testsuite</artifactId>
+ <artifactId>spring-ws-testsuite</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=1603296&r1=1603295&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-dom/pom.xml Tue Jun 17 22:01:48 2014
@@ -81,13 +81,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl-testsuite</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axiom-dom-testsuite</artifactId>
+ <artifactId>dom-testsuite</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=1603296&r1=1603295&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-impl/pom.xml Tue Jun 17 22:01:48 2014
@@ -80,12 +80,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>axiom-common-impl-testsuite</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>test</scope>
Modified: webservices/axiom/trunk/modules/axiom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/pom.xml?rev=1603296&r1=1603295&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/pom.xml Tue Jun 17 22:01:48
2014
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axiom-jaxen-testsuite</artifactId>
+ <artifactId>jaxen-testsuite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: webservices/axiom/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1603296&r1=1603295&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Tue Jun 17 22:01:48 2014
@@ -865,8 +865,6 @@
<module>buildutils</module>
<module>modules/axiom-buildutils</module>
<module>modules/axiom-testutils</module>
- <module>modules/axiom-jaxen-testsuite</module>
- <module>modules/axiom-dom-testsuite</module>
<module>modules/axiom-api</module>
<module>modules/axiom-testsuite</module>
<module>modules/axiom-common-impl</module>
@@ -879,7 +877,6 @@
<module>modules/axiom-integration</module>
<module>modules/axiom-all</module>
<module>modules/axiom-samples</module>
- <module>axiom-spring-ws-testsuite</module>
<module>axiom-spring-ws</module>
<module>systests</module>
<module>forbiddenapi-signatures</module>
Modified: webservices/axiom/trunk/testsuites/dom-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/dom-testsuite/pom.xml?rev=1603296&r1=1603292&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/testsuites/dom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testsuites/dom-testsuite/pom.xml Tue Jun 17
22:01:48 2014
@@ -21,23 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>testsuites</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axiom-dom-testsuite</artifactId>
- <name>Axiom DOM Test Suite</name>
+ <artifactId>dom-testsuite</artifactId>
+ <name>DOM Test Suite</name>
<description>
DOM test suite. This test suite can be applied to any DOM
implementation. It is validated against Apache Xerces.
</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-dom-testsuite</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-dom-testsuite</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom-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>junit</groupId>
Modified: webservices/axiom/trunk/testsuites/jaxen-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/jaxen-testsuite/pom.xml?rev=1603296&r1=1603292&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/testsuites/jaxen-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testsuites/jaxen-testsuite/pom.xml Tue Jun 17
22:01:48 2014
@@ -21,23 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>testsuites</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>axiom-jaxen-testsuite</artifactId>
- <name>Axiom Jaxen Test Suite</name>
+ <artifactId>jaxen-testsuite</artifactId>
+ <name>Jaxen Test Suite</name>
<description>
Contains unit test code from Jaxen.
</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-jaxen-testsuite</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-testsuite</developerConnection>
-
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxen-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>jaxen</groupId>
Modified: webservices/axiom/trunk/testsuites/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/pom.xml?rev=1603296&r1=1603295&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/testsuites/pom.xml (original)
+++ webservices/axiom/trunk/testsuites/pom.xml Tue Jun 17 22:01:48 2014
@@ -28,7 +28,10 @@
<name>Test Suites</name>
<packaging>pom</packaging>
<modules>
+ <module>dom-testsuite</module>
+ <module>jaxen-testsuite</module>
<module>soap-testsuite</module>
+ <module>spring-ws-testsuite</module>
</modules>
<build>
<plugins>
@@ -52,4 +55,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: webservices/axiom/trunk/testsuites/spring-ws-testsuite/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/spring-ws-testsuite/pom.xml?rev=1603296&r1=1603292&r2=1603296&view=diff
==============================================================================
--- webservices/axiom/trunk/testsuites/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testsuites/spring-ws-testsuite/pom.xml Tue Jun 17
22:01:48 2014
@@ -21,10 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom</artifactId>
+ <artifactId>testsuites</artifactId>
<version>1.2.15-SNAPSHOT</version>
</parent>
- <artifactId>axiom-spring-ws-testsuite</artifactId>
+ <artifactId>spring-ws-testsuite</artifactId>
<name>Spring-WS Test Suite</name>
<dependencies>
<dependency>
@@ -111,4 +111,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
