diff options
Diffstat (limited to 'java')
-rw-r--r-- | java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiServiceExporter.java (renamed from java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceExporter.java) | 32 | ||||
-rw-r--r-- | java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiServiceImporter.java (renamed from java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceImporter.java) | 6 | ||||
-rw-r--r-- | java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java | 2 |
3 files changed, 5 insertions, 35 deletions
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceExporter.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiServiceExporter.java index 016c88ba43..5a381f0b67 100644 --- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceExporter.java +++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiServiceExporter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.node.osgi.impl; +package org.apache.tuscany.sca.osgi.service.remoteadmin.impl; import java.util.ArrayList; import java.util.Collections; @@ -35,11 +35,7 @@ import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; import org.apache.tuscany.sca.node.impl.NodeImpl; import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointDescription; import org.apache.tuscany.sca.osgi.service.remoteadmin.ExportRegistration; -import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.EndpointDescriptionImpl; -import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.EndpointIntrospector; -import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.ExportRegistrationImpl; import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; @@ -50,7 +46,6 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer; public class OSGiServiceExporter implements ServiceTrackerCustomizer, LifeCycleListener { private ExtensionPointRegistry registry; private BundleContext context; - private ServiceTracker serviceTracker; private NodeFactoryImpl nodeFactory; private EndpointIntrospector introspector; @@ -73,31 +68,10 @@ public class OSGiServiceExporter implements ServiceTrackerCustomizer, LifeCycleL public void start() { init(); - /* - String filterStr = - "(& (" + SERVICE_EXPORTED_CONFIGS - + "=sca) (" - + SERVICE_EXPORTED_INTERFACES - + "=*) (!(" - + SERVICE_IMPORTED - + "=*)) )"; - try { - Filter filter = context.createFilter(filterStr); - serviceTracker = new ServiceTracker(context, filter, this); - serviceTracker.open(true); - } catch (InvalidSyntaxException e) { - // Ignore - } - */ } public void stop() { - /* - if (serviceTracker != null) { - serviceTracker.close(); - serviceTracker = null; - } - */ + this.introspector = null; } public Object addingService(ServiceReference reference) { @@ -110,7 +84,7 @@ public class OSGiServiceExporter implements ServiceTrackerCustomizer, LifeCycleL if (contribution != null) { NodeConfiguration configuration = nodeFactory.createNodeConfiguration(); - configuration.setURI("osgi.service." + String.valueOf(reference.getProperty(Constants.SERVICE_ID))); + configuration.setURI(contribution.getURI()); configuration.getExtensions().add(reference.getBundle()); // FIXME: Configure the domain and node URI NodeImpl node = new NodeImpl(nodeFactory, configuration, Collections.singletonList(contribution)); diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceImporter.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiServiceImporter.java index 7a0f3bbbc0..e42baab02d 100644 --- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiServiceImporter.java +++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiServiceImporter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.node.osgi.impl; +package org.apache.tuscany.sca.osgi.service.remoteadmin.impl; import java.util.Collections; @@ -33,8 +33,6 @@ import org.apache.tuscany.sca.node.impl.NodeFactoryImpl; import org.apache.tuscany.sca.node.impl.NodeImpl; import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointDescription; import org.apache.tuscany.sca.osgi.service.remoteadmin.ImportRegistration; -import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.EndpointIntrospector; -import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.ImportRegistrationImpl; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -79,7 +77,7 @@ public class OSGiServiceImporter implements LifeCycleListener { if (contribution != null) { NodeConfiguration configuration = nodeFactory.createNodeConfiguration(); - configuration.setURI("osgi.reference." + endpointDescription.getURI()); + configuration.setURI(contribution.getURI()); configuration.getExtensions().add(bundle); // FIXME: Configure the domain and node URI NodeImpl node = new NodeImpl(nodeFactory, configuration, Collections.singletonList(contribution)); diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java index 05e59844e9..f05c17b4dc 100644 --- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java +++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java @@ -24,8 +24,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.tuscany.sca.node.osgi.impl.OSGiServiceExporter; -import org.apache.tuscany.sca.node.osgi.impl.OSGiServiceImporter; import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointDescription; import org.apache.tuscany.sca.osgi.service.remoteadmin.ExportRegistration; import org.apache.tuscany.sca.osgi.service.remoteadmin.ImportRegistration; |