From 56589672690a32a51b4fb1273133ffbe17f38739 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 3 Nov 2009 00:14:53 +0000 Subject: Merge changes from trunk so that OSGi remote services can be run with Equinox and Felix over tribes's multicast. This introduces a dependency on tuscany maven-bundle-plugin 1.0.5-SNAPSHOT and we should release it with M4. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832215 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'branches/sca-java-2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java') diff --git a/branches/sca-java-2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java b/branches/sca-java-2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java index 59a21ade06..c869ab8c14 100644 --- a/branches/sca-java-2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java +++ b/branches/sca-java-2.0-M4/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java @@ -61,6 +61,9 @@ public class OSGiServiceImporter extends AbstractOSGiServiceHandler { if (domainRegistry != null) { configuration.setDomainRegistryURI(domainRegistry); } + if (domainURI != null) { + configuration.setDomainURI(domainURI); + } configuration.setURI(contribution.getURI()); configuration.getExtensions().add(bundle); // FIXME: Configure the domain and node URI -- cgit v1.2.3