Updated Branches: refs/heads/1.6.x 3300d3acf -> 11e800094
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java b/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java deleted file mode 100644 index 5f09d97..0000000 --- a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java +++ /dev/null @@ -1,41 +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.openstack.swift.v1.internal; - -import java.util.Properties; -import org.jclouds.apis.BaseApiLiveTest; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; -import org.jclouds.openstack.swift.v1.SwiftApi; - -/** - * Tests behavior of {@code SwiftApi} - * - * @author Adrian Cole - */ -public class BaseSwiftApiLiveTest extends BaseApiLiveTest<SwiftApi> { - - public BaseSwiftApiLiveTest() { - provider = "openstack-swift"; - } - - @Override - protected Properties setupProperties() { - Properties props = super.setupProperties(); - setIfTestSystemPropertyPresent(props, KeystoneProperties.CREDENTIAL_TYPE); - return props; - } -} http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java b/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java deleted file mode 100644 index 1d0c59a..0000000 --- a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftExpectTest.java +++ /dev/null @@ -1,50 +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.openstack.swift.v1.internal; - -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.jclouds.openstack.keystone.v2_0.internal.KeystoneFixture; -import org.jclouds.rest.internal.BaseRestApiExpectTest; - -/** - * Base class for writing Swift Expect tests - * - * @author Adrian Cole - */ -public class BaseSwiftExpectTest<T> extends BaseRestApiExpectTest<T> { - protected HttpRequest keystoneAuthWithUsernameAndPassword; - protected HttpRequest keystoneAuthWithAccessKeyAndSecretKey; - protected String authToken; - protected HttpResponse responseWithKeystoneAccess; - protected HttpRequest extensionsOfSwiftRequest; - protected HttpResponse extensionsOfSwiftResponse; - protected HttpResponse unmatchedExtensionsOfSwiftResponse; - - public BaseSwiftExpectTest() { - provider = "openstack-swift"; - keystoneAuthWithUsernameAndPassword = KeystoneFixture.INSTANCE.initialAuthWithUsernameAndPasswordAndTenantName(identity, - credential); - keystoneAuthWithAccessKeyAndSecretKey = KeystoneFixture.INSTANCE.initialAuthWithAccessKeyAndSecretKeyAndTenantName(identity, - credential); - - authToken = KeystoneFixture.INSTANCE.getAuthToken(); - responseWithKeystoneAccess = KeystoneFixture.INSTANCE.responseWithAccess(); - // now, createContext arg will need tenant prefix - identity = KeystoneFixture.INSTANCE.getTenantName() + ":" + identity; - } -} http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java ---------------------------------------------------------------------- diff --git a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java b/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java deleted file mode 100644 index 4f4b74e..0000000 --- a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/options/ListContainersOptionsTest.java +++ /dev/null @@ -1,94 +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.openstack.swift.v1.options; - -import static org.jclouds.openstack.swift.v1.options.ListContainersOptions.Builder.limit; -import static org.jclouds.openstack.swift.v1.options.ListContainersOptions.Builder.marker; -import static org.testng.Assert.assertEquals; - -import com.google.common.collect.ImmutableList; - -import org.jclouds.http.options.HttpRequestOptions; -import org.testng.annotations.Test; - -/** - * Tests possible uses of ListContainerOptions and ListContainerOptions.Builder.* - * - * @author Adrian Cole - */ -@Test(testName = "ListContainersOptionsTest") -public class ListContainersOptionsTest { - - @Test - public void testAssignability() { - assert HttpRequestOptions.class.isAssignableFrom(ListContainersOptions.class); - assert !String.class.isAssignableFrom(ListContainersOptions.class); - } - @Test - public void testNoOptionsQueryString() { - HttpRequestOptions options = new ListContainersOptions(); - assertEquals(options.buildQueryParameters().size(), 0); - } - - @Test - public void testMarker() { - ListContainersOptions options = new ListContainersOptions(); - options.marker("test"); - assertEquals(options.buildQueryParameters().get("marker"), ImmutableList.of("test")); - } - - @Test - public void testNullMarker() { - ListContainersOptions options = new ListContainersOptions(); - assertEquals(options.buildQueryParameters().get("marker"), ImmutableList.of()); - } - - @Test - public void testMarkerStatic() { - ListContainersOptions options = marker("test"); - assertEquals(options.buildQueryParameters().get("marker"), ImmutableList.of("test")); - } - - @Test(expectedExceptions = NullPointerException.class) - public void testMarkerNPE() { - marker(null); - } - - @Test - public void testLimit() { - ListContainersOptions options = new ListContainersOptions(); - options.limit(1000); - assertEquals(options.buildQueryParameters().get("limit"), ImmutableList.of("1000")); - } - - @Test - public void testNullLimit() { - ListContainersOptions options = new ListContainersOptions(); - assertEquals(options.buildQueryParameters().get("limit"), ImmutableList.of()); - } - - @Test - public void testLimitStatic() { - ListContainersOptions options = limit(1000); - assertEquals(options.buildQueryParameters().get("limit"), ImmutableList.of("1000")); - } - - @Test(expectedExceptions = IllegalStateException.class) - public void testLimitNegative() { - limit(-1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java ---------------------------------------------------------------------- diff --git a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java b/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java deleted file mode 100644 index fac9c5d..0000000 --- a/openstack/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/parse/ParseContainerListTest.java +++ /dev/null @@ -1,57 +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.openstack.swift.v1.parse; - -import java.util.Set; - -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; - -import org.jclouds.json.BaseSetParserTest; -import org.jclouds.openstack.swift.v1.domain.Container; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; - -/** - * - * @author Adrian Cole - */ -@Test(groups = "unit", testName = "ParseContainerListTest") -public class ParseContainerListTest extends BaseSetParserTest<Container> { - - @Override - public String resource() { - return "/container_list.json"; - } - - @Override - @Consumes(MediaType.APPLICATION_JSON) - public Set<Container> expected() { - return ImmutableSet - .of(Container.builder() - .name("test_container_1") - .count(2) - .bytes(78) - .build(), - Container.builder() - .name("test_container_2") - .count(1) - .bytes(17) - .build()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/openstack-swift/src/test/resources/container_list.json ---------------------------------------------------------------------- diff --git a/openstack/openstack-swift/src/test/resources/container_list.json b/openstack/openstack-swift/src/test/resources/container_list.json deleted file mode 100644 index f7d9b9b..0000000 --- a/openstack/openstack-swift/src/test/resources/container_list.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - {"name":"test_container_1", "count":2, "bytes":78}, - {"name":"test_container_2", "count":1, "bytes":17} -] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/openstack-swift/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openstack/openstack-swift/src/test/resources/logback.xml b/openstack/openstack-swift/src/test/resources/logback.xml deleted file mode 100644 index a4f81d3..0000000 --- a/openstack/openstack-swift/src/test/resources/logback.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> -<configuration scan="false"> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test-data/jclouds.log</file> - - <encoder> - <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern> - </encoder> - </appender> - - <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test-data/jclouds-wire.log</file> - - <encoder> - <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern> - </encoder> - </appender> - - <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test-data/jclouds-blobstore.log</file> - - <encoder> - <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern> - </encoder> - </appender> - - <root> - <level value="warn" /> - </root> - - <logger name="org.jclouds"> - <level value="DEBUG" /> - <appender-ref ref="FILE" /> - </logger> - - <logger name="jclouds.wire"> - <level value="DEBUG" /> - <appender-ref ref="WIREFILE" /> - </logger> - - <logger name="jclouds.headers"> - <level value="DEBUG" /> - <appender-ref ref="WIREFILE" /> - </logger> - - <logger name="jclouds.blobstore"> - <level value="DEBUG" /> - <appender-ref ref="BLOBSTOREFILE" /> - </logger> - -</configuration> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/openstack/pom.xml ---------------------------------------------------------------------- diff --git a/openstack/pom.xml b/openstack/pom.xml deleted file mode 100644 index 0a0dcdf..0000000 --- a/openstack/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs</artifactId> - <version>1.6.2-SNAPSHOT</version> - </parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs-openstack</artifactId> - <packaging>pom</packaging> - <name>jclouds labs openstack</name> - <modules> - <!--<module>openstack-atlas</module>--> - <!--<module>openstack-cinder-v2</module>--> - <module>openstack-glance</module> - <!--<module>openstack-keystone-v3</module>--> - <!--<module>openstack-moniker</module>--> - <module>openstack-quantum</module> - <module>openstack-reddwarf</module> - <module>openstack-swift</module> - </modules> -</project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1911e68..6bfd6c0 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,6 @@ <module>fgcp-de</module> <module>abiquo</module> <module>oauth</module> - <module>openstack</module> <module>jclouds-representations</module> <module>jclouds-management</module> </modules> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/rackspace-clouddns-uk/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddns-uk/pom.xml b/rackspace-clouddns-uk/pom.xml deleted file mode 100644 index 614a898..0000000 --- a/rackspace-clouddns-uk/pom.xml +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs</artifactId> - <version>1.6.1-SNAPSHOT</version> - </parent> - - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns-uk</artifactId> - <name>jclouds Rackspace Next Generation Cloud DNS UK provider</name> - <description>Rackspace Next Generation Cloud DNS UK</description> - <packaging>bundle</packaging> - - <properties> - <test.rackspace-clouddns-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddns-uk.endpoint> - <test.rackspace-clouddns-uk.api-version>1.0</test.rackspace-clouddns-uk.api-version> - <test.rackspace-clouddns-uk.build-version /> - <test.rackspace-clouddns-uk.identity>${test.rackspace-uk.identity}</test.rackspace-clouddns-uk.identity> - <test.rackspace-clouddns-uk.credential>${test.rackspace-uk.credential}</test.rackspace-clouddns-uk.credential> - <test.rackspace-clouddns-uk.template /> - <jclouds.osgi.export>org.jclouds.rackspace.clouddns.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - </jclouds.osgi.import> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-keystone</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-keystone</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-slf4j</artifactId> - <version>1.6.1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>live</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <threadCount>1</threadCount> - <systemPropertyVariables> - <test.rackspace-clouddns-uk.endpoint>${test.rackspace-clouddns-uk.endpoint}</test.rackspace-clouddns-uk.endpoint> - <test.rackspace-clouddns-uk.api-version>${test.rackspace-clouddns-uk.api-version}</test.rackspace-clouddns-uk.api-version> - <test.rackspace-clouddns-uk.build-version>${test.rackspace-clouddns-uk.build-version}</test.rackspace-clouddns-uk.build-version> - <test.rackspace-clouddns-uk.identity>${test.rackspace-clouddns-uk.identity}</test.rackspace-clouddns-uk.identity> - <test.rackspace-clouddns-uk.credential>${test.rackspace-clouddns-uk.credential}</test.rackspace-clouddns-uk.credential> - <test.rackspace-clouddns-uk.template>${test.rackspace-clouddns-uk.template}</test.rackspace-clouddns-uk.template> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/rackspace-clouddns-us/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddns-us/pom.xml b/rackspace-clouddns-us/pom.xml deleted file mode 100644 index b71572b..0000000 --- a/rackspace-clouddns-us/pom.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs</artifactId> - <version>1.6.1-SNAPSHOT</version> - </parent> - - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns-us</artifactId> - <name>jclouds Rackspace Next Generation Cloud DNS US provider</name> - <description>Rackspace Next Generation Cloud DNS US</description> - <packaging>bundle</packaging> - - <properties> - <test.rackspace-clouddns-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddns-us.endpoint> - <test.rackspace-clouddns-us.api-version>1.0</test.rackspace-clouddns-us.api-version> - <test.rackspace-clouddns-us.build-version /> - <test.rackspace-clouddns-us.identity>${test.rackspace-us.identity}</test.rackspace-clouddns-us.identity> - <test.rackspace-clouddns-us.credential>${test.rackspace-us.credential}</test.rackspace-clouddns-us.credential> - <test.rackspace-clouddns-us.template /> - <jclouds.osgi.export>org.jclouds.rackspace.clouddns.us*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds.compute.internal;version="${project.version}", - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - </jclouds.osgi.import> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-keystone</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-compute</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-keystone</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-nova</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.provider</groupId> - <artifactId>rackspace-cloudservers-us</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-slf4j</artifactId> - <version>1.6.1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>live</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <threadCount>1</threadCount> - <systemPropertyVariables> - <test.rackspace-clouddns-us.endpoint>${test.rackspace-clouddns-us.endpoint}</test.rackspace-clouddns-us.endpoint> - <test.rackspace-clouddns-us.api-version>${test.rackspace-clouddns-us.api-version}</test.rackspace-clouddns-us.api-version> - <test.rackspace-clouddns-us.build-version>${test.rackspace-clouddns-us.build-version}</test.rackspace-clouddns-us.build-version> - <test.rackspace-clouddns-us.identity>${test.rackspace-clouddns-us.identity}</test.rackspace-clouddns-us.identity> - <test.rackspace-clouddns-us.credential>${test.rackspace-clouddns-us.credential}</test.rackspace-clouddns-us.credential> - <test.rackspace-clouddns-us.template>${test.rackspace-clouddns-us.template}</test.rackspace-clouddns-us.template> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/11e80009/rackspace-clouddns/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace-clouddns/pom.xml b/rackspace-clouddns/pom.xml deleted file mode 100644 index 0677371..0000000 --- a/rackspace-clouddns/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>jclouds-labs</artifactId> - <version>1.6.1-SNAPSHOT</version> - </parent> - - <!-- TODO: when out of labs, switch to org.jclouds.provider --> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-clouddns</artifactId> - <name>jclouds rackspace clouddns api</name> - <description>jclouds components for Rackspace Cloud DNS</description> - <packaging>bundle</packaging> - - <properties> - <test.rackspace-clouddns.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-clouddns.endpoint> - <test.rackspace-clouddns.api-version>1.0</test.rackspace-clouddns.api-version> - <test.rackspace-clouddns.build-version /> - <test.rackspace-clouddns.identity>${test.rackspace-us.identity}</test.rackspace-clouddns.identity> - <test.rackspace-clouddns.credential>${test.rackspace-us.credential}</test.rackspace-clouddns.credential> - - <jclouds.osgi.export>org.jclouds.rackspace.clouddns.v1*;version="${project.version}"</jclouds.osgi.export> - <jclouds.osgi.import> - org.jclouds.rest.internal;version="${project.version}", - org.jclouds*;version="${project.version}", - * - </jclouds.osgi.import> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-keystone</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-core</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds</groupId> - <artifactId>jclouds-compute</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-keystone</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>openstack-nova</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.api</groupId> - <artifactId>rackspace-cloudidentity</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.provider</groupId> - <artifactId>rackspace-cloudservers-us</artifactId> - <version>1.6.1-SNAPSHOT</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jclouds.driver</groupId> - <artifactId>jclouds-slf4j</artifactId> - <version>1.6.1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>live</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>integration</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <!-- TODO: remove when multiple jobs/session are supported --> - <threadCount>1</threadCount> - <systemPropertyVariables> - <test.rackspace-clouddns.endpoint>${test.rackspace-clouddns.endpoint}</test.rackspace-clouddns.endpoint> - <test.rackspace-clouddns.api-version>${test.rackspace-clouddns.api-version}</test.rackspace-clouddns.api-version> - <test.rackspace-clouddns.build-version>${test.rackspace-clouddns.build-version}</test.rackspace-clouddns.build-version> - <test.rackspace-clouddns.identity>${test.rackspace-clouddns.identity}</test.rackspace-clouddns.identity> - <test.rackspace-clouddns.credential>${test.rackspace-clouddns.credential}</test.rackspace-clouddns.credential> - </systemPropertyVariables> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project>
