cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1484967 - in /cxf/dosgi/trunk: dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/ dsw/cxf-dsw/src/main/java/org/apache/cx...
Date Tue, 21 May 2013 21:24:29 GMT
Author: dkulp
Date: Tue May 21 21:24:28 2013
New Revision: 1484967

URL: http://svn.apache.org/r1484967
Log:
Fix checkstle/pmd things.  Add checkstyle/pmd to build

Modified:
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactory.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/qos/IntentUtils.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventProducer.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/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/ConfigTypeHandlerFactoryTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandlerTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/UtilsTest.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifier.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/ExportServiceTest.java
    cxf/dosgi/trunk/parent/pom.xml
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java Tue May 21 21:24:28 2013
@@ -84,13 +84,15 @@ public class Activator implements Manage
         Dictionary<String, Object> props = new Hashtable<String, Object>();
         String[] supportedIntents = intentMap.keySet().toArray(new String[] {});
         props.put("remote.intents.supported", supportedIntents);
-        props.put("remote.configs.supported", obtainSupportedConfigTypes(configTypeHandlerFactory.getSupportedConfigurationTypes()));
+        props.put("remote.configs.supported", 
+                  obtainSupportedConfigTypes(configTypeHandlerFactory.getSupportedConfigurationTypes()));
         LOG.info("Registering RemoteServiceAdminFactory...");
         rsaFactoryReg = bc.registerService(RemoteServiceAdmin.class.getName(), rsaf, props);
         decoratorReg = bc.registerService(ServiceDecorator.class.getName(), new ServiceDecoratorImpl(bc), null);
     }
 
-    // The CT sometimes uses the first element returned to register a service, but does not provide any additional configuration
+    // The CT sometimes uses the first element returned to register a service, but 
+    // does not provide any additional configuration.
     // Return the configuration type that works without additional configuration as the first in the list.
     private String[] obtainSupportedConfigTypes(List<String> types) {
         List<String> l = new ArrayList<String>(types);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactory.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactory.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactory.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactory.java Tue May 21 21:24:28 2013
@@ -96,7 +96,8 @@ public class ConfigTypeHandlerFactory {
         }
 
         if (types.contains(Constants.RS_CONFIG_TYPE)) {
-            Collection<String> intentsProperty = OsgiUtils.getMultiValueProperty(serviceProperties.get(RemoteConstants.SERVICE_EXPORTED_INTENTS));
+            Collection<String> intentsProperty 
+                = OsgiUtils.getMultiValueProperty(serviceProperties.get(RemoteConstants.SERVICE_EXPORTED_INTENTS));
             boolean hasHttpIntent = false;
             boolean hasSoapIntent = false;
             if (intentsProperty != null) {

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=1484967&r1=1484966&r2=1484967&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 Tue May 21 21:24:28 2013
@@ -123,14 +123,16 @@ public class PojoConfigurationTypeHandle
 
     private String getPojoAddress(Map<String, Object> sd, Class<?> iClass) {
         String address = getClientAddress(sd, iClass);
-        if (address != null)
+        if (address != null) {
             return address;
+        }
 
         // If the property is not of type string this will cause an ClassCastException which
         // will be propagated to the ExportRegistration exception property.
         Object port = sd.get(Constants.WS_PORT_PROPERTY);
-        if (port == null)
+        if (port == null) {
             port = "9000";
+        }
 
         address = "http://localhost:" + port + "/" + iClass.getName().replace('.', '/');
         LOG.info("Using a default address : " + address);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java Tue May 21 21:24:28 2013
@@ -69,16 +69,20 @@ public final class IntentUtils {
 
     public static Set<String> getRequestedIntents(Map<?, ?> sd) {
         Collection<String> intents = OsgiUtils.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_EXPORTED_INTENTS));
-        Collection<String> intents2 = OsgiUtils.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_EXPORTED_INTENTS_EXTRA));
+        Collection<String> intents2 
+            = OsgiUtils.getMultiValueProperty(sd.get(RemoteConstants.SERVICE_EXPORTED_INTENTS_EXTRA));
         @SuppressWarnings("deprecation")
         Collection<String> oldIntents = OsgiUtils.getMultiValueProperty(sd.get(Constants.EXPORTED_INTENTS_OLD));
         Set<String> allIntents = new HashSet<String>();
-        if (intents != null)
+        if (intents != null) {
             allIntents.addAll(parseIntents(intents));
-        if (intents2 != null)
+        }
+        if (intents2 != null) {
             allIntents.addAll(parseIntents(intents2));
-        if (oldIntents != null)
+        }
+        if (oldIntents != null) {
             allIntents.addAll(parseIntents(oldIntents));
+        }
 
         return allIntents;
     }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventProducer.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventProducer.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventProducer.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventProducer.java Tue May 21 21:24:28 2013
@@ -48,7 +48,9 @@ public class EventProducer {
     }
 
     protected void publishNotifcation(ExportRegistration er) {
-        int type = er.getException() == null ? RemoteServiceAdminEvent.EXPORT_REGISTRATION : RemoteServiceAdminEvent.EXPORT_ERROR;
+        int type = er.getException() == null 
+            ? RemoteServiceAdminEvent.EXPORT_REGISTRATION 
+            : RemoteServiceAdminEvent.EXPORT_ERROR;
         RemoteServiceAdminEvent rsae = new RemoteServiceAdminEvent(type, bctx.getBundle(), er.getExportReference(),
                 er.getException());
 

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=1484967&r1=1484966&r2=1484967&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 Tue May 21 21:24:28 2013
@@ -18,8 +18,8 @@
  */
 package org.apache.cxf.dosgi.dsw.service;
 
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Dictionary;
@@ -408,16 +408,16 @@ public class RemoteServiceAdminCore impl
      */
     protected void removeExportRegistration(ExportRegistrationImpl eri) {
         synchronized (exportedServices) {
-            for (Iterator<Collection<ExportRegistration>> it = exportedServices.values().iterator(); it.hasNext(); ) {
+            for (Iterator<Collection<ExportRegistration>> it = exportedServices.values().iterator(); it.hasNext();) {
                 Collection<ExportRegistration> value = it.next();
-                for (Iterator<ExportRegistration> it2 = value.iterator(); it2.hasNext(); ) {
+                for (Iterator<ExportRegistration> it2 = value.iterator(); it2.hasNext();) {
                     ExportRegistration er = it2.next();
                     if (er.equals(eri)) {
                         eventProducer.notifyRemoval(eri);
                         it2.remove();
-                        if (value.size() == 0)
+                        if (value.size() == 0) {
                             it.remove();
-
+                        }
                         return;
                     }
                 }

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=1484967&r1=1484966&r2=1484967&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 Tue May 21 21:24:28 2013
@@ -104,10 +104,8 @@ public final class OsgiUtils {
     private static String getStringProperty(Map dict, String name) {
         Object o = dict.get(name);
 
-        if (o != null) {
-            if (o instanceof String) {
-                return (String)o;
-            }
+        if (o instanceof String) {
+            return (String)o;
         }
         return null;
     }
@@ -170,7 +168,8 @@ public final class OsgiUtils {
         }
     }
 
-    public static void overlayProperties(Map<String, Object> serviceProperties, Map<String, Object> additionalProperties) {
+    public static void overlayProperties(Map<String, Object> serviceProperties,
+                                         Map<String, Object> additionalProperties) {
         Map<String, String> keysLowerCase = new HashMap<String, String>();
         for (String key : serviceProperties.keySet()) {
             keysLowerCase.put(key.toLowerCase(), key);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactoryTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactoryTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactoryTest.java Tue May 21 21:24:28 2013
@@ -18,8 +18,6 @@
  */
 package org.apache.cxf.dosgi.dsw.handlers;
 
-import static org.junit.Assert.assertTrue;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,6 +31,8 @@ import org.junit.Test;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.remoteserviceadmin.RemoteConstants;
 
+import static org.junit.Assert.assertTrue;
+
 
 public class ConfigTypeHandlerFactoryTest {
 

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=1484967&r1=1484966&r2=1484967&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 Tue May 21 21:24:28 2013
@@ -199,19 +199,19 @@ public class PojoConfigurationTypeHandle
     public void testAddressing() {
         runAddressingTest(new HashMap<String, Object>(), "http://localhost:9000/java/lang/Runnable");
 
-        HashMap<String, Object> p1 = new HashMap<String, Object>();
+        Map<String, Object> p1 = new HashMap<String, Object>();
         p1.put("org.apache.cxf.ws.address", "http://somewhere");
         runAddressingTest(p1, "http://somewhere");
 
-        HashMap<String, Object> p2 = new HashMap<String, Object>();
+        Map<String, Object> p2 = new HashMap<String, Object>();
         p2.put("org.apache.cxf.rs.address", "https://somewhereelse");
         runAddressingTest(p2, "https://somewhereelse");
 
-        HashMap<String, Object> p3 = new HashMap<String, Object>();
+        Map<String, Object> p3 = new HashMap<String, Object>();
         p3.put("org.apache.cxf.ws.port", 65535);
         runAddressingTest(p3, "http://localhost:65535/java/lang/Runnable");
 
-        HashMap<String, Object> p4 = new HashMap<String, Object>();
+        Map<String, Object> p4 = new HashMap<String, Object>();
         p4.put("org.apache.cxf.ws.port", "8181");
         runAddressingTest(p4, "http://localhost:8181/java/lang/Runnable");
     }
@@ -223,9 +223,12 @@ public class PojoConfigurationTypeHandle
         IntentManager intentManager = EasyMock.createNiceMock(IntentManager.class);
         EasyMock.replay(intentManager);
 
-        PojoConfigurationTypeHandler handler = new PojoConfigurationTypeHandler(dswContext, intentManager, dummyHttpServiceManager()) {
+        PojoConfigurationTypeHandler handler = new PojoConfigurationTypeHandler(dswContext, 
+                                                                                intentManager, 
+                                                                                dummyHttpServiceManager()) {
             @Override
-            protected ExportResult createServerFromFactory(ServerFactoryBean factory, Map<String, Object> endpointProps) {
+            protected ExportResult createServerFromFactory(ServerFactoryBean factory,
+                                                           Map<String, Object> endpointProps) {
                 return new ExportResult(endpointProps, (Server) null);
             }
         };
@@ -253,9 +256,12 @@ public class PojoConfigurationTypeHandle
         IntentManager intentManager = EasyMock.createNiceMock(IntentManager.class);
         EasyMock.replay(intentManager);
 
-        PojoConfigurationTypeHandler handler = new PojoConfigurationTypeHandler(dswContext, intentManager, dummyHttpServiceManager()) {
+        PojoConfigurationTypeHandler handler = new PojoConfigurationTypeHandler(dswContext, 
+                                                                                intentManager, 
+                                                                                dummyHttpServiceManager()) {
             @Override
-            protected ExportResult createServerFromFactory(ServerFactoryBean factory, Map<String, Object> endpointProps) {
+            protected ExportResult createServerFromFactory(ServerFactoryBean factory, 
+                                                           Map<String, Object> endpointProps) {
                 throw new TestException();
             }
         };
@@ -419,5 +425,6 @@ public class PojoConfigurationTypeHandle
     }
 
     @SuppressWarnings("serial")
-    public static class TestException extends RuntimeException {}
+    public static class TestException extends RuntimeException {
+    }
 }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java Tue May 21 21:24:28 2013
@@ -19,6 +19,7 @@
 package org.apache.cxf.dosgi.dsw.service;
 
 import java.util.Arrays;
+import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.UUID;
@@ -59,7 +60,7 @@ public class EventProducerTest {
         final Bundle bundle = EasyMock.createNiceMock(Bundle.class);
         EasyMock.expect(bundle.getBundleId()).andReturn(42L).anyTimes();
         EasyMock.expect(bundle.getSymbolicName()).andReturn("test.bundle").anyTimes();
-        Hashtable<String, String> headers = new Hashtable<String, String>();
+        Dictionary<String, String> headers = new Hashtable<String, String>();
         headers.put("Bundle-Version", "1.2.3.test");
         EasyMock.expect(bundle.getHeaders()).andReturn(headers).anyTimes();
         EasyMock.replay(bundle);
@@ -75,14 +76,15 @@ public class EventProducerTest {
                 Assert.assertSame(bundle, event.getProperty("bundle"));
                 Assert.assertEquals(new Long(42), event.getProperty("bundle.id"));
                 Assert.assertEquals("test.bundle", event.getProperty("bundle.symbolicname"));
-                Assert.assertEquals(new Version(1,2,3,"test"), event.getProperty("bundle.version"));
+                Assert.assertEquals(new Version(1, 2, 3, "test"), event.getProperty("bundle.version"));
                 Assert.assertNull(event.getProperty("cause"));
                 Assert.assertEquals(endpoint, event.getProperty("export.registration"));
 
                 Assert.assertEquals(new Long(Long.MAX_VALUE), event.getProperty("service.remote.id"));
                 Assert.assertEquals(uuid, event.getProperty("service.remote.uuid"));
                 Assert.assertEquals("foo://bar", event.getProperty("service.remote.uri"));
-                Assert.assertTrue(Arrays.equals(interfaces.toArray(new String[] {}), (String[]) event.getProperty("objectClass")));
+                Assert.assertTrue(Arrays.equals(interfaces.toArray(new String[] {}),
+                                                (String[]) event.getProperty("objectClass")));
 
                 Assert.assertNotNull(event.getProperty("timestamp"));
 
@@ -147,7 +149,8 @@ public class EventProducerTest {
                 Assert.assertEquals(new Version("0"), event.getProperty("bundle.version"));
                 Assert.assertSame(exportException, event.getProperty("cause"));
                 Assert.assertEquals(endpoint, event.getProperty("export.registration"));
-                Assert.assertTrue(Arrays.equals(new String[] {"org.foo.Bar"}, (String[]) event.getProperty("objectClass")));
+                Assert.assertTrue(Arrays.equals(new String[] {"org.foo.Bar"}, 
+                                                (String[]) event.getProperty("objectClass")));
 
                 RemoteServiceAdminEvent rsae = (RemoteServiceAdminEvent) event.getProperty("event");
                 Assert.assertSame(exportException, rsae.getException());

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java Tue May 21 21:24:28 2013
@@ -18,12 +18,6 @@
  */
 package org.apache.cxf.dosgi.dsw.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collection;
@@ -57,6 +51,12 @@ import org.osgi.service.remoteserviceadm
 import org.osgi.service.remoteserviceadmin.ImportRegistration;
 import org.osgi.service.remoteserviceadmin.RemoteConstants;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 
 public class RemoteServiceAdminCoreTest {
 
@@ -73,8 +73,8 @@ public class RemoteServiceAdminCoreTest 
 
         ServiceReference sref = c.createMock(ServiceReference.class);
         EasyMock.expect(sref.getBundle()).andReturn(b).anyTimes();
-        EasyMock.expect(sref.getPropertyKeys()).andReturn(new String[]{
-                "objectClass", "service.exported.interfaces"}).anyTimes();
+        EasyMock.expect(sref.getPropertyKeys())
+            .andReturn(new String[]{"objectClass", "service.exported.interfaces"}).anyTimes();
         EasyMock.expect(sref.getProperty("objectClass")).andReturn(new String [] {"a.b.C"}).anyTimes();
         EasyMock.expect(sref.getProperty("service.exported.interfaces")).andReturn("*").anyTimes();
 
@@ -172,8 +172,10 @@ public class RemoteServiceAdminCoreTest 
         EasyMock.expect(bc.getProperty(Constants.FRAMEWORK_VERSION)).andReturn(null).anyTimes();
         bc.addServiceListener(EasyMock.<ServiceListener>anyObject(), EasyMock.<String>anyObject());
         EasyMock.expectLastCall().anyTimes();
-        EasyMock.expect(bc.getServiceReferences(EasyMock.<String>anyObject(), EasyMock.<String>anyObject())).andReturn(null).anyTimes();
-        EasyMock.expect(bc.getAllServiceReferences(EasyMock.<String>anyObject(), EasyMock.<String>anyObject())).andReturn(null).anyTimes();
+        EasyMock.expect(bc.getServiceReferences(EasyMock.<String>anyObject(), 
+                                                EasyMock.<String>anyObject())).andReturn(null).anyTimes();
+        EasyMock.expect(bc.getAllServiceReferences(EasyMock.<String>anyObject(), 
+                                                   EasyMock.<String>anyObject())).andReturn(null).anyTimes();
 
         Bundle b = createDummyRsaBundle(bc);
 
@@ -189,22 +191,27 @@ public class RemoteServiceAdminCoreTest 
 
         EasyMock.expect(bc.getService(sref)).andReturn(svcObject).anyTimes();
         EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
-        EasyMock.expect(bc.createFilter("(service.id=51)")).andReturn(FrameworkUtil.createFilter("(service.id=51)")).anyTimes();
+        EasyMock.expect(bc.createFilter("(service.id=51)"))
+            .andReturn(FrameworkUtil.createFilter("(service.id=51)")).anyTimes();
         EasyMock.replay(bc);
 
-        HashMap<String, Object> eProps = new HashMap<String, Object>(sProps);
+        Map<String, Object> eProps = new HashMap<String, Object>(sProps);
         eProps.put("endpoint.id", "http://something");
         eProps.put("service.imported.configs", new String[] {"org.apache.cxf.ws"});
         ExportResult er = new ExportResult(eProps, (Server) null);
 
         ConfigurationTypeHandler handler = EasyMock.createNiceMock(ConfigurationTypeHandler.class);
-        EasyMock.expect(handler.createServer(sref, bc, sref.getBundle().getBundleContext(), sProps, Runnable.class, svcObject)).andReturn(er).once();
+        EasyMock.expect(handler.createServer(sref,
+                                             bc,
+                                             sref.getBundle().getBundleContext(), 
+                                             sProps, Runnable.class, svcObject)).andReturn(er).once();
         EasyMock.replay(handler);
 
         ConfigTypeHandlerFactory handlerFactory = EasyMock.createNiceMock(ConfigTypeHandlerFactory.class);
-        EasyMock.expect(handlerFactory.getHandler(bc, sProps)).andReturn(handler).once(); // Second time shouldn't get there because it should simply copy
+        EasyMock.expect(handlerFactory.getHandler(bc, sProps))
+            .andReturn(handler).once(); // Second time shouldn't get there because it should simply copy
         EasyMock.replay(handlerFactory);
-        RemoteServiceAdminCore rsaCore = new RemoteServiceAdminCore(bc, handlerFactory) {};
+        RemoteServiceAdminCore rsaCore = new RemoteServiceAdminCore(bc, handlerFactory);
 
         // Export the service for the first time
         List<ExportRegistration> ereg = rsaCore.exportService(sref, null);
@@ -216,8 +223,10 @@ public class RemoteServiceAdminCoreTest 
         Map<String, Object> edProps = ed.getProperties();
         assertEquals("http://something", edProps.get("endpoint.id"));
         assertNotNull(edProps.get("service.imported"));
-        assertTrue(Arrays.equals(new String [] {"java.lang.Runnable"}, (Object[]) edProps.get("objectClass")));
-        assertTrue(Arrays.equals(new String[] {"org.apache.cxf.ws"}, (Object[]) edProps.get("service.imported.configs")));
+        assertTrue(Arrays.equals(new String [] {"java.lang.Runnable"}, 
+                                 (Object[]) edProps.get("objectClass")));
+        assertTrue(Arrays.equals(new String[] {"org.apache.cxf.ws"}, 
+                                 (Object[]) edProps.get("service.imported.configs")));
 
         // Ask to export the same service again, this should not go through the whole process again but simply return
         // a copy of the first instance.
@@ -285,19 +294,20 @@ public class RemoteServiceAdminCoreTest 
         EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
         EasyMock.replay(bc);
 
-        HashMap<String, Object> eProps = new HashMap<String, Object>(sProps);
+        Map<String, Object> eProps = new HashMap<String, Object>(sProps);
         eProps.put("endpoint.id", "http://something");
         eProps.put("service.imported.configs", new String[] {"org.apache.cxf.ws"});
         ExportResult er = new ExportResult(eProps, new TestException());
 
         ConfigurationTypeHandler handler = EasyMock.createNiceMock(ConfigurationTypeHandler.class);
-        EasyMock.expect(handler.createServer(sref, bc, sref.getBundle().getBundleContext(), sProps, Runnable.class, svcObject)).andReturn(er);
+        EasyMock.expect(handler.createServer(sref, bc, sref.getBundle().getBundleContext(), 
+                                             sProps, Runnable.class, svcObject)).andReturn(er);
         EasyMock.replay(handler);
 
         ConfigTypeHandlerFactory handlerFactory = EasyMock.createNiceMock(ConfigTypeHandlerFactory.class);
         EasyMock.expect(handlerFactory.getHandler(bc, sProps)).andReturn(handler).anyTimes();
         EasyMock.replay(handlerFactory);
-        RemoteServiceAdminCore rsaCore = new RemoteServiceAdminCore(bc, handlerFactory) {};
+        RemoteServiceAdminCore rsaCore = new RemoteServiceAdminCore(bc, handlerFactory);
 
         List<ExportRegistration> ereg = rsaCore.exportService(sref, null);
         assertEquals(1, ereg.size());
@@ -344,5 +354,6 @@ public class RemoteServiceAdminCoreTest 
     }
 
     @SuppressWarnings("serial")
-    private static class TestException extends Exception {}
+    private static class TestException extends Exception {
+    }
 }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/UtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/UtilsTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/UtilsTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/UtilsTest.java Tue May 21 21:24:28 2013
@@ -18,10 +18,6 @@
  */
 package org.apache.cxf.dosgi.dsw.service;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -32,6 +28,10 @@ import org.apache.cxf.dosgi.dsw.util.Uti
 import org.junit.Test;
 import org.osgi.framework.Constants;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 
 public class UtilsTest {
 

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifier.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifier.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifier.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifier.java Tue May 21 21:24:28 2013
@@ -40,20 +40,20 @@ import org.slf4j.LoggerFactory;
  */
 public class EndpointListenerNotifier {
     private static final String ENDPOINT_LISTENER_FILTER =
-    		"(&(" + Constants.OBJECTCLASS + "=" + EndpointListener.class.getName() + ")"
-    		+ "(" + EndpointListener.ENDPOINT_LISTENER_SCOPE + "=*))";
-	private static final Logger LOG = LoggerFactory.getLogger(EndpointListenerNotifier.class);
+        "(&(" + Constants.OBJECTCLASS + "=" + EndpointListener.class.getName() + ")"
+        + "(" + EndpointListener.ENDPOINT_LISTENER_SCOPE + "=*))";
+    private static final Logger LOG = LoggerFactory.getLogger(EndpointListenerNotifier.class);
     private BundleContext bctx;
     private ServiceTracker stEndpointListeners;
 
     public EndpointListenerNotifier(BundleContext bctx, final EndpointRepository endpointRepository) {
         this.bctx = bctx;
         Filter filter;
-		try {
-			filter = bctx.createFilter(ENDPOINT_LISTENER_FILTER);
-		} catch (InvalidSyntaxException e) {
-			throw new RuntimeException("Unexpected exception creating filter", e);
-		}
+        try {
+            filter = bctx.createFilter(ENDPOINT_LISTENER_FILTER);
+        } catch (InvalidSyntaxException e) {
+            throw new RuntimeException("Unexpected exception creating filter", e);
+        }
         this.stEndpointListeners = new ServiceTracker(bctx, filter, null) {
             @Override
             public Object addingService(ServiceReference epListenerRef) {

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java Tue May 21 21:24:28 2013
@@ -40,7 +40,8 @@ import org.slf4j.LoggerFactory;
 class EndpointRepository {
     private static final Logger LOG = LoggerFactory.getLogger(EndpointRepository.class);
 
-    private final Map<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>> exportedServices = new LinkedHashMap<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>>();
+    private final Map<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>> exportedServices 
+        = new LinkedHashMap<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>>();
 
     /**
      * Remove all services exported by the given rsa and notify listeners

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java Tue May 21 21:24:28 2013
@@ -56,26 +56,34 @@ public class TopologyManagerExport {
 
     private static final String DOSGI_SERVICES = "(" + RemoteConstants.SERVICE_EXPORTED_INTERFACES + "=*)";
 
-	private static final Logger LOG = LoggerFactory.getLogger(TopologyManagerExport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TopologyManagerExport.class);
 
     private final BundleContext bctx;
     private final EndpointListenerNotifier epListenerNotifier;
     private final ExecutorService execService;
     private final RemoteServiceAdminTracker remoteServiceAdminTracker;
     private final ServiceListener serviceListener;
-	private final EndpointRepository endpointRepo;
+    private final EndpointRepository endpointRepo;
 
     public TopologyManagerExport(BundleContext ctx, RemoteServiceAdminTracker rsaTracker) {
+        this(ctx, rsaTracker, null);
+    }
+    public TopologyManagerExport(BundleContext ctx, RemoteServiceAdminTracker rsaTracker,
+                                 EndpointListenerNotifier notif) {
         endpointRepo = new EndpointRepository();
-        epListenerNotifier = createEndpointListenerNotifier(ctx, endpointRepo);
+        if (notif == null) {
+            epListenerNotifier = new EndpointListenerNotifier(ctx, endpointRepo);
+        } else {
+            epListenerNotifier = notif;
+        }
         execService = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
         bctx = ctx;
         this.remoteServiceAdminTracker = rsaTracker;
         this.remoteServiceAdminTracker.addListener(new RemoteServiceAdminLifeCycleListener() {
             public void added(RemoteServiceAdmin rsa) {
-        		for (ServiceReference serviceRef : endpointRepo.getServicesToBeExportedFor(rsa)) {
-        			triggerExport(serviceRef);
-        		}
+                for (ServiceReference serviceRef : endpointRepo.getServicesToBeExportedFor(rsa)) {
+                    triggerExport(serviceRef);
+                }
             }
 
             public void removed(RemoteServiceAdmin rsa) {
@@ -102,10 +110,6 @@ public class TopologyManagerExport {
         
     }
     
-    protected EndpointListenerNotifier createEndpointListenerNotifier(BundleContext ctx, EndpointRepository endpointRepository) {
-    	return new EndpointListenerNotifier(ctx, endpointRepository);
-    }
-    
     /**
      * checks if a Service is intended to be exported
      */
@@ -134,7 +138,7 @@ public class TopologyManagerExport {
     }
 
     protected void doExportService(final ServiceReference sref) {
-    	endpointRepo.addService(sref);
+        endpointRepo.addService(sref);
         List<RemoteServiceAdmin> rsaList = remoteServiceAdminTracker.getList();
         if (rsaList.size() == 0) {
             LOG.error(

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java Tue May 21 21:24:28 2013
@@ -19,8 +19,6 @@
 package org.apache.cxf.dosgi.topologymanager.exporter;
 
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -39,6 +37,8 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.service.remoteserviceadmin.EndpointDescription;
 import org.osgi.service.remoteserviceadmin.EndpointListener;
 
+import static org.junit.Assert.assertEquals;
+
 public class EndpointListenerNotifierTest {
 
     @Test

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/ExportServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/ExportServiceTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/ExportServiceTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/ExportServiceTest.java Tue May 21 21:24:28 2013
@@ -40,20 +40,20 @@ import org.osgi.service.remoteserviceadm
 import org.osgi.service.remoteserviceadmin.RemoteConstants;
 import org.osgi.service.remoteserviceadmin.RemoteServiceAdmin;
 
-
 public class ExportServiceTest {
 
-    
     /**
-     * This tests if the topology manager handles a service marked to be exported correctly by exporting it to
-     * an available RemoteServiceAdmin and by notifying an EndpointListener Afterwards
-     * @throws Exception 
+     * This tests if the topology manager handles a service marked to be
+     * exported correctly by exporting it to an available RemoteServiceAdmin and
+     * by notifying an EndpointListener Afterwards
+     * 
+     * @throws Exception
      */
     @SuppressWarnings("unchecked")
-	@Test
+    @Test
     public void testServiceExport() throws Exception {
         IMocksControl c = EasyMock.createControl();
-        
+
         BundleContext bctx = c.createMock(BundleContext.class);
         RemoteServiceAdmin rsa = c.createMock(RemoteServiceAdmin.class);
         final EndpointListenerNotifier mockEpListenerNotifier = c.createMock(EndpointListenerNotifier.class);
@@ -62,51 +62,43 @@ public class ExportServiceTest {
 
         final ServiceReference sref = createUserServiceBundle(c);
 
-        EasyMock.expect(bctx.getServiceReferences(EasyMock.<String>anyObject(), EasyMock.<String>anyObject()))
-        	.andReturn(null).atLeastOnce();
+        EasyMock
+            .expect(bctx.getServiceReferences(EasyMock.<String> anyObject(), EasyMock.<String> anyObject()))
+            .andReturn(null).atLeastOnce();
 
         RemoteServiceAdminTracker rsaTracker = createSingleRsaTracker(c, rsa);
 
-		EndpointDescription endpoint = createEndpoint(c);
-		ExportRegistration exportRegistration = createExportRegistration(c, endpoint);
+        EndpointDescription endpoint = createEndpoint(c);
+        ExportRegistration exportRegistration = createExportRegistration(c, endpoint);
 
-		// Main assertions
+        // Main assertions
         simulateUserServicePublished(bctx, sref);
         EasyMock.expect(rsa.exportService(EasyMock.same(sref), (Map<String, Object>)EasyMock.anyObject()))
-        	.andReturn(Collections.singletonList(exportRegistration)).once();
-        mockEpListenerNotifier.nofifyEndpointListenersOfAdding(EasyMock.eq(Collections.singletonList(endpoint)));
+            .andReturn(Collections.singletonList(exportRegistration)).once();
+        mockEpListenerNotifier.nofifyEndpointListenersOfAdding(EasyMock.eq(Collections
+            .singletonList(endpoint)));
         EasyMock.expectLastCall().once();
 
         c.replay();
-        
-		TopologyManagerExport topManager = new TopologyManagerExport(bctx, rsaTracker) {
 
-			/**
-			 * Replace epListenerNotifier with mock
-			 */
-			@Override
-			protected EndpointListenerNotifier createEndpointListenerNotifier(BundleContext ctx, 
-					EndpointRepository endpointRepository) {
-				return mockEpListenerNotifier;
-			}
-
-			/**
-			 * To avoid async call
-			 */
-			@Override
-			protected void triggerExport(ServiceReference sref) {
-				doExportService(sref);
-			}
-        	
+        TopologyManagerExport topManager = new TopologyManagerExport(bctx, rsaTracker, mockEpListenerNotifier) {
+
+            /**
+             * To avoid async call
+             */
+            @Override
+            protected void triggerExport(ServiceReference sref) {
+                doExportService(sref);
+            }
+
         };
         topManager.start();
         c.verify();
 
     }
 
-	private void simulateUserServicePublished(BundleContext bctx,
-			final ServiceReference sref) {
-		bctx.addServiceListener((ServiceListener)EasyMock.anyObject());
+    private void simulateUserServicePublished(BundleContext bctx, final ServiceReference sref) {
+        bctx.addServiceListener((ServiceListener)EasyMock.anyObject());
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
             public Object answer() throws Throwable {
                 System.out.println("Simulating publishing the user service");
@@ -116,42 +108,40 @@ public class ExportServiceTest {
                 return null;
             }
         }).once();
-	}
+    }
 
-	private RemoteServiceAdminTracker createSingleRsaTracker(IMocksControl c,
-			RemoteServiceAdmin rsa) {
-		RemoteServiceAdminTracker rsaTracker = c.createMock(RemoteServiceAdminTracker.class);
-        rsaTracker.addListener(EasyMock.<RemoteServiceAdminLifeCycleListener>anyObject());
+    private RemoteServiceAdminTracker createSingleRsaTracker(IMocksControl c, RemoteServiceAdmin rsa) {
+        RemoteServiceAdminTracker rsaTracker = c.createMock(RemoteServiceAdminTracker.class);
+        rsaTracker.addListener(EasyMock.<RemoteServiceAdminLifeCycleListener> anyObject());
         EasyMock.expectLastCall().once();
         EasyMock.expect(rsaTracker.getList()).andReturn(Collections.singletonList(rsa));
-		return rsaTracker;
-	}
+        return rsaTracker;
+    }
 
-	private ExportRegistration createExportRegistration(IMocksControl c,
-			EndpointDescription endpoint) {
-		ExportRegistration exportRegistration = c.createMock(ExportRegistration.class);
+    private ExportRegistration createExportRegistration(IMocksControl c, EndpointDescription endpoint) {
+        ExportRegistration exportRegistration = c.createMock(ExportRegistration.class);
         ExportReference exportReference = c.createMock(ExportReference.class);
         EasyMock.expect(exportRegistration.getExportReference()).andReturn(exportReference).anyTimes();
         EasyMock.expect(exportReference.getExportedEndpoint()).andReturn(endpoint).anyTimes();
-		return exportRegistration;
-	}
+        return exportRegistration;
+    }
 
-	private EndpointDescription createEndpoint(IMocksControl c) {
+    private EndpointDescription createEndpoint(IMocksControl c) {
         Map<String, Object> props = new HashMap<String, Object>();
         props.put(RemoteConstants.ENDPOINT_ID, "1");
-        props.put(Constants.OBJECTCLASS, new String[]{"abc"});
+        props.put(Constants.OBJECTCLASS, new String[] {"abc"});
         props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "cxf");
-		return new EndpointDescription(props);
-	}
+        return new EndpointDescription(props);
+    }
 
-	private ServiceReference createUserServiceBundle(IMocksControl c) {
-		final ServiceReference sref = c.createMock(ServiceReference.class);
+    private ServiceReference createUserServiceBundle(IMocksControl c) {
+        final ServiceReference sref = c.createMock(ServiceReference.class);
         EasyMock.expect(sref.getProperty(EasyMock.same(RemoteConstants.SERVICE_EXPORTED_INTERFACES)))
             .andReturn("*").anyTimes();
         Bundle srefBundle = c.createMock(Bundle.class);
         EasyMock.expect(sref.getBundle()).andReturn(srefBundle).atLeastOnce();
         EasyMock.expect(srefBundle.getSymbolicName()).andReturn("serviceBundleName").atLeastOnce();
-		return sref;
-	}
+        return sref;
+    }
 
 }

Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Tue May 21 21:24:28 2013
@@ -70,6 +70,9 @@
         <felix.plugin.version>2.3.4</felix.plugin.version>
         <exam.version>2.6.0</exam.version>
         <jdom.version>1.1.2_1</jdom.version>
+        
+        <cxf.resources.base.path />
+        <cxf.checkstyle.extension />
     </properties>
 
     <dependencyManagement>
@@ -272,6 +275,74 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.9.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf.build-utils</groupId>
+                        <artifactId>cxf-buildtools</artifactId>
+                        <version>${cxf.build-utils.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <configuration>
+                            <configLocation>${cxf.resources.base.path}cxf-checkstyle${cxf.checkstyle.extension}.xml</configLocation>
+                            <consoleOutput>true</consoleOutput>
+                            <failsOnError>true</failsOnError>
+                            <linkXRef>false</linkXRef>
+                            <suppressionsLocation>${cxf.resources.base.path}cxf-checkstyle-suppressions.xml</suppressionsLocation>
+                            <sourceDirectory>${basedir}/src</sourceDirectory>
+                            <excludes>**/archetype-resources/**/*.java</excludes>
+                        </configuration>
+                        <goals>
+                            <goal>checkstyle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.7.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.cxf.build-utils</groupId>
+                        <artifactId>cxf-buildtools</artifactId>
+                        <version>${cxf.build-utils.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <rulesets>
+                        <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
+                        <ruleset>${cxf.resources.base.path}cxf-pmd-custom.xml</ruleset>
+                    </rulesets>
+                    <sourceEncoding>UTF-8</sourceEncoding>
+                    <targetJdk>1.6</targetJdk>
+                    <linkXRef>false</linkXRef>
+                    <includeTests>true</includeTests>
+                    <verbose>true</verbose>
+                    <excludeRoots>
+                        <excludeRoot>${basedir}/src/main/generated</excludeRoot>
+                    </excludeRoots>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java Tue May 21 21:24:28 2013
@@ -32,74 +32,74 @@ import org.osgi.framework.ServiceReferen
 
 public class AbstractDosgiTest {
 
-	protected ServiceReference waitService(BundleContext bc, Class<?> cls,
-			String filter, int timeout) throws Exception {
-		ServiceReference[] refs = null;
-		for (int i = 0; i < timeout; i++) {
-			refs = bc.getServiceReferences(cls.getName(), filter);
-			if (refs != null && refs.length > 0) {
-				return refs[0];
-			}
-			System.out.println("Waiting for service: " + cls + filter);
-			Thread.sleep(1000);
-		}
-		throw new Exception("Service not found: " + cls + filter);
-	}
+    protected ServiceReference waitService(BundleContext bc, Class<?> cls, String filter, int timeout)
+        throws Exception {
+        ServiceReference[] refs = null;
+        for (int i = 0; i < timeout; i++) {
+            refs = bc.getServiceReferences(cls.getName(), filter);
+            if (refs != null && refs.length > 0) {
+                return refs[0];
+            }
+            System.out.println("Waiting for service: " + cls + filter);
+            Thread.sleep(1000);
+        }
+        throw new Exception("Service not found: " + cls + filter);
+    }
 
-	protected int getIntSysProperty(String key, int defaultValue) {
-		String valueSt = System.getProperty(key);
+    protected int getIntSysProperty(String key, int defaultValue) {
+        String valueSt = System.getProperty(key);
         int value = valueSt == null ? 0 : Integer.valueOf(valueSt);
         return (value > 0) ? value : defaultValue;
-	}
-	
-	protected void waitPort(int port) throws Exception {
-	    for (int i = 0; i < 20; i++) {
-	        Socket s = null;
-	        try {
-	            s = new Socket((String) null, port);
-	            // yep, its available
-	            return;
-	        } catch (IOException e) {
-	            // wait 
-	        } finally {
-	            if (s != null) {
-	                try {
-	                    s.close();
-	                } catch (IOException e) {
-	                    //ignore
-	                }
-	            }
-	        }
-	        System.out.println("Waiting for server to appear on port: " + port);
-	        Thread.sleep(1000);            
-	    }
-	    throw new TimeoutException();
-	}
-
-	protected GreeterService createGreeterServiceProxy(String serviceUri) {
-		ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
-		factory.setServiceClass(GreeterService.class);
-		factory.setAddress(serviceUri);
-		factory.getServiceFactory().setDataBinding(new AegisDatabinding());
-		return (GreeterService)factory.create();
-	}
-
-	protected Bundle getBundleByName(BundleContext bc, String sn) {
-	    for (Bundle bundle : bc.getBundles()) {
-	        if (bundle.getSymbolicName().equals(sn)) {
-	            return bundle;
-	        }
-	    }
-	    return null;
-	}
-
-	protected int getFreePort() throws IOException {
-	    ServerSocket socket = new ServerSocket(0);
-	    try {
-	        return socket.getLocalPort();
-	    } finally {
-	        socket.close();
-	    }
-	}
+    }
+
+    protected void waitPort(int port) throws Exception {
+        for (int i = 0; i < 20; i++) {
+            Socket s = null;
+            try {
+                s = new Socket((String)null, port);
+                // yep, its available
+                return;
+            } catch (IOException e) {
+                // wait
+            } finally {
+                if (s != null) {
+                    try {
+                        s.close();
+                    } catch (IOException e) {
+                        // ignore
+                    }
+                }
+            }
+            System.out.println("Waiting for server to appear on port: " + port);
+            Thread.sleep(1000);
+        }
+        throw new TimeoutException();
+    }
+
+    protected GreeterService createGreeterServiceProxy(String serviceUri) {
+        ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
+        factory.setServiceClass(GreeterService.class);
+        factory.setAddress(serviceUri);
+        factory.getServiceFactory().setDataBinding(new AegisDatabinding());
+        return (GreeterService)factory.create();
+    }
+
+    protected Bundle getBundleByName(BundleContext bc, String sn) {
+        for (Bundle bundle : bc.getBundles()) {
+            if (bundle.getSymbolicName().equals(sn)) {
+                return bundle;
+            }
+        }
+        return null;
+    }
+
+    protected int getFreePort() throws IOException {
+        ServerSocket socket = new ServerSocket(0);
+        try {
+            return socket.getLocalPort();
+        } finally {
+            socket.close();
+        }
+    }
 
 }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestCustomIntent.java Tue May 21 21:24:28 2013
@@ -18,12 +18,6 @@
  */
 package org.apache.cxf.dosgi.systests2.multi;
 
-import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.streamBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
 import java.io.InputStream;
 import java.util.Map;
 
@@ -48,6 +42,12 @@ import org.ops4j.pax.swissbox.tinybundle
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 
+import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.streamBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
 
 @RunWith(JUnit4TestRunner.class)
 public class TestCustomIntent extends AbstractDosgiTest {

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java Tue May 21 21:24:28 2013
@@ -52,9 +52,10 @@ import static org.ops4j.pax.exam.CoreOpt
 @RunWith(JUnit4TestRunner.class)
 public class TestDiscoveryExport extends AbstractDosgiTest {
 
-    private static final String GREETER_ZOOKEEPER_NODE = "/osgi/service_registry/org/apache/cxf/dosgi/samples/greeter/GreeterService/localhost#9090##greeter";
+    private static final String GREETER_ZOOKEEPER_NODE 
+        = "/osgi/service_registry/org/apache/cxf/dosgi/samples/greeter/GreeterService/localhost#9090##greeter";
 
-	@Inject
+    @Inject
     BundleContext bundleContext;
 
     @Inject
@@ -120,10 +121,10 @@ public class TestDiscoveryExport extends
             .build(TinyBundles.withBnd());
     }
 
-    protected void configureZookeeper(ConfigurationAdmin configAdmin, int zkPort) throws IOException {
+    protected void configureZookeeper(ConfigurationAdmin ca, int zkPort) throws IOException {
         System.out.println("*** Port for Zookeeper Server: " + zkPort);
-        updateZkServerConfig(zkPort, configAdmin);                            
-        updateZkClientConfig(zkPort, configAdmin);
+        updateZkServerConfig(zkPort, ca);                            
+        updateZkClientConfig(zkPort, ca);
     }
     
     protected void updateZkClientConfig(final int zkPort, ConfigurationAdmin cadmin) throws IOException {

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportRestService.java Tue May 21 21:24:28 2013
@@ -18,11 +18,6 @@
  */
 package org.apache.cxf.dosgi.systests2.multi;
 
-
-import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
 import javax.inject.Inject;
 
 import org.junit.Test;
@@ -32,6 +27,10 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.BundleContext;
 
+import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
 @RunWith(JUnit4TestRunner.class)
 public class TestExportRestService extends AbstractDosgiTest {
     @Inject

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java Tue May 21 21:24:28 2013
@@ -27,6 +27,10 @@ import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
 import org.apache.cxf.dosgi.samples.greeter.GreeterData;
 import org.apache.cxf.dosgi.samples.greeter.GreeterException;
 import org.apache.cxf.dosgi.samples.greeter.GreeterService;
@@ -39,15 +43,11 @@ import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.BundleContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
 
 import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
-
 @RunWith(JUnit4TestRunner.class)
 public class TestExportService extends AbstractDosgiTest {
     @Inject
@@ -56,57 +56,53 @@ public class TestExportService extends A
     @Configuration
     public static Option[] configure() throws Exception {
         return new Option[] {
-                MultiBundleTools.getDistroWithDiscovery(),
-                systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
-                mavenBundle().groupId("org.apache.servicemix.bundles")
-                    .artifactId("org.apache.servicemix.bundles.junit").version("4.9_2"),
-                mavenBundle().groupId("org.apache.cxf.dosgi.samples")
-                    .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
-                mavenBundle().groupId("org.apache.cxf.dosgi.samples")
-                    .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
-                mavenBundle().groupId("org.apache.cxf.dosgi.systests")
-                    .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
-                frameworkStartLevel(100)
-        };
+                             MultiBundleTools.getDistroWithDiscovery(),
+                             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+                             mavenBundle().groupId("org.apache.servicemix.bundles")
+                                 .artifactId("org.apache.servicemix.bundles.junit").version("4.9_2"),
+                             mavenBundle().groupId("org.apache.cxf.dosgi.samples")
+                                 .artifactId("cxf-dosgi-ri-samples-greeter-interface").versionAsInProject(),
+                             mavenBundle().groupId("org.apache.cxf.dosgi.samples")
+                                 .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
+                             mavenBundle().groupId("org.apache.cxf.dosgi.systests")
+                                 .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
+                             frameworkStartLevel(100)};
     }
 
-    
     @Test
     public void testAccessEndpoint() throws Exception {
         waitPort(9090);
 
         checkWsdl(new URL("http://localhost:9090/greeter?wsdl"));
-        
+
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        Thread.currentThread().setContextClassLoader(ClientProxyFactoryBean.class.getClassLoader());        
+        Thread.currentThread().setContextClassLoader(ClientProxyFactoryBean.class.getClassLoader());
         try {
             checkServiceCall("http://localhost:9090/greeter");
         } finally {
-            Thread.currentThread().setContextClassLoader(cl);            
-        } 
+            Thread.currentThread().setContextClassLoader(cl);
+        }
     }
 
-	private void checkServiceCall(String serviceUri) {
-		GreeterService client = createGreeterServiceProxy(serviceUri);
+    private void checkServiceCall(String serviceUri) {
+        GreeterService client = createGreeterServiceProxy(serviceUri);
+
+        Map<GreetingPhrase, String> greetings = client.greetMe("Fred");
+        Assert.assertEquals("Fred", greetings.get(new GreetingPhrase("Hello")));
+        System.out.println("Invocation result: " + greetings);
 
-		Map<GreetingPhrase, String> greetings = client.greetMe("Fred");
-		Assert.assertEquals("Fred", greetings.get(new GreetingPhrase("Hello")));
-		System.out.println("Invocation result: " + greetings);
-
-		try {
-		    GreeterData gd = new GreeterDataImpl("Stranger", 11, true);
-		    client.greetMe(gd);
-		    Assert.fail("GreeterException has to be thrown");
-		} catch (GreeterException ex) {
-		    Assert.assertEquals("Wrong exception message", 
-		                 "GreeterService can not greet Stranger", 
-		                 ex.toString());
-		}
-	}
-
-	private void checkWsdl(URL wsdlURL) throws ParserConfigurationException,
-			SAXException, IOException {
-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        try {
+            GreeterData gd = new GreeterDataImpl("Stranger", 11, true);
+            client.greetMe(gd);
+            Assert.fail("GreeterException has to be thrown");
+        } catch (GreeterException ex) {
+            Assert.assertEquals("Wrong exception message", "GreeterService can not greet Stranger",
+                                ex.toString());
+        }
+    }
+
+    private void checkWsdl(URL wsdlURL) throws ParserConfigurationException, SAXException, IOException {
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         dbf.setValidating(false);
         DocumentBuilder db = dbf.newDocumentBuilder();
@@ -115,7 +111,7 @@ public class TestExportService extends A
         Assert.assertEquals("definitions", el.getLocalName());
         Assert.assertEquals("http://schemas.xmlsoap.org/wsdl/", el.getNamespaceURI());
         Assert.assertEquals("GreeterService", el.getAttribute("name"));
-	}
+    }
 
     class GreeterDataImpl implements GreeterData {
         private String name;
@@ -127,7 +123,7 @@ public class TestExportService extends A
             age = a;
             exception = ex;
         }
-        
+
         public String getName() {
             return name;
         }
@@ -138,6 +134,6 @@ public class TestExportService extends A
 
         public boolean isException() {
             return exception;
-        }                
+        }
     }
 }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=1484967&r1=1484966&r2=1484967&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Tue May 21 21:24:28 2013
@@ -18,12 +18,6 @@
  */
 package org.apache.cxf.dosgi.systests2.multi;
 
-
-import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
 import java.io.InputStream;
 import java.util.Dictionary;
 import java.util.HashMap;
@@ -54,6 +48,12 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 
+import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+
 @RunWith(JUnit4TestRunner.class)
 public class TestImportService extends AbstractDosgiTest {
     @Inject



Mime
View raw message