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 2015/01/14 17:25:09 UTC
[1/2] karaf-cellar git commit: [KARAF-3294] Fix default
etc/hazelcast.xml for Hazelcast 3.4
Repository: karaf-cellar
Updated Branches:
refs/heads/master c67dd3df4 -> e4fb165d0
[KARAF-3294] Fix default etc/hazelcast.xml for Hazelcast 3.4
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/895fad16
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/895fad16
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/895fad16
Branch: refs/heads/master
Commit: 895fad169847e417900480661f2c2cbe9d1816f8
Parents: c67dd3d
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 14 17:24:03 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 14 17:24:03 2015 +0100
----------------------------------------------------------------------
assembly/src/main/resources/hazelcast.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/895fad16/assembly/src/main/resources/hazelcast.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/hazelcast.xml b/assembly/src/main/resources/hazelcast.xml
index ce48154..9d42a94 100644
--- a/assembly/src/main/resources/hazelcast.xml
+++ b/assembly/src/main/resources/hazelcast.xml
@@ -21,7 +21,7 @@
<multicast-group>224.2.2.3</multicast-group>
<multicast-port>54327</multicast-port>
</multicast>
- <tcp-ip enabled="true">
+ <tcp-ip enabled="false">
<interface>127.0.0.1</interface>
</tcp-ip>
<aws enabled="false">
[2/2] karaf-cellar git commit: [KARAF-3299] Upgrade to jclouds 1.8.1
Posted by jb...@apache.org.
[KARAF-3299] Upgrade to jclouds 1.8.1
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/e4fb165d
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/e4fb165d
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/e4fb165d
Branch: refs/heads/master
Commit: e4fb165d0d5d7bdc53acb8fdb957f50a8c005dfb
Parents: 895fad1
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jan 14 17:24:32 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jan 14 17:24:32 2015 +0100
----------------------------------------------------------------------
assembly/src/main/resources/features.xml | 2 +-
cloud/pom.xml | 4 ++--
.../apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java | 4 ++--
pom.xml | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/e4fb165d/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index 533070c..fb51245 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -15,7 +15,7 @@
-->
<features name="karaf-cellar-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
- <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
+ <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
<feature name="cellar-core" description="Karaf clustering core" version="${project.version}" resolver="(obr)">
<configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/e4fb165d/cloud/pom.xml
----------------------------------------------------------------------
diff --git a/cloud/pom.xml b/cloud/pom.xml
index be8111a..392b7d2 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -43,12 +43,12 @@
<!-- JClouds Dependencies -->
<dependency>
- <groupId>org.jclouds</groupId>
+ <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
+ <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-allblobstore</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/e4fb165d/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
----------------------------------------------------------------------
diff --git a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
index 677d1a8..d3cba4d 100644
--- a/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
+++ b/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
@@ -14,9 +14,9 @@
package org.apache.karaf.cellar.cloud;
import org.apache.karaf.cellar.core.discovery.DiscoveryService;
+import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
-import org.jclouds.blobstore.BlobStoreContextFactory;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata;
@@ -62,7 +62,7 @@ public class BlobStoreDiscoveryService implements DiscoveryService {
try {
if (blobStore == null) {
if (context == null) {
- context = new BlobStoreContextFactory().createContext(provider, identity, credential);
+ context = ContextBuilder.newBuilder(provider).credentials(identity, credential).buildView(BlobStoreContext.class);
}
blobStore = context.getBlobStore();
signIn();
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/e4fb165d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1e5c0f3..f56d55b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<felix.utils.version>1.6.0</felix.utils.version>
<felix.webconsole.version>4.2.2</felix.webconsole.version>
<hazelcast.version>3.4</hazelcast.version>
- <jclouds.version>1.4.0</jclouds.version>
+ <jclouds.version>1.8.1</jclouds.version>
<joda-time.version>2.5</joda-time.version>
<junit.version>4.11</junit.version>
<karaf.version>3.0.2</karaf.version>
@@ -269,13 +269,13 @@
<!-- JClouds -->
<dependency>
- <groupId>org.jclouds</groupId>
+ <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
+ <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-allblobstore</artifactId>
<version>${jclouds.version}</version>
</dependency>