Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 618ABDC28 for ; Mon, 5 Nov 2012 09:30:59 +0000 (UTC) Received: (qmail 30471 invoked by uid 500); 5 Nov 2012 09:30:58 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30347 invoked by uid 500); 5 Nov 2012 09:30:58 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 30291 invoked by uid 99); 5 Nov 2012 09:30:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2012 09:30:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2012 09:30:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 05BBF238896F; Mon, 5 Nov 2012 09:30:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1405722 - in /cxf/dosgi/trunk/dsw/cxf-dsw/src: main/java/org/apache/cxf/dosgi/dsw/handlers/ main/java/org/apache/cxf/dosgi/dsw/service/ test/java/org/apache/cxf/dosgi/dsw/handlers/ Date: Mon, 05 Nov 2012 09:30:33 -0000 To: commits@cxf.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121105093034.05BBF238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cschneider Date: Mon Nov 5 09:30:32 2012 New Revision: 1405722 URL: http://svn.apache.org/viewvc?rev=1405722&view=rev Log: DOSGI-139 Refactor DSW-CXF to remove dep cycle between service and handlers Added: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/CXFExportRegistration.java (with props) cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java - copied, changed from r1404990, cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactory.java Removed: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactory.java Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.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/JaxRSHttpServiceConfigurationTypeHandler.java cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.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/handlers/WsdlConfigurationTypeHandler.java cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java Added: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/CXFExportRegistration.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/CXFExportRegistration.java?rev=1405722&view=auto ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/CXFExportRegistration.java (added) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/CXFExportRegistration.java Mon Nov 5 09:30:32 2012 @@ -0,0 +1,19 @@ +package org.apache.cxf.dosgi.dsw.handlers; + +import org.apache.cxf.endpoint.Server; +import org.osgi.framework.ServiceReference; +import org.osgi.service.remoteserviceadmin.EndpointDescription; + +public interface CXFExportRegistration { + + public abstract ServiceReference getExportedService() throws IllegalStateException; + + public abstract void setEndpointdescription(EndpointDescription epd); + + public abstract void setServer(Server server); + + public abstract Server getServer(); + + public abstract void setException(Throwable ex); + +} \ No newline at end of file Propchange: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/CXFExportRegistration.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java Mon Nov 5 09:30:32 2012 @@ -20,7 +20,6 @@ package org.apache.cxf.dosgi.dsw.handler import java.util.Map; -import org.apache.cxf.dosgi.dsw.service.ExportRegistrationImpl; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.remoteserviceadmin.EndpointDescription; @@ -28,7 +27,7 @@ import org.osgi.service.remoteserviceadm public interface ConfigurationTypeHandler { String getType(); - void createServer(ExportRegistrationImpl serviceReference, + void createServer(CXFExportRegistration serviceReference, BundleContext dswContext, BundleContext callingContext, Map sd, 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=1405722&r1=1405721&r2=1405722&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 Mon Nov 5 09:30:32 2012 @@ -35,7 +35,6 @@ import org.apache.cxf.aegis.databinding. import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.dosgi.dsw.Constants; -import org.apache.cxf.dosgi.dsw.service.ExportRegistrationImpl; import org.apache.cxf.dosgi.dsw.util.OsgiUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientProxyFactoryBean; @@ -125,7 +124,7 @@ public class HttpServiceConfigurationTyp return null; } - public void createServer(ExportRegistrationImpl exportRegistration, BundleContext dswContext, + public void createServer(CXFExportRegistration exportRegistration, BundleContext dswContext, BundleContext callingContext, Map sd, Class iClass, Object serviceBean) { final String contextRoot = getServletContextRoot(sd, iClass); if (contextRoot == null) { @@ -194,7 +193,7 @@ public class HttpServiceConfigurationTyp } protected Bus registerServletAndGetBus(String contextRoot, BundleContext dswContext, - ExportRegistrationImpl exportRegistration) { + CXFExportRegistration exportRegistration) { CXFNonSpringServlet cxf = new CXFNonSpringServlet(); HttpService httpService = getHttpService(); try { @@ -312,7 +311,7 @@ public class HttpServiceConfigurationTyp * @param reference The service reference to track * @param alias The HTTP servlet context alias */ - protected void registerUnexportHook(ExportRegistrationImpl export, String alias) { + protected void registerUnexportHook(CXFExportRegistration export, String alias) { final ServiceReference sref = export.getExportedService(); final Long sid = (Long) sref.getProperty(org.osgi.framework.Constants.SERVICE_ID); LOG.log(Level.FINE, "Registering service listener for service with ID {0}", sid); Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java Mon Nov 5 09:30:32 2012 @@ -26,7 +26,6 @@ import java.util.logging.Logger; import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.dosgi.dsw.Constants; -import org.apache.cxf.dosgi.dsw.service.ExportRegistrationImpl; import org.apache.cxf.dosgi.dsw.util.OsgiUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; @@ -44,7 +43,7 @@ public class JaxRSHttpServiceConfigurati } @Override - public void createServer(ExportRegistrationImpl exportRegistration, BundleContext dswContext, + public void createServer(CXFExportRegistration exportRegistration, BundleContext dswContext, BundleContext callingContext, Map sd, Class iClass, Object serviceBean) { String contextRoot = getServletContextRoot(sd, iClass); Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java Mon Nov 5 09:30:32 2012 @@ -28,7 +28,6 @@ import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.dosgi.dsw.Constants; -import org.apache.cxf.dosgi.dsw.service.ExportRegistrationImpl; import org.apache.cxf.dosgi.dsw.util.OsgiUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; @@ -113,7 +112,7 @@ public class JaxRSPojoConfigurationTypeH } @Override - public void createServer(ExportRegistrationImpl exportRegistration, BundleContext dswContext, + public void createServer(CXFExportRegistration exportRegistration, BundleContext dswContext, BundleContext callingContext, Map sd, Class iClass, Object serviceBean) throws IntentUnsatifiedException { 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=1405722&r1=1405721&r2=1405722&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 Mon Nov 5 09:30:32 2012 @@ -26,7 +26,6 @@ import org.apache.cxf.aegis.databinding. import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.dosgi.dsw.Constants; -import org.apache.cxf.dosgi.dsw.service.ExportRegistrationImpl; import org.apache.cxf.dosgi.dsw.util.OsgiUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientProxyFactoryBean; @@ -89,7 +88,7 @@ public class PojoConfigurationTypeHandle return null; } - public void createServer(ExportRegistrationImpl exportRegistration, BundleContext dswContext, + public void createServer(CXFExportRegistration exportRegistration, BundleContext dswContext, BundleContext callingContext, Map sd, Class iClass, Object serviceBean) throws IntentUnsatifiedException { String address = getPojoAddress(sd, iClass); Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java Mon Nov 5 09:30:32 2012 @@ -31,7 +31,6 @@ import org.apache.cxf.common.logging.Log 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.service.ExportRegistrationImpl; import org.apache.cxf.dosgi.dsw.util.OsgiUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ServerFactoryBean; @@ -104,7 +103,7 @@ public class WsdlConfigurationTypeHandle return Service.create(wsdlAddress, serviceQname); } - public void createServer(ExportRegistrationImpl exportRegistration, + public void createServer(CXFExportRegistration exportRegistration, BundleContext dswContext, BundleContext callingContext, Map sd, Copied: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java (from r1404990, cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactory.java) URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java?p2=cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java&p1=cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactory.java&r1=1404990&r2=1405722&rev=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactory.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java Mon Nov 5 09:30:32 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cxf.dosgi.dsw.handlers; +package org.apache.cxf.dosgi.dsw.service; import java.security.AccessController; import java.security.PrivilegedAction; @@ -24,7 +24,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.dosgi.dsw.service.ImportRegistrationImpl; +import org.apache.cxf.dosgi.dsw.handlers.ConfigurationTypeHandler; +import org.apache.cxf.dosgi.dsw.handlers.IntentUnsatifiedException; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceFactory; Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java Mon Nov 5 09:30:32 2012 @@ -25,6 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.dosgi.dsw.handlers.CXFExportRegistration; import org.apache.cxf.endpoint.Server; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -37,7 +38,7 @@ import org.osgi.service.remoteserviceadm import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; -public class ExportRegistrationImpl implements ExportRegistration { +public class ExportRegistrationImpl implements ExportRegistration, CXFExportRegistration { private static final Logger LOG = LogUtils.getL7dLogger(ExportRegistrationImpl.class); @@ -128,6 +129,9 @@ public class ExportRegistrationImpl impl return serviceReference; } + /* (non-Javadoc) + * @see org.apache.cxf.dosgi.dsw.service.CXFExportRegistration#getExportedService() + */ public ServiceReference getExportedService() throws IllegalStateException { if (!closed) return serviceReference; @@ -135,6 +139,9 @@ public class ExportRegistrationImpl impl return null; } + /* (non-Javadoc) + * @see org.apache.cxf.dosgi.dsw.service.CXFExportRegistration#setEndpointdescription(org.osgi.service.remoteserviceadmin.EndpointDescription) + */ public void setEndpointdescription(EndpointDescription epd) { endpointDescription = epd; } @@ -158,14 +165,23 @@ public class ExportRegistrationImpl impl return r; } + /* (non-Javadoc) + * @see org.apache.cxf.dosgi.dsw.service.CXFExportRegistration#setServer(org.apache.cxf.endpoint.Server) + */ public void setServer(Server server) { this.server = server; } + /* (non-Javadoc) + * @see org.apache.cxf.dosgi.dsw.service.CXFExportRegistration#getServer() + */ public Server getServer() { return server; } + /* (non-Javadoc) + * @see org.apache.cxf.dosgi.dsw.service.CXFExportRegistration#setException(java.lang.Throwable) + */ public void setException(Throwable ex) { exception = ex; } Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java Mon Nov 5 09:30:32 2012 @@ -23,7 +23,6 @@ import java.util.List; import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.dosgi.dsw.handlers.ClientServiceFactory; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.service.remoteserviceadmin.EndpointDescription; Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java Mon Nov 5 09:30:32 2012 @@ -34,7 +34,6 @@ import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.dosgi.dsw.Constants; -import org.apache.cxf.dosgi.dsw.handlers.ClientServiceFactory; import org.apache.cxf.dosgi.dsw.handlers.ConfigTypeHandlerFactory; import org.apache.cxf.dosgi.dsw.handlers.ConfigurationTypeHandler; import org.apache.cxf.dosgi.dsw.qos.IntentMap; Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java?rev=1405722&r1=1405721&r2=1405722&view=diff ============================================================================== --- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java (original) +++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java Mon Nov 5 09:30:32 2012 @@ -23,6 +23,7 @@ import java.util.Map; import junit.framework.TestCase; +import org.apache.cxf.dosgi.dsw.service.ClientServiceFactory; import org.apache.cxf.dosgi.dsw.service.ImportRegistrationImpl; import org.easymock.EasyMock; import org.easymock.IMocksControl;