Author: veithen
Date: Sat Aug 26 15:51:51 2017
New Revision: 1806312
URL: http://svn.apache.org/viewvc?rev=1806312&view=rev
Log:
Build the SOAP 1.2 testing modules using Maven instead of Ant.
Added:
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/ (with props)
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/module.xml
- copied unchanged from r1806311,
axis/axis2/java/core/trunk/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/META-INF/module.xml
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/pom.xml (with props)
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/src/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/src/main/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/src/main/java/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/src/main/java/org/
- copied from r1806311,
axis/axis2/java/core/trunk/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/ (with props)
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/module.xml
- copied unchanged from r1806311,
axis/axis2/java/core/trunk/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/META-INF/module.xml
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/pom.xml (with props)
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/src/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/src/main/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/src/main/java/
axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/src/main/java/org/
- copied from r1806311,
axis/axis2/java/core/trunk/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/
Removed:
axis/axis2/java/core/trunk/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/
axis/axis2/java/core/trunk/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/
Modified:
axis/axis2/java/core/trunk/modules/integration/itest-build.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml
axis/axis2/java/core/trunk/systests/pom.xml
Modified: axis/axis2/java/core/trunk/modules/integration/itest-build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/itest-build.xml?rev=1806312&r1=1806311&r2=1806312&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/itest-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/itest-build.xml Sat Aug 26
15:51:51 2017
@@ -83,9 +83,6 @@
<ant antfile="itest-build.xml" inheritall="true"
inheritrefs="true" dir="." target="rpc-wsdl-codegen" />
<ant antfile="itest-build.xml" inheritall="true"
inheritrefs="true" dir="." target="wsdl20-codegen" />
-
- <ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="test-resources/SOAP12Testing/SOAP12TestModuleB" />
- <ant antfile="build.xml" inheritall="true" inheritrefs="true"
dir="test-resources/SOAP12Testing/SOAP12TestModuleC" />
</target>
<target name="rpc-wsdl-codegen">
Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1806312&r1=1806311&r2=1806312&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sat Aug 26 15:51:51
2017
@@ -140,6 +140,20 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>SOAP12TestModuleB</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>SOAP12TestModuleC</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>SOAP12TestServiceB</artifactId>
<version>${project.version}</version>
<type>aar</type>
@@ -373,7 +387,7 @@
<configuration>
<outputDirectory>target/Repository</outputDirectory>
<axis2xml>conf/axis2.xml</axis2xml>
- <modules>addressing</modules>
+
<modules>addressing,SOAP12TestModuleB,SOAP12TestModuleC</modules>
<includeServices>true</includeServices>
<services>SOAP12TestServiceB,SOAP12TestServiceC</services>
</configuration>
Propchange: axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 26 15:51:51 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/pom.xml?rev=1806312&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/pom.xml (added)
+++ axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/pom.xml Sat Aug 26
15:51:51 2017
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+ ~ 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.axis2</groupId>
+ <artifactId>systests</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>SOAP12TestModuleB</artifactId>
+ <packaging>mar</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <moduleXmlFile>module.xml</moduleXmlFile>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: axis/axis2/java/core/trunk/systests/SOAP12TestModuleB/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Aug 26 15:51:51 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/pom.xml?rev=1806312&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/pom.xml (added)
+++ axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/pom.xml Sat Aug 26
15:51:51 2017
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+ ~ 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.axis2</groupId>
+ <artifactId>systests</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>SOAP12TestModuleC</artifactId>
+ <packaging>mar</packaging>
+ <url>http://axis.apache.org/axis2/java/core/</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <moduleXmlFile>module.xml</moduleXmlFile>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: axis/axis2/java/core/trunk/systests/SOAP12TestModuleC/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/core/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/pom.xml?rev=1806312&r1=1806311&r2=1806312&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/systests/pom.xml (original)
+++ axis/axis2/java/core/trunk/systests/pom.xml Sat Aug 26 15:51:51 2017
@@ -42,6 +42,8 @@
<modules>
<module>echo</module>
+ <module>SOAP12TestModuleB</module>
+ <module>SOAP12TestModuleC</module>
<module>SOAP12TestServiceB</module>
<module>SOAP12TestServiceC</module>
<module>webapp-tests</module>
