Repository: jclouds-karaf Updated Branches: refs/heads/master 21149b046 -> fa11dcfc1
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index b8705a6..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/JcloudsKarafTestSupport.java +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests; - -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; -import java.io.File; -import java.io.PrintStream; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Dictionary; -import java.util.Enumeration; - -import javax.inject.Inject; - -import org.apache.felix.service.command.CommandProcessor; -import org.apache.felix.service.command.CommandSession; -import org.ops4j.pax.exam.CoreOptions; -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; -import org.osgi.framework.Constants; -import org.osgi.framework.Filter; -import org.osgi.framework.FrameworkUtil; -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; - public static final Long DEFAULT_WAIT = 10000L; - - public static final String KARAF_GROUP_ID = "org.apache.karaf"; - public static final String KARAF_ARTIFACT_ID = "apache-karaf"; - - public static final String JCLOUDS_KARAF_GROUP_ID = "org.apache.jclouds.karaf"; - public static final String JCLOUDS_KARAF_ARTIFACT_ID = "jclouds-karaf"; - - public static final String JCLOUDS_GROUP_ID = "org.apache.jclouds"; - public static final String JCLOUDS_ARTIFACT_ID = "jclouds-core"; - - @Inject - protected BundleContext bundleContext; - - - /** - * This is used to customize the Probe that will contain the test. - * We need to enable dynamic import of provisional bundles, to use the Console. - * - * @param probe - * @return - */ - @ProbeBuilder - public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { - probe.setHeader(Constants.DYNAMICIMPORT_PACKAGE, "*,org.apache.felix.service.*;status=provisional"); - return probe; - } - - /** - * Create an {@link Option} for using Apache Karaf distribution. - * - * @return - */ - protected Option jcloudsDistributionConfiguration() { - 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") - ); - } - - /** - * Sets a System property. - * @param propertyName - * @return - */ - public static Option systemProperty(String propertyName, String propertyValue) { - return editConfigurationFileExtend("etc/system.properties", propertyName, propertyValue != null ? propertyValue : ""); - } - - /** - * Copies the actual System property to the container properties. - * @param propertyName - * @return - */ - public static Option systemProperty(String propertyName) { - return systemProperty(propertyName, System.getProperty(propertyName)); - } - - - /** - * Executes the command and returns the output as a String. - * - * @param command - * @return - */ - protected String executeCommand(String command) { - ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - PrintStream printStream = new PrintStream(byteArrayOutputStream); - CommandProcessor commandProcessor = getOsgiService(CommandProcessor.class); - CommandSession commandSession = commandProcessor.createSession(System.in, printStream, System.err); - //This is required in order to run scripts that use those session variables. - commandSession.put("APPLICATION", System.getProperty("karaf.name", "root")); - commandSession.put("USER", "karaf"); - - try { - System.err.println(command); - commandSession.execute(command); - } catch (Exception e) { - e.printStackTrace(System.err); - } - return byteArrayOutputStream.toString(); - } - - - /** - * Executes multiple commands inside a Single Session. - * Commands have a default timeout of 10 seconds. - * @param commands - * @return - */ - protected String executeCommands(final String ...commands) { - final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); - final PrintStream printStream = new PrintStream(byteArrayOutputStream); - final CommandProcessor commandProcessor = getOsgiService(CommandProcessor.class); - final CommandSession commandSession = commandProcessor.createSession(System.in, printStream, System.err); - commandSession.put("APPLICATION", System.getProperty("karaf.name", "root")); - commandSession.put("USER", "karaf"); - - for (String command : commands) { - try { - System.err.println(command); - commandSession.execute(command); - } catch (Exception e) { - e.printStackTrace(System.err); - } - } - - return byteArrayOutputStream.toString(); - } - - protected Bundle installBundle(String groupId, String artifactId) throws Exception { - MavenArtifactProvisionOption mvnUrl = mavenBundle(groupId, artifactId); - return bundleContext.installBundle(mvnUrl.getURL()); - } - - - protected Bundle getInstalledBundle(String symbolicName) { - for (Bundle b : bundleContext.getBundles()) { - if (b.getSymbolicName().equals(symbolicName)) { - return b; - } - } - for (Bundle b : bundleContext.getBundles()) { - System.err.println("Bundle: " + b.getSymbolicName()); - } - throw new RuntimeException("Bundle " + symbolicName + " does not exist"); - } - - /* - * Explode the dictionary into a ,-delimited list of key=value pairs - */ - private static String explode(Dictionary dictionary) { - Enumeration keys = dictionary.keys(); - StringBuffer result = new StringBuffer(); - while (keys.hasMoreElements()) { - Object key = keys.nextElement(); - result.append(String.format("%s=%s", key, dictionary.get(key))); - if (keys.hasMoreElements()) { - result.append(", "); - } - } - return result.toString(); - } - - protected <T> T getOsgiService(Class<T> type, long timeout) { - return getOsgiService(type, null, timeout); - } - - protected <T> T getOsgiService(Class<T> type) { - return getOsgiService(type, null, DEFAULT_TIMEOUT); - } - - protected <T> T getOsgiService(Class<T> type, String filter, long timeout) { - ServiceTracker tracker = null; - try { - String flt; - if (filter != null) { - if (filter.startsWith("(")) { - flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")" + filter + ")"; - } else { - flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() + ")(" + filter + "))"; - } - } else { - flt = "(" + Constants.OBJECTCLASS + "=" + type.getName() + ")"; - } - Filter osgiFilter = FrameworkUtil.createFilter(flt); - tracker = new ServiceTracker(bundleContext, osgiFilter, null); - tracker.open(true); - // Note that the tracker is not closed to keep the reference - // This is buggy, as the service reference may change i think - Object svc = type.cast(tracker.waitForService(timeout)); - if (svc == null) { - Dictionary dic = bundleContext.getBundle().getHeaders(); - System.err.println("Test bundle headers: " + explode(dic)); - - for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, null))) { - System.err.println("ServiceReference: " + ref); - } - - for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) { - System.err.println("Filtered ServiceReference: " + ref); - } - - throw new RuntimeException("Gave up waiting for service " + flt); - } - return type.cast(svc); - } catch (InvalidSyntaxException e) { - throw new IllegalArgumentException("Invalid filter", e); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } - - - /* - * Provides an iterable collection of references, even if the original array is null - */ - private static Collection<ServiceReference> asCollection(ServiceReference[] references) { - return references != null ? Arrays.asList(references) : Collections.<ServiceReference>emptyList(); - } - - /** - * Create an provisioning option for the specified maven artifact - * (groupId and artifactId), using the version found in the list - * of dependencies of this maven project. - * - * @param groupId the groupId of the maven bundle - * @param artifactId the artifactId of the maven bundle - * @return the provisioning option for the given bundle - */ - protected static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId) { - return CoreOptions.mavenBundle(groupId, artifactId).versionAsInProject(); - } - - /** - * Create an provisioning option for the specified maven artifact - * (groupId and artifactId), using the version found in the list - * of dependencies of this maven project. - * - * @param groupId the groupId of the maven bundle - * @param artifactId the artifactId of the maven bundle - * @param version the version of the maven bundle - * @return the provisioning option for the given bundle - */ - protected static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId, String version) { - return CoreOptions.mavenBundle(groupId, artifactId).version(version); - } - - /** - * Returns the Version of Karaf to be used. - * - * @return - */ - protected String getKarafVersion() { - return MavenUtils.getArtifactVersion(KARAF_GROUP_ID, KARAF_ARTIFACT_ID); - } -} - - http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index e008148..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/MiscFeaturesInstallationTest.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class MiscFeaturesInstallationTest extends JcloudsFeaturesTestSupport { - - @Before - public void setUp() { - System.err.println(executeCommand("features:addurl " + getJcloudsKarafFeatureURL())); - } - - @After - public void tearDown() { - - } - - @Test - public void testBasicFeaturesInstallation() throws Exception { - installAndCheckFeature("jclouds-commands"); - } - - @Test - public void testGoGridFeature() throws Exception { - installAndCheckFeature("jclouds-gogrid"); - } - - @Test - public void testGo2CloudFeature() throws Exception { - installAndCheckFeature("jclouds-go2cloud-jhb1"); - } - - @Test - public void testOpenHostingEast1Feature() throws Exception { - installAndCheckFeature("jclouds-openhosting-east1"); - } - - @Test - public void testServerloveZ1ManFeature() throws Exception { - installAndCheckFeature("jclouds-serverlove-z1-man"); - } - - @Test - public void testSkalicloudSdgMyFeature() throws Exception { - installAndCheckFeature("jclouds-skalicloud-sdg-my"); - } - - @Test - public void testSoftlayerFeature() throws Exception { - installAndCheckFeature("jclouds-softlayer"); - } - - @Test - public void testAzureBlobFeature() throws Exception { - installAndCheckFeature("jclouds-azureblob"); - } - - @Test - public void testB2Feature() throws Exception { - installAndCheckFeature("jclouds-b2"); - } - - @Test - public void testAzureComputeArmFeature() throws Exception { - installAndCheckFeature("jclouds-azurecompute-arm"); - } - - @Test - public void testDynectFeature() throws Exception { - installAndCheckFeature("jclouds-dynect"); - } - - @Test - public void testGlesysFeature() throws Exception { - installAndCheckFeature("jclouds-glesys"); - } - - @Test - public void testDigitalOcean2Feature() throws Exception { - installAndCheckFeature("jclouds-digitalocean2"); - } - - @Test - public void testGoogleComputeEngineFeature() throws Exception { - installAndCheckFeature("jclouds-google-compute-engine"); - } - - @Test - public void testGoogleCloudStorageFeature() throws Exception { - installAndCheckFeature("jclouds-google-cloud-storage"); - } - - @Test - public void testProfitBricksFeature() throws Exception { - installAndCheckFeature("jclouds-profitbricks"); - } - - @Test - public void testPacketFeature() throws Exception { - installAndCheckFeature("jclouds-packet"); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java b/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java deleted file mode 100644 index bc6632f..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/ObrResolverTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - -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; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class ObrResolverTest extends JcloudsFeaturesTestSupport { - - @Before - public void setUp() { - System.err.println(executeCommand("features:addurl " + getJcloudsKarafFeatureURL())); - } - - @After - public void tearDown() { - - } - - /** - * This test checks that when the obr resolver is installed, jclouds-services feature can be properly installed. - * @throws Exception - */ - @Test - public void testJcloudsKarafServicesResolution() throws Exception { - installAndCheckFeature("obr"); - installAndCheckFeature("jclouds-services"); - String jcloudsServicesBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.services"); - assertNotNull(jcloudsServicesBundles); - int jcloudsServicesBundlesCount = Integer.parseInt(jcloudsServicesBundles.trim()); - assertEquals("Expected only one jclouds-services bundle", 1, jcloudsServicesBundlesCount); - } - - /** - * This test checks that when the obr resolver is installed, jclouds-commands feature can be properly installed. - * @throws Exception - */ - @Test - public void testJcloudsKarafCommandsResolution() throws Exception { - installAndCheckFeature("obr"); - installAndCheckFeature("jclouds-commands"); - String jcloudsCommandsBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.commands"); - assertNotNull(jcloudsCommandsBundles); - int jcloudsCommandsBundlesCount = Integer.parseInt(jcloudsCommandsBundles.trim()); - assertEquals("Expected one jclouds-commands bundle", 1, jcloudsCommandsBundlesCount); - - String jcloudsServicesBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.services"); - assertNotNull(jcloudsServicesBundles); - int jcloudsServicesBundlesCount = Integer.parseInt(jcloudsServicesBundles.trim()); - assertEquals("Expected one jclouds-services bundle", 1, jcloudsServicesBundlesCount); - } - - /** - * This test checks that when the obr resolver is installed, jclouds-chef feature can be properly installed. - * @throws Exception - */ - @Test - public void testJcloudsKarafChefResolution() throws Exception { - installAndCheckFeature("obr"); - installAndCheckFeature("jclouds-chef"); - String jcloudsChefCommandsBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.chef.commands"); - assertNotNull(jcloudsChefCommandsBundles); - int jcloudsCommandsBundlesCount = Integer.parseInt(jcloudsChefCommandsBundles.trim()); - assertEquals("Expected one chef commands bundle", 1, jcloudsCommandsBundlesCount); - - String jcloudsChefServicesBundles = executeCommand("osgi:list -s | grep -i -c org.apache.jclouds.karaf.chef.services"); - assertNotNull(jcloudsChefServicesBundles); - int jcloudsServicesBundlesCount = Integer.parseInt(jcloudsChefServicesBundles.trim()); - assertEquals("Expected one chef services bundle", 1, jcloudsServicesBundlesCount); - } - - /** - * This test checks that when the obr resolver is installed, we don't have multiple jersey bundles. - * @throws Exception - */ - @Ignore - @Test - public void testJerseyResolution() throws Exception { - installAndCheckFeature("obr"); - executeCommand("osgi:install -s mvn:com.sun.jersey/jersey-core/1.6"); - installAndCheckFeature("jclouds-aws-ec2"); - String jerseyBundles = executeCommand("osgi:list | grep -i -c jersey"); - assertNotNull(jerseyBundles); - int jerseyBundleCount = Integer.parseInt(jerseyBundles.trim()); - assertEquals("Expected only one jersey bundle",1,jerseyBundleCount); - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java b/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java deleted file mode 100644 index 1b768a8..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/RackspaceFeaturesInstallationTest.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class RackspaceFeaturesInstallationTest extends JcloudsFeaturesTestSupport { - - @Before - public void setUp() { - System.err.println(executeCommand("features:addurl " + getJcloudsKarafFeatureURL())); - } - - @After - public void tearDown() { - - } - - @Test - public void testRackspaceCloudServersUsFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudservers-us"); - } - - @Test - public void testRackspaceCloudServersUkFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudservers-uk"); - } - - @Test - public void testCloudDnsUsFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-clouddns-us"); - } - - @Test - public void testCloudDnsUkFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-clouddns-uk"); - } - - @Test - public void testCloudLoadBalancersUsFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudloadbalancers-us"); - } - - @Test - public void testCloudLoadBalancersUkFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudloadbalancers-uk"); - } - - @Test - public void testCloudBlockStorageUsFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudblockstorage-us"); - } - - @Test - public void testCloudBlockStorageUkFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudblockstorage-uk"); - } - - @Test - public void testRackspaceCloudFilesUkFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudfiles-uk"); - } - - @Test - public void testRackspaceCloudFilesUsFeature() throws Exception { - installAndCheckFeature("jclouds-rackspace-cloudfiles-us"); - } - -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/itests/src/test/java/org/jclouds/karaf/itests/ServiceTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/ServiceTest.java b/itests/src/test/java/org/jclouds/karaf/itests/ServiceTest.java new file mode 100644 index 0000000..feca9b0 --- /dev/null +++ b/itests/src/test/java/org/jclouds/karaf/itests/ServiceTest.java @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jclouds.karaf.itests; + +import static org.junit.Assert.assertNotNull; +import static org.ops4j.pax.exam.CoreOptions.maven; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; +import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; + +import java.io.File; + +import javax.inject.Inject; + +import org.jclouds.compute.ComputeService; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.ProbeBuilder; +import org.ops4j.pax.exam.TestProbeBuilder; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.karaf.options.LogLevelOption; +import org.ops4j.pax.exam.options.MavenArtifactUrlReference; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; + +@RunWith(PaxExam.class) +@ExamReactorStrategy(PerClass.class) +public class ServiceTest extends BasePaxExamTest { + + @Inject + protected BundleContext bundleContext; + + @Inject + ComputeService computeService; + + @Test + @Ignore("not ready yet") + public void testServiceAvailability() throws Exception { + assertNotNull(computeService); + } + + //Need to check this for class loading errors + @Test + @Ignore("not ready yet") + public void testComputeService() throws Exception { + assertNotNull(computeService); + assertNotNull(computeService.listAssignableLocations()); + } + + @ProbeBuilder + public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { + probe.setHeader(Constants.DYNAMICIMPORT_PACKAGE, "*,org.apache.felix.service.*;status=provisional"); + return probe; + } + + @Configuration + public Option[] config() { + MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf-minimal").versionAsInProject().type("tar.gz"); + return new Option[]{ + karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")), + configureSecurity().disableKarafMBeanServerBuilder(), + keepRuntimeFolder(), + editConfigurationFilePut("etc/system.properties", "features.xml", System.getProperty("features.xml")), + editConfigurationFileExtend( + "etc/org.ops4j.pax.url.mvn.cfg", + "org.ops4j.pax.url.mvn.repositories", + "file:" + System.getProperty("features-repo") + "@id=local@snapshots@releases"), + logLevel(LogLevelOption.LogLevel.INFO), + }; + } +} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index b4b9cb1..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/live/AwsEc2LiveTest.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests.live; - -import static org.junit.Assert.assertTrue; -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; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -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; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class AwsEc2LiveTest extends JcloudsLiveTestSupport { - - String group = "karaf"; - - @Before - public void setUp() throws Exception { - identity = System.getProperty("jclouds.aws.identity"); - credential = System.getProperty("jclouds.aws.credential"); - regions = System.getProperty("jclouds.aws.region"); - image = System.getProperty("jclouds.aws.image"); - location = System.getProperty("jclouds.aws.location"); - user = System.getProperty("jclouds.aws.user"); - - if (isComputeLiveConfigured()) { - installAndCheckFeature("jclouds-commands"); - Thread.sleep(DEFAULT_TIMEOUT); - } else { - System.err.println("Aborting test."); - System.err.flush(); - } - } - - @After - public void tearDown() { - if (isComputeLiveConfigured()) { - executeCommand("jclouds:node-destroy-all "); - } - } - - @Test - public void testCreateNodeLive() throws InterruptedException { - if (isComputeLiveConfigured()) { - createManagedComputeService("aws-ec2", false); - ComputeService computeService = getOsgiService(ComputeService.class,1000000L); - - System.err.println(executeCommand("jclouds:image-list")); - System.err.println(executeCommand("jclouds:node-create --imageId " + image + " --locationId " + location + " " + group)); - System.err.println(executeCommand("jclouds:group-runscript -d ls -u " + user + " " + group)); - assertTrue("Expected at least one node", computeService.listNodes().size() >= 1); - } - } - - @Configuration - public Option[] config() { - return new Option[]{ - jcloudsDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR), - systemProperty("jclouds.aws.identity"), - systemProperty("jclouds.aws.credential"), - systemProperty("jclouds.aws.region"), - systemProperty("jclouds.aws.image"), - systemProperty("jclouds.aws.location"), - systemProperty("jclouds.aws.user"), - scanFeatures(String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)),"jclouds", "jclouds-compute", "jclouds-aws-ec2").start() - }; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index cd4e583..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/live/AwsS3LiveTest.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests.live; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -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; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.util.LinkedHashSet; -import java.util.Set; - -import com.google.common.io.ByteStreams; -import org.apache.karaf.features.FeaturesService; -import org.jclouds.blobstore.BlobStore; -import org.jclouds.util.Closeables2; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -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; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class AwsS3LiveTest extends JcloudsLiveTestSupport { - - String group = "karaf"; - - @Before - public void setUp() throws Exception { - identity = System.getProperty("jclouds.aws.identity"); - credential = System.getProperty("jclouds.aws.credential"); - - if (isBlobStoreLiveConfigured()) { - installAndCheckFeature("jclouds-commands"); - Thread.sleep(DEFAULT_TIMEOUT); - } else { - System.err.println("Aborting test."); - System.err.flush(); - } - } - - @After - public void tearDown() { - if (isBlobStoreLiveConfigured()) { - System.err.println(executeCommand("jclouds:blobstore-container-delete itest-container")); - } - } - - @Test - public void testBlobStoreReadWrite() throws InterruptedException { - if (isBlobStoreLiveConfigured()) { - createManagedBlobStoreService("aws-s3"); - BlobStore blobStoreService = getOsgiService(BlobStore.class); - Thread.sleep(DEFAULT_TIMEOUT); - - String featureURL = System.getProperty("jclouds.featureURL"); - System.err.println(executeCommand("jclouds:blobstore-list")); - System.err.println(executeCommand("jclouds:blobstore-container-create itest-container")); - - System.err.println(executeCommand("jclouds:blobstore-write itest-container myfolder/myfile "+ featureURL )); - System.err.println(executeCommand("jclouds:blobstore-write --url-payload itest-container testblob "+ System.getProperty("jclouds.featureURL"))); - System.err.println(executeCommand("jclouds:blobstore-read --display itest-container testblob ")); - } - } - - - @Test - public void testUrlHandler() throws Exception { - if (isBlobStoreLiveConfigured()) { - createManagedBlobStoreService("aws-s3"); - BlobStore blobStoreService = getOsgiService(BlobStore.class); - Thread.sleep(DEFAULT_TIMEOUT); - - FeaturesService featuresService = getOsgiService(FeaturesService.class); - featuresService.installFeature("jclouds-url-handler"); - - //Let's add a bundle to S3 - String groupId = "org.jclouds.api"; - String artifactId = "byon"; - String version = System.getProperty("jclouds.version"); - - System.err.println(executeCommand("jclouds:blobstore-list")); - System.err.println(executeCommand("jclouds:blobstore-container-create itest-container")); - - URL artifactUrl = new URL("mvn:"+groupId+"/"+artifactId+"/"+version); - URL blobUrl = new URL("blob:aws-s3/itest-container/maven2/org/jclouds/api/byon/" +version+"/"+artifactId+"-"+version+".jar" ); - InputStream is = artifactUrl.openConnection().getInputStream(); - OutputStream os = blobUrl.openConnection().getOutputStream(); - try { - ByteStreams.copy(is, os); - os.flush(); - } finally { - Closeables2.closeQuietly(is); - Closeables2.closeQuietly(os); - } - //Make sure that only S3 is available as a repo. - System.err.println(executeCommands("config:edit org.ops4j.pax.url.mvn", - "config:propset org.ops4j.pax.url.mvn.localRepository " + System.getProperty("karaf.base") + File.separatorChar + "none", - "config:propset org.ops4j.pax.url.mvn.repositories blob:aws-s3/itest-container/maven2@snapshots ", - "config:update")); - Thread.sleep(DEFAULT_TIMEOUT); - - final Set<String> installedSymbolicNames = new LinkedHashSet<String>(); - - //Add a Bundle Listener - bundleContext.addBundleListener(new BundleListener(){ - @Override - public void bundleChanged(BundleEvent event) { - if (event.getType() == BundleEvent.INSTALLED) { - installedSymbolicNames.add(event.getBundle().getSymbolicName()); - } - } - }); - - //Install the bundle the from S3. - System.err.println(executeCommand("osgi:install mvn:org.jclouds.api/byon/" + version)); - - //Verify that no other bundle can be installed. - System.err.println(executeCommand("osgi:install mvn:org.jclouds.api/nova/" + version)); - assertTrue(installedSymbolicNames.contains("byon")); - assertFalse(installedSymbolicNames.contains("nova")); - - - } - } - - @Configuration - public Option[] config() { - return new Option[]{ - jcloudsDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR), - systemProperty("jclouds.aws.identity"), - systemProperty("jclouds.aws.credential"), - systemProperty("jclouds.karaf.version",MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)), - systemProperty("jclouds.version",MavenUtils.getArtifactVersion(JCLOUDS_GROUP_ID, JCLOUDS_ARTIFACT_ID)), - systemProperty("jclouds.featureURL",String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID))), - scanFeatures(String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)),"jclouds", "jclouds-commands", "jclouds-aws-s3").start() - }; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index 19fb057..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/live/CloudFilesUsLiveTest.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests.live; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -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; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.util.LinkedHashSet; -import java.util.Set; - -import com.google.common.io.ByteStreams; -import org.apache.karaf.features.FeaturesService; -import org.jclouds.blobstore.BlobStore; -import org.jclouds.util.Closeables2; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -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; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleListener; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class CloudFilesUsLiveTest extends JcloudsLiveTestSupport { - - String group = "karaf"; - - @Before - public void setUp() throws Exception { - identity = System.getProperty("jclouds.rackspace.identity"); - credential = System.getProperty("jclouds.rackspace.credential"); - - if (isBlobStoreLiveConfigured()) { - installAndCheckFeature("jclouds-commands"); - Thread.sleep(DEFAULT_TIMEOUT); - } else { - System.err.println("Aborting test."); - System.err.flush(); - } - } - - @After - public void tearDown() { - if (isBlobStoreLiveConfigured()) { - System.err.println(executeCommand("jclouds:blobstore-container-delete itest-container")); - } - } - - @Test - public void testBlobStoreReadWrite() throws InterruptedException { - if (isBlobStoreLiveConfigured()) { - createManagedBlobStoreService("rackspace-cloudfiles-us"); - BlobStore blobStoreService = getOsgiService(BlobStore.class); - Thread.sleep(DEFAULT_TIMEOUT); - - String featureURL = System.getProperty("jclouds.featureURL"); - System.err.println(executeCommand("jclouds:blobstore-list")); - System.err.println(executeCommand("jclouds:blobstore-container-create itest-container")); - - System.err.println(executeCommand("jclouds:blobstore-write itest-container myfolder/myfile "+ featureURL )); - System.err.println(executeCommand("jclouds:blobstore-write --url-payload itest-container "+ System.getProperty("jclouds.featureURL"))); - System.err.println(executeCommand("jclouds:blobstore-read --display itest-container testblob ")); - } - } - - - @Test - public void testUrlHandler() throws Exception { - if (isBlobStoreLiveConfigured()) { - createManagedBlobStoreService("rackspace-cloudfiles-us"); - BlobStore blobStoreService = getOsgiService(BlobStore.class); - Thread.sleep(DEFAULT_TIMEOUT); - - FeaturesService featuresService = getOsgiService(FeaturesService.class); - featuresService.installFeature("jclouds-url-handler"); - - //Let's add a bundle to S3 - String groupId = "org.jclouds.api"; - String artifactId = "byon"; - String version = System.getProperty("jclouds.version"); - - System.err.println(executeCommand("jclouds:blobstore-list")); - System.err.println(executeCommand("jclouds:blobstore-container-create itest-container")); - - URL artifactUrl = new URL("mvn:"+groupId+"/"+artifactId+"/"+version); - URL blobUrl = new URL("blob:aws-s3/itest-container/maven2/org/jclouds/api/byon/" +version+"/"+artifactId+"-"+version+".jar" ); - InputStream is = artifactUrl.openConnection().getInputStream(); - OutputStream os = blobUrl.openConnection().getOutputStream(); - try { - ByteStreams.copy(is, os); - } finally { - Closeables2.closeQuietly(is); - Closeables2.closeQuietly(os); - } - - //Make sure that only S3 is available as a repo. - System.err.println(executeCommands("config:edit org.ops4j.pax.url.mvn", - "config:propset org.ops4j.pax.url.mvn.localRepository " + System.getProperty("karaf.base") + File.separatorChar + "none", - "config:propset org.ops4j.pax.url.mvn.repositories blob:rackspace-cloudfiles-us/itest-container/maven2@snapshots ", - "config:update")); - Thread.sleep(DEFAULT_TIMEOUT); - - final Set<String> installedSymbolicNames = new LinkedHashSet<String>(); - - //Add a Bundle Listener - bundleContext.addBundleListener(new BundleListener(){ - @Override - public void bundleChanged(BundleEvent event) { - if (event.getType() == BundleEvent.INSTALLED) { - installedSymbolicNames.add(event.getBundle().getSymbolicName()); - } - } - }); - - //Install the bundle the from S3. - System.err.println(executeCommand("osgi:install mvn:org.jclouds.api/byon/" + version)); - - //Verify that no other bundle can be installed. - System.err.println(executeCommand("osgi:install mvn:org.jclouds.api/nova/" + version)); - assertTrue(installedSymbolicNames.contains("byon")); - assertFalse(installedSymbolicNames.contains("nova")); - - - } - } - - @Configuration - public Option[] config() { - return new Option[]{ - jcloudsDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR), - systemProperty("jclouds.rackspace.identity"), - systemProperty("jclouds.rackspace.credential"), - systemProperty("jclouds.karaf.version",MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)), - systemProperty("jclouds.version",MavenUtils.getArtifactVersion(JCLOUDS_GROUP_ID, JCLOUDS_ARTIFACT_ID)), - systemProperty("jclouds.featureURL",String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID))), - scanFeatures(String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)),"jclouds", "jclouds-commands", "jclouds-rackspace-cloudfiles-us").start() - }; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/itests/src/test/java/org/jclouds/karaf/itests/live/JcloudsLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/jclouds/karaf/itests/live/JcloudsLiveTestSupport.java b/itests/src/test/java/org/jclouds/karaf/itests/live/JcloudsLiveTestSupport.java deleted file mode 100644 index f67a339..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/live/JcloudsLiveTestSupport.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests.live; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.LinkedList; -import java.util.List; - -import com.google.common.io.CharStreams; -import org.jclouds.karaf.itests.JcloudsFeaturesTestSupport; - -public class JcloudsLiveTestSupport extends JcloudsFeaturesTestSupport { - - String identity; - String credential; - String image; - String location; - String user; - String regions; - - - /** - * Checks if Live Test parameters are properly configured for compute tests. - * - * @return - */ - public boolean isComputeLiveConfigured() { - return - identity != null && credential != null && image != null && location != null - && !identity.isEmpty() && !credential.isEmpty() && !image.isEmpty() && !location.isEmpty(); - } - - /** - * Checks if Live Test parameters are properly configured for blobstore tests. - * - * @return - */ - public boolean isBlobStoreLiveConfigured() { - return - identity != null && credential != null - && !identity.isEmpty() && !credential.isEmpty(); - } - - /** - * Creates a Managed Compute Service using the configured system properties. - */ - public void createManagedComputeService(String provider, boolean eventSupport) { - List<String> options = new LinkedList<String>(); - if (regions != null && !regions.isEmpty()) { - options.add("jclouds.regions=" + regions); - } - String cmd = "jclouds:compute-service-create --provider " + provider + " --identity " + identity + " --credential " + credential; - for (String option : options) { - cmd += " --add-option " + option; - } - executeCommand(cmd); - } - - - /** - * Creates a Managed Compute Service using the configured system properties. - */ - public void createManagedBlobStoreService(String provider) { - String cmd = "jclouds:blobstore-service-create --provider " + provider + " --identity " + identity + " --credential " + credential; - executeCommand(cmd); - } - - /** - * @return the IP address of the client on which this code is running. - * @throws java.io.IOException - */ - protected String getOriginatingIp() throws IOException { - URL url = new URL("http://checkip.amazonaws.com/";); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.connect(); - InputStream in = connection.getInputStream(); - try { - return CharStreams.toString(new InputStreamReader(in)).trim() + "/32"; - } finally { - in.close(); - } - } - -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index 074e2da..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/live/RackspaceLiveTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests.live; - -import static org.junit.Assert.assertTrue; -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; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -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; -import org.ops4j.pax.exam.junit.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; - -@RunWith(JUnit4TestRunner.class) -@ExamReactorStrategy(AllConfinedStagedReactorFactory.class) -public class RackspaceLiveTest extends JcloudsLiveTestSupport { - - String group = "karaf"; - - @Before - public void setUp() throws Exception { - identity = System.getProperty("jclouds.rackspace.identity"); - credential = System.getProperty("jclouds.rackspace.credential"); - regions = System.getProperty("jclouds.rackspace.region"); - image = System.getProperty("jclouds.rackspace.image"); - location = System.getProperty("jclouds.rackspace.location"); - user = System.getProperty("jclouds.rackspace.user"); - - if (isComputeLiveConfigured()) { - installAndCheckFeature("jclouds-commands"); - Thread.sleep(DEFAULT_TIMEOUT); - } else { - System.err.println("Aborting test."); - System.err.flush(); - } - } - - @After - public void tearDown() { - if (isComputeLiveConfigured()) { - executeCommand("jclouds:node-destroy-all "); - } - } - - @Test - public void testNodeCreateLive() throws InterruptedException { - if (isComputeLiveConfigured()) { - createManagedComputeService("rackspace-cloudservers-us", false); - ComputeService computeService = getOsgiService(ComputeService.class, 1000000L); - Thread.sleep(DEFAULT_TIMEOUT); - System.err.println(executeCommand("jclouds:image-list")); - System.err.println(executeCommand("jclouds:node-create --imageId " + image + " --locationId " + location + " " + group)); - System.err.println(executeCommand("jclouds:group-runscript -d ls -u " + user + " " + group)); - assertTrue("Expected at least one node", computeService.listNodes().size() >= 1); - } - } - - @Configuration - public Option[] config() { - return new Option[]{ - jcloudsDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR), - systemProperty("jclouds.rackspace.identity"), - systemProperty("jclouds.rackspace.credential"), - systemProperty("jclouds.rackspace.region"), - systemProperty("jclouds.rackspace.image"), - systemProperty("jclouds.rackspace.location"), - systemProperty("jclouds.rackspace.user"), - scanFeatures(String.format(JCLOUDS_FEATURE_FORMAT, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)), "jclouds", "jclouds-compute", "jclouds-rackspace-cloudserver-us").start() - }; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/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 deleted file mode 100644 index 4d80827..0000000 --- a/itests/src/test/java/org/jclouds/karaf/itests/special/JcloudsCamelCxfFeaturesTestSupport.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jclouds.karaf.itests.special; - -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.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; - -public class JcloudsCamelCxfFeaturesTestSupport extends AwsEc2LiveTest { - - public static final String CAMEL_GROUP_ID = "org.apache.camel.karaf"; - public static final String CAMEL_ARTIFACT_ID = "apache-camel"; - public static final String CAMEL_FEATURE_FORMAT = "mvn:org.apache.camel.karaf/apache-camel/%s/xml/features"; - public static final String CAMEL_FEATURE_VERSION_PROPERTY = "camel.feature.version"; - - @Before - public void setUp() throws Exception { - System.err.println(executeCommand("features:addurl " + String.format(CAMEL_FEATURE_FORMAT,System.getProperty(CAMEL_FEATURE_VERSION_PROPERTY)))); - System.err.println(executeCommand("features:removeurl " + String.format(JCLOUDS_FEATURE_FORMAT, "1.3.1"))); - System.err.println(executeCommand("features:addurl " + String.format(JCLOUDS_FEATURE_FORMAT,System.getProperty(JCLOUDS_FEATURE_VERSION_PROPERTY)))); - System.err.println(executeCommand("features:install xml-specs-api")); - System.err.println(executeCommand("osgi:install mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr250-1.0/1.9.0")); - System.err.println(executeCommand("features:install camel-cxf")); - System.err.println(executeCommand("features:install jclouds-aws-ec2")); - System.err.println(executeCommand("features:install jclouds-services")); - super.setUp(); - } - - @Configuration - public Option[] config() { - return new Option[]{ - jcloudsDistributionConfiguration(), keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.ERROR), - systemProperty("jclouds.aws.identity"), - systemProperty("jclouds.aws.credential"), - systemProperty("jclouds.aws.region"), - systemProperty("jclouds.aws.image"), - systemProperty("jclouds.aws.location"), - systemProperty("jclouds.aws.user"), - systemProperty(JCLOUDS_FEATURE_VERSION_PROPERTY, MavenUtils.getArtifactVersion(JCLOUDS_KARAF_GROUP_ID, JCLOUDS_KARAF_ARTIFACT_ID)), - systemProperty(CAMEL_FEATURE_VERSION_PROPERTY, MavenUtils.getArtifactVersion(CAMEL_GROUP_ID, CAMEL_ARTIFACT_ID)), - replaceConfigurationFile("etc/jre.properties", new File("target/test-classes/jre.properties.cxf")), - }; - } -} http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/itests/src/test/resources/jre.properties.cxf ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/jre.properties.cxf b/itests/src/test/resources/jre.properties.cxf deleted file mode 100644 index cb8c207..0000000 --- a/itests/src/test/resources/jre.properties.cxf +++ /dev/null @@ -1,472 +0,0 @@ -################################################################################ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# -# Java platform package export properties. -# - -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.5= \ - javax.accessibility, \ - javax.activity, \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers - -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.6= \ - javax.accessibility, \ -# javax.activation, \ - javax.activity, \ -# javax.annotation;version="1.1", \ - javax.annotation.processing;version="1.1", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ -# javax.jws, \ -# javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ -# javax.xml.bind, \ -# javax.xml.bind.annotation, \ -# javax.xml.bind.annotation.adapters, \ -# javax.xml.bind.attachment, \ -# javax.xml.bind.helpers, \ -# javax.xml.bind.util, \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ -# javax.xml.soap, \ -# javax.xml.stream, \ -# javax.xml.stream.events, \ -# javax.xml.stream.util, \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ -# javax.xml.ws, \ -# javax.xml.ws.handler, \ -# javax.xml.ws.handler.soap, \ -# javax.xml.ws.http, \ -# javax.xml.ws.soap, \ -# javax.xml.ws.spi, \ - javax.xml.ws.wsaddressing, \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers - -# Standard package set. Note that: -# - javax.transaction* is exported with a mandatory attribute -jre-1.7= \ - javax.accessibility, \ -# javax.activation, \ - javax.activity, \ -# javax.annotation;version="1.1", \ - javax.annotation.processing;version="1.1", \ - javax.crypto, \ - javax.crypto.interfaces, \ - javax.crypto.spec, \ - javax.imageio, \ - javax.imageio.event, \ - javax.imageio.metadata, \ - javax.imageio.plugins.bmp, \ - javax.imageio.plugins.jpeg, \ - javax.imageio.spi, \ - javax.imageio.stream, \ -# javax.jws, \ -# javax.jws.soap, \ - javax.lang.model, \ - javax.lang.model.element, \ - javax.lang.model.type, \ - javax.lang.model.util, \ - javax.management, \ - javax.management.loading, \ - javax.management.modelmbean, \ - javax.management.monitor, \ - javax.management.openmbean, \ - javax.management.relation, \ - javax.management.remote, \ - javax.management.remote.rmi, \ - javax.management.timer, \ - javax.naming, \ - javax.naming.directory, \ - javax.naming.event, \ - javax.naming.ldap, \ - javax.naming.spi, \ - javax.net, \ - javax.net.ssl, \ - javax.print, \ - javax.print.attribute, \ - javax.print.attribute.standard, \ - javax.print.event, \ - javax.rmi, \ - javax.rmi.CORBA, \ - javax.rmi.ssl, \ - javax.script, \ - javax.security.auth, \ - javax.security.auth.callback, \ - javax.security.auth.kerberos, \ - javax.security.auth.login, \ - javax.security.auth.spi, \ - javax.security.auth.x500, \ - javax.security.cert, \ - javax.security.sasl, \ - javax.sound.midi, \ - javax.sound.midi.spi, \ - javax.sound.sampled, \ - javax.sound.sampled.spi, \ - javax.sql, \ - javax.sql.rowset, \ - javax.sql.rowset.serial, \ - javax.sql.rowset.spi, \ - javax.swing, \ - javax.swing.border, \ - javax.swing.colorchooser, \ - javax.swing.event, \ - javax.swing.filechooser, \ - javax.swing.plaf, \ - javax.swing.plaf.basic, \ - javax.swing.plaf.metal, \ - javax.swing.plaf.multi, \ - javax.swing.plaf.synth, \ - javax.swing.table, \ - javax.swing.text, \ - javax.swing.text.html, \ - javax.swing.text.html.parser, \ - javax.swing.text.rtf, \ - javax.swing.tree, \ - javax.swing.undo, \ - javax.tools, \ - javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \ - javax.xml, \ -# javax.xml.bind, \ -# javax.xml.bind.annotation, \ -# javax.xml.bind.annotation.adapters, \ -# javax.xml.bind.attachment, \ -# javax.xml.bind.helpers, \ -# javax.xml.bind.util, \ - javax.xml.crypto, \ - javax.xml.crypto.dom, \ - javax.xml.crypto.dsig, \ - javax.xml.crypto.dsig.dom, \ - javax.xml.crypto.dsig.keyinfo, \ - javax.xml.crypto.dsig.spec, \ - javax.xml.datatype, \ - javax.xml.namespace, \ - javax.xml.parsers, \ -# javax.xml.soap, \ -# javax.xml.stream, \ -# javax.xml.stream.events, \ -# javax.xml.stream.util, \ - javax.xml.transform, \ - javax.xml.transform.dom, \ - javax.xml.transform.sax, \ - javax.xml.transform.stax, \ - javax.xml.transform.stream, \ - javax.xml.validation, \ -# javax.xml.ws, \ -# javax.xml.ws.handler, \ -# javax.xml.ws.handler.soap, \ -# javax.xml.ws.http, \ -# javax.xml.ws.soap, \ -# javax.xml.ws.spi, \ - javax.xml.ws.wsaddressing, \ - javax.xml.xpath, \ - org.ietf.jgss, \ - org.omg.CORBA, \ - org.omg.CORBA_2_3, \ - org.omg.CORBA_2_3.portable, \ - org.omg.CORBA.DynAnyPackage, \ - org.omg.CORBA.ORBPackage, \ - org.omg.CORBA.portable, \ - org.omg.CORBA.TypeCodePackage, \ - org.omg.CosNaming, \ - org.omg.CosNaming.NamingContextExtPackage, \ - org.omg.CosNaming.NamingContextPackage, \ - org.omg.Dynamic, \ - org.omg.DynamicAny, \ - org.omg.DynamicAny.DynAnyFactoryPackage, \ - org.omg.DynamicAny.DynAnyPackage, \ - org.omg.IOP, \ - org.omg.IOP.CodecFactoryPackage, \ - org.omg.IOP.CodecPackage, \ - org.omg.Messaging, \ - org.omg.PortableInterceptor, \ - org.omg.PortableInterceptor.ORBInitInfoPackage, \ - org.omg.PortableServer, \ - org.omg.PortableServer.CurrentPackage, \ - org.omg.PortableServer.POAManagerPackage, \ - org.omg.PortableServer.POAPackage, \ - org.omg.PortableServer.portable, \ - org.omg.PortableServer.ServantLocatorPackage, \ - org.omg.SendingContext, \ - org.omg.stub.java.rmi, \ - org.omg.stub.javax.management.remote.rmi, \ - org.w3c.dom, \ - org.w3c.dom.bootstrap, \ - org.w3c.dom.css, \ - org.w3c.dom.events, \ - org.w3c.dom.html, \ - org.w3c.dom.ls, \ - org.w3c.dom.ranges, \ - org.w3c.dom.stylesheets, \ - org.w3c.dom.traversal, \ - org.w3c.dom.views, \ - org.w3c.dom.xpath, \ - org.xml.sax, \ - org.xml.sax.ext, \ - org.xml.sax.helpers http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7252df7..4e36f83 100644 --- a/pom.xml +++ b/pom.xml @@ -177,8 +177,9 @@ limitations under the License. <module>urlhandler</module> <module>chef</module> <module>feature</module> - <module>itests</module> + <module>feature-labs</module> <module>recipe</module> + <module>itests</module> </modules> <properties> @@ -191,10 +192,11 @@ limitations under the License. <guava.version>16.0.1</guava.version> <guava.test.version>10.0</guava.test.version> <guice.version>3.0</guice.version> - <httpclient.version>4.1.1</httpclient.version> - <httpcore.version>4.1</httpcore.version> + <httpclient.version>4.3.4</httpclient.version> + <httpcore.version>4.3.2</httpcore.version> <java-xmlbuilder.bundle.version>1.1_1</java-xmlbuilder.bundle.version> <javax.inject.bundle.version>1_1</javax.inject.bundle.version> + <javax.ws.rs.api.version>2.0.1</javax.ws.rs.api.version> <jclouds.version>2.1.0-SNAPSHOT</jclouds.version> <jclouds.chef.version>${jclouds.version}</jclouds.chef.version> <jersey.version>1.11</jersey.version> @@ -209,15 +211,15 @@ 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.3.11</karaf.version> + <karaf.version>4.0.8</karaf.version> <net.oauth.bundle.version>20100527_1</net.oauth.bundle.version> <netty.bundle.version>3.5.9.Final</netty.bundle.version> - <osgi.version>4.3.0</osgi.version> + <osgi.version>6.0.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> <slf4j.version>1.5.8</slf4j.version> - <snakeyaml.version>1.11</snakeyaml.version> + <snakeyaml.version>1.17</snakeyaml.version> <okhttp.version>2.2.0</okhttp.version> <okio.version>1.2.0</okio.version> <okhttp.bundle.version>${okhttp.version}_1</okhttp.bundle.version> @@ -305,7 +307,7 @@ limitations under the License. </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <version>${osgi.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/fa11dcfc/recipe/pom.xml ---------------------------------------------------------------------- diff --git a/recipe/pom.xml b/recipe/pom.xml index 73ad13c..df1c72e 100644 --- a/recipe/pom.xml +++ b/recipe/pom.xml @@ -51,7 +51,7 @@ limitations under the License. </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> </dependency> <dependency> <groupId>org.apache.jclouds</groupId>
