Author: veithen
Date: Tue Dec 19 20:38:47 2017
New Revision: 1818719
URL: http://svn.apache.org/viewvc?rev=1818719&view=rev
Log:
Use axis2-repo-maven-plugin to assemble the test repositories for JiBX.
Modified:
axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=1818719&r1=1818718&r2=1818719&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Tue Dec 19 20:38:47 2017
@@ -168,44 +168,50 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>library-unwrapped-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/library-unwrapped</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <inputDirectory>src/test/repo</inputDirectory>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/library-unwrapped/resources</directory>
-
<targetPath>services/library.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+
<value>org.apache.axis2.jibx.library.unwrapped.service.LibraryImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>library-wrapped-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/library-wrapped</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <inputDirectory>src/test/repo</inputDirectory>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/library-wrapped/resources</directory>
-
<targetPath>services/library.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+
<value>org.apache.axis2.jibx.library.wrapped.service.LibraryImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
</executions>
Modified:
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java?rev=1818719&r1=1818718&r2=1818719&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java
Tue Dec 19 20:38:47 2017
@@ -26,7 +26,6 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jibx.beans.Book;
import org.apache.axis2.jibx.library.unwrapped.client.LibraryStub;
-import org.apache.axis2.jibx.library.unwrapped.service.LibraryImpl;
import org.apache.axis2.testutils.UtilServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -38,7 +37,6 @@ public class LibraryTest {
UtilServer.start(System.getProperty("basedir", ".") +
"/target/repo/library-unwrapped");
AxisConfiguration axisConfiguration =
UtilServer.getConfigurationContext().getAxisConfiguration();
AxisService service = axisConfiguration.getService("library");
-
service.getParameter(Constants.SERVICE_CLASS).setValue(LibraryImpl.class.getName());
service.setScope(Constants.SCOPE_APPLICATION);
}
Modified:
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java?rev=1818719&r1=1818718&r2=1818719&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java
Tue Dec 19 20:38:47 2017
@@ -23,7 +23,6 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jibx.beans.Book;
import org.apache.axis2.jibx.library.wrapped.client.LibraryStub;
-import org.apache.axis2.jibx.library.wrapped.service.LibraryImpl;
import org.apache.axis2.jibx.wrappers.AddBookRequest;
import org.apache.axis2.testutils.UtilServer;
import org.junit.AfterClass;
@@ -36,7 +35,6 @@ public class LibraryTest {
UtilServer.start(System.getProperty("basedir", ".") +
"/target/repo/library-wrapped");
AxisConfiguration axisConfiguration =
UtilServer.getConfigurationContext().getAxisConfiguration();
AxisService service = axisConfiguration.getService("library");
-
service.getParameter(Constants.SERVICE_CLASS).setValue(LibraryImpl.class.getName());
service.setScope(Constants.SCOPE_APPLICATION);
}
