Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2019-10-11 00:13:59 -0400
committerslewis2019-10-11 00:13:59 -0400
commit987e1fddb48302a8d8f7bfdc8c5ccb540ac5ad63 (patch)
tree03e06426039c82ecfe4509d715ba2a586373c2c3
parentbeac2d63527012932d01c3fcbd6b32c21ca6dc21 (diff)
downloadorg.eclipse.ecf-987e1fddb48302a8d8f7bfdc8c5ccb540ac5ad63.tar.gz
org.eclipse.ecf-987e1fddb48302a8d8f7bfdc8c5ccb540ac5ad63.tar.xz
org.eclipse.ecf-987e1fddb48302a8d8f7bfdc8c5ccb540ac5ad63.zip
Enhanced fix for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=551944 Change-Id: I0000000000000000000000000000000000000000
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/.settings/org.eclipse.m2e.core.prefs4
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF3
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml2
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java5
4 files changed, 8 insertions, 6 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/.settings/org.eclipse.m2e.core.prefs b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
index 225960ff0..0248ba6fc 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.osgi.services.distribution
Automatic-Module-Name: org.eclipse.ecf.osgi.services.distribution
-Bundle-Version: 2.1.300.qualifier
+Bundle-Version: 2.1.400.qualifier
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.ecf.core.util;version="3.6.0",
@@ -13,6 +13,5 @@ Import-Package: org.eclipse.ecf.core.util;version="3.6.0",
org.osgi.service.remoteserviceadmin;version="[1.0.0,2.0.0)"
Bundle-Localization: plugin
Export-Package: org.eclipse.ecf.osgi.services.distribution;version="2.0.0";x-internal:=true
-Bundle-ActivationPolicy: lazy
Provide-Capability: osgi.remoteserviceadmin.topology; policy:List<String>="promiscuous"; version:Version=1.1
Bundle-Activator: org.eclipse.ecf.internal.osgi.services.distribution.Activator
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml
index 053a25f0d..4da25853c 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.osgi.services.distribution</artifactId>
- <version>2.1.300-SNAPSHOT</version>
+ <version>2.1.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java
index 1c3f2d547..dcdf5711c 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/Activator.java
@@ -20,8 +20,7 @@ import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener;
public class Activator implements BundleActivator {
- private static final String[] DEPENDENTS = new String[] { "org.eclipse.ecf", //$NON-NLS-1$
- "org.eclipse.ecf.osgi.services.remoteserviceadmin" }; //$NON-NLS-1$
+ private static final String[] DEPENDENTS = new String[] { "org.eclipse.ecf.osgi.services.remoteserviceadmin" }; //$NON-NLS-1$
private BasicTopologyManager topologyManager;
private ServiceRegistration topologyManagerRegistration;
@@ -38,7 +37,7 @@ public class Activator implements BundleActivator {
if (topologyManagerRegistration != null) {
topologyManagerRegistration.unregister();
topologyManagerRegistration = null;
- this.topologyManager.deactivate();
+ this.topologyManager.stop();
this.topologyManager = null;
}
}

Back to the top