svn commit: r1818742 - in /axis/axis2/java/core/trunk/modules/jibx: pom.xml src/test/java/org/apache/axis2/jibx/Echo.java src/test/java/org/apache/axis2/jibx/Test.java

[veithen]

Author: veithen
Date: Wed Dec 20 08:25:38 2017
New Revision: 1818742

URL: http://svn.apache.org/viewvc?rev=1818742&view=rev
Log:
Use the pre-built Echo service in JiBX tests.

Removed:
    
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Echo.java
Modified:
    axis/axis2/java/core/trunk/modules/jibx/pom.xml
    
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.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=1818742&r1=1818741&r2=1818742&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Wed Dec 20 08:25:38 2017
@@ -69,6 +69,13 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>echo</artifactId>
+            <version>${project.version}</version>
+            <type>aar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <url>http://axis.apache.org/axis2/java/core/</url>
     <scm>
@@ -173,6 +180,17 @@
                 <version>${project.version}</version>
                 <executions>
                     <execution>
+                        <id>echo-repo</id>
+                        <goals>
+                            <goal>create-test-repository</goal>
+                        </goals>
+                        <configuration>
+                            
<outputDirectory>${project.build.directory}/repo/echo</outputDirectory>
+                            <inputDirectory>src/test/repo</inputDirectory>
+                            <services>echo</services>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>library-unwrapped-repo</id>
                         <goals>
                             <goal>create-test-repository</goal>
@@ -180,6 +198,7 @@
                         <configuration>
                             
<outputDirectory>${project.build.directory}/repo/library-unwrapped</outputDirectory>
                             <inputDirectory>src/test/repo</inputDirectory>
+                            <includeServices>false</includeServices>
                             <serviceDescriptions>
                                 <serviceDescription>
                                     
<directory>${project.build.directory}/gen/library-unwrapped/resources</directory>
@@ -201,6 +220,7 @@
                         <configuration>
                             
<outputDirectory>${project.build.directory}/repo/library-wrapped</outputDirectory>
                             <inputDirectory>src/test/repo</inputDirectory>
+                            <includeServices>false</includeServices>
                             <serviceDescriptions>
                                 <serviceDescription>
                                     
<directory>${project.build.directory}/gen/library-wrapped/resources</directory>

Modified: 
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java?rev=1818742&r1=1818741&r2=1818742&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
 Wed Dec 20 08:25:38 2017
@@ -20,12 +20,8 @@
 package org.apache.axis2.jibx;
 
 import junit.framework.TestCase;
-import org.apache.axis2.description.AxisService;
 import org.apache.axis2.jibx.customer.EchoCustomerServiceStub;
 import org.apache.axis2.testutils.UtilServer;
-import org.apache.axis2.util.Utils;
-
-import javax.xml.namespace.QName;
 
 /**
  * Full code generation and runtime test for JiBX data binding extension. This 
is based on the
@@ -33,22 +29,13 @@ import javax.xml.namespace.QName;
  */
 public class Test extends TestCase {
     private static final String REPOSITORY_DIR =
-            System.getProperty("basedir", ".") + "/src/test/repo/";
-
-    public static final QName serviceName = new QName("EchoCustomerService");
-    public static final QName operationName = new QName("echo");
-
-    private AxisService service;
+            System.getProperty("basedir", ".") + "/target/repo/echo";
 
     private void startServer() throws Exception {
-        service = Utils.createSimpleService(serviceName,
-                                            Echo.class.getName(), 
operationName);
         UtilServer.start(REPOSITORY_DIR);
-        UtilServer.deployService(service);
     }
 
     private void stopServer() throws Exception {
-        UtilServer.unDeployService(serviceName);
         UtilServer.stop();
 /*        File outputFile = new File(OUTPUT_LOCATION_BASE);
         if (outputFile.exists() && outputFile.isDirectory()){
@@ -64,7 +51,7 @@ public class Test extends TestCase {
         Customer customer = new Customer("Redmond", person, "+14258858080",
                                          "WA", "14619 NE 80th Pl.", new 
Integer(98052));
         EchoCustomerServiceStub stub = new 
EchoCustomerServiceStub(UtilServer.getConfigurationContext(),
-                "http://127.0.0.1:"; + UtilServer.TESTING_PORT + 
"/axis2/services/EchoCustomerService/echo");
+                "http://127.0.0.1:"; + UtilServer.TESTING_PORT + 
"/axis2/services/Echo/echo");
         Customer result = stub.echo(customer);
         stopServer();
         assertEquals("Result object does not match request object",