You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/06/23 07:28:55 UTC
[2/2] karaf-cellar git commit: [KARAF-4236] Add etcd support for
discovery
[KARAF-4236] Add etcd support for discovery
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/1c59ffb7
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/1c59ffb7
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/1c59ffb7
Branch: refs/heads/master
Commit: 1c59ffb756b32f71e5805024c183b7285ae9d7c5
Parents: f9cc1d5 ee4adcf
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Jun 23 09:28:22 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Jun 23 09:28:22 2016 +0200
----------------------------------------------------------------------
assembly/src/main/resources/features.xml | 17 ++-
etcd/NOTICE | 43 ++++++
etcd/pom.xml | 130 ++++++++++++++++++
.../karaf/cellar/etcd/EtcdDiscoveryService.java | 131 +++++++++++++++++++
.../etcd/EtcdDiscoveryServiceFactory.java | 121 +++++++++++++++++
.../karaf/cellar/etcd/internal/CellarNode.java | 33 +++++
.../karaf/cellar/etcd/internal/EtcdAction.java | 39 ++++++
.../karaf/cellar/etcd/internal/EtcdKeyNode.java | 87 ++++++++++++
.../cellar/etcd/internal/EtcdKeyResponse.java | 34 +++++
.../karaf/cellar/etcd/internal/EtcdService.java | 24 ++++
.../cellar/etcd/internal/osgi/Activator.java | 49 +++++++
.../cellar/etcd/EtcdDiscoveryServiceTest.java | 55 ++++++++
pom.xml | 27 +++-
13 files changed, 784 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/1c59ffb7/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --cc assembly/src/main/resources/features.xml
index 1316c49,692c1e9..f4889d5
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@@ -98,11 -98,11 +98,22 @@@
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.cloud/${project.version}</bundle>
</feature>
-- <feature name="cellar-kubernetes" description="Cellar kubernetes support in clusters" version="${project.version}">
++ <feature name="cellar-kubernetes" description="Cellar Kubernetes support" version="${project.version}">
++ <feature>cellar-core</feature>
<feature>fabric8-kubernetes-api</feature>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.kubernetes/${project.version}</bundle>
</feature>
++ <feature name="cellar-dns" description="Cellar DNS support" version="${project.version}">
++ <feature>cellar-core</feature>
++ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.dns/${project.version}</bundle>
++ </feature>
++
++ <feature name="cellar-etcd" description="Cellar Etcd discovery support" version="${project.version}">
++ <feature>cellar-core</feature>
++ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.etcd/${project.version}</bundle>
++ </feature>
++
<feature name="cellar-webconsole" description="Cellar plugin for Karaf WebConsole" version="${project.version}">
<feature>webconsole</feature>
<feature>cellar-hazelcast</feature>
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/1c59ffb7/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f8f159c,12b2796..c5c281a
--- a/pom.xml
+++ b/pom.xml
@@@ -66,7 -68,7 +68,8 @@@
<module>http</module>
<module>cloud</module>
<module>kubernetes</module>
+ <module>dns</module>
+ <module>etcd</module>
<module>webconsole</module>
<module>assembly</module>
<module>samples</module>