You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by am...@apache.org on 2013/06/05 02:40:58 UTC
svn commit: r1489675 [1/7] - in /cxf/dosgi/trunk: ./ discovery/
discovery/distributed/ discovery/distributed/cxf-discovery/
discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/
discovery/distributed/cxf-discovery/...
Author: amichai
Date: Wed Jun 5 00:40:54 2013
New Revision: 1489675
URL: http://svn.apache.org/r1489675
Log:
Standardize whitespace style
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryPlugin.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManager.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListener.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryDriverTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerImplTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/FindInZooKeeperCustomizerTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManagerTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java
cxf/dosgi/trunk/discovery/distributed/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/Activator.java
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarter.java
cxf/dosgi/trunk/discovery/distributed/zookeeper-server/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/server/ZookeeperStarterTest.java
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryUtils.java
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryUtilsTest.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/ActivatorTest.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
cxf/dosgi/trunk/discovery/local/src/test/resources/ed1.xml
cxf/dosgi/trunk/discovery/local/src/test/resources/ed2-generated.xml
cxf/dosgi/trunk/discovery/local/src/test/resources/ed2.xml
cxf/dosgi/trunk/discovery/local/src/test/resources/ed3.xml
cxf/dosgi/trunk/discovery/local/src/test/resources/ed4.xml
cxf/dosgi/trunk/discovery/pom.xml
cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/LICENSE.vm
cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE
cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README
cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/release_notes.txt
cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
cxf/dosgi/trunk/distribution/pom.xml
cxf/dosgi/trunk/distribution/sources/src/main/release/LICENSE
cxf/dosgi/trunk/distribution/sources/src/main/release/README
cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt
cxf/dosgi/trunk/distribution/subsystem/pom.xml
cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/subsystem-assembly.xml
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/Constants.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRule.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/decorator/Rule.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecorator.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImpl.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigTypeHandlerFactory.java
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/ExportResult.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceManager.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/JaxRSUtils.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/LocalHostUtil.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/SecurityDelegatingHttpContext.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandler.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/qos/DefaultIntentMapFactory.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentManager.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentManagerImpl.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentMap.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentTracker.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUnsatisfiedException.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/ClientServiceFactory.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventAdminHelper.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/ExportReferenceImpl.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/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminInstance.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceadminFactory.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/ClassUtils.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/main/java/org/apache/cxf/dosgi/dsw/util/Utils.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/TestUtils.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/decorator/InterfaceRuleTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/decorator/ServiceDecoratorImplTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.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/HttpServiceManagerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.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/handlers/SecurityDelegatingHttpContextTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandlerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/jaxws/MyJaxWsEchoServiceImpl.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/simple/MySimpleEchoServiceImpl.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfFindListenerHookTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/CxfPublishHookTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/ServiceHookUtilsTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/hooks/TestService.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentManagerImplTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentTrackerTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentUtilsTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/DistributionProviderImplTest.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/ImportRegistrationImplTest.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-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/ClassUtilsTest.java
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/Activator.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/main/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerManager.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImpl.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ServiceInterestListener.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminLifeCycleListener.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminTracker.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/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerImplTest.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImplTest.java
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java
cxf/dosgi/trunk/dsw/pom.xml
cxf/dosgi/trunk/felix/pom.xml
cxf/dosgi/trunk/felix/profiles/pom.xml
cxf/dosgi/trunk/felix/shell.tui/pom.xml
cxf/dosgi/trunk/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java
cxf/dosgi/trunk/parent/pom.xml
cxf/dosgi/trunk/pom.xml
cxf/dosgi/trunk/samples/discovery/client/pom.xml
cxf/dosgi/trunk/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
cxf/dosgi/trunk/samples/discovery/impl/pom.xml
cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java
cxf/dosgi/trunk/samples/discovery/interface/pom.xml
cxf/dosgi/trunk/samples/discovery/pom.xml
cxf/dosgi/trunk/samples/ds/client/pom.xml
cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java
cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/AdderConsumer.java
cxf/dosgi/trunk/samples/ds/impl/pom.xml
cxf/dosgi/trunk/samples/ds/impl/src/main/java/org/apache/cxf/dosgi/samples/ds/impl/AdderServiceImpl.java
cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml
cxf/dosgi/trunk/samples/ds/interface/pom.xml
cxf/dosgi/trunk/samples/ds/pom.xml
cxf/dosgi/trunk/samples/greeter/client/pom.xml
cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDataImpl.java
cxf/dosgi/trunk/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java
cxf/dosgi/trunk/samples/greeter/impl/pom.xml
cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/Activator.java
cxf/dosgi/trunk/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java
cxf/dosgi/trunk/samples/greeter/interface/pom.xml
cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterException.java
cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreeterService.java
cxf/dosgi/trunk/samples/greeter/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/GreetingPhrase.java
cxf/dosgi/trunk/samples/greeter/pom.xml
cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml
cxf/dosgi/trunk/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml
cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/Activator.java
cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl.java
cxf/dosgi/trunk/samples/greeter_rest/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/rest/GreeterServiceImpl2.java
cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml
cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/Activator.java
cxf/dosgi/trunk/samples/greeter_rest/impl2/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl2/rest/GreeterServiceImpl2.java
cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml
cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterException.java
cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterInfo.java
cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService.java
cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreeterService2.java
cxf/dosgi/trunk/samples/greeter_rest/interface/src/main/java/org/apache/cxf/dosgi/samples/greeter/rest/GreetingPhrase.java
cxf/dosgi/trunk/samples/greeter_rest/pom.xml
cxf/dosgi/trunk/samples/pom.xml
cxf/dosgi/trunk/samples/security_filter/pom.xml
cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/Activator.java
cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SampleSecurityFilter.java
cxf/dosgi/trunk/samples/security_filter/src/main/java/org/apache/cxf/dosgi/samples/security/SecureRestEndpoint.java
cxf/dosgi/trunk/samples/spring_dm/client/pom.xml
cxf/dosgi/trunk/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java
cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml
cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml
cxf/dosgi/trunk/samples/spring_dm/impl/src/main/java/org/apache/cxf/dosgi/samples/springdm/impl/DinnerServiceImpl.java
cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml
cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml
cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java
cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/Restaurant.java
cxf/dosgi/trunk/samples/spring_dm/pom.xml
cxf/dosgi/trunk/systests2/common/pom.xml
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/GreeterDataImpl.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyActivator.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/Test2Service.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/ClientActivator.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/ServerActivator.java
cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/server/Test2ServiceImpl.java
cxf/dosgi/trunk/systests2/multi-bundle/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/MultiBundleTools.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
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/AddGreetingPhraseInterceptor.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomFeature.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/CustomIntentActivator.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/EmptyGreeterService.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/customintent/service/GreeterServiceWithCustomIntentActivator.java
cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/log4j.properties
cxf/dosgi/trunk/systests2/pom.xml
cxf/dosgi/trunk/tck/apply-to-tck.sh.template
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Wed Jun 5 00:40:54 2013
@@ -64,7 +64,7 @@
</exclusion>
</exclusions>
</dependency>
-
+
<!-- We need the newer log4j as the one from zookeeper has some ugly dependencies -->
<dependency>
<groupId>log4j</groupId>
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java Wed Jun 5 00:40:54 2013
@@ -27,6 +27,7 @@ import org.osgi.framework.Constants;
import org.osgi.service.cm.ManagedService;
public class Activator implements BundleActivator {
+
private ZooKeeperDiscovery zkd;
public synchronized void start(BundleContext bc) throws Exception {
@@ -39,5 +40,4 @@ public class Activator implements Bundle
public synchronized void stop(BundleContext bc) throws Exception {
zkd.stop();
}
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryPlugin.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryPlugin.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryPlugin.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryPlugin.java Wed Jun 5 00:40:54 2013
@@ -29,13 +29,14 @@ import java.util.Map;
* lookup process. <p/>
*
* DiscoveryPlugins use the OSGi WhiteBoard pattern. To add one to the system, register an instance under this interface
- * with the OSGi Service Registry. All registered DiscoveryPlugin instances are visited and given a chance to
+ * with the OSGi Service Registry. All registered DiscoveryPlugin instances are visited and given a chance to
* process the information before it is pushed into ZooKeeper. <p/>
*
* Note that the changes made using this plugin do not modify the local service registration.
*
*/
public interface DiscoveryPlugin {
+
/**
* Process service registration information. Plugins can change this information before it is published into the
* ZooKeeper discovery system.
@@ -43,10 +44,10 @@ public interface DiscoveryPlugin {
* @param mutableProperties A map of service registration properties. The map is mutable and any changes to the map
* will be reflected in the ZooKeeper registration.
* @param endpointKey The key under which the service is registered in ZooKeeper. This key typically has the
- * following format: hostname#port##context. While the actual value of this key is not actually used by the
+ * following format: hostname#port##context. While the actual value of this key is not actually used by the
* system (people can use it as a hint to understand where the service is located), the value <i>must</i> be
* unique for all services of a given type.
- * @return The <tt>endpointKey</tt> value to be used. If there is no need to change this simply return the value
+ * @return The <tt>endpointKey</tt> value to be used. If there is no need to change this simply return the value
* of the <tt>endpointKey</tt> parameter.
*/
String process(Map<String, Object> mutableProperties, String endpointKey);
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java Wed Jun 5 00:40:54 2013
@@ -27,10 +27,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Tracks interest in EndpointListeners. Delegates to InterfaceMonitorManager to manage
+ * Tracks interest in EndpointListeners. Delegates to InterfaceMonitorManager to manage
* interest in the scopes of each EndpointListener.
*/
public class EndpointListenerTrackerCustomizer implements ServiceTrackerCustomizer {
+
private static final Logger LOG = LoggerFactory.getLogger(EndpointListenerTrackerCustomizer.class);
private static final Pattern OBJECTCLASS_PATTERN = Pattern.compile(".*\\(objectClass=([^)]+)\\).*");
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java Wed Jun 5 00:40:54 2013
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
* notification to other EndpointListeners with a matching scope).
*/
public class InterfaceMonitor implements Watcher, StatCallback {
+
private static final Logger LOG = LoggerFactory.getLogger(InterfaceMonitor.class);
private final String znode;
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManager.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManager.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManager.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManager.java Wed Jun 5 00:40:54 2013
@@ -44,8 +44,9 @@ import org.slf4j.LoggerFactory;
* These events are then forwarded to all interested EndpointListeners
*/
public class InterfaceMonitorManager {
+
private static final Logger LOG = LoggerFactory.getLogger(InterfaceMonitorManager.class);
-
+
private final ZooKeeper zooKeeper;
private final Map<ServiceReference, List<String> /* scopes of the epl */> handledEndpointListeners
= new HashMap<ServiceReference, List<String>>();
@@ -56,7 +57,7 @@ public class InterfaceMonitorManager {
List<ServiceReference> relatedServiceListeners = new CopyOnWriteArrayList<ServiceReference>();
InterfaceMonitor im;
}
-
+
public InterfaceMonitorManager(BundleContext bctx, ZooKeeper zooKeeper) {
this.bctx = bctx;
this.zooKeeper = zooKeeper;
@@ -88,7 +89,7 @@ public class InterfaceMonitorManager {
handledScopes.add(scope);
}
}
-
+
/**
* Only for test case!
*/
@@ -102,14 +103,15 @@ public class InterfaceMonitorManager {
protected synchronized Map<ServiceReference, List<String>> getHandledEndpointListeners() {
return handledEndpointListeners;
}
-
+
private InterfaceMonitor createInterfaceMonitor(final String scope, String objClass, final Interest interest) {
// holding this object's lock in the callbacks can lead to a deadlock with InterfaceMonitor
EndpointListener epListener = new EndpointListener() {
+
public void endpointRemoved(EndpointDescription endpoint, String matchedFilter) {
notifyListeners(endpoint, scope, false, interest.relatedServiceListeners);
}
-
+
public void endpointAdded(EndpointDescription endpoint, String matchedFilter) {
notifyListeners(endpoint, scope, true, interest.relatedServiceListeners);
}
@@ -135,7 +137,7 @@ public class InterfaceMonitorManager {
}
handledEndpointListeners.remove(sref);
}
-
+
private void notifyListeners(EndpointDescription epd, String currentScope, boolean isAdded,
List<ServiceReference> relatedServiceListeners) {
for (ServiceReference sref : relatedServiceListeners) {
@@ -165,7 +167,7 @@ public class InterfaceMonitorManager {
}
}
}
-
+
private static boolean matches(String scope, EndpointDescription epd) {
try {
Filter f = FrameworkUtil.createFilter(scope);
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListener.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListener.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListener.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListener.java Wed Jun 5 00:40:54 2013
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
* Listens for local Endpoints and publishes them to Zookeeper
*/
public class PublishingEndpointListener implements EndpointListener {
+
private static final Logger LOG = LoggerFactory.getLogger(PublishingEndpointListener.class);
private final ZooKeeper zookeeper;
@@ -76,7 +77,6 @@ public class PublishingEndpointListener
LOG.error("Exception while processing the addition of an endpoint.", ex);
}
}
-
}
private void addEndpoint(EndpointDescription endpoint) throws URISyntaxException, KeeperException,
@@ -122,7 +122,6 @@ public class PublishingEndpointListener
LOG.error("Exception while processing the removal of an endpoint", ex);
}
}
-
}
private void removeEndpoint(EndpointDescription endpoint) throws UnknownHostException, URISyntaxException {
@@ -143,7 +142,6 @@ public class PublishingEndpointListener
private static void ensurePath(String path, ZooKeeper zk) throws KeeperException, InterruptedException {
StringBuilder current = new StringBuilder();
-
String[] parts = Util.removeEmpty(path.split("/"));
for (String part : parts) {
current.append('/');
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java Wed Jun 5 00:40:54 2013
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
* Creates local EndpointListeners that publish to Zookeeper.
*/
public class PublishingEndpointListenerFactory implements ServiceFactory {
+
public static final String DISCOVERY_ZOOKEEPER_ID = "org.apache.cxf.dosgi.discovery.zookeeper";
private static final Logger LOG = LoggerFactory.getLogger(PublishingEndpointListenerFactory.class);
@@ -71,7 +72,7 @@ public class PublishingEndpointListenerF
public synchronized void start() {
Dictionary<String, String> props = new Hashtable<String, String>();
- props.put(EndpointListener.ENDPOINT_LISTENER_SCOPE,
+ props.put(EndpointListener.ENDPOINT_LISTENER_SCOPE,
"(&(" + Constants.OBJECTCLASS + "=*)(" + RemoteConstants.ENDPOINT_FRAMEWORK_UUID
+ "=" + Util.getUUID(bctx) + "))");
props.put(DISCOVERY_ZOOKEEPER_ID, "true");
@@ -100,5 +101,4 @@ public class PublishingEndpointListenerF
return listeners;
}
}
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java Wed Jun 5 00:40:54 2013
@@ -103,5 +103,4 @@ public final class Util {
return uuid;
}
}
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryDriverTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryDriverTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryDriverTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryDriverTest.java Wed Jun 5 00:40:54 2013
@@ -21,15 +21,15 @@ package org.apache.cxf.dosgi.discovery.z
import junit.framework.TestCase;
public class DiscoveryDriverTest extends TestCase {
-
+
public void testDUMMY() {
assertTrue(true);
}
-
+
// public void testDiscoveryDriver() throws Exception {
// BundleContext bc = getDefaultBundleContext();
// Dictionary<String, String> props = getDefaultProps();
-//
+//
// final StringBuilder sb = new StringBuilder();
// DiscoveryDriver dd = new DiscoveryDriver(bc, props) {
// @Override
@@ -38,17 +38,17 @@ public class DiscoveryDriverTest extends
// ZooKeeper zk = EasyMock.createMock(ZooKeeper.class);
// EasyMock.replay(zk);
// return zk;
-// }
+// }
// };
// EasyMock.verify(bc);
// assertEquals("somehost:1910", sb.toString());
-//
+//
// EasyMock.verify(dd.zooKeeper);
// EasyMock.reset(dd.zooKeeper);
// dd.zooKeeper.close();
// EasyMock.expectLastCall();
// EasyMock.replay(dd.zooKeeper);
-//
+//
// ServiceTracker st1 = EasyMock.createMock(ServiceTracker.class);
// st1.close();
// EasyMock.expectLastCall();
@@ -57,35 +57,35 @@ public class DiscoveryDriverTest extends
// st2.close();
// EasyMock.expectLastCall();
// EasyMock.replay(st2);
-//
+//
// dd.lookupTracker = st1;
// dd.publicationTracker = st2;
-//
-// dd.destroy();
+//
+// dd.destroy();
// }
//
// private void expectServiceTrackerCalls(BundleContext bc, String objectClass)
// throws InvalidSyntaxException {
// Filter filter = EasyMock.createNiceMock(Filter.class);
// EasyMock.replay(filter);
-//
+//
// EasyMock.expect(bc.createFilter("(objectClass=" + objectClass + ")"))
// .andReturn(filter).anyTimes();
-// bc.addServiceListener((ServiceListener) EasyMock.anyObject(),
+// bc.addServiceListener((ServiceListener) EasyMock.anyObject(),
// EasyMock.eq("(objectClass=" + objectClass + ")"));
// EasyMock.expectLastCall().anyTimes();
// EasyMock.expect(bc.getServiceReferences(objectClass, null))
// .andReturn(new ServiceReference [0]).anyTimes();
// }
-//
+//
// public void testProcessEvent() throws Exception {
// DiscoveryDriver db = new DiscoveryDriver(getDefaultBundleContext(), getDefaultProps()) {
// @Override
// ZooKeeper createZooKeeper() throws IOException {
// return null;
-// }
+// }
// };
-//
+//
// FindInZooKeeperCustomizer fc = new FindInZooKeeperCustomizer(null, null);
// List<InterfaceMonitor> l1 = new ArrayList<InterfaceMonitor>();
// InterfaceMonitor dm1a = EasyMock.createMock(InterfaceMonitor.class);
@@ -98,7 +98,7 @@ public class DiscoveryDriverTest extends
// EasyMock.replay(dm1b);
// l1.add(dm1a);
// l1.add(dm1b);
-//
+//
// List<InterfaceMonitor> l2 = new ArrayList<InterfaceMonitor>();
// InterfaceMonitor dm2 = EasyMock.createMock(InterfaceMonitor.class);
// dm2.process();
@@ -108,10 +108,10 @@ public class DiscoveryDriverTest extends
//
// fc.watchers.put(EasyMock.createMock(DiscoveredServiceTracker.class), l1);
// fc.watchers.put(EasyMock.createMock(DiscoveredServiceTracker.class), l2);
-//
+//
// db.finderCustomizer = fc;
// db.process(null);
-//
+//
// EasyMock.verify(dm1a);
// EasyMock.verify(dm1b);
// EasyMock.verify(dm2);
@@ -132,5 +132,4 @@ public class DiscoveryDriverTest extends
// props.put("zookeeper.timeout", "1500");
// return props;
// }
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java Wed Jun 5 00:40:54 2013
@@ -38,55 +38,47 @@ public class EndpointListenerFactoryTest
BundleContext ctx = c.createMock(BundleContext.class);
ZooKeeper zk = c.createMock(ZooKeeper.class);
ServiceRegistration sreg = c.createMock(ServiceRegistration.class);
-
+
PublishingEndpointListenerFactory eplf = new PublishingEndpointListenerFactory(zk, ctx);
- EasyMock.expect(
- ctx.registerService(EasyMock.eq(EndpointListener.class.getName()), EasyMock.eq(eplf),
+ EasyMock.expect(ctx.registerService(EasyMock.eq(EndpointListener.class.getName()), EasyMock.eq(eplf),
(Dictionary<String, String>)EasyMock.anyObject())).andReturn(sreg).once();
-
- EasyMock.expect(ctx.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("myUUID")
- .anyTimes();
-
+
+ EasyMock.expect(ctx.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("myUUID").anyTimes();
+
c.replay();
eplf.start();
c.verify();
-
+
c.reset();
sreg.unregister();
EasyMock.expectLastCall().once();
c.replay();
eplf.stop();
c.verify();
-
-
}
public void testServiceFactory() {
IMocksControl c = EasyMock.createNiceControl();
-
+
BundleContext ctx = c.createMock(BundleContext.class);
ZooKeeper zk = c.createMock(ZooKeeper.class);
ServiceRegistration sreg = c.createMock(ServiceRegistration.class);
-
+
PublishingEndpointListenerFactory eplf = new PublishingEndpointListenerFactory(zk, ctx);
- EasyMock.expect(
- ctx.registerService(EasyMock.eq(EndpointListener.class.getName()), EasyMock.eq(eplf),
+ EasyMock.expect(ctx.registerService(EasyMock.eq(EndpointListener.class.getName()), EasyMock.eq(eplf),
(Dictionary<String, String>)EasyMock.anyObject())).andReturn(sreg).once();
-
- EasyMock.expect(ctx.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("myUUID")
- .anyTimes();
+ EasyMock.expect(ctx.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("myUUID").anyTimes();
PublishingEndpointListener eli = c.createMock(PublishingEndpointListener.class);
eli.close();
EasyMock.expectLastCall().once();
-
+
c.replay();
eplf.start();
-
-
+
Object service = eplf.getService(null, null);
assertNotNull(service);
assertTrue(service instanceof EndpointListener);
@@ -94,18 +86,17 @@ public class EndpointListenerFactoryTest
List<PublishingEndpointListener> listeners = eplf.getListeners();
assertEquals(1, listeners.size());
assertEquals(service, listeners.get(0));
-
+
eplf.ungetService(null, null, service);
listeners = eplf.getListeners();
assertEquals(0, listeners.size());
-
- eplf.ungetService(null, null, eli); // no call to close
+
+ eplf.ungetService(null, null, eli); // no call to close
listeners.add(eli);
eplf.ungetService(null, null, eli); // call to close
listeners = eplf.getListeners();
assertEquals(0, listeners.size());
-
+
c.verify();
}
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerImplTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerImplTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerImplTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerImplTest.java Wed Jun 5 00:40:54 2013
@@ -44,17 +44,15 @@ import org.osgi.service.remoteserviceadm
public class EndpointListenerImplTest extends TestCase {
public void testEndpointRemovalAdding() throws KeeperException, InterruptedException {
-
IMocksControl c = EasyMock.createNiceControl();
BundleContext ctx = c.createMock(BundleContext.class);
ZooKeeper zk = c.createMock(ZooKeeper.class);
String path = "/osgi/service_registry/myClass/google.de#80##test";
- EasyMock.expect(
- zk.create(EasyMock.eq(path),
- (byte[])EasyMock.anyObject(), EasyMock.eq(Ids.OPEN_ACL_UNSAFE), EasyMock
- .eq(CreateMode.EPHEMERAL))).andReturn("").once();
+ EasyMock.expect(zk.create(EasyMock.eq(path),
+ (byte[])EasyMock.anyObject(), EasyMock.eq(Ids.OPEN_ACL_UNSAFE),
+ EasyMock.eq(CreateMode.EPHEMERAL))).andReturn("").once();
zk.delete(EasyMock.eq("/osgi/service_registry/myClass/google.de#80##test"), EasyMock.eq(-1));
EasyMock.expectLastCall().once();
@@ -73,13 +71,12 @@ public class EndpointListenerImplTest ex
EndpointDescription ed = new EndpointDescription(props);
eli.endpointAdded(ed, null);
- eli.endpointAdded(ed, null); // should do nothing
+ eli.endpointAdded(ed, null); // should do nothing
eli.endpointRemoved(ed, null);
eli.endpointRemoved(ed, null); // should do nothing
c.verify();
-
}
public void testDiscoveryPlugin() throws Exception {
@@ -110,8 +107,8 @@ public class EndpointListenerImplTest ex
EasyMock.eq("(objectClass=org.apache.cxf.dosgi.discovery.zookeeper.DiscoveryPlugin)"));
EasyMock.expect(ctx.getService(sr1)).andReturn(plugin1).anyTimes();
EasyMock.expect(ctx.getService(sr2)).andReturn(plugin2).anyTimes();
- EasyMock.expect(ctx.getServiceReferences(DiscoveryPlugin.class.getName(), null)).andReturn(
- new ServiceReference[] {sr1, sr2}).anyTimes();
+ EasyMock.expect(ctx.getServiceReferences(DiscoveryPlugin.class.getName(), null))
+ .andReturn(new ServiceReference[]{sr1, sr2}).anyTimes();
EasyMock.replay(ctx);
Map<String, Object> props = new HashMap<String, Object>();
@@ -144,7 +141,6 @@ public class EndpointListenerImplTest ex
EasyMock.verify(zk);
}
-
@SuppressWarnings("unchecked")
private List<EndpointDescription> getEndpointsList(PublishingEndpointListener eli) throws Exception {
Field field = eli.getClass().getDeclaredField("endpoints");
@@ -153,17 +149,15 @@ public class EndpointListenerImplTest ex
}
public void testClose() throws KeeperException, InterruptedException {
-
IMocksControl c = EasyMock.createNiceControl();
BundleContext ctx = c.createMock(BundleContext.class);
ZooKeeper zk = c.createMock(ZooKeeper.class);
String path = "/osgi/service_registry/myClass/google.de#80##test";
- EasyMock.expect(
- zk.create(EasyMock.eq(path),
- (byte[])EasyMock.anyObject(), EasyMock.eq(Ids.OPEN_ACL_UNSAFE), EasyMock
- .eq(CreateMode.EPHEMERAL))).andReturn("").once();
+ EasyMock.expect(zk.create(EasyMock.eq(path),
+ (byte[])EasyMock.anyObject(), EasyMock.eq(Ids.OPEN_ACL_UNSAFE),
+ EasyMock.eq(CreateMode.EPHEMERAL))).andReturn("").once();
zk.delete(EasyMock.eq("/osgi/service_registry/myClass/google.de#80##test"), EasyMock.eq(-1));
EasyMock.expectLastCall().once();
@@ -186,13 +180,10 @@ public class EndpointListenerImplTest ex
eli.close(); // should result in zk.delete(...)
c.verify();
-
}
-
public void testGetKey() throws Exception {
assertEquals("somehost#9090##org#example#TestEndpoint",
PublishingEndpointListener.getKey("http://somehost:9090/org/example/TestEndpoint"));
}
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/FindInZooKeeperCustomizerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/FindInZooKeeperCustomizerTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/FindInZooKeeperCustomizerTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/FindInZooKeeperCustomizerTest.java Wed Jun 5 00:40:54 2013
@@ -21,56 +21,56 @@ package org.apache.cxf.dosgi.discovery.z
import junit.framework.TestCase;
public class FindInZooKeeperCustomizerTest extends TestCase {
-
+
public void testDUMMY() {
assertTrue(true);
}
-
+
// public void testAddingServiceInterface() {
// DiscoveredServiceTracker dst = new DiscoveredServiceTracker() {
// public void serviceChanged(DiscoveredServiceNotification dsn) {}
// };
-//
+//
// ServiceReference sr = EasyMock.createMock(ServiceReference.class);
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA)).
-// andReturn(Collections.singleton(String.class.getName()));
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA)).
-// andReturn(null);
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA))
+// .andReturn(Collections.singleton(String.class.getName()));
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA))
+// .andReturn(null);
// EasyMock.replay(sr);
-//
+//
// DiscoveredServiceTracker dst2 = new DiscoveredServiceTracker() {
// public void serviceChanged(DiscoveredServiceNotification dsn) {}
// };
-//
+//
// ServiceReference sr2 = EasyMock.createMock(ServiceReference.class);
-// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA)).
-// andReturn(Arrays.asList(Integer.class.getName(), Comparable.class.getName()));
-// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA)).
-// andReturn(null);
+// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA))
+// .andReturn(Arrays.asList(Integer.class.getName(), Comparable.class.getName()));
+// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA))
+// .andReturn(null);
// EasyMock.replay(sr2);
-//
+//
// BundleContext bc = EasyMock.createMock(BundleContext.class);
// EasyMock.expect(bc.getService(sr)).andReturn(dst);
// EasyMock.expect(bc.getService(sr2)).andReturn(dst2);
// EasyMock.replay(bc);
-//
+//
// ZooKeeper zk = EasyMock.createMock(ZooKeeper.class);
// zkExpectExists(zk, String.class.getName());
// zkExpectExists(zk, Integer.class.getName());
// zkExpectExists(zk, Comparable.class.getName());
// EasyMock.expectLastCall();
// EasyMock.replay(zk);
-//
+//
// FindInZooKeeperCustomizer fc = new FindInZooKeeperCustomizer(bc, zk);
//
// // ---------------------------------------------------------------
// // Test the addingService APIs
// // ---------------------------------------------------------------
-//
+//
// assertEquals("Precondition failed", 0, fc.watchers.size());
// fc.addingService(sr);
// assertEquals(1, fc.watchers.size());
-//
+//
// DiscoveredServiceTracker key = fc.watchers.keySet().iterator().next();
// assertSame(dst, key);
// List<InterfaceMonitor> dmList = fc.watchers.get(key);
@@ -78,27 +78,27 @@ public class FindInZooKeeperCustomizerTe
// InterfaceMonitor dm = dmList.iterator().next();
// assertNotNull(dm.listener);
// assertSame(zk, dm.zookeeper);
-// assertEquals(Util.getZooKeeperPath(String.class.getName()), dm.znode);
+// assertEquals(Util.getZooKeeperPath(String.class.getName()), dm.znode);
//
// assertEquals("Precondition failed", 1, fc.watchers.size());
// fc.addingService(sr2);
// assertEquals(2, fc.watchers.size());
-//
+//
// assertTrue(fc.watchers.containsKey(dst));
// assertTrue(fc.watchers.containsKey(dst2));
// assertEquals(dmList, fc.watchers.get(dst));
// List<InterfaceMonitor> dmList2 = fc.watchers.get(dst2);
// assertEquals(2, dmList2.size());
-//
+//
// Set<String> actual = new HashSet<String>();
// for (InterfaceMonitor im : dmList2) {
// actual.add(im.znode);
// }
// Set<String> expected = new HashSet<String>(Arrays.asList(
-// Util.getZooKeeperPath(Integer.class.getName()),
+// Util.getZooKeeperPath(Integer.class.getName()),
// Util.getZooKeeperPath(Comparable.class.getName())));
// assertEquals(expected, actual);
-//
+//
// EasyMock.verify(zk);
//
// // ---------------------------------------------------------------
@@ -107,18 +107,18 @@ public class FindInZooKeeperCustomizerTe
// EasyMock.reset(zk);
// zkExpectExists(zk, List.class.getName());
// EasyMock.replay(zk);
-//
+//
// EasyMock.reset(sr);
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA)).
-// andReturn(Collections.singleton(List.class.getName()));
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA)).
-// andReturn(null);
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA))
+// .andReturn(Collections.singleton(List.class.getName()));
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA))
+// .andReturn(null);
// EasyMock.replay(sr);
-//
+//
// assertEquals("Precondition failed", 2, fc.watchers.size());
// fc.modifiedService(sr, dst);
// assertEquals("Precondition failed", 2, fc.watchers.size());
-//
+//
// assertTrue(fc.watchers.containsKey(dst));
// assertTrue(fc.watchers.containsKey(dst2));
// assertEquals(dmList2, fc.watchers.get(dst2));
@@ -126,72 +126,72 @@ public class FindInZooKeeperCustomizerTe
// assertEquals(1, dmList3.size());
// assertEquals(Util.getZooKeeperPath(List.class.getName()), dmList3.iterator().next().znode);
//
-// EasyMock.verify(zk);
+// EasyMock.verify(zk);
//
// // ---------------------------------------------------------------
// // Test the removedService APIs
// // ---------------------------------------------------------------
// EasyMock.reset(zk);
// EasyMock.replay(zk);
-//
+//
// assertEquals("Precondition failed", 2, fc.watchers.size());
// fc.removedService(sr2, dst2);
// assertEquals("Precondition failed", 1, fc.watchers.size());
-//
+//
// assertEquals(dmList3, fc.watchers.get(dst));
// assertNull(fc.watchers.get(dst2));
-//
-// EasyMock.verify(zk);
+//
+// EasyMock.verify(zk);
// }
//
// public void testAddingServiceFilter() {
// DiscoveredServiceTracker dst = new DiscoveredServiceTracker() {
// public void serviceChanged(DiscoveredServiceNotification dsn) {}
// };
-//
+//
// ServiceReference sr = EasyMock.createMock(ServiceReference.class);
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA)).
-// andReturn(null);
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA))
+// .andReturn(null);
// Set<String> stringFilter = Collections.singleton("(objectClass=java.lang.String)");
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA)).
-// andReturn(stringFilter);
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA))
+// .andReturn(stringFilter);
// EasyMock.replay(sr);
-//
+//
// DiscoveredServiceTracker dst2 = new DiscoveredServiceTracker() {
// public void serviceChanged(DiscoveredServiceNotification dsn) {}
// };
-//
+//
// ServiceReference sr2 = EasyMock.createMock(ServiceReference.class);
-// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA)).
-// andReturn(null);
-// List<String> combinedFilter =
-// Arrays.asList("(objectClass=java.lang.Integer)","(objectClass=java.lang.Comparable)");
-// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA)).
-// andReturn(combinedFilter);
+// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA))
+// .andReturn(null);
+// List<String> combinedFilter =
+// Arrays.asList("(objectClass=java.lang.Integer)", "(objectClass=java.lang.Comparable)");
+// EasyMock.expect(sr2.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA))
+// .andReturn(combinedFilter);
// EasyMock.replay(sr2);
-//
+//
// BundleContext bc = EasyMock.createMock(BundleContext.class);
// EasyMock.expect(bc.getService(sr)).andReturn(dst);
// EasyMock.expect(bc.getService(sr2)).andReturn(dst2);
// EasyMock.replay(bc);
-//
+//
// ZooKeeper zk = EasyMock.createMock(ZooKeeper.class);
// zkExpectExists(zk, String.class.getName());
// zkExpectExists(zk, Integer.class.getName());
// zkExpectExists(zk, Comparable.class.getName());
// EasyMock.expectLastCall();
// EasyMock.replay(zk);
-//
+//
// FindInZooKeeperCustomizer fc = new FindInZooKeeperCustomizer(bc, zk);
//
// // ---------------------------------------------------------------
// // Test the addingService APIs
// // ---------------------------------------------------------------
-//
+//
// assertEquals("Precondition failed", 0, fc.watchers.size());
// fc.addingService(sr);
// assertEquals(1, fc.watchers.size());
-//
+//
// DiscoveredServiceTracker key = fc.watchers.keySet().iterator().next();
// assertSame(dst, key);
// List<InterfaceMonitor> dmList = fc.watchers.get(key);
@@ -199,12 +199,12 @@ public class FindInZooKeeperCustomizerTe
// InterfaceMonitor dm = dmList.iterator().next();
// assertNotNull(dm.listener);
// assertSame(zk, dm.zookeeper);
-// assertEquals(Util.getZooKeeperPath(String.class.getName()), dm.znode);
+// assertEquals(Util.getZooKeeperPath(String.class.getName()), dm.znode);
//
// assertEquals("Precondition failed", 1, fc.watchers.size());
// fc.addingService(sr2);
// assertEquals(2, fc.watchers.size());
-//
+//
// assertTrue(fc.watchers.containsKey(dst));
// assertTrue(fc.watchers.containsKey(dst2));
// assertEquals(dmList, fc.watchers.get(dst));
@@ -215,10 +215,10 @@ public class FindInZooKeeperCustomizerTe
// actual.add(im.znode);
// }
// Set<String> expected = new HashSet<String>(Arrays.asList(
-// Util.getZooKeeperPath(Integer.class.getName()),
+// Util.getZooKeeperPath(Integer.class.getName()),
// Util.getZooKeeperPath(Comparable.class.getName())));
// assertEquals(expected, actual);
-//
+//
// EasyMock.verify(zk);
//
// // ---------------------------------------------------------------
@@ -227,19 +227,19 @@ public class FindInZooKeeperCustomizerTe
// EasyMock.reset(zk);
// zkExpectExists(zk, List.class.getName());
// EasyMock.replay(zk);
-//
+//
// EasyMock.reset(sr);
// Set<String> listFilter = Collections.singleton("(objectClass=java.util.List)");
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA)).
-// andReturn(null);
-// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA)).
-// andReturn(listFilter);
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.INTERFACE_MATCH_CRITERIA))
+// .andReturn(null);
+// EasyMock.expect(sr.getProperty(DiscoveredServiceTracker.FILTER_MATCH_CRITERIA))
+// .andReturn(listFilter);
// EasyMock.replay(sr);
-//
+//
// assertEquals("Precondition failed", 2, fc.watchers.size());
// fc.modifiedService(sr, dst);
// assertEquals("Precondition failed", 2, fc.watchers.size());
-//
+//
// assertTrue(fc.watchers.containsKey(dst));
// assertTrue(fc.watchers.containsKey(dst2));
// assertEquals(dmList2, fc.watchers.get(dst2));
@@ -247,55 +247,55 @@ public class FindInZooKeeperCustomizerTe
// assertEquals(1, dmList3.size());
// assertEquals(Util.getZooKeeperPath(List.class.getName()), dmList3.iterator().next().znode);
//
-// EasyMock.verify(zk);
+// EasyMock.verify(zk);
//
// // ---------------------------------------------------------------
// // Test the removedService APIs
// // ---------------------------------------------------------------
// EasyMock.reset(zk);
// EasyMock.replay(zk);
-//
+//
// assertEquals("Precondition failed", 2, fc.watchers.size());
// fc.removedService(sr2, dst2);
// assertEquals("Precondition failed", 1, fc.watchers.size());
-//
+//
// assertEquals(dmList3, fc.watchers.get(dst));
// assertNull(fc.watchers.get(dst2));
-//
-// EasyMock.verify(zk);
+//
+// EasyMock.verify(zk);
// }
-//
+//
// public void testGetInterfacesFromFilter() {
// testGetInterfacesFromFilter("objectClass=org.apache_2.Some$FunnyClass",
// "org.apache_2.Some$FunnyClass");
-// testGetInterfacesFromFilter("(&(a=b)(objectClass = org.acme.Q)",
+// testGetInterfacesFromFilter("(&(a=b)(objectClass = org.acme.Q)",
// "org.acme.Q");
-// testGetInterfacesFromFilter("(&(objectClassIdentifier=b)(objectClass = org.acme.Q)",
+// testGetInterfacesFromFilter("(&(objectClassIdentifier=b)(objectClass = org.acme.Q)",
// "org.acme.Q");
-// testGetInterfacesFromFilter("(|(OBJECTCLASS= X )(objectclass = Y)",
+// testGetInterfacesFromFilter("(|(OBJECTCLASS= X )(objectclass = Y)",
// "X", "Y");
-// testGetInterfacesFromFilter(new String [] {"(objectClass=X)", "(objectClass=Y)"},
+// testGetInterfacesFromFilter(new String[] {"(objectClass=X)", "(objectClass=Y)"},
// "X", "Y");
// }
//
// private void testGetInterfacesFromFilter(String filter, String ... interfaces) {
-// testGetInterfacesFromFilter(new String [] {filter}, interfaces);
+// testGetInterfacesFromFilter(new String[] {filter}, interfaces);
// }
-//
-// private void testGetInterfacesFromFilter(String [] filters, String ... interfaces) {
+//
+// private void testGetInterfacesFromFilter(String[] filters, String ... interfaces) {
// FindInZooKeeperCustomizer.getInterfacesFromFilter(Arrays.asList(filters));
// }
//
// private void zkExpectExists(ZooKeeper zk, String className) {
-// zk.exists(EasyMock.eq(Util.getZooKeeperPath(className)),
-// (Watcher) EasyMock.anyObject(),
+// zk.exists(EasyMock.eq(Util.getZooKeeperPath(className)),
+// (Watcher) EasyMock.anyObject(),
// (StatCallback) EasyMock.anyObject(), EasyMock.isNull());
// EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
// public Object answer() throws Throwable {
// assertEquals(EasyMock.getCurrentArguments()[1],
// EasyMock.getCurrentArguments()[2]);
// return null;
-// }
+// }
// });
// }
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImplTest.java Wed Jun 5 00:40:54 2013
@@ -21,28 +21,28 @@ package org.apache.cxf.dosgi.discovery.z
import junit.framework.TestCase;
public class InterfaceDataMonitorListenerImplTest extends TestCase {
-
+
public void testDUMMY() {
assertTrue(true);
}
-
+
// public void testChange() throws Exception {
// final List<DiscoveredServiceNotification> dsnCallbacks = new ArrayList<DiscoveredServiceNotification>();
// DiscoveredServiceTracker dst = new DiscoveredServiceTracker() {
// public void serviceChanged(DiscoveredServiceNotification dsn) {
// dsnCallbacks.add(dsn);
-// }
+// }
// };
-//
+//
// //----------------------------------------------------------------
// // Test DiscoveredServiceNotification.AVAILABLE
// //----------------------------------------------------------------
// Properties initial = new Properties();
-// initial.put("a", "b");
+// initial.put("a", "b");
// initial.put(ServicePublication.ENDPOINT_LOCATION, "http://somehost:12345/some/context");
// ByteArrayOutputStream propBytes = new ByteArrayOutputStream();
// initial.store(propBytes, "");
-//
+//
// ZooKeeper zk = EasyMock.createMock(ZooKeeper.class);
// EasyMock.expect(zk.getChildren(Util.getZooKeeperPath(String.class.getName()), false))
// .andReturn(Arrays.asList("x#y#z"));
@@ -51,7 +51,7 @@ public class InterfaceDataMonitorListene
// EasyMock.replay(zk);
//
// InterfaceDataMonitorListenerImpl dml = new InterfaceDataMonitorListenerImpl(zk, String.class.getName(), dst);
-//
+//
// assertEquals("Precondition failed", 0, dsnCallbacks.size());
// dml.change();
// assertEquals(1, dsnCallbacks.size());
@@ -60,16 +60,16 @@ public class InterfaceDataMonitorListene
// assertEquals(DiscoveredServiceNotification.AVAILABLE, dsn.getType());
// assertEquals(0, dsn.getFilters().size());
// ServiceEndpointDescription sed = dsn.getServiceEndpointDescription();
-// assertEquals(Collections.singleton(String.class.getName()), sed.getProvidedInterfaces());
-//
+// assertEquals(Collections.singleton(String.class.getName()), sed.getProvidedInterfaces());
+//
// Properties expected = new Properties();
// expected.load(new ByteArrayInputStream(propBytes.toByteArray()));
// expected.put("service.exported.configs", "org.apache.cxf.ws");
// expected.put("org.apache.cxf.ws.address", "http://somehost:12345/some/context");
-//
+//
// assertEquals(expected, sed.getProperties());
// EasyMock.verify(zk);
-//
+//
// // Again with the same data
// EasyMock.reset(zk);
// EasyMock.expect(zk.getChildren(Util.getZooKeeperPath(String.class.getName()), false))
@@ -82,7 +82,7 @@ public class InterfaceDataMonitorListene
// assertEquals("Precondition failed", 0, dsnCallbacks.size());
// dml.change();
// assertEquals(0, dsnCallbacks.size());
-//
+//
// EasyMock.verify(zk);
// //----------------------------------------------------------------
// // Test DiscoveredServiceNotification.MODIFIED
@@ -93,7 +93,7 @@ public class InterfaceDataMonitorListene
// modified.put("service.exported.configs", "org.apache.cxf.rs");
// ByteArrayOutputStream modBytes = new ByteArrayOutputStream();
// modified.store(modBytes, "");
-//
+//
// EasyMock.reset(zk);
// EasyMock.expect(zk.getChildren(Util.getZooKeeperPath(String.class.getName()), false))
// .andReturn(Arrays.asList("x#y#z"));
@@ -110,9 +110,9 @@ public class InterfaceDataMonitorListene
// assertEquals(DiscoveredServiceNotification.MODIFIED, dsn2.getType());
// assertEquals(0, dsn2.getFilters().size());
// ServiceEndpointDescription sed2 = dsn2.getServiceEndpointDescription();
-// assertEquals(Collections.singleton(String.class.getName()), sed2.getProvidedInterfaces());
+// assertEquals(Collections.singleton(String.class.getName()), sed2.getProvidedInterfaces());
// assertEquals(modified, sed2.getProperties());
-//
+//
// EasyMock.verify(zk);
//
// //----------------------------------------------------------------
@@ -125,7 +125,7 @@ public class InterfaceDataMonitorListene
// modified2.put("org.apache.cxf.ws.address", "http://somewhereelse/123");
// ByteArrayOutputStream modBytes2 = new ByteArrayOutputStream();
// modified2.store(modBytes2, "");
-//
+//
// EasyMock.reset(zk);
// EasyMock.expect(zk.getChildren(Util.getZooKeeperPath(String.class.getName()), false))
// .andReturn(Arrays.asList("x#y#z"));
@@ -142,9 +142,9 @@ public class InterfaceDataMonitorListene
// assertEquals(DiscoveredServiceNotification.MODIFIED, dsn3.getType());
// assertEquals(0, dsn3.getFilters().size());
// ServiceEndpointDescription sed3 = dsn3.getServiceEndpointDescription();
-// assertEquals(Collections.singleton(String.class.getName()), sed3.getProvidedInterfaces());
+// assertEquals(Collections.singleton(String.class.getName()), sed3.getProvidedInterfaces());
// assertEquals(modified2, sed3.getProperties());
-//
+//
// EasyMock.verify(zk);
// //----------------------------------------------------------------
// // Test DiscoveredServiceNotification.UNAVAILABLE
@@ -163,11 +163,11 @@ public class InterfaceDataMonitorListene
// assertEquals(DiscoveredServiceNotification.UNAVAILABLE, dsn4.getType());
// assertEquals(0, dsn4.getFilters().size());
// ServiceEndpointDescription sed4 = dsn4.getServiceEndpointDescription();
-// assertEquals(Collections.singleton(String.class.getName()), sed4.getProvidedInterfaces());
+// assertEquals(Collections.singleton(String.class.getName()), sed4.getProvidedInterfaces());
// assertEquals(modified2, sed4.getProperties());
-//
+//
// EasyMock.verify(zk);
-//
+//
// // Try the same again...
// EasyMock.reset(zk);
// EasyMock.expect(zk.getChildren(Util.getZooKeeperPath(String.class.getName()), false))
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManagerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManagerTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManagerTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorManagerTest.java Wed Jun 5 00:40:54 2013
@@ -34,49 +34,47 @@ import org.osgi.framework.ServiceReferen
import static org.junit.Assert.assertEquals;
public class InterfaceMonitorManagerTest {
-
+
@Test
public void testEndpointListenerTrackerCustomizer() {
-
IMocksControl c = EasyMock.createNiceControl();
-
+
BundleContext ctx = c.createMock(BundleContext.class);
ZooKeeper zk = c.createMock(ZooKeeper.class);
-
+
ServiceReference sref = c.createMock(ServiceReference.class);
ServiceReference sref2 = c.createMock(ServiceReference.class);
-
+
final Map<String, ?> p = new HashMap<String, Object>();
-
+
EasyMock.expect(sref.getPropertyKeys()).andAnswer(new IAnswer<String[]>() {
public String[] answer() throws Throwable {
return p.keySet().toArray(new String[p.size()]);
}
}).anyTimes();
-
+
EasyMock.expect(sref.getProperty((String)EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
String key = (String)(EasyMock.getCurrentArguments()[0]);
return p.get(key);
}
}).anyTimes();
-
+
EasyMock.expect(sref2.getPropertyKeys()).andAnswer(new IAnswer<String[]>() {
public String[] answer() throws Throwable {
return p.keySet().toArray(new String[p.size()]);
}
}).anyTimes();
-
+
EasyMock.expect(sref2.getProperty((String)EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
public Object answer() throws Throwable {
String key = (String)(EasyMock.getCurrentArguments()[0]);
return p.get(key);
}
}).anyTimes();
-
-
+
final List<IMocksControl> controls = new ArrayList<IMocksControl>();
-
+
InterfaceMonitorManager eltc = new InterfaceMonitorManager(ctx, zk) {
protected InterfaceMonitor createInterfaceMonitor(String scope, String objClass, Interest interest) {
IMocksControl lc = EasyMock.createNiceControl();
@@ -90,64 +88,61 @@ public class InterfaceMonitorManagerTest
return im;
}
};
-
+
c.replay();
-
+
// sref has no scope -> nothing should happen
-
+
assertEquals(0, eltc.getHandledEndpointListeners().size());
assertEquals(0, eltc.getInterestingScopes().size());
-
+
//p.put(EndpointListener.ENDPOINT_LISTENER_SCOPE, );
-
- eltc.addInterest(sref, "(objectClass=mine)", "mine");
-
+
+ eltc.addInterest(sref, "(objectClass=mine)", "mine");
+
assertEquals(1, eltc.getHandledEndpointListeners().size());
assertEquals(1, eltc.getHandledEndpointListeners().get(sref).size());
assertEquals("(objectClass=mine)", eltc.getHandledEndpointListeners().get(sref).get(0));
assertEquals(1, eltc.getInterestingScopes().size());
-
-
+
eltc.addInterest(sref, "(objectClass=mine)", "mine");
-
+
assertEquals(1, eltc.getHandledEndpointListeners().size());
assertEquals(1, eltc.getHandledEndpointListeners().get(sref).size());
assertEquals("(objectClass=mine)", eltc.getHandledEndpointListeners().get(sref).get(0));
assertEquals(1, eltc.getInterestingScopes().size());
-
+
eltc.addInterest(sref2, "(objectClass=mine)", "mine");
-
+
assertEquals(2, eltc.getHandledEndpointListeners().size());
assertEquals(1, eltc.getHandledEndpointListeners().get(sref).size());
assertEquals(1, eltc.getHandledEndpointListeners().get(sref2).size());
assertEquals("(objectClass=mine)", eltc.getHandledEndpointListeners().get(sref).get(0));
assertEquals("(objectClass=mine)", eltc.getHandledEndpointListeners().get(sref2).get(0));
assertEquals(1, eltc.getInterestingScopes().size());
-
-
+
eltc.removeInterest(sref);
-
+
assertEquals(1, eltc.getHandledEndpointListeners().size());
assertEquals(1, eltc.getHandledEndpointListeners().get(sref2).size());
assertEquals("(objectClass=mine)", eltc.getHandledEndpointListeners().get(sref2).get(0));
assertEquals(1, eltc.getInterestingScopes().size());
-
+
eltc.removeInterest(sref);
-
+
assertEquals(1, eltc.getHandledEndpointListeners().size());
assertEquals(1, eltc.getHandledEndpointListeners().get(sref2).size());
assertEquals("(objectClass=mine)", eltc.getHandledEndpointListeners().get(sref2).get(0));
assertEquals(1, eltc.getInterestingScopes().size());
-
+
eltc.removeInterest(sref2);
-
+
assertEquals(0, eltc.getHandledEndpointListeners().size());
assertEquals(0, eltc.getInterestingScopes().size());
-
+
c.verify();
for (IMocksControl control : controls) {
control.verify();
}
}
-
}
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitorTest.java Wed Jun 5 00:40:54 2013
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.dosgi.discovery.zookeeper;
-
import java.util.Collections;
import junit.framework.TestCase;
@@ -39,7 +38,6 @@ import static org.easymock.EasyMock.expe
public class InterfaceMonitorTest extends TestCase {
public void testInterfaceMonitor() throws KeeperException, InterruptedException {
-
IMocksControl c = EasyMock.createControl();
ZooKeeper zk = c.createMock(ZooKeeper.class);
Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java Wed Jun 5 00:40:54 2013
@@ -30,9 +30,9 @@ import org.osgi.service.remoteserviceadm
public class UtilTest extends TestCase {
public void testGetZooKeeperPath() {
- assertEquals(Util.PATH_PREFIX + '/' + "org/example/Test",
+ assertEquals(Util.PATH_PREFIX + '/' + "org/example/Test",
Util.getZooKeeperPath("org.example.Test"));
-
+
// used for the recursive discovery
assertEquals(Util.PATH_PREFIX, Util.getZooKeeperPath(null));
assertEquals(Util.PATH_PREFIX, Util.getZooKeeperPath(""));
@@ -43,11 +43,11 @@ public class UtilTest extends TestCase {
String[] out = Util.getStringPlusProperty("MyString");
assertEquals(1, out.length);
assertEquals("MyString", out[0]);
-
+
out = Util.getStringPlusProperty(new String[]{"MyString"});
assertEquals(1, out.length);
assertEquals("MyString", out[0]);
-
+
out = Util.getStringPlusProperty(Arrays.asList("MyString"));
assertEquals(1, out.length);
assertEquals("MyString", out[0]);
@@ -89,23 +89,22 @@ public class UtilTest extends TestCase {
assertEquals("hi", out[0]);
assertEquals("bye", out[1]);
}
-
+
public void testGetScopes() {
IMocksControl c = EasyMock.createNiceControl();
-
+
String[] scopes = new String[]{"myScope=test", ""};
-
+
ServiceReference sref = c.createMock(ServiceReference.class);
EasyMock.expect(sref.getProperty(EasyMock.eq(EndpointListener.ENDPOINT_LISTENER_SCOPE)))
.andReturn(scopes).anyTimes();
-
+
c.replay();
-
+
String[] ret = Util.getScopes(sref);
-
+
c.verify();
assertEquals(1, ret.length);
assertEquals(scopes[0], ret[0]);
-
}
}
Modified: cxf/dosgi/trunk/discovery/distributed/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/pom.xml Wed Jun 5 00:40:54 2013
@@ -38,5 +38,5 @@
<module>zookeeper-server</module>
<module>zookeeper-server-config</module>
<module>cxf-discovery</module>
- </modules>
+ </modules>
</project>
Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml Wed Jun 5 00:40:54 2013
@@ -37,14 +37,14 @@
<properties>
<topDirectoryLocation>../../..</topDirectoryLocation>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
@@ -54,12 +54,12 @@
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -77,7 +77,7 @@
<Export-Package />
</instructions>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java Wed Jun 5 00:40:54 2013
@@ -34,6 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Activator implements BundleActivator {
+
private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
private static final String ZOOKEEPER_PORT = "org.apache.cxf.dosgi.discovery.zookeeper.port";
private static final String PID = "org.apache.cxf.dosgi.discovery.zookeeper.server";
@@ -48,7 +49,7 @@ public class Activator implements Bundle
LOG.info("Global zookeeper port: {}", port);
}
}
-
+
st = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null) {
@Override
public Object addingService(ServiceReference reference) {
@@ -67,12 +68,12 @@ public class Activator implements Bundle
}
}
return svc;
- }
+ }
};
st.open();
-
+
// The following section is done synchronously otherwise it doesn't happen in time for the CT
- ServiceReference[] refs = context.getServiceReferences(ManagedService.class.getName(),
+ ServiceReference[] refs = context.getServiceReferences(ManagedService.class.getName(),
"(service.pid=org.apache.cxf.dosgi.discovery.zookeeper)");
if (refs == null || refs.length == 0) {
throw new RuntimeException("This bundle must be started after the bundle with the Zookeeper "
@@ -93,7 +94,7 @@ public class Activator implements Bundle
}
LOG.debug("Passed the zookeeper.host property to the Zookeeper Client managed service.");
}
-
+
private String getFreePort() {
try {
ServerSocket ss = new ServerSocket(0);
@@ -104,8 +105,8 @@ public class Activator implements Bundle
LOG.error("Failed to find a free port!", e);
return null;
}
- }
-
+ }
+
public void stop(BundleContext context) throws Exception {
st.close();
}