Author: veithen
Date: Tue Dec 26 21:48:09 2017
New Revision: 1819298
URL: http://svn.apache.org/viewvc?rev=1819298&view=rev
Log:
Let axis2-repo-maven-plugin build the AddressingProvider service JAR.
Added:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/servicejars/
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/servicejars/AddressingProvider/
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/servicejars/AddressingProvider/META-INF/
- copied from r1819297,
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/addressing/META-INF/
Removed:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/addressing/META-INF/
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1819298&r1=1819297&r2=1819298&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Tue Dec 26
21:48:09 2017
@@ -189,6 +189,13 @@
<axis2xml>test-resources/axis2.xml</axis2xml>
<jaxwsServices>
<jaxwsService>
+ <name>AddressingProvider</name>
+ <packages>
+
<package>org.apache.axis2.jaxws.provider.addressing</package>
+ </packages>
+
<resourcesDirectory>src/test/servicejars/AddressingProvider</resourcesDirectory>
+ </jaxwsService>
+ <jaxwsService>
<name>XPayloadStringProvider</name>
<packages>
<package>org.apache.axis2.jaxws.xmlhttp.provider.payload.string</package>
@@ -959,18 +966,6 @@
<jar
destfile="${servicejars.dir}/RPCLitSWA.jar"
basedir="${servicejars.dir}/RPCLitSWA" />
<delete dir="${servicejars.dir}/RPCLitSWA" />
- <copy
toDir="${servicejars.dir}/AddressingProvider/">
- <fileset dir="target/test-classes">
- <include
name="org/apache/axis2/jaxws/provider/addressing/**" />
- </fileset>
- <fileset
dir="src/test/java/org/apache/axis2/jaxws/provider/addressing/">
- <include name="META-INF/**" />
- </fileset>
- </copy>
-
- <jar
destfile="${servicejars.dir}/AddressingProvider.jar"
basedir="${servicejars.dir}/AddressingProvider" />
- <delete
dir="${servicejars.dir}/AddressingProvider" />
-
<copy
toDir="${servicejars.dir}/SOAP12EchoService/">
<fileset dir="target/test-classes">
<include
name="org/apache/axis2/jaxws/proxy/soap12/**" />
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/AddressingProviderTests.java?rev=1819298&r1=1819297&r2=1819298&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/provider/AddressingProviderTests.java
Tue Dec 26 21:48:09 2017
@@ -226,7 +226,7 @@ public class AddressingProviderTests ext
}
private URL getWsdl() throws Exception {
- String wsdlLocation =
"/src/test/java/org/apache/axis2/jaxws/provider/addressing/META-INF/AddressingProvider.wsdl";
+ String wsdlLocation =
"/src/test/servicejars/AddressingProvider/META-INF/AddressingProvider.wsdl";
String baseDir = new
File(System.getProperty("basedir",".")).getCanonicalPath();
wsdlLocation = new File(baseDir + wsdlLocation).getAbsolutePath();
File file = new File(wsdlLocation);
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1819298&r1=1819297&r2=1819298&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Tue Dec 26 21:48:09 2017
@@ -335,6 +335,9 @@ public abstract class AbstractCreateRepo
for (File classDirectory : getClassDirectories()) {
archiver.addDirectory(classDirectory, includes, new
String[0]);
}
+ if (service.getResourcesDirectory() != null) {
+ archiver.addDirectory(service.getResourcesDirectory());
+ }
archiver.createArchive();
} catch (ArchiverException ex) {
throw new MojoExecutionException("Failed to build " +
jarName, ex);
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java?rev=1819298&r1=1819297&r2=1819298&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java
Tue Dec 26 21:48:09 2017
@@ -18,9 +18,12 @@
*/
package org.apache.axis2.maven2.repo;
+import java.io.File;
+
public final class JAXWSService {
private String name;
private String[] packages;
+ private File resourcesDirectory;
public String getName() {
return name;
@@ -37,4 +40,12 @@ public final class JAXWSService {
public void setPackages(String[] packages) {
this.packages = packages;
}
+
+ public File getResourcesDirectory() {
+ return resourcesDirectory;
+ }
+
+ public void setResourcesDirectory(File resourcesDirectory) {
+ this.resourcesDirectory = resourcesDirectory;
+ }
}
