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 [5/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/...
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -40,6 +40,7 @@ import org.osgi.service.remoteserviceadm
import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent;
public class EventProducerTest {
+
@Test
public void testPublishNotification() throws Exception {
RemoteServiceAdminCore remoteServiceAdminCore = EasyMock.createNiceMock(RemoteServiceAdminCore.class);
@@ -106,8 +107,8 @@ public class EventProducerTest {
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.getBundle()).andReturn(bundle).anyTimes();
- EasyMock.expect(bc.getAllServiceReferences(EventAdmin.class.getName(), null)).
- andReturn(new ServiceReference[] {eaSref}).anyTimes();
+ EasyMock.expect(bc.getAllServiceReferences(EventAdmin.class.getName(), null))
+ .andReturn(new ServiceReference[] {eaSref}).anyTimes();
EasyMock.expect(bc.getService(eaSref)).andReturn(ea).anyTimes();
EasyMock.replay(bc);
EventProducer eventProducer = new EventProducer(bc);
@@ -149,7 +150,7 @@ 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"},
+ Assert.assertTrue(Arrays.equals(new String[] {"org.foo.Bar"},
(String[]) event.getProperty("objectClass")));
RemoteServiceAdminEvent rsae = (RemoteServiceAdminEvent) event.getProperty("event");
@@ -170,8 +171,8 @@ public class EventProducerTest {
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.getBundle()).andReturn(bundle).anyTimes();
- EasyMock.expect(bc.getAllServiceReferences(EventAdmin.class.getName(), null)).
- andReturn(new ServiceReference[] {eaSref}).anyTimes();
+ EasyMock.expect(bc.getAllServiceReferences(EventAdmin.class.getName(), null))
+ .andReturn(new ServiceReference[] {eaSref}).anyTimes();
EasyMock.expect(bc.getService(eaSref)).andReturn(ea).anyTimes();
EasyMock.replay(bc);
EventProducer eventProducer = new EventProducer(bc);
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java Wed Jun 5 00:40:54 2013
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.dosgi.dsw.service;
-
import org.easymock.IMocksControl;
import org.easymock.classextension.EasyMock;
import org.junit.Test;
@@ -34,161 +33,145 @@ public class ImportRegistrationImplTest
@Test
public void testException() {
-
IMocksControl c = EasyMock.createNiceControl();
Exception e = c.createMock(Exception.class);
c.replay();
-
+
ImportRegistrationImpl i = new ImportRegistrationImpl(e);
-
+
assertEquals(e, i.getException());
assertNull(i.getImportedEndpointDescription());
assertNull(i.getImportedService());
assertEquals(i, i.getParent());
}
-
+
@Test
public void testDefaultCtor() {
-
IMocksControl c = EasyMock.createNiceControl();
EndpointDescription ed = c.createMock(EndpointDescription.class);
RemoteServiceAdminCore rsac = c.createMock(RemoteServiceAdminCore.class);
-
-
+
c.replay();
-
+
ImportRegistrationImpl i = new ImportRegistrationImpl(ed, rsac);
-
+
assertNull(i.getException());
assertEquals(i, i.getParent());
assertEquals(ed, i.getImportedEndpointDescription());
-
}
-
@Test
public void testCloneAndClose() {
-
IMocksControl c = EasyMock.createControl();
EndpointDescription ed = c.createMock(EndpointDescription.class);
RemoteServiceAdminCore rsac = c.createMock(RemoteServiceAdminCore.class);
-
+
ServiceRegistration sr = c.createMock(ServiceRegistration.class);
ServiceReference sref = c.createMock(ServiceReference.class);
EasyMock.expect(sr.getReference()).andReturn(sref).anyTimes();
-
+
c.replay();
-
+
ImportRegistrationImpl i1 = new ImportRegistrationImpl(ed, rsac);
-
+
ImportRegistrationImpl i2 = new ImportRegistrationImpl(i1);
-
+
ImportRegistrationImpl i3 = new ImportRegistrationImpl(i2);
-
-
+
try {
- i2.setImportedServiceRegistration(sr);
+ i2.setImportedServiceRegistration(sr);
assertTrue("An exception should be thrown here !", false);
} catch (IllegalStateException e) {
// must be thrown here
}
-
+
i1.setImportedServiceRegistration(sr);
-
-
-
-
+
assertEquals(i1, i1.getParent());
assertEquals(i1, i2.getParent());
assertEquals(i1, i3.getParent());
-
+
assertEquals(ed, i1.getImportedEndpointDescription());
assertEquals(ed, i2.getImportedEndpointDescription());
assertEquals(ed, i3.getImportedEndpointDescription());
-
+
c.verify();
c.reset();
-
+
rsac.removeImportRegistration(EasyMock.eq(i3));
EasyMock.expectLastCall().once();
-
+
c.replay();
-
+
i3.close();
i3.close(); // shouldn't change anything
-
+
assertNull(i3.getImportedEndpointDescription());
-
-
+
c.verify();
c.reset();
-
+
rsac.removeImportRegistration(EasyMock.eq(i1));
EasyMock.expectLastCall().once();
-
+
c.replay();
-
-
+
i1.close();
-
+
c.verify();
c.reset();
-
+
rsac.removeImportRegistration(EasyMock.eq(i2));
EasyMock.expectLastCall().once();
-
+
sr.unregister();
EasyMock.expectLastCall().once();
-
+
c.replay();
-
+
i2.close();
c.verify();
-
-
}
-
+
@Test
public void testCloseAll() {
IMocksControl c = EasyMock.createControl();
EndpointDescription ed = c.createMock(EndpointDescription.class);
RemoteServiceAdminCore rsac = c.createMock(RemoteServiceAdminCore.class);
-
+
c.replay();
-
+
ImportRegistrationImpl i1 = new ImportRegistrationImpl(ed, rsac);
-
+
ImportRegistrationImpl i2 = new ImportRegistrationImpl(i1);
-
+
ImportRegistrationImpl i3 = new ImportRegistrationImpl(i2);
-
-
+
assertEquals(i1, i1.getParent());
assertEquals(i1, i2.getParent());
assertEquals(i1, i3.getParent());
-
+
c.verify();
c.reset();
-
+
rsac.removeImportRegistration(EasyMock.eq(i2));
EasyMock.expectLastCall().once();
-
+
c.replay();
-
+
i2.close();
c.verify();
c.reset();
-
+
rsac.removeImportRegistration(EasyMock.eq(i1));
EasyMock.expectLastCall().once();
rsac.removeImportRegistration(EasyMock.eq(i3));
EasyMock.expectLastCall().once();
-
+
c.replay();
i3.closeAll();
c.verify();
}
-
}
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -57,7 +57,6 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-
public class RemoteServiceAdminCoreTest {
@Test
@@ -75,7 +74,7 @@ public class RemoteServiceAdminCoreTest
EasyMock.expect(sref.getBundle()).andReturn(b).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("objectClass")).andReturn(new String[] {"a.b.C"}).anyTimes();
EasyMock.expect(sref.getProperty("service.exported.interfaces")).andReturn("*").anyTimes();
ConfigTypeHandlerFactory configTypeHandlerFactory = c.createMock(ConfigTypeHandlerFactory.class);
@@ -97,7 +96,6 @@ public class RemoteServiceAdminCoreTest
@Test
public void testImport() {
-
IMocksControl c = EasyMock.createNiceControl();
Bundle b = c.createMock(Bundle.class);
BundleContext bc = c.createMock(BundleContext.class);
@@ -125,7 +123,6 @@ public class RemoteServiceAdminCoreTest
protected void proxifyMatchingInterface(String interfaceName, ImportRegistrationImpl imReg,
ConfigurationTypeHandler handler,
BundleContext requestingContext) {
-
}
};
c.replay();
@@ -172,9 +169,9 @@ 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.expect(bc.getServiceReferences(EasyMock.<String>anyObject(),
EasyMock.<String>anyObject())).andReturn(null).anyTimes();
- EasyMock.expect(bc.getAllServiceReferences(EasyMock.<String>anyObject(),
+ EasyMock.expect(bc.getAllServiceReferences(EasyMock.<String>anyObject(),
EasyMock.<String>anyObject())).andReturn(null).anyTimes();
Bundle b = createDummyRsaBundle(bc);
@@ -203,7 +200,7 @@ public class RemoteServiceAdminCoreTest
ConfigurationTypeHandler handler = EasyMock.createNiceMock(ConfigurationTypeHandler.class);
EasyMock.expect(handler.createServer(sref,
bc,
- sref.getBundle().getBundleContext(),
+ sref.getBundle().getBundleContext(),
sProps, Runnable.class, svcObject)).andReturn(er).once();
EasyMock.replay(handler);
@@ -223,9 +220,9 @@ 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"},
+ assertTrue(Arrays.equals(new String[] {"java.lang.Runnable"},
(Object[]) edProps.get("objectClass")));
- assertTrue(Arrays.equals(new String[] {"org.apache.cxf.ws"},
+ 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
@@ -300,7 +297,7 @@ public class RemoteServiceAdminCoreTest
ExportResult er = new ExportResult(eProps, new TestException());
ConfigurationTypeHandler handler = EasyMock.createNiceMock(ConfigurationTypeHandler.class);
- EasyMock.expect(handler.createServer(sref, bc, sref.getBundle().getBundleContext(),
+ EasyMock.expect(handler.createServer(sref, bc, sref.getBundle().getBundleContext(),
sProps, Runnable.class, svcObject)).andReturn(er);
EasyMock.replay(handler);
@@ -342,7 +339,7 @@ public class RemoteServiceAdminCoreTest
ServiceReference sref = EasyMock.createNiceMock(ServiceReference.class);
EasyMock.expect(sref.getBundle()).andReturn(b).anyTimes();
- EasyMock.expect(sref.getPropertyKeys()).andReturn(sProps.keySet().toArray(new String [] {})).anyTimes();
+ EasyMock.expect(sref.getPropertyKeys()).andReturn(sProps.keySet().toArray(new String[] {})).anyTimes();
EasyMock.expect(sref.getProperty((String) EasyMock.anyObject())).andAnswer(new IAnswer<Object>() {
@Override
public Object answer() throws Throwable {
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -32,7 +32,6 @@ import static org.junit.Assert.assertArr
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-
public class UtilsTest {
@Test
@@ -45,7 +44,6 @@ public class UtilsTest {
@Test
public void testNormalizeStringPlus() {
-
String s1 = "s1";
String s2 = "s2";
String s3 = "s3";
@@ -66,12 +64,10 @@ public class UtilsTest {
}, Utils.normalizeStringPlus(s1));
assertArrayEquals(sa, Utils.normalizeStringPlus(sa));
assertArrayEquals(sa, Utils.normalizeStringPlus(sl));
-
}
@Test
public void testOverlayProperties() {
-
Map<String, Object> original = new HashMap<String, Object>();
original.put("MyProp", "my value");
@@ -167,7 +163,5 @@ public class UtilsTest {
}
}
assertEquals("newValue", copy.get("MyProp"));
-
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/ClassUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/ClassUtilsTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/ClassUtilsTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/ClassUtilsTest.java Wed Jun 5 00:40:54 2013
@@ -34,7 +34,7 @@ public class ClassUtilsTest extends Test
assertEquals(List.class, ClassUtils.getInterfaceClass(new ArrayList<String>(), "java.util.List"));
assertEquals(Collection.class, ClassUtils.getInterfaceClass(new ArrayList<String>(), "java.util.Collection"));
}
-
+
public void testGetInterfaceClassFromSubclass() {
assertEquals(Map.class, ClassUtils.getInterfaceClass(new MySubclassFour(), "java.util.Map"));
assertNull(ClassUtils.getInterfaceClass(new MySubclassFour(), "java.util.UnknownType"));
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java Wed Jun 5 00:40:54 2013
@@ -40,6 +40,7 @@ import org.osgi.service.remoteserviceadm
import org.osgi.service.remoteserviceadmin.RemoteConstants;
public class OsgiUtilsTest extends TestCase {
+
public void testMultiValuePropertyAsString() {
assertEquals(Collections.singleton("hi"),
OsgiUtils.getMultiValueProperty("hi"));
@@ -47,7 +48,7 @@ public class OsgiUtilsTest extends TestC
public void testMultiValuePropertyAsArray() {
assertEquals(Arrays.asList("a", "b"),
- OsgiUtils.getMultiValueProperty(new String [] {"a", "b"}));
+ OsgiUtils.getMultiValueProperty(new String[] {"a", "b"}));
}
public void testMultiValuePropertyAsCollection() {
@@ -173,12 +174,9 @@ public class OsgiUtilsTest extends TestC
public boolean isRemovalPending() {
return false;
}
-
}
-
public void testGetProperty() {
-
Map<String, Object> p = new HashMap<String, Object>();
p.put(RemoteConstants.ENDPOINT_ID, "http://google.de");
p.put("notAString", new Object());
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/Activator.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/Activator.java Wed Jun 5 00:40:54 2013
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Activator implements BundleActivator {
+
private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
private TopologyManagerExport topManager;
@@ -51,5 +52,4 @@ public class Activator implements Bundle
topManagerImport.stop();
rsaTracker.close();
}
-
}
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
* Tracks EndpointListeners and allows to notify them of endpoints.
*/
public class EndpointListenerNotifier {
+
private static final String ENDPOINT_LISTENER_FILTER =
"(&(" + Constants.OBJECTCLASS + "=" + EndpointListener.class.getName() + ")"
+ "(" + EndpointListener.ENDPOINT_LISTENER_SCOPE + "=*))";
@@ -71,11 +72,9 @@ public class EndpointListenerNotifier {
notifyListener(true, epListenerRef, endpointRepository.getAllEndpoints());
super.modifiedService(epListenerRef, service);
}
-
};
-
}
-
+
public void start() {
stEndpointListeners.open();
}
@@ -128,7 +127,7 @@ public class EndpointListenerNotifier {
}
}
}
-
+
static List<Filter> getFiltersFromEndpointListenerScope(ServiceReference sref, BundleContext bctx) {
List<Filter> filters = new ArrayList<Filter>();
try {
@@ -156,7 +155,7 @@ public class EndpointListenerNotifier {
}
return filters;
}
-
+
private List<Filter> getMatchingFilters(List<Filter> filters,
EndpointDescription endpoint) {
List<Filter> matchingFilters = new ArrayList<Filter>();
@@ -172,12 +171,12 @@ public class EndpointListenerNotifier {
}
return matchingFilters;
}
-
+
/**
* Retrieves an endpoint's properties as a Dictionary.
- *
+ *
* @param ep an endpoint description
- * @return endpoint properties (will never return null)
+ * @return endpoint properties (will never return null)
*/
private Dictionary<String, Object> getEndpointProperties(EndpointDescription ep) {
if (ep == null || ep.getProperties() == null) {
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -38,14 +38,15 @@ import org.slf4j.LoggerFactory;
* endpoints.
*/
class EndpointRepository {
+
private static final Logger LOG = LoggerFactory.getLogger(EndpointRepository.class);
- private final Map<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>> exportedServices
+ private final Map<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>> exportedServices
= new LinkedHashMap<ServiceReference, Map<RemoteServiceAdmin, Collection<EndpointDescription>>>();
/**
* Remove all services exported by the given rsa.
- *
+ *
* @param rsa the RemoteServiceAdmin to remove
* @return list of removed endpoints
*/
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -43,14 +43,14 @@ import org.slf4j.LoggerFactory;
/**
* Manages exported endpoints of DOSGi services and notifies EndpointListeners of changes.
- *
+ *
* <li> Tracks local RemoteServiceAdmin instances by using a ServiceTracker
* <li> Uses a ServiceListener to track local OSGi services
* <li> When a service is published that is supported by DOSGi the
* known RemoteServiceAdmins are instructed to export the service and
* the EndpointListeners are notified
* <li> When a service is unpublished the EndpointListeners are notified.
- * The endpoints are not closed as the ExportRegistration takes care of this
+ * The endpoints are not closed as the ExportRegistration takes care of this
*/
public class TopologyManagerExport {
@@ -80,6 +80,7 @@ public class TopologyManagerExport {
bctx = ctx;
this.remoteServiceAdminTracker = rsaTracker;
this.remoteServiceAdminTracker.addListener(new RemoteServiceAdminLifeCycleListener() {
+
public void added(RemoteServiceAdmin rsa) {
for (ServiceReference serviceRef : endpointRepo.getServicesToBeExportedFor(rsa)) {
triggerExport(serviceRef);
@@ -92,6 +93,7 @@ public class TopologyManagerExport {
}
});
serviceListener = new ServiceListener() {
+
public void serviceChanged(ServiceEvent event) {
ServiceReference sref = event.getServiceReference();
if (event.getType() == ServiceEvent.REGISTERED) {
@@ -107,7 +109,7 @@ public class TopologyManagerExport {
}
};
}
-
+
/**
* checks if a Service is intended to be exported
*/
@@ -126,7 +128,7 @@ public class TopologyManagerExport {
bctx.removeServiceListener(serviceListener);
epListenerNotifier.stop();
}
-
+
protected void triggerExport(final ServiceReference sref) {
execService.execute(new Runnable() {
public void run() {
@@ -139,15 +141,13 @@ public class TopologyManagerExport {
endpointRepo.addService(sref);
List<RemoteServiceAdmin> rsaList = remoteServiceAdminTracker.getList();
if (rsaList.isEmpty()) {
- LOG.error(
- "No RemoteServiceAdmin available! Unable to export service from bundle {}, interfaces: {}",
+ LOG.error("No RemoteServiceAdmin available! Unable to export service from bundle {}, interfaces: {}",
sref.getBundle().getSymbolicName(),
sref.getProperty(org.osgi.framework.Constants.OBJECTCLASS));
}
for (final RemoteServiceAdmin remoteServiceAdmin : rsaList) {
- LOG.info("TopologyManager: handling remoteServiceAdmin "
- + remoteServiceAdmin);
+ LOG.info("TopologyManager: handling remoteServiceAdmin " + remoteServiceAdmin);
if (endpointRepo.isAlreadyExportedForRsa(sref, remoteServiceAdmin)) {
// already handled by this remoteServiceAdmin
@@ -185,9 +185,9 @@ public class TopologyManagerExport {
*/
private EndpointDescription getExportedEndpoint(ExportRegistration exReg) {
ExportReference ref = (exReg == null) ? null : exReg.getExportReference();
- return (ref == null) ? null : ref.getExportedEndpoint();
+ return (ref == null) ? null : ref.getExportedEndpoint();
}
-
+
private void exportExistingServices() {
try {
// cast to String is necessary for compiling against OSGi core version >= 4.3
@@ -201,5 +201,4 @@ public class TopologyManagerExport {
LOG.error("Error in filter {}. This should not occur!", DOSGI_SERVICES);
}
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerManager.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerManager.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerManager.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerManager.java Wed Jun 5 00:40:54 2013
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
public class EndpointListenerManager {
private static final Logger LOG = LoggerFactory.getLogger(EndpointListenerManager.class);
-
+
private final BundleContext bctx;
private volatile ServiceRegistration serviceRegistration;
private final List<String> filters = new ArrayList<String>();
@@ -50,7 +50,7 @@ public class EndpointListenerManager {
serviceRegistration = bctx.registerService(EndpointListener.class.getName(), endpointListener,
getRegistrationProperties());
}
-
+
public void stop() {
if (serviceRegistration != null) {
serviceRegistration.unregister();
@@ -95,5 +95,4 @@ public class EndpointListenerManager {
serviceRegistration.setProperties(getRegistrationProperties());
}
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImpl.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImpl.java Wed Jun 5 00:40:54 2013
@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
* in services
*/
public class ListenerHookImpl implements ListenerHook {
+
private static final Logger LOG = LoggerFactory.getLogger(ListenerHookImpl.class);
private static final String CLASS_NAME_EXPRESSION = ".*\\(" + Constants.OBJECTCLASS
@@ -89,9 +90,7 @@ public class ListenerHookImpl implements
}
String exFilter = extendFilter(listenerInfo.getFilter(), bctx);
serviceInterestListener.addServiceInterest(exFilter);
-
}
-
}
@SuppressWarnings("rawtypes")
@@ -105,9 +104,7 @@ public class ListenerHookImpl implements
// TODO: determine if service was handled?
String exFilter = extendFilter(listenerInfo.getFilter(), bctx);
serviceInterestListener.removeServiceInterest(exFilter);
-
}
-
}
private static String getClassNameFromFilter(String filter) {
@@ -143,9 +140,8 @@ public class ListenerHookImpl implements
return uuid;
}
}
-
+
static String extendFilter(String filter, BundleContext bctx) {
return "(&" + filter + "(!(" + RemoteConstants.ENDPOINT_FRAMEWORK_UUID + "=" + getUUID(bctx) + ")))";
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ServiceInterestListener.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ServiceInterestListener.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ServiceInterestListener.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/ServiceInterestListener.java Wed Jun 5 00:40:54 2013
@@ -23,5 +23,4 @@ public interface ServiceInterestListener
void addServiceInterest(String filter);
void removeServiceInterest(String filter);
-
}
\ No newline at end of file
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java Wed Jun 5 00:40:54 2013
@@ -45,9 +45,9 @@ import org.slf4j.LoggerFactory;
/**
* Listens for remote endpoints using the EndpointListener interface and the EndpointListenerManager.
- * Listens for local service interests using the ListenerHookImpl that calls back through the
- * ServiceInterestListener interface.
- * Manages local creation and destruction of service imports using the available RemoteServiceAdmin services.
+ * Listens for local service interests using the ListenerHookImpl that calls back through the
+ * ServiceInterestListener interface.
+ * Manages local creation and destruction of service imports using the available RemoteServiceAdmin services.
*/
public class TopologyManagerImport implements EndpointListener, RemoteServiceAdminListener, ServiceInterestListener {
@@ -61,8 +61,8 @@ public class TopologyManagerImport imple
/**
* If set to false only one service is imported for each import interest even it multiple services are
- * available. If set to true, all available services are imported.
- *
+ * available. If set to true, all available services are imported.
+ *
* TODO: Make this available as a configuration option
*/
private boolean importAllAvailable = true;
@@ -78,19 +78,20 @@ public class TopologyManagerImport imple
/**
* List of Endpoints by matched filter that were reported by the EndpointListener and can be imported
*/
- private final Map<String /* filter */, List<EndpointDescription>> importPossibilities
+ private final Map<String /* filter */, List<EndpointDescription>> importPossibilities
= new HashMap<String, List<EndpointDescription>>();
-
+
/**
* List of already imported Endpoints by their matched filter
*/
- private final Map<String /* filter */, List<ImportRegistration>> importedServices
+ private final Map<String /* filter */, List<ImportRegistration>> importedServices
= new HashMap<String, List<ImportRegistration>>();
public TopologyManagerImport(BundleContext bc, RemoteServiceAdminTracker rsaTracker) {
bctx = bc;
remoteServiceAdminTracker = rsaTracker;
remoteServiceAdminTracker.addListener(new RemoteServiceAdminLifeCycleListener() {
+
public void added(RemoteServiceAdmin rsa) {
triggerImportsForRemoteServiceAdmin(rsa);
}
@@ -114,7 +115,7 @@ public class TopologyManagerImport imple
execService.shutdown();
// this is called from Activator.stop(), which implicitly unregisters our registered services
}
-
+
/* (non-Javadoc)
* @see org.apache.cxf.dosgi.topologymanager.ServiceInterestListener#addServiceInterest(java.lang.String)
*/
@@ -207,11 +208,9 @@ public class TopologyManagerImport imple
}
// Notify EndpointListeners? NO!
}
-
});
-
}
-
+
private void unexportNotAvailableServices(String filter) {
synchronized (importedServices) {
List<ImportRegistration> importRegistrations = importedServices.get(filter);
@@ -235,7 +234,7 @@ public class TopologyManagerImport imple
}
}
}
-
+
private boolean isImportPossibilityAvailable(EndpointDescription ep, String filter) {
synchronized (importPossibilities) {
List<EndpointDescription> ips = importPossibilities.get(filter);
@@ -290,8 +289,8 @@ public class TopologyManagerImport imple
}
/**
- * Tries to import the service with each rsa until one import is successful
- *
+ * Tries to import the service with each rsa until one import is successful
+ *
* @param ep endpoint to import
* @return import registration of the first successful import
*/
@@ -319,5 +318,4 @@ public class TopologyManagerImport imple
removeImportReference(event.getImportReference());
}
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminLifeCycleListener.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminLifeCycleListener.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminLifeCycleListener.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminLifeCycleListener.java Wed Jun 5 00:40:54 2013
@@ -24,6 +24,7 @@ import org.osgi.service.remoteserviceadm
* Callback interface to be notified of RemoteServiceAdmin services that are added or removed
*/
public interface RemoteServiceAdminLifeCycleListener {
+
void added(RemoteServiceAdmin rsa);
void removed(RemoteServiceAdmin rsa);
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminTracker.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminTracker.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/rsatracker/RemoteServiceAdminTracker.java Wed Jun 5 00:40:54 2013
@@ -33,6 +33,7 @@ import org.osgi.util.tracker.ServiceTrac
* when RemoteServiceAdmin services are added or removed
*/
public class RemoteServiceAdminTracker extends ServiceTracker {
+
private List<RemoteServiceAdminLifeCycleListener> listeners;
public RemoteServiceAdminTracker(BundleContext bc) {
@@ -71,5 +72,4 @@ public class RemoteServiceAdminTracker e
}
return list;
}
-
}
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.dosgi.topologymanager.exporter;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -43,7 +42,6 @@ public class EndpointListenerNotifierTes
@Test
public void testNotifyListenersOfRemovalIfAppropriate() throws InvalidSyntaxException {
-
IMocksControl c = EasyMock.createNiceControl();
BundleContext bc = c.createMock(BundleContext.class);
@@ -51,18 +49,17 @@ public class EndpointListenerNotifierTes
EndpointListener epl = EasyMock.createMock(EndpointListener.class);
EndpointDescription epd = c.createMock(EndpointDescription.class);
EndpointDescription epd2 = c.createMock(EndpointDescription.class);
-
+
Map<String, Object> props = new HashMap<String, Object>();
String[] oc = new String[1];
oc[0] = "myClass";
props.put("objectClass", oc);
-
+
Map<String, Object> props2 = new HashMap<String, Object>();
oc = new String[1];
oc[0] = "notMyClass";
props2.put("objectClass", oc);
-
-
+
EasyMock.expect(bc.getService(EasyMock.eq(sref))).andReturn(epl).anyTimes();
EasyMock.expect(bc.createFilter((String)EasyMock.anyObject())).andAnswer(new IAnswer<Filter>() {
public Filter answer() throws Throwable {
@@ -72,22 +69,19 @@ public class EndpointListenerNotifierTes
EasyMock.expect(sref.getProperty(EasyMock.eq(EndpointListener.ENDPOINT_LISTENER_SCOPE)))
.andReturn("(objectClass=myClass)").anyTimes();
-
EasyMock.expect(epd.getProperties()).andReturn(props).anyTimes();
EasyMock.expect(epd2.getProperties()).andReturn(props2).anyTimes();
-
+
// must only be called for the first EndpointDescription!
epl.endpointRemoved(EasyMock.eq(epd), EasyMock.eq("(objectClass=myClass)"));
EasyMock.expectLastCall().once();
-
+
EndpointRepository exportRepository = EasyMock.createMock(EndpointRepository.class);
-
+
c.replay();
EasyMock.replay(epl);
-
-
- EndpointListenerNotifier tm = new EndpointListenerNotifier(bc, exportRepository);
+ EndpointListenerNotifier tm = new EndpointListenerNotifier(bc, exportRepository);
List<EndpointDescription> endpoints = new ArrayList<EndpointDescription>();
endpoints.add(epd);
@@ -97,19 +91,17 @@ public class EndpointListenerNotifierTes
c.verify();
EasyMock.verify(epl);
-
}
@Test
public void testNormalizeScopeForSingleString() {
-
try {
ServiceReference sr = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr.getProperty(EndpointListener.ENDPOINT_LISTENER_SCOPE))
.andReturn("Filterstring");
Filter f = EasyMock.createNiceMock(Filter.class);
-
+
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.createFilter((String)EasyMock.anyObject())).andReturn(f);
@@ -127,22 +119,18 @@ public class EndpointListenerNotifierTes
e.printStackTrace();
}
}
-
-
+
@Test
public void testNormalizeScopeForStringArray() {
-
try {
-
String[] filterStrings = {"f1", "f2", "f3"};
-
+
ServiceReference sr = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr.getProperty(EndpointListener.ENDPOINT_LISTENER_SCOPE))
.andReturn(filterStrings);
Filter f = EasyMock.createNiceMock(Filter.class);
-
-
+
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.createFilter((String)EasyMock.anyObject())).andReturn(f).times(filterStrings.length);
@@ -160,25 +148,21 @@ public class EndpointListenerNotifierTes
e.printStackTrace();
}
}
-
+
@Test
public void testNormalizeScopeForCollection() {
-
try {
-
-
Collection<String> collection = new ArrayList<String>();
collection.add("f1");
collection.add("f2");
collection.add("f3");
-
+
ServiceReference sr = EasyMock.createMock(ServiceReference.class);
EasyMock.expect(sr.getProperty(EndpointListener.ENDPOINT_LISTENER_SCOPE))
.andReturn(collection);
Filter f = EasyMock.createNiceMock(Filter.class);
-
-
+
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.createFilter((String)EasyMock.anyObject())).andReturn(f).times(collection.size());
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=1489675&r1=1489674&r2=1489675&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 Wed Jun 5 00:40:54 2013
@@ -46,7 +46,7 @@ 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 notifying an EndpointListener afterwards.
- *
+ *
* @throws Exception
*/
@SuppressWarnings("unchecked")
@@ -81,7 +81,6 @@ public class ExportServiceTest {
c.replay();
TopologyManagerExport topManager = new TopologyManagerExport(bctx, rsaTracker, mockEpListenerNotifier) {
-
/**
* To avoid async call
*/
@@ -89,11 +88,9 @@ public class ExportServiceTest {
protected void triggerExport(ServiceReference sref) {
doExportService(sref);
}
-
};
topManager.start();
c.verify();
-
}
private void simulateUserServicePublished(BundleContext bctx, final ServiceReference sref) {
@@ -142,5 +139,4 @@ public class ExportServiceTest {
EasyMock.expect(srefBundle.getSymbolicName()).andReturn("serviceBundleName").atLeastOnce();
return sref;
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerImplTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerImplTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerImplTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/EndpointListenerImplTest.java Wed Jun 5 00:40:54 2013
@@ -29,35 +29,29 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.remoteserviceadmin.EndpointListener;
-
-
public class EndpointListenerImplTest extends Assert {
-
+
int testCase;
@SuppressWarnings("rawtypes")
@Test
public void testScopeChange() {
-
-
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
TopologyManagerImport tm = EasyMock.createNiceMock(TopologyManagerImport.class);
ServiceRegistration sr = EasyMock.createNiceMock(ServiceRegistration.class);
-
+
// expect Listener registration
EasyMock.expect(bc.registerService((String)EasyMock.anyObject(),
- EasyMock.anyObject(),
+ EasyMock.anyObject(),
(Dictionary)EasyMock.anyObject())).andReturn(sr).atLeastOnce();
-
-
+
sr.setProperties((Dictionary)EasyMock.anyObject());
-
-
+
// expect property changes based on later calls
EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
-
+
public Object answer() throws Throwable {
- Object[] args = EasyMock.getCurrentArguments();
+ Object[] args = EasyMock.getCurrentArguments();
Dictionary props = (Dictionary)args[0];
@SuppressWarnings("unchecked")
List<String> scope = (List<String>)props.get(EndpointListener.ENDPOINT_LISTENER_SCOPE);
@@ -88,34 +82,31 @@ public class EndpointListenerImplTest ex
return null;
}
}).atLeastOnce();
-
-
+
EasyMock.replay(bc);
EasyMock.replay(tm);
EasyMock.replay(sr);
-
+
EndpointListenerManager endpointListener = new EndpointListenerManager(bc, tm);
-
+
endpointListener.start();
-
testCase = 1;
- endpointListener.extendScope("(a=b)");
+ endpointListener.extendScope("(a=b)");
testCase = 2;
endpointListener.reduceScope("(a=b)");
-
+
testCase = 3;
endpointListener.extendScope("(a=b)");
testCase = 4;
endpointListener.extendScope("(c=d)");
- testCase = 5;
+ testCase = 5;
endpointListener.reduceScope("(a=b)");
-
+
endpointListener.stop();
-
+
EasyMock.verify(bc);
EasyMock.verify(tm);
EasyMock.verify(sr);
}
-
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImplTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImplTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImplTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/ListenerHookImplTest.java Wed Jun 5 00:40:54 2013
@@ -34,9 +34,8 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-
public class ListenerHookImplTest {
-
+
@Test
public void testGetNewUUID() {
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
@@ -44,9 +43,9 @@ public class ListenerHookImplTest {
EasyMock.replay(bc);
String uuid = ListenerHookImpl.getUUID(bc);
assertNotNull(uuid);
-
+
assertEquals(System.getProperty("org.osgi.framework.uuid"), uuid);
-
+
EasyMock.verify(bc);
}
@@ -56,29 +55,28 @@ public class ListenerHookImplTest {
EasyMock.expect(bc.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("MyUUID").atLeastOnce();
EasyMock.replay(bc);
String uuid = ListenerHookImpl.getUUID(bc);
-
+
assertEquals("MyUUID", uuid);
-
+
EasyMock.verify(bc);
}
@Test
public void testUUIDFilterExtension() throws InvalidSyntaxException {
String filter = "(a=b)";
-
-
+
BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
EasyMock.expect(bc.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("MyUUID").atLeastOnce();
EasyMock.replay(bc);
-
+
filter = ListenerHookImpl.extendFilter(filter, bc);
-
+
Filter f = FrameworkUtil.createFilter(filter);
-
+
Dictionary<String, String> m = new Hashtable<String, String>();
m.put("a", "b");
-
- assertTrue(filter + " filter must match as uuid is missing", f.match(m));
+
+ assertTrue(filter + " filter must match as uuid is missing", f.match(m));
m.put(RemoteConstants.ENDPOINT_FRAMEWORK_UUID, "MyUUID");
assertFalse(filter + " filter must NOT match as uuid is the local one", f.match(m));
}
Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java Wed Jun 5 00:40:54 2013
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.dosgi.topologymanager.importer;
-
import java.util.Arrays;
import java.util.Dictionary;
import java.util.concurrent.Semaphore;
@@ -41,35 +40,33 @@ import static org.junit.Assert.assertTru
public class TopologyManagerImportTest {
-
@SuppressWarnings("rawtypes")
@Test
public void testImportForNewlyAddedRSA() throws InterruptedException {
-
IMocksControl c = EasyMock.createControl();
c.makeThreadSafe(true);
-
+
final Semaphore sema = new Semaphore(0);
-
+
BundleContext bc = c.createMock(BundleContext.class);
RemoteServiceAdminTracker rsaTracker = c.createMock(RemoteServiceAdminTracker.class);
ServiceRegistration sreg = c.createMock(ServiceRegistration.class);
sreg.unregister();
EasyMock.expectLastCall().once();
EasyMock.expect(bc.registerService((String)EasyMock.anyObject(),
- EasyMock.anyObject(),
+ EasyMock.anyObject(),
(Dictionary)EasyMock.anyObject())).andReturn(sreg).anyTimes();
-
+
EndpointDescription epd = c.createMock(EndpointDescription.class);
- RemoteServiceAdmin rsa = c.createMock(RemoteServiceAdmin.class);
+ RemoteServiceAdmin rsa = c.createMock(RemoteServiceAdmin.class);
final ImportRegistration ireg = c.createMock(ImportRegistration.class);
EasyMock.expect(ireg.getException()).andReturn(null).anyTimes();
ImportReference iref = c.createMock(ImportReference.class);
-
+
rsaTracker.addListener(EasyMock.<RemoteServiceAdminLifeCycleListener>anyObject());
EasyMock.expect(rsaTracker.getList()).andReturn(Arrays.asList(rsa)).anyTimes();
-
+
EasyMock.expect(rsa.importService(EasyMock.eq(epd))).andAnswer(new IAnswer<ImportRegistration>() {
public ImportRegistration answer() throws Throwable {
sema.release();
@@ -79,7 +76,7 @@ public class TopologyManagerImportTest {
EasyMock.expect(ireg.getImportReference()).andReturn(iref).anyTimes();
EasyMock.expect(iref.getImportedEndpoint()).andReturn(epd).anyTimes();
c.replay();
-
+
TopologyManagerImport tm = new TopologyManagerImport(bc, rsaTracker);
tm.start();
@@ -90,7 +87,5 @@ public class TopologyManagerImportTest {
sema.tryAcquire(100, TimeUnit.SECONDS));
tm.stop();
c.verify();
-
}
-
}
Modified: cxf/dosgi/trunk/dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/pom.xml Wed Jun 5 00:40:54 2013
@@ -41,5 +41,5 @@
<modules>
<module>cxf-dsw</module>
<module>cxf-topology-manager</module>
- </modules>
+ </modules>
</project>
Modified: cxf/dosgi/trunk/felix/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/pom.xml (original)
+++ cxf/dosgi/trunk/felix/pom.xml Wed Jun 5 00:40:54 2013
@@ -29,14 +29,13 @@
<version>1.5-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
-
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
</properties>
<modules>
- <module>shell.tui</module>
+ <module>shell.tui</module>
<module>profiles</module>
</modules>
Modified: cxf/dosgi/trunk/felix/profiles/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/pom.xml (original)
+++ cxf/dosgi/trunk/felix/profiles/pom.xml Wed Jun 5 00:40:54 2013
@@ -48,32 +48,32 @@
<version>${jetty.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>1.7.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -97,23 +97,23 @@
</dependency>
<dependency>
- <groupId>org.apache.ws.xmlschema</groupId>
- <artifactId>xmlschema-core</artifactId>
- <version>${xmlschema.bundle.version}</version>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <version>${xmlschema.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
- <version>${xmlresolver.bundle.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>${neethi.bundle.version}</version>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<version>${wsdl4j.bundle.version}</version>
</dependency>
<dependency>
@@ -123,35 +123,34 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- <version>${jaxbimpl.bundle.version}</version>
- </dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxbimpl.bundle.version}</version>
+ </dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.asm</artifactId>
- <version>${asm.bundle.version}</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.bundle.version}</version>
</dependency>
-
-
+
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<version>${woodstox.bundle.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -169,7 +168,7 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-io</artifactId>
@@ -186,7 +185,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
@@ -196,7 +195,7 @@
<directory>src/main/resources/</directory>
<filtering>true</filtering>
</resource>
- </resources>
- </build>
+ </resources>
+ </build>
</project>
Modified: cxf/dosgi/trunk/felix/shell.tui/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/shell.tui/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/shell.tui/pom.xml (original)
+++ cxf/dosgi/trunk/felix/shell.tui/pom.xml Wed Jun 5 00:40:54 2013
@@ -69,7 +69,7 @@
<exclude>**/*.java</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: cxf/dosgi/trunk/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java (original)
+++ cxf/dosgi/trunk/felix/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java Wed Jun 5 00:40:54 2013
@@ -33,6 +33,7 @@ import org.osgi.framework.ServiceListene
import org.osgi.framework.ServiceReference;
public class Activator implements BundleActivator {
+
private static final String RUN_CMD = "run ";
private BundleContext context;
@@ -56,7 +57,6 @@ public class Activator implements Bundle
initializeService();
} else if (event.getType() == ServiceEvent.UNREGISTERING
&& event.getServiceReference().equals(shellRef)) {
-
// Unget the service if it is unregistering.
context.ungetService(shellRef);
shellRef = null;
@@ -69,8 +69,7 @@ public class Activator implements Bundle
};
try {
context.addServiceListener(sl,
- "(objectClass="
- + org.apache.felix.shell.ShellService.class.getName() + ")");
+ "(objectClass=" + org.apache.felix.shell.ShellService.class.getName() + ")");
} catch (InvalidSyntaxException ex) {
System.err.println("ShellTui: Cannot add service listener.");
System.err.println("ShellTui: " + ex);
@@ -105,6 +104,7 @@ public class Activator implements Bundle
}
private class ShellTuiRunnable implements Runnable {
+
private boolean stop;
public void stop() {
@@ -163,7 +163,6 @@ public class Activator implements Bundle
} else {
shell.executeCommand(line, System.out, System.err);
}
-
} catch (Exception ex) {
System.err.println("ShellTui: " + ex);
ex.printStackTrace();
Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Wed Jun 5 00:40:54 2013
@@ -32,9 +32,9 @@
<packaging>pom</packaging>
<name>Distributed OSGI Reference Implementation Parent</name>
-
- <!-- Some versions of libraries used are different to the ones from CXF, this is
- generally caused by the fact that not all versions are available yet as
+
+ <!-- Some versions of libraries used are different to the ones from CXF, this is
+ generally caused by the fact that not all versions are available yet as
OSGi bundles. -->
<!-- Note: the Felix Framework bundle contains the org.osgi core packages,
@@ -64,11 +64,11 @@
<log4j.version>1.2.17</log4j.version>
<jetty.version>7.4.2.v20110526</jetty.version>
<xmlschema.bundle.version>2.0.3</xmlschema.bundle.version>
- <xmlresolver.bundle.version>1.2_5</xmlresolver.bundle.version>
+ <xmlresolver.bundle.version>1.2_5</xmlresolver.bundle.version>
<neethi.bundle.version>3.0.2</neethi.bundle.version>
<wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
<xmlsec.version>1.5.3</xmlsec.version>
- <asm.bundle.version>3.3.1_1</asm.bundle.version>
+ <asm.bundle.version>3.3.1_1</asm.bundle.version>
<commons.pool.bundle.version>1.5.4_1</commons.pool.bundle.version>
<woodstox.bundle.version>4.1.4</woodstox.bundle.version>
<jaxbimpl.bundle.version>2.2.1.1_2</jaxbimpl.bundle.version>
@@ -76,7 +76,7 @@
<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>
@@ -129,7 +129,7 @@
<pluginManagement>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix.plugin.version}</version>
@@ -246,7 +246,7 @@
</file>
</additionalConfig>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
@@ -365,7 +365,6 @@
</snapshots>
</repository>
-
</repositories>
<pluginRepositories>
@@ -382,6 +381,5 @@
</releases>
</pluginRepository>
</pluginRepositories>
-
</project>
Modified: cxf/dosgi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/pom.xml (original)
+++ cxf/dosgi/trunk/pom.xml Wed Jun 5 00:40:54 2013
@@ -24,7 +24,7 @@
<version>1.5-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Distributed OSGI Reference Implementation</name>
+ <name>Distributed OSGI Reference Implementation</name>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/cxf/dosgi/trunk</connection>
@@ -85,7 +85,7 @@
<archive>http://mail-archives.apache.org/mod_mbox/cxf-issues</archive>
</mailingList>
</mailingLists>
-
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -93,12 +93,12 @@
<distribution>repo</distribution>
</license>
</licenses>
-
+
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
-
+
<modules>
<module>parent</module>
<module>felix</module>
Modified: cxf/dosgi/trunk/samples/discovery/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/client/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/client/pom.xml Wed Jun 5 00:40:54 2013
@@ -32,7 +32,7 @@
</parent>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
@@ -42,13 +42,13 @@
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf.dosgi.samples</groupId>
<artifactId>cxf-dosgi-ri-samples-discovery-interface</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
@@ -62,14 +62,14 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.consumer.Activator</Bundle-Activator>
<Import-Package>
- org.apache.cxf.dosgi.samples.discovery,
- org.osgi.framework,
+ org.apache.cxf.dosgi.samples.discovery,
+ org.osgi.framework,
org.osgi.util.tracker
- </Import-Package>
- <Private-Package>org.apache.cxf.dosgi.samples.discovery.consumer</Private-Package>
+ </Import-Package>
+ <Private-Package>org.apache.cxf.dosgi.samples.discovery.consumer</Private-Package>
</instructions>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java (original)
+++ cxf/dosgi/trunk/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java Wed Jun 5 00:40:54 2013
@@ -33,6 +33,7 @@ import org.osgi.framework.ServiceReferen
import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator {
+
private ServiceTracker tracker;
private Map<DisplayService, String> displays = new ConcurrentHashMap<DisplayService, String>();
private ScheduledExecutorService scheduler;
@@ -40,6 +41,7 @@ public class Activator implements Bundle
public void start(BundleContext bc) throws Exception {
tracker = new ServiceTracker(bc, DisplayService.class.getName(), null) {
+
public Object addingService(ServiceReference reference) {
Object svc = super.addingService(reference);
if (svc instanceof DisplayService) {
@@ -54,10 +56,10 @@ public class Activator implements Bundle
String value = displays.remove(service);
System.out.println("Removed display: " + value);
super.removedService(reference, service);
- }
- };
+ }
+ };
tracker.open();
-
+
scheduler = Executors.newScheduledThreadPool(1);
Runnable printer = new Runnable() {
int counter;
@@ -72,7 +74,7 @@ public class Activator implements Bundle
System.out.println("Could not send message to display: " + entry.getValue());
}
}
- }
+ }
};
handle = scheduler.scheduleAtFixedRate(printer, 5, 5, TimeUnit.SECONDS);
}
Modified: cxf/dosgi/trunk/samples/discovery/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/pom.xml Wed Jun 5 00:40:54 2013
@@ -32,7 +32,7 @@
</parent>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
@@ -42,13 +42,13 @@
<artifactId>org.osgi.foundation</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf.dosgi.samples</groupId>
<artifactId>cxf-dosgi-ri-samples-discovery-interface</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
@@ -64,11 +64,11 @@
<Import-Package>
org.apache.cxf.dosgi.samples.discovery,
org.osgi.framework
- </Import-Package>
- <Private-Package>org.apache.cxf.dosgi.samples.discovery.impl</Private-Package>
+ </Import-Package>
+ <Private-Package>org.apache.cxf.dosgi.samples.discovery.impl</Private-Package>
</instructions>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java Wed Jun 5 00:40:54 2013
@@ -31,20 +31,21 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
public class Activator implements BundleActivator {
+
private ServiceRegistration reg;
- public void start(BundleContext bc) throws Exception {
+ public void start(BundleContext bc) throws Exception {
Dictionary<String, Object> props = new Hashtable<String, Object>();
-
+
String host = getHostName();
int port = getPort();
-
+
props.put("service.exported.interfaces", "*");
props.put("service.exported.configs", "org.apache.cxf.ws");
props.put("org.apache.cxf.ws.address", getAddress(host, port)); // old obsolete value
props.put("endpoint.id", getAddress(host, port));
- reg = bc.registerService(DisplayService.class.getName(),
+ reg = bc.registerService(DisplayService.class.getName(),
new DisplayServiceImpl(host + ":" + port), props);
}
@@ -67,5 +68,4 @@ public class Activator implements Bundle
public void stop(BundleContext bc) throws Exception {
reg.unregister();
}
-
}
Modified: cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java Wed Jun 5 00:40:54 2013
@@ -21,13 +21,14 @@ package org.apache.cxf.dosgi.samples.dis
import org.apache.cxf.dosgi.samples.discovery.DisplayService;
public class DisplayServiceImpl implements DisplayService {
+
private final String id;
-
+
public DisplayServiceImpl(String id) {
this.id = id;
System.out.println("Created DisplayService [" + id + "]");
}
-
+
public boolean displayText(String text) {
System.out.println("DisplayService [" + id + "]: " + text);
return true;
@@ -35,5 +36,5 @@ public class DisplayServiceImpl implemen
public String getID() {
return id;
- }
+ }
}
Modified: cxf/dosgi/trunk/samples/discovery/interface/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/interface/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/interface/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/interface/pom.xml Wed Jun 5 00:40:54 2013
@@ -43,10 +43,10 @@
<Bundle-Description>This bundle contains the interfaces of the Distributed OSGi Discovery sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package />
- <Export-Package>org.apache.cxf.dosgi.samples.discovery</Export-Package>
+ <Export-Package>org.apache.cxf.dosgi.samples.discovery</Export-Package>
</instructions>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/samples/discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/pom.xml Wed Jun 5 00:40:54 2013
@@ -32,11 +32,11 @@
<version>1.5-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
-
- <modules>
+
+ <modules>
<module>interface</module>
<module>impl</module>
<module>client</module>
- </modules>
+ </modules>
</project>
Modified: cxf/dosgi/trunk/samples/ds/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/client/pom.xml Wed Jun 5 00:40:54 2013
@@ -32,18 +32,18 @@
</parent>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf.dosgi.samples</groupId>
<artifactId>cxf-dosgi-ri-samples-ds-interface</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
@@ -56,12 +56,12 @@
<Bundle-Description>This bundle contains the client-side implementation of the Distributed OSGi with Declarative Services sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.cxf.dosgi.samples.ds.consumer.Activator</Bundle-Activator>
- <Import-Package>*</Import-Package>
- <Private-Package>org.apache.cxf.dosgi.samples.ds.consumer</Private-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>org.apache.cxf.dosgi.samples.ds.consumer</Private-Package>
<Service-Component>OSGI-INF/component.xml</Service-Component>
</instructions>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java (original)
+++ cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java Wed Jun 5 00:40:54 2013
@@ -27,10 +27,11 @@ import org.osgi.util.tracker.ServiceTrac
* This Activator simply registers a service tracker to indicate its interest in the
* AdderService which causes the service to get registered by the Listener Hook.
* It is a workaround for the problem that the current ListenerHook is incompatible
- * with the Equinox DS implementation which doesn't specify a filter when looking up
+ * with the Equinox DS implementation which doesn't specify a filter when looking up
* a service. See also DOSGI-73.
*/
-public class Activator implements BundleActivator {
+public class Activator implements BundleActivator {
+
private ServiceTracker tracker;
public void start(BundleContext context) throws Exception {
Modified: cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/AdderConsumer.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/AdderConsumer.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/AdderConsumer.java (original)
+++ cxf/dosgi/trunk/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/AdderConsumer.java Wed Jun 5 00:40:54 2013
@@ -21,16 +21,17 @@ package org.apache.cxf.dosgi.samples.ds.
import org.apache.cxf.dosgi.samples.ds.AdderService;
public class AdderConsumer {
+
private AdderService adder;
-
+
public void bindAdder(AdderService a) {
adder = a;
}
-
+
public void unbindAdder(AdderService a) {
adder = null;
}
-
+
public void start() {
System.out.println("Declarative Service consumer component.");
System.out.println("Using adder service: 1 + 1 = " + adder.add(1, 1));
Modified: cxf/dosgi/trunk/samples/ds/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/impl/pom.xml?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/impl/pom.xml Wed Jun 5 00:40:54 2013
@@ -37,7 +37,7 @@
<artifactId>cxf-dosgi-ri-samples-ds-interface</artifactId>
<version>${project.version}</version>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
@@ -49,12 +49,12 @@
<Bundle-Name>${project.name}</Bundle-Name>
<Bundle-Description>This bundle contains the server-side implementation of the Distributed OSGi with Declarative Services sample.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Import-Package>org.apache.cxf.dosgi.samples.ds</Import-Package>
- <Private-Package>org.apache.cxf.dosgi.samples.ds.impl</Private-Package>
+ <Import-Package>org.apache.cxf.dosgi.samples.ds</Import-Package>
+ <Private-Package>org.apache.cxf.dosgi.samples.ds.impl</Private-Package>
<Service-Component>OSGI-INF/component.xml</Service-Component>
</instructions>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
</project>
Modified: cxf/dosgi/trunk/samples/ds/impl/src/main/java/org/apache/cxf/dosgi/samples/ds/impl/AdderServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/impl/src/main/java/org/apache/cxf/dosgi/samples/ds/impl/AdderServiceImpl.java?rev=1489675&r1=1489674&r2=1489675&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/impl/src/main/java/org/apache/cxf/dosgi/samples/ds/impl/AdderServiceImpl.java (original)
+++ cxf/dosgi/trunk/samples/ds/impl/src/main/java/org/apache/cxf/dosgi/samples/ds/impl/AdderServiceImpl.java Wed Jun 5 00:40:54 2013
@@ -21,6 +21,7 @@ package org.apache.cxf.dosgi.samples.ds.
import org.apache.cxf.dosgi.samples.ds.AdderService;
public class AdderServiceImpl implements AdderService {
+
public int add(int a, int b) {
int result = a + b;
System.out.println("Adder service invoked: " + a + " + " + b + " = " + result);