svn commit: r1779817 - in /axis/axis2/java/core/branches/hermetic-tests: ./ modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java

[veithen]

Author: veithen
Date: Sun Jan 22 14:32:34 2017
New Revision: 1779817

URL: http://svn.apache.org/viewvc?rev=1779817&view=rev
Log:
Merge latest changes from trunk.

Modified:
    axis/axis2/java/core/branches/hermetic-tests/   (props changed)
    
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java

Propchange: axis/axis2/java/core/branches/hermetic-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 22 14:32:34 2017
@@ -1,4 +1,4 @@
 /axis/axis2/java/core/branches/1_6:1295540
 /axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
 
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1779063-1779814
+/axis/axis2/java/core/trunk:1779063-1779816

Modified: 
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java?rev=1779817&r1=1779816&r2=1779817&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
 (original)
+++ 
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
 Sun Jan 22 14:32:34 2017
@@ -50,11 +50,11 @@ public class Axis2Server extends Externa
     }
 
     public String getEndpoint(String serviceName) throws AxisFault {
-        return 
getConfigurationContext().getAxisConfiguration().getService(serviceName).getEPRs()[0];
+        return getEndpointReference(serviceName).getAddress();
     }
 
     public EndpointReference getEndpointReference(String serviceName) throws 
AxisFault {
-        return new EndpointReference(getEndpoint(serviceName));
+        return server.getEPRForService(serviceName, "localhost");
     }
 
     @Override