Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Alexander Kuppe2010-10-29 12:01:22 -0400
committerMarkus Alexander Kuppe2010-10-29 12:01:22 -0400
commitd93e83c4293f1dad476cdf44ec03abffddfc6e23 (patch)
treeda1b9edc52d839b82dc56a02dae88203a562da1c
parent977c2eaec764a4110c056c9eb96142c8ecccffc4 (diff)
parent5353951a4b3ddb1d619f4a9c22ba90ba2279ac77 (diff)
downloadorg.eclipse.ecf-d93e83c4293f1dad476cdf44ec03abffddfc6e23.tar.gz
org.eclipse.ecf-d93e83c4293f1dad476cdf44ec03abffddfc6e23.tar.xz
org.eclipse.ecf-d93e83c4293f1dad476cdf44ec03abffddfc6e23.zip
Merge branch 'master' into Release_3_4R-Release_3_4-sdk_feature-8_2010-10-29_09-13-51
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/META-INF/MANIFEST.MF1
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF1
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java13
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java2
-rw-r--r--releng/features/org.eclipse.ecf.core.featurepatch/feature.properties2
-rw-r--r--releng/features/org.eclipse.ecf.core.featurepatch/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.sdk/feature.xml2
7 files changed, 17 insertions, 6 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/META-INF/MANIFEST.MF
index 7d8ef7711..1ef999c86 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.rest.rss/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Import-Package: com.sun.syndication.feed.synd;version="0.9.0",
org.osgi.util.tracker
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.6.0"
+Bundle-Localization: plugin
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF
index de55e7975..1c84bdd37 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.rest.synd/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Import-Package: com.sun.syndication.feed;version="0.9.0",
Bundle-ActivationPolicy: lazy
Require-Bundle: org.jdom;bundle-version="1.0.0"
Export-Package: org.eclipse.ecf.remoteservice.rest.synd
+Bundle-Localization: plugin
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
index f99f3cb54..1c3cc6639 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
@@ -142,15 +142,25 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt
targetID = (aTargetID == null) ? getConfig().getID() : aTargetID;
fireContainerEvent(new ContainerConnectingEvent(this.getID(), targetID, connectContext));
synchronized (containers) {
+ final Collection containersFailedToConnect = new HashSet();
for (final Iterator itr = containers.iterator(); itr.hasNext();) {
final IContainer container = (IContainer) itr.next();
if (container.getConnectedID() == null) {
- container.connect(targetID, connectContext);
+ try {
+ container.connect(targetID, connectContext);
+ } catch (ContainerConnectException cce) {
+ Trace.catching(Activator.PLUGIN_ID, METHODS_TRACING, this.getClass(), "connect", //$NON-NLS-1$
+ cce);
+ containersFailedToConnect.add(container);
+ continue;
+ }
}
final IDiscoveryLocator idca = (IDiscoveryLocator) container;
idca.addServiceListener(ccsl);
idca.addServiceTypeListener(ccstl);
}
+ // remove all containers that failed to connect and thus are unusable subsequently
+ containers.removeAll(containersFailedToConnect);
}
fireContainerEvent(new ContainerConnectedEvent(this.getID(), targetID));
}
@@ -378,6 +388,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt
} catch (ContainerConnectException e) {
// we eat the exception here
Trace.catching(Activator.PLUGIN_ID, METHODS_CATCHING, this.getClass(), "addContainer(Object)", e); //$NON-NLS-1$
+ return false;
}
}
final IDiscoveryLocator idca = (IDiscoveryLocator) object;
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
index 9bc75293d..f07ffcc9f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Messages.java
@@ -9,8 +9,6 @@ public class Messages extends NLS {
public static String DnsSdDiscoveryContainerAdapter_Comparator_SRV_Records;
public static String DnsSdDiscoveryContainerAdapter_No_IDiscovery_Advertiser;
public static String DnsSdDiscoveryContainerAdapter_No_IDiscovery_Locator;
- public static String DnsSdDiscoveryException_1;
- public static String DnsSdDiscoveryException_3;
public static String DnsSdDiscoveryException_DynDns_Update_Denied;
public static String DnsSdDiscoveryException_DynDNS_Updated_Failed;
public static String DnsSdDiscoveryException_TSIG_Verify_Failed;
diff --git a/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties b/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties
index b11ae724c..6e51da1ee 100644
--- a/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties
+++ b/releng/features/org.eclipse.ecf.core.featurepatch/feature.properties
@@ -6,7 +6,7 @@
# http://www.eclipse.org/legal/epl-v10.html
#
############################################################################
-featureName=ECF 3.2 Patch for Eclipse 3.5.X
+featureName=ECF 3.2 Patch for Eclipse 3.5.X and 3.6.x
providerName=Eclipse.org - ECF
# "licenseURL" property - URL of the "Feature License"
diff --git a/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml b/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml
index 0bfe0b941..af558c0a7 100644
--- a/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml
+++ b/releng/features/org.eclipse.ecf.core.featurepatch/feature.xml
@@ -6,7 +6,7 @@
provider-name="%providerName">
<description url="http://www.eclipse.org/ecf">
- This feature provides a patch of Eclipse 3.5-3.6 ECF Core Bundles. This allows the ECF 3.3 Target Components to function properly.
+ This feature provides a patch of Eclipse 3.5-3.6 ECF Core Bundles. This allows the ECF 3.4 Target Components to function properly.
</description>
<copyright>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
index c3e332554..3526647f5 100644
--- a/releng/features/org.eclipse.ecf.sdk/feature.xml
+++ b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.sdk"
label="ECF Target Components Feature"
- version="3.3.0.qualifier"
+ version="3.4.0.qualifier"
provider-name="Eclipse.org">
<description url="http://www.eclipse.org/ecf">

Back to the top