Small refactoring
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java b/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java
index e03b605..4f2c40e 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/httpservice/HttpServiceManager.java
@@ -133,12 +133,12 @@
return "/" + type.getName().replace('.', '/');
}
- public String getAbsoluteAddress(String contextRoot, String relativeEndpointAddress) {
- if (relativeEndpointAddress.startsWith("http")) {
- return relativeEndpointAddress;
+ public String getAbsoluteAddress(String contextRoot, String endpointAddress) {
+ if (endpointAddress.startsWith("http")) {
+ return endpointAddress;
}
String effContextRoot = contextRoot == null ? cxfServletAlias : contextRoot;
- return this.httpBase + effContextRoot + relativeEndpointAddress;
+ return this.httpBase + effContextRoot + endpointAddress;
}
private final class UnregisterListener implements ServiceListener {
diff --git a/common/src/main/java/org/apache/cxf/dosgi/common/util/ServerWrapper.java b/common/src/main/java/org/apache/cxf/dosgi/common/util/ServerEndpoint.java
similarity index 91%
rename from common/src/main/java/org/apache/cxf/dosgi/common/util/ServerWrapper.java
rename to common/src/main/java/org/apache/cxf/dosgi/common/util/ServerEndpoint.java
index 22144ca..5d6d1a7 100644
--- a/common/src/main/java/org/apache/cxf/dosgi/common/util/ServerWrapper.java
+++ b/common/src/main/java/org/apache/cxf/dosgi/common/util/ServerEndpoint.java
@@ -24,11 +24,11 @@
import org.apache.cxf.endpoint.Server;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
-public class ServerWrapper implements Endpoint {
+public class ServerEndpoint implements Endpoint {
private EndpointDescription desc;
private Server server;
- public ServerWrapper(EndpointDescription desc, Server server) {
+ public ServerEndpoint(EndpointDescription desc, Server server) {
this.desc = desc;
this.server = server;
}
diff --git a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
index 050c642..44d70f4 100644
--- a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
+++ b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
@@ -36,7 +36,7 @@
import org.apache.cxf.dosgi.common.intent.IntentManager;
import org.apache.cxf.dosgi.common.proxy.ProxyFactory;
import org.apache.cxf.dosgi.common.util.OsgiUtils;
-import org.apache.cxf.dosgi.common.util.ServerWrapper;
+import org.apache.cxf.dosgi.common.util.ServerEndpoint;
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
@@ -170,7 +170,7 @@
try {
Thread.currentThread().setContextClassLoader(JAXRSServerFactoryBean.class.getClassLoader());
Server server = factory.create();
- return new ServerWrapper(epd, server);
+ return new ServerEndpoint(epd, server);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
diff --git a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
index 26fdfd0..3c5cfd0 100644
--- a/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
+++ b/provider-ws/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ws/WsProvider.java
@@ -39,7 +39,7 @@
import org.apache.cxf.dosgi.common.intent.IntentManager;
import org.apache.cxf.dosgi.common.proxy.ProxyFactory;
import org.apache.cxf.dosgi.common.util.OsgiUtils;
-import org.apache.cxf.dosgi.common.util.ServerWrapper;
+import org.apache.cxf.dosgi.common.util.ServerEndpoint;
import org.apache.cxf.endpoint.AbstractEndpointFactory;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
@@ -213,7 +213,7 @@
try {
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
Server server = factory.create();
- return new ServerWrapper(epd, server);
+ return new ServerEndpoint(epd, server);
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
diff --git a/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java b/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java
index 4ab9b31..c935f3d 100644
--- a/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java
+++ b/provider-ws/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ws/PojoConfigurationTypeHandlerTest.java
@@ -31,7 +31,7 @@
import org.apache.cxf.dosgi.common.httpservice.HttpServiceManager;
import org.apache.cxf.dosgi.common.intent.IntentManager;
import org.apache.cxf.dosgi.common.intent.IntentManagerImpl;
-import org.apache.cxf.dosgi.common.util.ServerWrapper;
+import org.apache.cxf.dosgi.common.util.ServerEndpoint;
import org.apache.cxf.dosgi.dsw.handlers.jaxws.MyJaxWsEchoService;
import org.apache.cxf.dosgi.dsw.handlers.simple.MySimpleEchoService;
import org.apache.cxf.endpoint.AbstractEndpointFactory;
@@ -214,7 +214,7 @@
@Override
protected Endpoint createServerFromFactory(ServerFactoryBean factory,
EndpointDescription epd) {
- return new ServerWrapper(epd, null);
+ return new ServerEndpoint(epd, null);
}
};
handler.setIntentManager(intentManager);
@@ -356,7 +356,7 @@
Object myService = null;
c.replay();
- ServerWrapper serverWrapper = (ServerWrapper)handler.exportService(myService,
+ ServerEndpoint serverWrapper = (ServerEndpoint)handler.exportService(myService,
serviceBC,
sd,
new Class[]{MyJaxWsEchoService.class});
@@ -383,7 +383,7 @@
sd.put(WsConstants.WS_ADDRESS_PROPERTY, "/somewhere_else");
BundleContext serviceBC = c.createMock(BundleContext.class);
c.replay();
- ServerWrapper serverWrapper = (ServerWrapper)handler.exportService(null, serviceBC, sd,
+ ServerEndpoint serverWrapper = (ServerEndpoint)handler.exportService(null, serviceBC, sd,
new Class[]{MySimpleEchoService.class});
c.verify();
