You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2018/02/08 22:22:36 UTC
svn commit: r1823604 - in /axis/axis2/java/core/trunk/modules/transport/tcp:
pom.xml test/org/apache/axis2/transport/tcp/UtilsTCPServer.java
Author: veithen
Date: Thu Feb 8 22:22:35 2018
New Revision: 1823604
URL: http://svn.apache.org/viewvc?rev=1823604&view=rev
Log:
Use axis2-repo-maven-plugin to build the test repositories for the TCP transport.
Modified:
axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml
axis/axis2/java/core/trunk/modules/transport/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java
Modified: axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml?rev=1823604&r1=1823603&r2=1823604&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/tcp/pom.xml Thu Feb 8 22:22:35 2018
@@ -58,26 +58,34 @@
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <version>${project.version}</version>
<executions>
- <execution>
- <id>build-repo</id>
- <phase>test-compile</phase>
+ <execution>
+ <id>build-server-repo</id>
+ <goals>
+ <goal>create-test-repository</goal>
+ </goals>
<configuration>
- <tasks>
- <mkdir dir="target/test-resources/samples/modules" />
- <mkdir dir="target/test-resources/samples/conf" />
- <copy file="${settings.localRepository}/org/apache/axis2/addressing/${project.version}/addressing-${project.version}.mar" tofile="target/test-resources/samples/modules/addressing.mar" />
- <copy file="conf/axis2.xml" tofile="target/test-resources/samples/conf/axis2.xml" />
- <copy file="conf/client_axis2.xml" tofile="target/test-resources/samples/conf/client_axis2.xml" />
- </tasks>
+ <outputDirectory>${project.build.directory}/repo/server</outputDirectory>
+ <axis2xml>conf/axis2.xml</axis2xml>
</configuration>
- <goals>
- <goal>run</goal>
+ </execution>
+ <execution>
+ <id>build-client-repo</id>
+ <goals>
+ <goal>create-test-repository</goal>
</goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/repo/client</outputDirectory>
+ <axis2xml>conf/client_axis2.xml</axis2xml>
+ </configuration>
</execution>
</executions>
+ <configuration>
+ <configurationDirectory>conf</configurationDirectory>
+ </configuration>
</plugin>
<plugin>
Modified: axis/axis2/java/core/trunk/modules/transport/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java?rev=1823604&r1=1823603&r2=1823604&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/tcp/test/org/apache/axis2/transport/tcp/UtilsTCPServer.java Thu Feb 8 22:22:35 2018
@@ -59,7 +59,7 @@ public class UtilsTCPServer {
if (count == 0) {
// start tcp server
- File file = new File(prefixBaseDirectory(Constants.TESTING_REPOSITORY));
+ File file = new File(prefixBaseDirectory("target/repo/server"));
System.out.println(file.getAbsoluteFile());
if (!file.exists()) {
throw new Exception("Repository directory does not exist");
@@ -96,10 +96,10 @@ public class UtilsTCPServer {
}
public static ConfigurationContext createClientConfigurationContext() throws Exception {
- File file = new File(prefixBaseDirectory(Constants.TESTING_REPOSITORY));
+ File file = new File(prefixBaseDirectory("target/repo/client"));
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(
- file.getAbsolutePath(), file.getAbsolutePath() + "/conf/client_axis2.xml");
+ file.getAbsolutePath(), file.getAbsolutePath() + "/conf/axis2.xml");
return configContext;
}