Author: cschneider
Date: Fri Nov 23 09:50:25 2012
New Revision: 1412802
URL: http://svn.apache.org/viewvc?rev=1412802&view=rev
Log:
DOSGI-128 Small refactoring in preparation of the auto detection of jaxws and
jaxb services
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractConfigurationHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractConfigurationHandler.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractConfigurationHandler.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractConfigurationHandler.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractConfigurationHandler.java
Fri Nov 23 09:50:25 2012
@@ -119,14 +119,8 @@ public abstract class AbstractConfigurat
String[] allIntents = IntentUtils.mergeArrays(intents,
IntentUtils.getInetntsImplementedByTheService(sd));
props.put(RemoteConstants.SERVICE_INTENTS, allIntents);
}
-
- // for (String cfg : importedConfigs) {
- // props.put(cfg + ".stuff", "unused");
- // }
-
- // make sure that the Endpoint contains the address that was actualy
used
- addAddressProperty(props, address);
-
+
+ props.put(RemoteConstants.ENDPOINT_ID, address);
return props;
}
@@ -145,11 +139,4 @@ public abstract class AbstractConfigurat
}
}
- protected void addAddressProperty(Map props, String address) {
- if (props != null) {
- props.put(RemoteConstants.ENDPOINT_ID, address);
- }
- }
-
-
}
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
Fri Nov 23 09:50:25 2012
@@ -24,7 +24,9 @@ import java.util.Map;
import javax.xml.namespace.QName;
+import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.common.util.PackageUtils;
+import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.dosgi.dsw.Constants;
import org.apache.cxf.dosgi.dsw.qos.IntentManager;
import org.apache.cxf.dosgi.dsw.util.ClassUtils;
@@ -36,9 +38,11 @@ import org.apache.cxf.frontend.ClientPro
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.remoteserviceadmin.RemoteConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,21 +58,23 @@ public abstract class AbstractPojoConfig
}
// Isolated so that it can be substituted for testing
- ClientProxyFactoryBean createClientProxyFactoryBean(String frontEndImpl) {
- if("jaxws".equals(frontEndImpl)) {
- return new JaxWsProxyFactoryBean();
- } else {
- return new ClientProxyFactoryBean();
- }
+ ClientProxyFactoryBean createClientProxyFactoryBean(ServiceReference sref,
Class<?> iClass) {
+ String frontEnd =
(String)sref.getProperty(Constants.WS_FRONTEND_PROP_KEY);
+ ClientProxyFactoryBean factory = "jaxws".equals(frontEnd) ? new
JaxWsProxyFactoryBean() : new ClientProxyFactoryBean();
+ String dataBindingName =
(String)sref.getProperty(Constants.WS_DATABINDING_PROP_KEY);
+ DataBinding databinding = "jaxb".equals(dataBindingName) ? new
JAXBDataBinding() : new AegisDatabinding();
+ factory.getServiceFactory().setDataBinding(databinding);
+ return factory;
}
// Isolated so that it can be substituted for testing
- ServerFactoryBean createServerFactoryBean(String frontEndImpl) {
- if("jaxws".equals(frontEndImpl)) {
- return new JaxWsServerFactoryBean();
- } else {
- return new ServerFactoryBean();
- }
+ ServerFactoryBean createServerFactoryBean(ServiceReference sref, Class<?>
iClass) {
+ String frontEnd =
(String)sref.getProperty(Constants.WS_FRONTEND_PROP_KEY);
+ ServerFactoryBean factory = "jaxws".equals(frontEnd) ? new
JaxWsServerFactoryBean() : new ServerFactoryBean();
+ String dataBindingName =
(String)sref.getProperty(Constants.WS_DATABINDING_PROP_KEY);
+ DataBinding databinding = "jaxb".equals(dataBindingName) ? new
JAXBDataBinding() : new AegisDatabinding();
+ factory.getServiceFactory().setDataBinding(databinding);
+ return factory;
}
protected void setWsdlProperties(ServerFactoryBean factory,
@@ -137,7 +143,7 @@ public abstract class AbstractPojoConfig
}
}
- protected QName getServiceQName(Class<?> iClass, Map sd, String
nsPropName, String namePropName) {
+ protected static QName getServiceQName(Class<?> iClass, Map sd, String
nsPropName, String namePropName) {
String serviceNs = OsgiUtils.getProperty(sd, nsPropName);
String serviceName = OsgiUtils.getProperty(sd, namePropName);
if (iClass == null && (serviceNs == null || serviceName == null)) {
@@ -153,7 +159,7 @@ public abstract class AbstractPojoConfig
return new QName(serviceNs, serviceName);
}
- protected QName getPortQName(String ns, Map sd, String propName) {
+ protected static QName getPortQName(String ns, Map sd, String propName) {
String portName = OsgiUtils.getProperty(sd, propName);
if (portName == null) {
return null;
@@ -161,7 +167,7 @@ public abstract class AbstractPojoConfig
return new QName(ns, portName);
}
- protected void addInterceptors(AbstractEndpointFactory factory,
BundleContext callingContext,
+ protected static void addInterceptors(AbstractEndpointFactory factory,
BundleContext callingContext,
Map sd, String propName) {
List<Object> providers =
ClassUtils.loadProviderClasses(callingContext, sd, propName);
@@ -184,7 +190,7 @@ public abstract class AbstractPojoConfig
}
- protected void addFeatures(AbstractEndpointFactory factory, BundleContext
callingContext,
+ protected static void addFeatures(AbstractEndpointFactory factory,
BundleContext callingContext,
Map sd, String propName) {
List<Object> providers =
ClassUtils.loadProviderClasses(callingContext, sd, propName);
@@ -193,7 +199,7 @@ public abstract class AbstractPojoConfig
}
}
- protected void addContextProperties(AbstractEndpointFactory factory,
BundleContext callingContext,
+ protected static void addContextProperties(AbstractEndpointFactory
factory, BundleContext callingContext,
Map sd, String propName) {
Map<String, Object> props = (Map<String, Object>)sd.get(propName);
if (props != null) {
@@ -206,38 +212,18 @@ public abstract class AbstractPojoConfig
}
protected String getPojoAddress(Map sd, Class<?> iClass) {
- String address = OsgiUtils.getProperty(sd,
RemoteConstants.ENDPOINT_ID);
- if(address == null && sd.get(RemoteConstants.ENDPOINT_ID)!=null ){
- LOG.error("Could not use address property " +
RemoteConstants.ENDPOINT_ID );
+ String address = null;
+ try {
+ address = OsgiUtils.getFirstNonEmptyStringProperty(sd,
+ RemoteConstants.ENDPOINT_ID,
+ Constants.WS_ADDRESS_PROPERTY,
+ Constants.WS_ADDRESS_PROPERTY,
+ Constants.WS_ADDRESS_PROPERTY_OLD,
+ Constants.RS_ADDRESS_PROPERTY);
+ } catch (RuntimeException e) {
+ LOG.error(e.getMessage(), e);
return null;
}
-
-
- if (address == null) {
- address = OsgiUtils.getProperty(sd, Constants.WS_ADDRESS_PROPERTY);
- }
- if(address == null && sd.get(Constants.WS_ADDRESS_PROPERTY)!=null ){
- LOG.error("Could not use address property " +
Constants.WS_ADDRESS_PROPERTY );
- return null;
- }
-
- if (address == null) {
- address = OsgiUtils.getProperty(sd,
Constants.WS_ADDRESS_PROPERTY_OLD);
- }
- if(address == null && sd.get(Constants.WS_ADDRESS_PROPERTY_OLD)!=null
){
- LOG.error("Could not use address property " +
Constants.WS_ADDRESS_PROPERTY_OLD);
- return null;
- }
-
- if (address == null) {
- address = OsgiUtils.getProperty(sd, Constants.RS_ADDRESS_PROPERTY);
- }
- if(address == null && sd.get(Constants.RS_ADDRESS_PROPERTY)!=null ){
- LOG.error("Could not use address property " +
Constants.RS_ADDRESS_PROPERTY);
- return null;
- }
-
-
if (address == null) {
String port = null;
Object p = sd.get(Constants.WS_PORT_PROPERTY);
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
Fri Nov 23 09:50:25 2012
@@ -90,21 +90,11 @@ public class HttpServiceConfigurationTyp
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- DataBinding databinding;
- String dataBindingImpl =
(String)serviceReference.getProperty(Constants.WS_DATABINDING_PROP_KEY);
- if ("jaxb".equals(dataBindingImpl)) {
- databinding = new JAXBDataBinding();
- } else {
- databinding = new AegisDatabinding();
- }
- String frontEndImpl =
(String)serviceReference.getProperty(Constants.WS_FRONTEND_PROP_KEY);
- ClientProxyFactoryBean factory =
createClientProxyFactoryBean(frontEndImpl);
+ ClientProxyFactoryBean factory =
createClientProxyFactoryBean(serviceReference, iClass);
addWsInterceptorsFeaturesProps(factory.getClientFactoryBean(),
callingContext, sd.getProperties());
setClientWsdlProperties(factory.getClientFactoryBean(),
dswContext, sd.getProperties(), false);
-
factory.setServiceClass(iClass);
factory.setAddress(address);
- factory.getServiceFactory().setDataBinding(databinding);
intentManager.applyIntents(factory.getFeatures(),
factory.getClientFactoryBean(), sd.getProperties());
@@ -127,34 +117,19 @@ public class HttpServiceConfigurationTyp
}
Bus bus = registerServletAndGetBus(contextRoot, dswContext, sref);
- DataBinding databinding;
- String dataBindingImpl =
(String)sref.getProperty(Constants.WS_DATABINDING_PROP_KEY);
- String dataBindingImpl2 = (String)
sref.getProperty(Constants.WS_DATABINDING_PROP_KEY);
- if ("jaxb".equals(dataBindingImpl) || "jaxb".equals(dataBindingImpl2))
{
- databinding = new JAXBDataBinding();
- } else {
- databinding = new AegisDatabinding();
- }
- String frontEndImpl =
(String)sref.getProperty(Constants.WS_FRONTEND_PROP_KEY);
- String frontEndImpl2 = (String)
sref.getProperty(Constants.WS_FRONTEND_PROP_KEY);
-
- ServerFactoryBean factory =
- createServerFactoryBean(frontEndImpl != null ? frontEndImpl :
frontEndImpl2);
-
+
+ ServerFactoryBean factory = createServerFactoryBean(sref, iClass);
factory.setBus(bus);
factory.setServiceClass(iClass);
-
String relativeEndpointAddress = getRelativeEndpointAddress(sd);
factory.setAddress(relativeEndpointAddress);
- factory.getServiceFactory().setDataBinding(databinding);
factory.setServiceBean(serviceBean);
addWsInterceptorsFeaturesProps(factory, callingContext, sd);
setWsdlProperties(factory, callingContext, sd, false);
- String completeEndpointAddress =
- constructAddress(dswContext, contextRoot,
relativeEndpointAddress);
+ String completeEndpointAddress = constructAddress(dswContext,
contextRoot, relativeEndpointAddress);
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
String[] intents =
intentManager.applyIntents(factory.getFeatures(),factory, sd);
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
Fri Nov 23 09:50:25 2012
@@ -21,14 +21,10 @@ package org.apache.cxf.dosgi.dsw.handler
import java.util.Map;
import org.apache.cxf.aegis.databinding.AegisDatabinding;
-import org.apache.cxf.binding.BindingConfiguration;
-import org.apache.cxf.binding.soap.SoapBindingConfiguration;
import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.dosgi.dsw.Constants;
import org.apache.cxf.dosgi.dsw.qos.IntentManager;
import org.apache.cxf.dosgi.dsw.qos.IntentUnsatifiedException;
-import org.apache.cxf.dosgi.dsw.qos.IntentUtils;
-import org.apache.cxf.dosgi.dsw.util.OsgiUtils;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
@@ -36,7 +32,6 @@ import org.apache.cxf.jaxb.JAXBDataBindi
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
-import org.osgi.service.remoteserviceadmin.RemoteConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,19 +57,9 @@ public class PojoConfigurationTypeHandle
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- DataBinding databinding;
- String dataBindingImpl =
(String)serviceReference.getProperty(Constants.WS_DATABINDING_PROP_KEY);
- if ("jaxb".equals(dataBindingImpl)) {
- databinding = new JAXBDataBinding();
- } else {
- databinding = new AegisDatabinding();
- }
- String frontEndImpl =
(String)serviceReference.getProperty(Constants.WS_FRONTEND_PROP_KEY);
- ClientProxyFactoryBean factory =
createClientProxyFactoryBean(frontEndImpl);
+ ClientProxyFactoryBean factory =
createClientProxyFactoryBean(serviceReference, iClass);
factory.setServiceClass(iClass);
factory.setAddress(address);
- factory.getServiceFactory().setDataBinding(databinding);
-
addWsInterceptorsFeaturesProps(factory.getClientFactoryBean(),
callingContext, sd.getProperties());
setClientWsdlProperties(factory.getClientFactoryBean(),
dswContext, sd.getProperties(), false);
@@ -101,19 +86,9 @@ public class PojoConfigurationTypeHandle
LOG.info("Creating a " + iClass.getName() + " endpoint from CXF
PublishHook, address is " + address);
- DataBinding databinding;
- String dataBindingImpl =
(String)sref.getProperty(Constants.WS_DATABINDING_PROP_KEY);
- if ("jaxb".equals(dataBindingImpl)) {
- databinding = new JAXBDataBinding();
- } else {
- databinding = new AegisDatabinding();
- }
- String frontEndImpl =
(String)sref.getProperty(Constants.WS_FRONTEND_PROP_KEY);
- ServerFactoryBean factory = createServerFactoryBean(frontEndImpl);
-
+ ServerFactoryBean factory = createServerFactoryBean(sref, iClass);
factory.setServiceClass(iClass);
factory.setAddress(address);
- factory.getServiceFactory().setDataBinding(databinding);
factory.setServiceBean(serviceBean);
addWsInterceptorsFeaturesProps(factory, callingContext, sd);
@@ -136,52 +111,7 @@ public class PojoConfigurationTypeHandle
}
}
- protected String getPojoAddress(Map sd, Class<?> iClass) {
- String address = OsgiUtils.getProperty(sd,
RemoteConstants.ENDPOINT_ID);
- if(address == null && sd.get(RemoteConstants.ENDPOINT_ID)!=null ){
- LOG.error("Could not use address property " +
RemoteConstants.ENDPOINT_ID );
- return null;
- }
-
- if (address == null) {
- address = OsgiUtils.getProperty(sd, Constants.WS_ADDRESS_PROPERTY);
- }
- if(address == null && sd.get(Constants.WS_ADDRESS_PROPERTY)!=null ){
- LOG.error("Could not use address property " +
Constants.WS_ADDRESS_PROPERTY );
- return null;
- }
-
- if (address == null) {
- address = OsgiUtils.getProperty(sd,
Constants.WS_ADDRESS_PROPERTY_OLD);
- }
- if(address == null && sd.get(Constants.WS_ADDRESS_PROPERTY_OLD)!=null
){
- LOG.error("Could not use address property " +
Constants.WS_ADDRESS_PROPERTY_OLD);
- return null;
- }
-
- if (address == null) {
- address = OsgiUtils.getProperty(sd, Constants.RS_ADDRESS_PROPERTY);
- }
- if(address == null && sd.get(Constants.RS_ADDRESS_PROPERTY)!=null ){
- LOG.error("Could not use address property " +
Constants.RS_ADDRESS_PROPERTY);
- return null;
- }
-
-
- if (address == null) {
- String port = null;
- Object p = sd.get(Constants.WS_PORT_PROPERTY);
- if (p instanceof String) {
- port = (String) p;
- }
-
- address = getDefaultAddress(iClass, port);
- if (address != null) {
- LOG.info("Using a default address : " + address);
- }
- }
- return address;
- }
+
}
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java
Fri Nov 23 09:50:25 2012
@@ -92,6 +92,30 @@ public final class OsgiUtils {
}
return null;
}
+
+ public static String
getFirstNonEmptyStringProperty(@SuppressWarnings("rawtypes") Map dict, String
... keys) {
+ for (String key : keys) {
+ String value = getStringProperty(dict, key);
+ if (value != null) {
+ return value;
+ }
+ }
+ return null;
+ }
+
+ @SuppressWarnings("rawtypes")
+ private static String getStringProperty(Map dict, String name) {
+ Object o = dict.get(name);
+
+ if (o != null) {
+ if (o instanceof String) {
+ return (String)o;
+ } else {
+ throw new RuntimeException("Could not use property " + name +
" as the value is not a String");
+ }
+ }
+ return null;
+ }
/**
* Tries to retrieve the version of iClass via the PackageAdmin
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandlerTest.java
Fri Nov 23 09:50:25 2012
@@ -71,7 +71,7 @@ public class HttpServiceConfigurationTyp
HttpServiceConfigurationTypeHandler h =
new HttpServiceConfigurationTypeHandler(dswContext, intentManager
, handlerProps) {
@Override
- ServerFactoryBean createServerFactoryBean(String frontend) {
+ ServerFactoryBean createServerFactoryBean(ServiceReference
sRef, Class<?> iClass) {
return sfb;
}
};
@@ -144,7 +144,7 @@ public class HttpServiceConfigurationTyp
HttpServiceConfigurationTypeHandler h =
new HttpServiceConfigurationTypeHandler(dswContext, intentManager,
handlerProps) {
@Override
- ServerFactoryBean createServerFactoryBean(String frontend) {
+ ServerFactoryBean createServerFactoryBean(ServiceReference
sRef, Class<?> iClass) {
return sfb;
}
@@ -211,7 +211,7 @@ public class HttpServiceConfigurationTyp
HttpServiceConfigurationTypeHandler h =
new HttpServiceConfigurationTypeHandler(dswContext, intentManager,
handlerProps) {
@Override
- ServerFactoryBean createServerFactoryBean(String frontend) {
+ ServerFactoryBean createServerFactoryBean(ServiceReference
sRef, Class<?> iClass) {
return sfb;
}
};
@@ -338,7 +338,7 @@ public class HttpServiceConfigurationTyp
IntentManager intentManager = new DummyIntentManager(new String[] {
"a.b.c" });
HttpServiceConfigurationTypeHandler h = new
HttpServiceConfigurationTypeHandler(bc1, intentManager , handlerProps) {
@Override
- ClientProxyFactoryBean createClientProxyFactoryBean(String
frontend) {
+ ClientProxyFactoryBean
createClientProxyFactoryBean(ServiceReference sRef, Class<?> iClass) {
return cpfb;
}
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java?rev=1412802&r1=1412801&r2=1412802&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
Fri Nov 23 09:50:25 2012
@@ -138,7 +138,7 @@ public class PojoConfigurationTypeHandle
};
PojoConfigurationTypeHandler p = new PojoConfigurationTypeHandler(bc1,
intentManager, handlerProps) {
@Override
- ClientProxyFactoryBean createClientProxyFactoryBean(String
frontend) {
+ ClientProxyFactoryBean
createClientProxyFactoryBean(ServiceReference sRef, Class<?> iClass) {
return cpfb;
}
};
@@ -275,7 +275,7 @@ public class PojoConfigurationTypeHandle
};
PojoConfigurationTypeHandler p = new
PojoConfigurationTypeHandler(dswContext, intentManager, handlerProps) {
@Override
- ServerFactoryBean createServerFactoryBean(String frontend) {
+ ServerFactoryBean createServerFactoryBean(ServiceReference sRef,
Class<?> iClass) {
return sfb;
}
};
