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 2016/01/29 17:15:04 UTC
[1/5] cxf-dosgi git commit: Upgrade all dependencies versions
Repository: cxf-dosgi
Updated Branches:
refs/heads/master e690e12c9 -> 1e102fb85
Upgrade all dependencies versions
Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/17efe75d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/17efe75d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/17efe75d
Branch: refs/heads/master
Commit: 17efe75dcdd9155e6a940ea24101e4f10250db06
Parents: e690e12
Author: Amichai Rothman <am...@apache.org>
Authored: Fri Jan 29 16:47:59 2016 +0200
Committer: Amichai Rothman <am...@apache.org>
Committed: Fri Jan 29 16:47:59 2016 +0200
----------------------------------------------------------------------
felix/shell.tui/pom.xml | 4 ++--
parent/pom.xml | 32 ++++++++++++++++----------------
systests2/multi-bundle/pom.xml | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/17efe75d/felix/shell.tui/pom.xml
----------------------------------------------------------------------
diff --git a/felix/shell.tui/pom.xml b/felix/shell.tui/pom.xml
index 8dd6b56..e0a6d6f 100644
--- a/felix/shell.tui/pom.xml
+++ b/felix/shell.tui/pom.xml
@@ -42,12 +42,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.1</version>
+ <version>1.4.3</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/17efe75d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c9cecd2..cc143f5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -40,33 +40,33 @@
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>4.3.1</osgi.compendium.version>
- <cxf.version>3.1.1</cxf.version>
+ <cxf.version>3.1.4</cxf.version>
<cxf.build-utils.version>3.1.0</cxf.build-utils.version>
- <felix.version>4.2.1</felix.version>
- <spring.version>3.0.6.RELEASE</spring.version>
+ <felix.version>5.4.0</felix.version>
+ <spring.version>4.2.4.RELEASE</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
- <zookeeper.version>3.3.2</zookeeper.version>
+ <zookeeper.version>3.4.7</zookeeper.version>
<remote.service.admin.interfaces.version>1.0.0</remote.service.admin.interfaces.version>
- <servicemix.specs.version>2.2.0</servicemix.specs.version>
+ <servicemix.specs.version>2.6.0</servicemix.specs.version>
<pax.web.version>1.0.11</pax.web.version>
<pax.logging.version>1.7.0</pax.logging.version>
<servlet.version>3.0</servlet.version>
<log4j.version>1.2.17</log4j.version>
- <jetty.version>7.4.2.v20110526</jetty.version>
- <xmlschema.bundle.version>2.0.3</xmlschema.bundle.version>
+ <jetty.version>9.3.7.v20160115</jetty.version>
+ <xmlschema.bundle.version>2.2.1</xmlschema.bundle.version>
<xmlresolver.bundle.version>1.2_5</xmlresolver.bundle.version>
- <neethi.bundle.version>3.0.2</neethi.bundle.version>
+ <neethi.bundle.version>3.0.3</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>
<commons.pool.bundle.version>1.5.4_1</commons.pool.bundle.version>
- <woodstox.bundle.version>4.1.4</woodstox.bundle.version>
+ <woodstox.bundle.version>4.4.1</woodstox.bundle.version>
<jaxbimpl.bundle.version>2.2.1.1_2</jaxbimpl.bundle.version>
- <slf4j.version>1.7.0</slf4j.version>
+ <slf4j.version>1.7.14</slf4j.version>
<felix.plugin.version>2.4.0</felix.plugin.version>
- <exam.version>3.2.0</exam.version>
+ <exam.version>4.8.0</exam.version>
<cxf.resources.base.path />
<cxf.checkstyle.extension />
</properties>
@@ -96,25 +96,25 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.5.2</version>
+ <version>3.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
- <version>2.5.2</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -160,7 +160,7 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <version>2.0.0</version>
+ <version>2.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/17efe75d/systests2/multi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/systests2/multi-bundle/pom.xml b/systests2/multi-bundle/pom.xml
index 5147cd6..cccb87f 100644
--- a/systests2/multi-bundle/pom.xml
+++ b/systests2/multi-bundle/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>1.6.0</version>
+ <version>2.4.5</version>
</dependency>
<dependency>
[2/5] cxf-dosgi git commit: Fix resource (thread) leak in discovery
sample's client
Posted by am...@apache.org.
Fix resource (thread) leak in discovery sample's client
Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/09ff50b0
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/09ff50b0
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/09ff50b0
Branch: refs/heads/master
Commit: 09ff50b03334a8b2765a765c4d923e90339acc84
Parents: 17efe75
Author: Amichai Rothman <am...@apache.org>
Authored: Fri Jan 29 16:50:53 2016 +0200
Committer: Amichai Rothman <am...@apache.org>
Committed: Fri Jan 29 16:50:53 2016 +0200
----------------------------------------------------------------------
.../org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/09ff50b0/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
----------------------------------------------------------------------
diff --git a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java b/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
index 2221116..9a6c1d4 100644
--- a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
+++ b/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
@@ -81,6 +81,7 @@ public class Activator implements BundleActivator {
public void stop(BundleContext bc) throws Exception {
handle.cancel(true);
+ scheduler.shutdown();
tracker.close();
}
}
[3/5] cxf-dosgi git commit: Little refactorings in greeter samples
Posted by am...@apache.org.
Little refactorings in greeter samples
Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/3d2022a1
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/3d2022a1
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/3d2022a1
Branch: refs/heads/master
Commit: 3d2022a1170624358366bb59f277f554b34804a1
Parents: 09ff50b
Author: Amichai Rothman <am...@apache.org>
Authored: Fri Jan 29 17:06:39 2016 +0200
Committer: Amichai Rothman <am...@apache.org>
Committed: Fri Jan 29 17:06:39 2016 +0200
----------------------------------------------------------------------
.../greeter/impl/GreeterServiceImpl.java | 4 +-
.../samples/greeter/client/rest/Activator.java | 42 ++++++++++----------
2 files changed, 21 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/3d2022a1/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java
----------------------------------------------------------------------
diff --git a/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java b/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java
index 6e6a4af..0a10dd8 100644
--- a/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java
+++ b/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java
@@ -50,12 +50,10 @@ public class GreeterServiceImpl implements GreeterService {
String details = gd.getName() + "(" + gd.getAge() + ")";
System.out.println("Invoking: greetMe(" + details + ")");
- GreetingPhrase[] greetings = new GreetingPhrase[] {
+ return new GreetingPhrase[] {
new GreetingPhrase("Howdy " + details),
new GreetingPhrase("Hallo " + details),
new GreetingPhrase("Ni hao " + details)
};
-
- return greetings;
}
}
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/3d2022a1/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
index 667060f..2d5cfd1 100644
--- a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
+++ b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
@@ -85,19 +85,18 @@ public class Activator implements BundleActivator {
String name = JOptionPane.showInputDialog("Enter name:");
if (name == null) {
break;
- } else {
- System.out.println("*** Invoking greeter ***");
- try {
- GreeterInfo info = greeter.greetMe(name);
+ }
+ System.out.println("*** Invoking greeter ***");
+ try {
+ GreeterInfo info = greeter.greetMe(name);
- System.out.println("greetMe(\"" + name + "\") returns:");
- for (GreetingPhrase greeting: info.getGreetings()) {
- System.out.println(" " + greeting.getPhrase()
- + " " + greeting.getName());
- }
- } catch (GreeterException ex) {
- System.out.println("GreeterException: " + ex.toString());
+ System.out.println("greetMe(\"" + name + "\") returns:");
+ for (GreetingPhrase greeting: info.getGreetings()) {
+ System.out.println(" " + greeting.getPhrase()
+ + " " + greeting.getName());
}
+ } catch (GreeterException ex) {
+ System.out.println("GreeterException: " + ex.toString());
}
}
}
@@ -108,19 +107,18 @@ public class Activator implements BundleActivator {
String name = JOptionPane.showInputDialog("Greeter2: Enter name");
if (name == null) {
break;
- } else {
- System.out.println("*** Invoking greeter2 ***");
- try {
- GreeterInfo info = greeter.greetMe(name);
+ }
+ System.out.println("*** Invoking greeter2 ***");
+ try {
+ GreeterInfo info = greeter.greetMe(name);
- System.out.println("greetMe(\"" + name + "\") returns:");
- for (GreetingPhrase greeting: info.getGreetings()) {
- System.out.println(" " + greeting.getPhrase()
- + " " + greeting.getName());
- }
- } catch (GreeterException ex) {
- System.out.println("GreeterException: " + ex.toString());
+ System.out.println("greetMe(\"" + name + "\") returns:");
+ for (GreetingPhrase greeting: info.getGreetings()) {
+ System.out.println(" " + greeting.getPhrase()
+ + " " + greeting.getName());
}
+ } catch (GreeterException ex) {
+ System.out.println("GreeterException: " + ex.toString());
}
}
}
[5/5] cxf-dosgi git commit: Fix greeter sample issues: - many dialogs
created but never disposed (resource leak) - thread never ends (thread leak)
- dialog still shown after service bundle is stopped - dialog still shown
after client bundle is stopped
Posted by am...@apache.org.
Fix greeter sample issues:
- many dialogs created but never disposed (resource leak)
- thread never ends (thread leak)
- dialog still shown after service bundle is stopped
- dialog still shown after client bundle is stopped
Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/1e102fb8
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/1e102fb8
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/1e102fb8
Branch: refs/heads/master
Commit: 1e102fb85054dc958bed74c32f6e7b32c88a55f9
Parents: 2f2bb26
Author: Amichai Rothman <am...@apache.org>
Authored: Fri Jan 29 17:56:15 2016 +0200
Committer: Amichai Rothman <am...@apache.org>
Committed: Fri Jan 29 17:56:15 2016 +0200
----------------------------------------------------------------------
.../dosgi/samples/greeter/client/Activator.java | 26 ++++++++++++++------
.../samples/greeter/client/GreeterDialog.java | 4 +++
2 files changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/1e102fb8/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
----------------------------------------------------------------------
diff --git a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java b/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
index 78b9fe1..121573e 100644
--- a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
+++ b/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
@@ -19,6 +19,7 @@
package org.apache.cxf.dosgi.samples.greeter.client;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.cxf.dosgi.samples.greeter.GreeterData;
import org.apache.cxf.dosgi.samples.greeter.GreeterException;
@@ -32,15 +33,25 @@ import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator {
private ServiceTracker<GreeterService, GreeterService> tracker;
+ private ConcurrentHashMap<GreeterService, GreeterDialog> dialogs =
+ new ConcurrentHashMap<GreeterService, GreeterDialog>();
public void start(final BundleContext bc) {
tracker = new ServiceTracker<GreeterService, GreeterService>(bc, GreeterService.class, null) {
@Override
public GreeterService addingService(ServiceReference<GreeterService> reference) {
GreeterService service = super.addingService(reference);
+ dialogs.put(service, new GreeterDialog());
useService(service);
return service;
}
+
+ @Override
+ public void removedService(ServiceReference<GreeterService> reference, GreeterService service) {
+ super.removedService(reference, service);
+ GreeterDialog dialog = dialogs.remove(service);
+ dialog.dispose();
+ }
};
tracker.open();
}
@@ -56,8 +67,15 @@ public class Activator implements BundleActivator {
private void greeterUI(final GreeterService greeter) {
while (true) {
+ GreeterDialog dialog = dialogs.get(greeter);
+ if (dialog == null) {
+ return; // exit thread if service is removed
+ }
System.out.println("*** Opening greeter client dialog ***");
- Object gd = getGreeterData();
+ dialog.resetSelection();
+ dialog.setVisible(true); // blocks until dismissed
+ Object gd = dialog.getSelection();
+
if (gd instanceof String) {
System.out.println("*** Invoking greeter ***");
Map<GreetingPhrase, String> result = greeter.greetMe((String) gd);
@@ -82,12 +100,6 @@ public class Activator implements BundleActivator {
}
}
- private static Object getGreeterData() {
- GreeterDialog gd = new GreeterDialog();
- gd.setVisible(true);
- return gd.getSelection();
- }
-
public void stop(BundleContext bc) throws Exception {
tracker.close();
}
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/1e102fb8/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java
----------------------------------------------------------------------
diff --git a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java b/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java
index 3983a82..fa48792 100644
--- a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java
+++ b/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/GreeterDialog.java
@@ -186,6 +186,10 @@ public class GreeterDialog extends JDialog {
return complexPanel;
}
+ public void resetSelection() {
+ selection = null;
+ }
+
public Object getSelection() {
return selection;
}
[4/5] cxf-dosgi git commit: Update ServiceTrackers to use generics
and @Override annotations
Posted by am...@apache.org.
Update ServiceTrackers to use generics and @Override annotations
Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/2f2bb26a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/2f2bb26a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/2f2bb26a
Branch: refs/heads/master
Commit: 2f2bb26af80833404a17a47d1582705a45b740d7
Parents: 3d2022a
Author: Amichai Rothman <am...@apache.org>
Authored: Fri Jan 29 17:42:22 2016 +0200
Committer: Amichai Rothman <am...@apache.org>
Committed: Fri Jan 29 17:42:22 2016 +0200
----------------------------------------------------------------------
.../subscribe/EndpointListenerTracker.java | 3 ++
.../zookeeper/server/config/Activator.java | 31 +++++++++-----------
.../local/internal/LocalDiscovery.java | 6 ++--
.../util/SimpleServiceTracker.java | 2 +-
.../samples/discovery/consumer/Activator.java | 21 +++++++------
.../dosgi/samples/ds/consumer/Activator.java | 4 +--
.../dosgi/samples/greeter/client/Activator.java | 12 ++++----
.../samples/greeter/client/rest/Activator.java | 24 +++++++--------
.../common/test1/MyServiceTracker.java | 19 ++++++------
.../test2/client/Test2ServiceTracker.java | 24 +++++++--------
10 files changed, 68 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/EndpointListenerTracker.java
----------------------------------------------------------------------
diff --git a/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/EndpointListenerTracker.java b/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/EndpointListenerTracker.java
index 59e8c66..4d0a25f 100644
--- a/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/EndpointListenerTracker.java
+++ b/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/EndpointListenerTracker.java
@@ -35,17 +35,20 @@ public class EndpointListenerTracker extends ServiceTracker<EndpointListener, En
this.imManager = imManager;
}
+ @Override
public EndpointListener addingService(ServiceReference<EndpointListener> endpointListener) {
imManager.addInterest(endpointListener);
return null;
}
+ @Override
public void modifiedService(ServiceReference<EndpointListener> endpointListener, EndpointListener service) {
// called when an EndpointListener updates its service properties,
// e.g. when its interest scope is expanded/reduced
imManager.addInterest(endpointListener);
}
+ @Override
public void removedService(ServiceReference<EndpointListener> endpointListener, EndpointListener service) {
imManager.removeInterest(endpointListener);
}
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java
----------------------------------------------------------------------
diff --git a/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java b/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java
index cbe0e79..a00c7b0 100644
--- a/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java
+++ b/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java
@@ -38,7 +38,7 @@ 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";
- private ServiceTracker st;
+ private ServiceTracker<ConfigurationAdmin, ConfigurationAdmin> st;
public void start(BundleContext context) throws Exception {
synchronized (Activator.class) {
@@ -50,24 +50,21 @@ public class Activator implements BundleActivator {
}
}
- st = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null) {
+ st = new ServiceTracker<ConfigurationAdmin, ConfigurationAdmin>(context, ConfigurationAdmin.class, null) {
@Override
- public Object addingService(ServiceReference reference) {
- Object svc = super.addingService(reference);
- if (svc instanceof ConfigurationAdmin) {
- try {
- ConfigurationAdmin cadmin = (ConfigurationAdmin) svc;
- Configuration cfg = cadmin.getConfiguration(PID, null);
- Dictionary<String, Object> props = new Hashtable<String, Object>();
- String zp = System.getProperty(ZOOKEEPER_PORT);
- props.put("clientPort", zp);
- cfg.update(props);
- LOG.debug("Set ZooKeeper client port to {}", zp);
- } catch (IOException e) {
- LOG.error("Failed to configure ZooKeeper server!", e);
- }
+ public ConfigurationAdmin addingService(ServiceReference<ConfigurationAdmin> reference) {
+ ConfigurationAdmin service = super.addingService(reference);
+ try {
+ Configuration cfg = service.getConfiguration(PID, null);
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
+ String zp = System.getProperty(ZOOKEEPER_PORT);
+ props.put("clientPort", zp);
+ cfg.update(props);
+ LOG.debug("Set ZooKeeper client port to {}", zp);
+ } catch (IOException e) {
+ LOG.error("Failed to configure ZooKeeper server!", e);
}
- return svc;
+ return service;
}
};
st.open();
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
----------------------------------------------------------------------
diff --git a/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java b/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
index ebfaefe..2761cf3 100644
--- a/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
+++ b/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
@@ -62,9 +62,9 @@ public class LocalDiscovery implements BundleListener {
@Override
public EndpointListener addingService(ServiceReference<EndpointListener> reference) {
- EndpointListener svc = super.addingService(reference);
- addListener(reference, svc);
- return svc;
+ EndpointListener service = super.addingService(reference);
+ addListener(reference, service);
+ return service;
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java
----------------------------------------------------------------------
diff --git a/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java b/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java
index 29238aa..fc5b35e 100644
--- a/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java
+++ b/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java
@@ -92,7 +92,7 @@ public class SimpleServiceTracker<T> extends ServiceTracker<T, T> {
@Override
public T addingService(ServiceReference<T> reference) {
- T service = (T) super.addingService(reference);
+ T service = super.addingService(reference);
services.put(reference, service);
for (SimpleServiceTrackerListener<T> listener : listeners) {
listener.added(reference, service);
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
----------------------------------------------------------------------
diff --git a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java b/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
index 9a6c1d4..cdeb360 100644
--- a/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
+++ b/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java
@@ -34,25 +34,24 @@ import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator {
- private ServiceTracker tracker;
+ private ServiceTracker<DisplayService, DisplayService> tracker;
private Map<DisplayService, String> displays = new ConcurrentHashMap<DisplayService, String>();
private ScheduledExecutorService scheduler;
private ScheduledFuture<?> handle;
public void start(BundleContext bc) throws Exception {
- tracker = new ServiceTracker(bc, DisplayService.class.getName(), null) {
+ tracker = new ServiceTracker<DisplayService, DisplayService>(bc, DisplayService.class, null) {
- public Object addingService(ServiceReference reference) {
- Object svc = super.addingService(reference);
- if (svc instanceof DisplayService) {
- DisplayService d = (DisplayService) svc;
- System.out.println("Adding display: " + d.getID() + " (" + d + ")");
- displays.put(d, d.getID());
- }
- return svc;
+ @Override
+ public DisplayService addingService(ServiceReference<DisplayService> reference) {
+ DisplayService service = super.addingService(reference);
+ System.out.println("Adding display: " + service.getID() + " (" + service + ")");
+ displays.put(service, service.getID());
+ return service;
}
- public void removedService(ServiceReference reference, Object service) {
+ @Override
+ public void removedService(ServiceReference<DisplayService> reference, DisplayService service) {
String value = displays.remove(service);
System.out.println("Removed display: " + value);
super.removedService(reference, service);
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java
----------------------------------------------------------------------
diff --git a/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java b/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java
index 304493d..ac059ad 100644
--- a/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java
+++ b/samples/ds/client/src/main/java/org/apache/cxf/dosgi/samples/ds/consumer/Activator.java
@@ -32,10 +32,10 @@ import org.osgi.util.tracker.ServiceTracker;
*/
public class Activator implements BundleActivator {
- private ServiceTracker tracker;
+ private ServiceTracker<AdderService, AdderService> tracker;
public void start(BundleContext context) throws Exception {
- tracker = new ServiceTracker(context, AdderService.class.getName(), null);
+ tracker = new ServiceTracker<AdderService, AdderService>(context, AdderService.class, null);
tracker.open();
}
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
----------------------------------------------------------------------
diff --git a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java b/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
index 6f46760..78b9fe1 100644
--- a/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
+++ b/samples/greeter/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/Activator.java
@@ -31,16 +31,14 @@ import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator {
- private ServiceTracker tracker;
+ private ServiceTracker<GreeterService, GreeterService> tracker;
public void start(final BundleContext bc) {
- tracker = new ServiceTracker(bc, GreeterService.class.getName(), null) {
+ tracker = new ServiceTracker<GreeterService, GreeterService>(bc, GreeterService.class, null) {
@Override
- public Object addingService(ServiceReference reference) {
- Object service = super.addingService(reference);
- if (service instanceof GreeterService) {
- useService((GreeterService) service);
- }
+ public GreeterService addingService(ServiceReference<GreeterService> reference) {
+ GreeterService service = super.addingService(reference);
+ useService(service);
return service;
}
};
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
----------------------------------------------------------------------
diff --git a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
index 2d5cfd1..0fc7802 100644
--- a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
+++ b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java
@@ -32,29 +32,25 @@ import org.osgi.util.tracker.ServiceTracker;
public class Activator implements BundleActivator {
- private ServiceTracker tracker;
- private ServiceTracker tracker2;
+ private ServiceTracker<GreeterService, GreeterService> tracker;
+ private ServiceTracker<GreeterService2, GreeterService2> tracker2;
public void start(final BundleContext bc) {
- tracker = new ServiceTracker(bc, GreeterService.class.getName(), null) {
+ tracker = new ServiceTracker<GreeterService, GreeterService>(bc, GreeterService.class, null) {
@Override
- public Object addingService(ServiceReference reference) {
- Object service = super.addingService(reference);
- if (service instanceof GreeterService) {
- useGreeterService((GreeterService) service);
- }
+ public GreeterService addingService(ServiceReference<GreeterService> reference) {
+ GreeterService service = super.addingService(reference);
+ useGreeterService(service);
return service;
}
};
tracker.open();
- tracker2 = new ServiceTracker(bc, GreeterService2.class.getName(), null) {
+ tracker2 = new ServiceTracker<GreeterService2, GreeterService2>(bc, GreeterService2.class, null) {
@Override
- public Object addingService(ServiceReference reference) {
- Object service = super.addingService(reference);
- if (service instanceof GreeterService2) {
- useGreeterService2((GreeterService2) service);
- }
+ public GreeterService2 addingService(ServiceReference<GreeterService2> reference) {
+ GreeterService2 service = super.addingService(reference);
+ useGreeterService2(service);
return service;
}
};
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
----------------------------------------------------------------------
diff --git a/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java b/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
index 8cc1e42..2886ce8 100644
--- a/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
+++ b/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
@@ -29,21 +29,20 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-public class MyServiceTracker extends ServiceTracker {
+public class MyServiceTracker extends ServiceTracker<GreeterService, GreeterService> {
private static StringBuffer invocationResult = new StringBuffer();
public MyServiceTracker(BundleContext context) {
- super(context, GreeterService.class.getName(), null);
+ super(context, GreeterService.class, null);
}
- public Object addingService(ServiceReference reference) {
- Object svc = super.addingService(reference);
- if (svc instanceof GreeterService) {
- System.out.println("[client] Got a GreeterService...");
- invokeGreeter((GreeterService) svc);
- }
- return svc;
+ @Override
+ public GreeterService addingService(ServiceReference<GreeterService> reference) {
+ GreeterService service = super.addingService(reference);
+ System.out.println("[client] Got a GreeterService...");
+ invokeGreeter(service);
+ return service;
}
public static String getResult() {
@@ -74,4 +73,4 @@ public class MyServiceTracker extends ServiceTracker {
x.printStackTrace(System.err);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/2f2bb26a/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java
----------------------------------------------------------------------
diff --git a/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java b/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java
index 5933e21..9996eb4 100644
--- a/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java
+++ b/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test2/client/Test2ServiceTracker.java
@@ -28,7 +28,7 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-public class Test2ServiceTracker extends ServiceTracker {
+public class Test2ServiceTracker extends ServiceTracker<Test2Service, Test2Service> {
public Test2ServiceTracker(BundleContext context) {
super(context, getFilter(context), null);
@@ -48,21 +48,19 @@ public class Test2ServiceTracker extends ServiceTracker {
}
@Override
- public Object addingService(ServiceReference reference) {
- Object svc = super.addingService(reference);
- if (svc instanceof Test2Service) {
- System.out.println("*** Ref: " + reference);
- for (String key : reference.getPropertyKeys()) {
- System.out.println(" " + key + "-" + reference.getProperty(key));
- }
-
- invokeRemoteTestService(context, (Test2Service) svc);
+ public Test2Service addingService(ServiceReference<Test2Service> reference) {
+ Test2Service service = super.addingService(reference);
+ System.out.println("*** Ref: " + reference);
+ for (String key : reference.getPropertyKeys()) {
+ System.out.println(" " + key + "-" + reference.getProperty(key));
}
- return svc;
+
+ invokeRemoteTestService(context, service);
+ return service;
}
- private void invokeRemoteTestService(BundleContext bc, Test2Service svc) {
- String res = svc.getRemoteStackTrace();
+ private void invokeRemoteTestService(BundleContext bc, Test2Service service) {
+ String res = service.getRemoteStackTrace();
Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("result", res);