Author: veithen
Date: Sun Nov 18 11:15:54 2012
New Revision: 1410873
URL: http://svn.apache.org/viewvc?rev=1410873&view=rev
Log:
Created a new (intermediary) parent Maven module for the tests and moved the
interop tests.
Added:
axis/axis1/java/trunk/tests/
axis/axis1/java/trunk/tests/interop-tests/
- copied from r1410570, axis/axis1/java/trunk/interop/
axis/axis1/java/trunk/tests/pom.xml (with props)
Removed:
axis/axis1/java/trunk/interop/
axis/axis1/java/trunk/tests/interop-tests/src/test/resources/
Modified:
axis/axis1/java/trunk/pom.xml
axis/axis1/java/trunk/tests/interop-tests/pom.xml
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1410873&r1=1410872&r2=1410873&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Sun Nov 18 11:15:54 2012
@@ -80,13 +80,13 @@
<module>axis-war</module>
<module>distribution</module>
<module>integration</module>
- <module>interop</module>
<module>interop-mock</module>
<module>maven</module>
<module>samples</module>
<module>soapmonitor-applet</module>
<module>soapmonitor-client</module>
<module>tcpmon</module>
+ <module>tests</module>
</modules>
<dependencyManagement>
<dependencies>
Modified: axis/axis1/java/trunk/tests/interop-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/tests/interop-tests/pom.xml?rev=1410873&r1=1410570&r2=1410873&view=diff
==============================================================================
--- axis/axis1/java/trunk/tests/interop-tests/pom.xml (original)
+++ axis/axis1/java/trunk/tests/interop-tests/pom.xml Sun Nov 18 11:15:54 2012
@@ -21,11 +21,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.axis</groupId>
- <artifactId>axis-project</artifactId>
+ <artifactId>tests</artifactId>
<version>1.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>interop</artifactId>
+ <artifactId>interop-tests</artifactId>
<name>Interoperability tests</name>
<dependencies>
<dependency>
@@ -67,7 +67,7 @@
<goal>generate-test-sources</goal>
</goals>
<configuration>
-
<file>../interop-mock/src/main/resources/wsdl/soap12-add-test.wsdl</file>
+
<file>../../interop-mock/src/main/resources/wsdl/soap12-add-test.wsdl</file>
<generate>both</generate>
<mappings>
<mapping>
@@ -87,7 +87,7 @@
<goal>generate-test-sources</goal>
</goals>
<configuration>
-
<file>../interop-mock/src/main/resources/wsdl/soap12-test.wsdl</file>
+
<file>../../interop-mock/src/main/resources/wsdl/soap12-test.wsdl</file>
<generate>both</generate>
<mappings>
<mapping>
@@ -107,7 +107,7 @@
<goal>generate-test-sources</goal>
</goals>
<configuration>
-
<file>../interop-mock/src/main/resources/wsdl/TerraService.wsdl</file>
+
<file>../../interop-mock/src/main/resources/wsdl/TerraService.wsdl</file>
<generate>client</generate>
<wrapArrays>true</wrapArrays>
<mappings>
@@ -219,19 +219,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>
Added: axis/axis1/java/trunk/tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/tests/pom.xml?rev=1410873&view=auto
==============================================================================
--- axis/axis1/java/trunk/tests/pom.xml (added)
+++ axis/axis1/java/trunk/tests/pom.xml Sun Nov 18 11:15:54 2012
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tests</artifactId>
+ <name>Tests</name>
+ <packaging>pom</packaging>
+ <description>
+ Root POM for the Axis (integration) tests.
+ </description>
+ <modules>
+ <module>interop-tests</module>
+ </modules>
+ <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>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <!-- Don't generate Javadoc JARs for tests since we don't
deploy them anyway -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Propchange: axis/axis1/java/trunk/tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
