diff options
| author | slewis | 2011-06-19 23:52:27 +0000 |
|---|---|---|
| committer | slewis | 2011-06-19 23:52:27 +0000 |
| commit | 1af9f1483cb32f89c2a753748b93f668f5f1579a (patch) | |
| tree | 2b73f145bde29e63ae23fe09854109e3deea5446 /compendium | |
| parent | 18204529e1b90661daa033435b38a9e99c2429b5 (diff) | |
| download | org.eclipse.ecf-1af9f1483cb32f89c2a753748b93f668f5f1579a.tar.gz org.eclipse.ecf-1af9f1483cb32f89c2a753748b93f668f5f1579a.tar.xz org.eclipse.ecf-1af9f1483cb32f89c2a753748b93f668f5f1579a.zip | |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=349078
Diffstat (limited to 'compendium')
| -rw-r--r-- | compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManager.java | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManager.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManager.java index f6fca33f7..72aea4108 100644 --- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManager.java +++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/BasicTopologyManager.java @@ -5,7 +5,9 @@ import java.util.Dictionary; import java.util.Properties;
import org.eclipse.ecf.osgi.services.remoteserviceadmin.AbstractTopologyManager;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.hooks.service.EventHook;
import org.osgi.service.remoteserviceadmin.EndpointListener;
@@ -21,6 +23,16 @@ public class BasicTopologyManager extends AbstractTopologyManager implements private static final String endpointListenerScope = System
.getProperty("org.eclipse.ecf.osgi.services.discovery.endpointListenerScope"); //$NON-NLS-1$
+ private boolean exportRegisteredSvcs = new Boolean(
+ System.getProperty(
+ "org.eclipse.ecf.osgi.services.basictopologymanager.exportRegisteredSvcs", "true")).booleanValue(); //$NON-NLS-1$ //$NON-NLS-2$
+
+ private String exportRegisteredSvcsClassname = System
+ .getProperty("org.eclipse.ecf.osgi.services.basictopologymanager.exportRegisteredSvcsClassname"); //$NON-NLS-1$
+
+ private String exportRegisteredSvcsFilter = System
+ .getProperty("org.eclipse.ecf.osgi.services.basictopologymanager.exportRegisteredSvcsFilter"); //$NON-NLS-1$
+
private ServiceRegistration endpointListenerRegistration;
private ServiceRegistration eventHookRegistration;
@@ -29,6 +41,18 @@ public class BasicTopologyManager extends AbstractTopologyManager implements super(context);
}
+ public void setExportRegisteredSvcs(boolean val) {
+ this.exportRegisteredSvcs = val;
+ }
+
+ public void setExportRegisteredSvcsClassname(String classname) {
+ this.exportRegisteredSvcsClassname = classname;
+ }
+
+ public void setExportRegisteredSvcsFilter(String filter) {
+ this.exportRegisteredSvcsFilter = filter;
+ }
+
private String getEndpointListenerScope() {
// If it's set via system property, then simply use it
if (endpointListenerScope != null)
@@ -55,7 +79,38 @@ public class BasicTopologyManager extends AbstractTopologyManager implements return result;
}
+ public void exportRegisteredServices(String exportRegisteredSvcsClassname,
+ String exportRegisteredSvcsFilter) {
+ ServiceReference[] existingServiceRefs = null;
+ try {
+ existingServiceRefs = getContext().getAllServiceReferences(
+ exportRegisteredSvcsClassname, exportRegisteredSvcsFilter);
+ } catch (InvalidSyntaxException e) {
+ logError(
+ "exportRegisteredServices", //$NON-NLS-1$
+ "Could not retrieve existing service references for exportRegisteredSvcsClassname=" //$NON-NLS-1$
+ + exportRegisteredSvcsClassname
+ + " and exportRegisteredSvcsFilter=" //$NON-NLS-1$
+ + exportRegisteredSvcsFilter);
+ }
+ // Now export as if the service was registering right now...i.e. perform
+ // export
+ if (existingServiceRefs != null)
+ for (int i = 0; i < existingServiceRefs.length; i++)
+ // This method will check the service properties for
+ // remote service props. If previously registered as a
+ // remote service, it will export the remote
+ // service if not it will simply return/skip
+ handleServiceRegistering(existingServiceRefs[i]);
+ }
+
public void start() throws Exception {
+
+ // First export any previously registered remote services
+ if (exportRegisteredSvcs)
+ exportRegisteredServices(exportRegisteredSvcsClassname,
+ exportRegisteredSvcsFilter);
+
// Register as EndpointListener, so that it gets notified when Endpoints
// are discovered
Properties props = new Properties();
|