Author: veithen
Date: Wed Dec 20 22:56:29 2017
New Revision: 1818861
URL: http://svn.apache.org/viewvc?rev=1818861&view=rev
Log:
Use axis2-repo-maven-plugin to assemble the test repositories in jaxbri-tests.
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
Modified: axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml?rev=1818861&r1=1818860&r2=1818861&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml Wed Dec
20 22:56:29 2017
@@ -197,85 +197,94 @@
</dependencies>
</plugin>
<plugin>
- <artifactId>maven-resources-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
<execution>
<id>Test01-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/Test01</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/Test01/resources</directory>
-
<targetPath>services/Test01.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+
<value>org.apache.axis2.jaxbri.Test01Impl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>processor-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/processor</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/processor/resources</directory>
-
<targetPath>services/processor.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+
<value>org.apache.axis2.jaxbri.processor.ProcessorImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>identityservice-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/identityservice</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/identityservice/resources</directory>
-
<targetPath>services/identityservice.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+
<value>org.apache.axis2.jaxbri.identityservice.IdentityLinkingServiceImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
<execution>
<id>mtom-repo</id>
- <phase>generate-test-resources</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>create-test-repository</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/repo/mtom</outputDirectory>
- <resources>
- <resource>
- <directory>src/test/repo</directory>
- </resource>
- <resource>
+ <serviceDescriptions>
+ <serviceDescription>
<directory>${project.build.directory}/gen/mtom/resources</directory>
-
<targetPath>services/mtom.aar/META-INF</targetPath>
- </resource>
- </resources>
+ <parameters>
+ <parameter>
+ <name>ServiceClass</name>
+
<value>org.apache.axis2.jaxbri.mtom.MtomImpl</value>
+ </parameter>
+ </parameters>
+ </serviceDescription>
+ </serviceDescriptions>
</configuration>
</execution>
</executions>
+ <configuration>
+ <inputDirectory>src/test/repo</inputDirectory>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java?rev=1818861&r1=1818860&r2=1818861&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
(original)
+++
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/Test01Test.java
Wed Dec 20 22:56:29 2017
@@ -20,9 +20,6 @@ package org.apache.axis2.jaxbri;
import static org.junit.Assert.assertEquals;
-import org.apache.axis2.Constants;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.testutils.UtilServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -36,9 +33,6 @@ public class Test01Test {
@BeforeClass
public static void startServer() throws Exception {
UtilServer.start(System.getProperty("basedir", ".") +
"/target/repo/Test01");
- AxisConfiguration axisConfiguration =
UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("Test01");
-
service.getParameter(Constants.SERVICE_CLASS).setValue(Test01Impl.class.getName());
}
@AfterClass
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java?rev=1818861&r1=1818860&r2=1818861&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
(original)
+++
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/identityservice/IdentityServiceTest.java
Wed Dec 20 22:56:29 2017
@@ -37,7 +37,6 @@ public class IdentityServiceTest {
UtilServer.start(System.getProperty("basedir", ".") +
"/target/repo/identityservice");
AxisConfiguration axisConfiguration =
UtilServer.getConfigurationContext().getAxisConfiguration();
AxisService service =
axisConfiguration.getService("IdentityLinkingService");
-
service.getParameter(Constants.SERVICE_CLASS).setValue(IdentityLinkingServiceImpl.class.getName());
service.setScope(Constants.SCOPE_APPLICATION);
}
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java?rev=1818861&r1=1818860&r2=1818861&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
(original)
+++
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
Wed Dec 20 22:56:29 2017
@@ -40,7 +40,6 @@ public class MtomTest {
AxisConfiguration axisConfiguration =
UtilServer.getConfigurationContext().getAxisConfiguration();
axisConfiguration.getParameter(Constants.Configuration.ENABLE_MTOM).setValue(true);
AxisService service = axisConfiguration.getService("mtom");
-
service.getParameter(Constants.SERVICE_CLASS).setValue(MtomImpl.class.getName());
service.setScope(Constants.SCOPE_APPLICATION);
}
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java?rev=1818861&r1=1818860&r2=1818861&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
(original)
+++
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/processor/ProcessorTest.java
Wed Dec 20 22:56:29 2017
@@ -29,12 +29,9 @@ import javax.xml.transform.dom.DOMResult
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.jaxbri.processor.client.Processor;
import org.apache.axis2.jaxbri.processor.client.ProcessorStub;
import org.apache.axis2.jaxbri.processor.data.ReplyMessage;
@@ -55,9 +52,6 @@ public class ProcessorTest {
@BeforeClass
public static void startServer() throws Exception {
UtilServer.start(System.getProperty("basedir", ".") +
"/target/repo/processor");
- AxisConfiguration axisConfiguration =
UtilServer.getConfigurationContext().getAxisConfiguration();
- AxisService service = axisConfiguration.getService("Processor");
-
service.getParameter(Constants.SERVICE_CLASS).setValue(ProcessorImpl.class.getName());
}
@AfterClass
