You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2014/03/05 23:30:25 UTC
git commit: [JCLOUDS-189] Upgrade to Karaf 2.3.2. Explicitly specify
jclouds feautre to add to feature repo. Use Karaf's 2.3.x pax-exam support.
Repository: jclouds-karaf
Updated Branches:
refs/heads/master 6abf499b0 -> f212c9888
[JCLOUDS-189] Upgrade to Karaf 2.3.2. Explicitly specify jclouds feautre to add to feature repo. Use Karaf's 2.3.x pax-exam support.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/f212c988
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/f212c988
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/f212c988
Branch: refs/heads/master
Commit: f212c98888177a47bf6cbf2c10484652d565351c
Parents: 6abf499
Author: Ioannis Canellos <io...@apache.org>
Authored: Thu Aug 1 21:59:11 2013 +0300
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Mar 5 21:40:40 2014 +0100
----------------------------------------------------------------------
.../java/org/jclouds/karaf/cache/Activator.java | 3 +-
.../org/jclouds/karaf/chef/cache/Activator.java | 3 +-
.../chef/commands/ChefServiceCreateCommand.java | 9 ++--
.../BlobStoreServiceCreateCommand.java | 9 ++--
.../compute/ComputeServiceCreateCommand.java | 9 ++--
feature/pom.xml | 55 ++++++++++++++++++++
itests/pom.xml | 13 +++--
.../itests/AwsFeaturesInstallationTest.java | 1 -
.../itests/JcloudsFeaturesTestSupport.java | 6 +--
.../karaf/itests/JcloudsKarafTestSupport.java | 20 +++++--
.../itests/MiscFeaturesInstallationTest.java | 1 -
.../karaf/itests/live/AwsEc2LiveTest.java | 6 +--
.../karaf/itests/live/AwsS3LiveTest.java | 6 +--
.../karaf/itests/live/CloudFilesUsLiveTest.java | 6 +--
.../karaf/itests/live/RackspaceLiveTest.java | 8 +--
.../JcloudsCamelCxfFeaturesTestSupport.java | 8 +--
pom.xml | 27 +++++-----
services/pom.xml | 8 ---
18 files changed, 128 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/Activator.java b/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
index d20bcd2..a1bc0ec 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
@@ -25,6 +25,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
+import java.util.Hashtable;
import java.util.Properties;
public class Activator implements BundleActivator {
@@ -64,7 +65,7 @@ public class Activator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
CacheProvider cacheProvider = new BasicCacheProvider();
- cacheProviderRegistration = context.registerService(CacheProvider.class.getName(), cacheProvider, new Properties());
+ cacheProviderRegistration = context.registerService(CacheProvider.class.getName(), cacheProvider, new Hashtable<String, Object>());
computeServiceTracker = CacheUtils.createServiceCacheTracker(context, ComputeService.class, computeCacheManager);
computeCacheableTracker = CacheUtils.createCacheableTracker(context, "jclouds.computeservice",computeCacheManager);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
----------------------------------------------------------------------
diff --git a/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java b/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
index 70ec099..5c81f60 100644
--- a/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
+++ b/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
@@ -27,6 +27,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
+import java.util.Hashtable;
import java.util.Properties;
public class Activator implements BundleActivator {
@@ -57,7 +58,7 @@ public class Activator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
CacheProvider cacheProvider = new BasicCacheProvider();
- cacheProviderRegistration = context.registerService(CacheProvider.class.getName(), cacheProvider, new Properties());
+ cacheProviderRegistration = context.registerService(CacheProvider.class.getName(), cacheProvider, new Hashtable<String, Object>());
chefServiceTracker = CacheUtils.createServiceCacheTracker(context, ChefService.class, chefCacheManager);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
index ac48668..df3d43a 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
@@ -29,10 +29,7 @@ import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
@Command(scope = "chef", name = "service-create", description = "Creates a chef service")
public class ChefServiceCreateCommand extends ChefCommandWithOptions {
@@ -126,9 +123,9 @@ public class ChefServiceCreateCommand extends ChefCommandWithOptions {
Configuration configuration = findOrCreateFactoryConfiguration(configurationAdmin, "org.jclouds.chef", name, api);
if (configuration != null) {
@SuppressWarnings("unchecked")
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
if (dictionary == null) {
- dictionary = new Properties();
+ dictionary = new Hashtable<String, Object>();
}
String apiValue = ChefHelper.getChefApi(api);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreServiceCreateCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreServiceCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreServiceCreateCommand.java
index 18d4671..65d8004 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreServiceCreateCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobStoreServiceCreateCommand.java
@@ -29,10 +29,7 @@ import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
@Command(scope = "jclouds", name = "blobstore-service-create", description = "Creates a BlobStore service.", detailedDescription = "classpath:blobstore-service-create.txt")
public class BlobStoreServiceCreateCommand extends BlobStoreCommandWithOptions {
@@ -141,9 +138,9 @@ public class BlobStoreServiceCreateCommand extends BlobStoreCommandWithOptions {
"org.jclouds.blobstore", id, provider, api);
if (configuration != null) {
@SuppressWarnings("unchecked")
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
if (dictionary == null) {
- dictionary = new Properties();
+ dictionary = new Hashtable<String, Object>();
}
String providerValue = EnvHelper.getBlobStoreProvider(provider);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeServiceCreateCommand.java
----------------------------------------------------------------------
diff --git a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeServiceCreateCommand.java b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeServiceCreateCommand.java
index 152c33e..8c67b58 100644
--- a/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeServiceCreateCommand.java
+++ b/commands/src/main/java/org/jclouds/karaf/commands/compute/ComputeServiceCreateCommand.java
@@ -17,10 +17,7 @@
package org.jclouds.karaf.commands.compute;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
@@ -140,9 +137,9 @@ public class ComputeServiceCreateCommand extends ComputeCommandWithOptions {
Configuration configuration = findOrCreateFactoryConfiguration(configurationAdmin, "org.jclouds.compute", name, provider, api);
if (configuration != null) {
@SuppressWarnings("unchecked")
- Dictionary<Object, Object> dictionary = configuration.getProperties();
+ Dictionary<String, Object> dictionary = configuration.getProperties();
if (dictionary == null) {
- dictionary = new Properties();
+ dictionary = new Hashtable<String, Object>();
}
String providerValue = EnvHelper.getComputeProvider(provider);
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/feature/pom.xml
----------------------------------------------------------------------
diff --git a/feature/pom.xml b/feature/pom.xml
index 83798cd..fef9cdd 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -104,6 +104,61 @@ limitations under the License.
<descriptors>
<descriptor>file:${basedir}/target/feature.xml</descriptor>
</descriptors>
+ <features>
+ <feature>jclouds</feature>
+ <feature>jclouds-blobstore</feature>
+ <feature>jclouds-compute</feature>
+ <feature>jclouds-management</feature>
+ <feature>jclouds-api-filesystem</feature>
+ <feature>jclouds-api-elasticstack</feature>
+ <feature>jclouds-api-vcloud</feature>
+ <feature>jclouds-api-byon</feature>
+ <feature>jclouds-api-swift</feature>
+ <feature>jclouds-api-openstack-nova</feature>
+ <feature>jclouds-api-openstack-keystone</feature>
+ <feature>jclouds-api-openstack-cinder</feature>
+ <feature>jclouds-aws-cloudwatch</feature>
+ <feature>jclouds-aws-ec2</feature>
+ <feature>jclouds-aws-route53</feature>
+ <feature>jclouds-aws-s3</feature>
+ <feature>jclouds-aws-sqs</feature>
+ <feature>jclouds-aws-sts</feature>
+ <feature>jclouds-azureblob</feature>
+ <feature>jclouds-bluelock-vcloud-zone01</feature>
+ <feature>jclouds-cloudfiles-uk</feature>
+ <feature>jclouds-cloudfiles-us</feature>
+ <feature>jclouds-dynect</feature>
+ <feature>jclouds-rackspace-cloudloadbalancers-us</feature>
+ <feature>jclouds-rackspace-cloudloadbalancers-uk</feature>
+ <feature>jclouds-cloudonestorage</feature>
+ <feature>jclouds-cloudserver-uk</feature>
+ <feature>jclouds-cloudserver-us</feature>
+ <feature>jclouds-rackspace-cloudservers-us</feature>
+ <feature>jclouds-rackspace-cloudservers-uk</feature>
+ <feature>jclouds-rackspace-clouddns-us</feature>
+ <feature>jclouds-rackspace-clouddns-uk</feature>
+ <feature>jclouds-rackspace-cloudblockstorage-us</feature>
+ <feature>jclouds-rackspace-cloudblockstorage-uk</feature>
+ <feature>jclouds-cloudsigma-zrh</feature>
+ <feature>jclouds-cloudsigma-lvs</feature>
+ <feature>jclouds-elastichosts-lon-b</feature>
+ <feature>jclouds-elastichosts-lon-p</feature>
+ <feature>jclouds-elastichosts-sat-p</feature>
+ <feature>jclouds-elastichosts-lax-p</feature>
+ <feature>jclouds-elastichosts-tor-p</feature>
+ <feature>jclouds-gogrid</feature>
+ <feature>jclouds-go2cloud-jhb1</feature>
+ <feature>jclouds-greenhousedata-element-vcloud</feature>
+ <feature>jclouds-glesys</feature>
+ <feature>jclouds-hpcloud-objectstorage</feature>
+ <feature>jclouds-hpcloud-compute</feature>
+ <feature>jclouds-ninefold-storage</feature>
+ <feature>jclouds-ninefold-compute</feature>
+ <feature>jclouds-openhosting-east1</feature>
+ <feature>jclouds-serverlove-z1-man</feature>
+ <feature>jclouds-skalicloud-sdg-my</feature>
+ <feature>jclouds-softlayer</feature>
+ </features>
<repository>target/features-repo</repository>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 98213eb..5393fc8 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -108,12 +108,17 @@ limitations under the License.
<dependency>
- <groupId>org.openengsb.labs.paxexam.karaf</groupId>
- <artifactId>paxexam-karaf-container</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.options</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<scope>test</scope>
@@ -170,6 +175,8 @@ limitations under the License.
<exclude>**/special/*Test.*</exclude>
</excludes>
<systemPropertyVariables>
+ <!-- Private Maven Repo -->
+ <maven.repo.local>${maven.repo.local}</maven.repo.local>
<!-- EC2 Live Variables -->
<jclouds.aws.identity>${jclouds.aws.identity}</jclouds.aws.identity>
<jclouds.aws.credential>${jclouds.aws.credential}</jclouds.aws.credential>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/AwsFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/AwsFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/AwsFeaturesInstallationTest.java
index 3cd8655..f282998 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/AwsFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/AwsFeaturesInstallationTest.java
@@ -50,7 +50,6 @@ public class AwsFeaturesInstallationTest extends JcloudsFeaturesTestSupport {
installAndCheckFeature("jclouds-aws-sqs");
}
- @Ignore
@Test
public void testAwsStsFeature() throws Exception {
installAndCheckFeature("jclouds-aws-sts");
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java
index 279efa2..19757b9 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsFeaturesTestSupport.java
@@ -18,11 +18,11 @@
package org.jclouds.karaf.itests;
import static junit.framework.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import org.apache.karaf.features.FeaturesService;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
index 2182ce4..b8705a6 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java
@@ -17,8 +17,8 @@
package org.jclouds.karaf.itests;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
import static org.ops4j.pax.exam.CoreOptions.maven;
import java.io.ByteArrayOutputStream;
@@ -39,6 +39,7 @@ import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.junit.ProbeBuilder;
+import org.ops4j.pax.exam.options.DefaultCompositeOption;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -49,6 +50,8 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFileExtend;
+
public class JcloudsKarafTestSupport {
public static final Long DEFAULT_TIMEOUT = 10000L;
@@ -86,9 +89,16 @@ public class JcloudsKarafTestSupport {
* @return
*/
protected Option jcloudsDistributionConfiguration() {
- return karafDistributionConfiguration().frameworkUrl(
- maven().groupId(KARAF_GROUP_ID).artifactId(KARAF_ARTIFACT_ID).versionAsInProject().type("tar.gz"))
- .karafVersion(getKarafVersion()).name("Apache Karaf Distro").unpackDirectory(new File("target/paxexam/unpack/"));
+ return new DefaultCompositeOption(karafDistributionConfiguration()
+ .frameworkUrl(maven()
+ .groupId(KARAF_GROUP_ID)
+ .artifactId(KARAF_ARTIFACT_ID)
+ .versionAsInProject().type("tar.gz"))
+ .karafVersion(getKarafVersion()).name("Apache Karaf Distro")
+ .unpackDirectory(new File("target/paxexam/unpack/")),
+ //We use this option to allow the container to use artifacts found in a private repo.
+ editConfigurationFileExtend("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories",", file:${maven.local.repo}@id=mavenlocalrepo@snapshots")
+ );
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
index 26e2dd9..e2f79d4 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java
@@ -19,7 +19,6 @@ package org.jclouds.karaf.itests;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/live/AwsEc2LiveTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/live/AwsEc2LiveTest.java b/itests/src/test/java/org/jclouds/karaf/itests/live/AwsEc2LiveTest.java
index c0faa41..b4b9cb1 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/live/AwsEc2LiveTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/live/AwsEc2LiveTest.java
@@ -18,8 +18,8 @@
package org.jclouds.karaf.itests.live;
import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import org.jclouds.compute.ComputeService;
@@ -27,7 +27,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/live/AwsS3LiveTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/live/AwsS3LiveTest.java b/itests/src/test/java/org/jclouds/karaf/itests/live/AwsS3LiveTest.java
index 1fdcfd9..cd4e583 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/live/AwsS3LiveTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/live/AwsS3LiveTest.java
@@ -19,8 +19,8 @@ package org.jclouds.karaf.itests.live;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import java.io.File;
@@ -38,7 +38,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/live/CloudFilesUsLiveTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/live/CloudFilesUsLiveTest.java b/itests/src/test/java/org/jclouds/karaf/itests/live/CloudFilesUsLiveTest.java
index a4b54b8..40ee228 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/live/CloudFilesUsLiveTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/live/CloudFilesUsLiveTest.java
@@ -19,8 +19,8 @@ package org.jclouds.karaf.itests.live;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import java.io.File;
@@ -38,7 +38,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java b/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
index 54ff732..58d728d 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java
@@ -18,9 +18,9 @@
package org.jclouds.karaf.itests.live;
import static org.junit.Assert.assertTrue;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.debugConfiguration;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.debugConfiguration;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import org.jclouds.compute.ComputeService;
@@ -28,7 +28,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/itests/src/test/java/org/jclouds/karaf/itests/special/JcloudsCamelCxfFeaturesTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/jclouds/karaf/itests/special/JcloudsCamelCxfFeaturesTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/special/JcloudsCamelCxfFeaturesTestSupport.java
index 86d9ac0..4d80827 100644
--- a/itests/src/test/java/org/jclouds/karaf/itests/special/JcloudsCamelCxfFeaturesTestSupport.java
+++ b/itests/src/test/java/org/jclouds/karaf/itests/special/JcloudsCamelCxfFeaturesTestSupport.java
@@ -17,15 +17,15 @@
package org.jclouds.karaf.itests.special;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.logLevel;
-import static org.openengsb.labs.paxexam.karaf.options.KarafDistributionOption.replaceConfigurationFile;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
+import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.replaceConfigurationFile;
import java.io.File;
import org.jclouds.karaf.itests.live.AwsEc2LiveTest;
import org.junit.Before;
-import org.openengsb.labs.paxexam.karaf.options.LogLevelOption;
+import org.apache.karaf.tooling.exam.options.LogLevelOption;
import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4588594..984d1bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,12 +205,11 @@ limitations under the License.
<junit.version>4.8.2</junit.version>
<jzlib.bundle.version>1.0.7_1</jzlib.bundle.version>
<jzlib.version>1.0.7</jzlib.version>
- <karaf.version>2.2.7</karaf.version>
+ <karaf.version>2.3.2</karaf.version>
<net.oauth.bundle.version>20100527_1</net.oauth.bundle.version>
<netty.bundle.version>3.3.1.Final</netty.bundle.version>
- <osgi.version>4.2.0</osgi.version>
- <pax-exam-karaf.version>0.4.1</pax-exam-karaf.version>
- <pax-exam.version>2.3.1</pax-exam.version>
+ <osgi.version>4.3.0</osgi.version>
+ <pax-exam.version>2.6.0</pax-exam.version>
<pax-url-mvn.version>1.3.5</pax-url-mvn.version>
<pax-url-aether.version>1.4.0.RC1</pax-url-aether.version>
<rocoto.version>6.2</rocoto.version>
@@ -324,14 +323,6 @@ limitations under the License.
<version>${pax-url-aether.version}</version>
</dependency>
- <!-- Pax Exam Karaf -->
- <dependency>
- <groupId>org.openengsb.labs.paxexam.karaf</groupId>
- <artifactId>paxexam-karaf-container</artifactId>
- <version>${pax-exam-karaf.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
@@ -556,6 +547,18 @@ limitations under the License.
<version>${karaf.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.options</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.tooling.exam</groupId>
+ <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ <version>${karaf.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/f212c988/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index ddeac09..b9f6973 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -77,14 +77,6 @@ limitations under the License.
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>