Merge branch 'master' into Release_3_4
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/META-INF/MANIFEST.MF
index a8321ce..88cbe7b 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/META-INF/MANIFEST.MF
@@ -10,8 +10,6 @@
org.eclipse.ecf.core.identity;version="3.0.0",
org.eclipse.ecf.core.security,
org.eclipse.ecf.discovery;version="3.0.0",
- org.eclipse.ecf.provider.zookeeper,
- org.eclipse.ecf.provider.zookeeper.core,
org.eclipse.ecf.services.quotes,
org.osgi.framework;version="1.3.0"
Bundle-ActivationPolicy: lazy
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/src/org/eclipse/ecf/examples/remoteservices/quotes/consumer/ConsumerUI.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/src/org/eclipse/ecf/examples/remoteservices/quotes/consumer/ConsumerUI.java
index 94bc0e9..d65c879 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/src/org/eclipse/ecf/examples/remoteservices/quotes/consumer/ConsumerUI.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.quotes.consumer/src/org/eclipse/ecf/examples/remoteservices/quotes/consumer/ConsumerUI.java
@@ -3,7 +3,6 @@
import org.eclipse.ecf.core.ContainerCreateException;
import org.eclipse.ecf.core.ContainerFactory;
import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.provider.zookeeper.core.ZooDiscoveryContainerInstantiator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.MouseAdapter;
@@ -128,8 +127,10 @@
IContainer zooContainer = null;
try {
- zooContainer = ContainerFactory.getDefault().createContainer(ZooDiscoveryContainerInstantiator.NAME);
+ zooContainer = ContainerFactory.getDefault().createContainer("ecf.discovery.zoodiscovery");
} catch (ContainerCreateException e1) {
+ System.out.println("Failed to create ZooDiscovery container. Is ZooDiscovery deployed?");;
+ return;
}
if (zooContainer.getConnectedID() != null)
diff --git a/releng/org.eclipse.ecf.releng.bm/ecf.rmap b/releng/org.eclipse.ecf.releng.bm/ecf.rmap
index 0bc0206..4b32b89 100644
--- a/releng/org.eclipse.ecf.releng.bm/ecf.rmap
+++ b/releng/org.eclipse.ecf.releng.bm/ecf.rmap
@@ -10,7 +10,7 @@
<!-- org.eclipse -->
<searchPath name="org.eclipse">
<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="false" source="false">
- <uri format="http://download.eclipse.org/eclipse/updates/3.6/R-3.6.1-201009090800/?importType=binary"/>
+ <uri format="http://download.eclipse.org/eclipse/updates/3.6/R-3.6.1-201009090800?importType=binary"/>
</provider>
<!-- dev.eclipse.org PDEMapProvider -->
<provider xsi:type="pmp:PDEMapProvider" readerType="cvs" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
@@ -42,7 +42,7 @@
</uri>
</provider>
<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="false" source="false">
- <uri format="{0}/?importType=binary">
+ <uri format="{0}?importType=binary">
<bc:propertyRef key="ecf.p2.repository" />
</uri>
</provider>
@@ -51,41 +51,41 @@
<!-- org.xbill.dns -->
<searchPath name="org.xbill.dns">
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
- <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/I20101014084557/repository/?importType=binary"/>
+ <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/I20101014084557/repository?importType=binary"/>
</provider>
</searchPath>
<!-- pluginbuilder -->
<searchPath name="org.pluginbuilder">
<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="false" source="false">
- <uri format="http://self.pluginbuilder.org/nightly/p2-updateSite/?importType=binary"/>
+ <uri format="http://self.pluginbuilder.org/nightly/p2-updateSite?importType=binary"/>
</provider>
</searchPath>
<!-- swtbot -->
<searchPath name="org.eclipse.swtbot">
<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="false" source="false">
- <uri format="http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site/?importType=binary"/>
+ <uri format="http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site?importType=binary"/>
</provider>
<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="false" source="false">
- <uri format="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/?importType=binary"/>
+ <uri format="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site?importType=binary"/>
</provider>
</searchPath>
<!-- eclemma -->
<searchPath name="com.mountainminds.eclemma">
<provider readerType="p2" componentTypes="osgi.bundle,eclipse.feature,buckminster" mutable="false" source="false">
- <uri format="http://update.eclemma.org/?importType=binary"/>
+ <uri format="http://update.eclemma.org?importType=binary"/>
</provider>
</searchPath>
<!-- default -->
<searchPath name="default">
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
- <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite/?importType=binary"/>
+ <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite?importType=binary"/>
</provider>
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
- <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20100831105311/repository/?importType=binary"/>
+ <uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20100831105311/repository?importType=binary"/>
</provider>
<!-- dev.eclipse.org PDEMapProvider -->
<provider xsi:type="pmp:PDEMapProvider" readerType="cvs" componentTypes="osgi.bundle,eclipse.feature" mutable="false" source="true">
