Built version 1.3.0

ECF · Dec 5, 2017 · ee0adb3 · ee0adb3
1 parent 553af09
commit ee0adb3
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 7 deletions.
diff --git a/...s/org.eclipse.ecf.provider.etcd/src/org/eclipse/ecf/internal/provider/etcd/Activator.java b/...s/org.eclipse.ecf.provider.etcd/src/org/eclipse/ecf/internal/provider/etcd/Activator.java
@@ -72,9 +72,8 @@ public void start(BundleContext ctxt) throws Exception {
 			String hostname = System.getProperty(EtcdDiscoveryContainerConfig.ETCD_TARGETID_HOSTNAME_PROP);
 			if (hostname == null) {
 				LogUtility.logError("createEtcdDiscoveryContainer", DebugOptions.DEBUG, Activator.class, //$NON-NLS-1$
-						"No etcd service hostname configured via system property=" //$NON-NLS-1$
-								+ EtcdDiscoveryContainerConfig.ETCD_TARGETID_HOSTNAME_PROP
-								+ ".  No EtcdDiscoveryContainer created"); //$NON-NLS-1$
+						"No EtcdDiscoveryContainer created.Etcd service hostname must be configured via system property=" //$NON-NLS-1$
+								+ EtcdDiscoveryContainerConfig.ETCD_TARGETID_HOSTNAME_PROP);
 				return;
 			}
 			config = new EtcdDiscoveryContainerConfig();

diff --git a/...pse.ecf.provider.etcd/src/org/eclipse/ecf/provider/etcd/EtcdDiscoveryContainerConfig.java b/...pse.ecf.provider.etcd/src/org/eclipse/ecf/provider/etcd/EtcdDiscoveryContainerConfig.java
@@ -60,14 +60,18 @@ public class EtcdDiscoveryContainerConfig extends DiscoveryContainerConfig {
 	public static final String ETCD_TTL_PROP = EtcdDiscoveryContainerInstantiator.NAME + ".ttl"; //$NON-NLS-1$
 	public static final Integer ETCD_TTL_DEFAULT = Integer.getInteger(ETCD_TTL_PROP, 0);
 
+	public static final String ETCD_CONTAINERID_PROP = EtcdDiscoveryContainerInstantiator.NAME + ".containerId"; //$NON-NLS-1$
+	public static final String ETCD_CONTAINERID_DEFAULT = EtcdDiscoveryContainer.class.getName();
+
 	private EtcdServiceID targetID;
 	private String sessionId;
 	private long ttl = ETCD_TTL_DEFAULT.longValue();
 	private int sessionTTL = ETCD_SESSIONTTL_DEFAULT;
 
 	public EtcdDiscoveryContainerConfig() throws MalformedURLException, URISyntaxException {
-		this(EtcdDiscoveryContainer.class.getName());
+		this(System.getProperty(ETCD_CONTAINERID_PROP,ETCD_CONTAINERID_DEFAULT));
 	}
+
 	public EtcdDiscoveryContainerConfig(String containerId)
 			throws MalformedURLException, URISyntaxException {
 		super(IDFactory.getDefault().createStringID(containerId));

diff --git a/features/org.eclipse.ecf.provider.etcd.feature/build/artifacts.jar b/features/org.eclipse.ecf.provider.etcd.feature/build/artifacts.jar
diff --git a/features/org.eclipse.ecf.provider.etcd.feature/build/content.jar b/features/org.eclipse.ecf.provider.etcd.feature/build/content.jar
diff --git a/...eature/build/features/org.eclipse.ecf.provider.etcd.feature.source_1.2.0.201711271212.jar b/...eature/build/features/org.eclipse.ecf.provider.etcd.feature.source_1.2.0.201711271212.jar
diff --git a/...eature/build/features/org.eclipse.ecf.provider.etcd.feature.source_1.3.0.201712041851.jar b/...eature/build/features/org.eclipse.ecf.provider.etcd.feature.source_1.3.0.201712041851.jar
diff --git a/...vider.etcd.feature_1.2.0.201711271212.jar → ...vider.etcd.feature_1.3.0.201712041851.jar b/...vider.etcd.feature_1.2.0.201711271212.jar → ...vider.etcd.feature_1.3.0.201712041851.jar
diff --git a/features/org.eclipse.ecf.provider.etcd.feature/build/karaf-features.xml b/features/org.eclipse.ecf.provider.etcd.feature/build/karaf-features.xml
@@ -1,7 +1,7 @@
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-discovery-etcd-1.2.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-discovery-etcd-1.3.0">
 
-<feature name="ecf-remoteservices-discprovider-etcd" version="1.2.0" description="ECF RemoteServices Etcd Discovery Provider">
-	<bundle>https://github.com/ECF/etcd-provider/blob/master/features/org.eclipse.ecf.provider.etcd.feature/build/plugins/org.eclipse.ecf.provider.etcd_1.2.0.201711271212.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-etcd" version="1.3.0" description="ECF RemoteServices Etcd Discovery Provider">
+	<bundle>https://github.com/ECF/etcd-provider/blob/master/features/org.eclipse.ecf.provider.etcd.feature/build/plugins/org.eclipse.ecf.provider.etcd_1.3.0.201712041851.jar</bundle>
 </feature>
 
 </features>

diff --git a/...ovider.etcd.source_1.2.0.201711271212.jar → ...ovider.etcd.source_1.3.0.201712041851.jar b/...ovider.etcd.source_1.2.0.201711271212.jar → ...ovider.etcd.source_1.3.0.201712041851.jar
diff --git a/....provider.etcd.feature/build/plugins/org.eclipse.ecf.provider.etcd_1.2.0.201711271212.jar b/....provider.etcd.feature/build/plugins/org.eclipse.ecf.provider.etcd_1.2.0.201711271212.jar
diff --git a/....provider.etcd.feature/build/plugins/org.eclipse.ecf.provider.etcd_1.3.0.201712041851.jar b/....provider.etcd.feature/build/plugins/org.eclipse.ecf.provider.etcd_1.3.0.201712041851.jar