[axis-axis2-java-core] 20/31: Merge r1741977 (partially) and r1765192 to the 1.7 branch.

[bi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch 1_7
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 6572291552d121c65d276e5e288dab56e2ba12ba
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Sun Jan 6 15:12:12 2019 +0000

    Merge r1741977 (partially) and r1765192 to the 1.7 branch.
---
 .../main/java/org/apache/axis2/testutils/Axis2Server.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java b/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
index 5ad43ab..e06a3a9 100644
--- a/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
+++ b/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
@@ -19,6 +19,7 @@
 package org.apache.axis2.testutils;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
@@ -41,15 +42,19 @@ public class Axis2Server extends ExternalResource {
         return port;
     }
 
-    public String getEndpoint(String serviceName) throws AxisFault {
+    public ConfigurationContext getConfigurationContext() {
         if (configurationContext == null) {
             throw new IllegalStateException();
         }
-        return configurationContext.getAxisConfiguration().getService(serviceName).getEPRs()[0];
+        return configurationContext;
     }
 
-    public ConfigurationContext getConfigurationContext() {
-        return configurationContext;
+    public String getEndpoint(String serviceName) throws AxisFault {
+        return getConfigurationContext().getAxisConfiguration().getService(serviceName).getEPRs()[0];
+    }
+
+    public EndpointReference getEndpointReference(String serviceName) throws AxisFault {
+        return new EndpointReference(getEndpoint(serviceName));
     }
 
     @Override