Repository: jclouds-examples Updated Branches: refs/heads/master 0168a3998 -> 934cdb085
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/934cdb08/play-compute/public/stylesheets/main.css ---------------------------------------------------------------------- diff --git a/play-compute/public/stylesheets/main.css b/play-compute/public/stylesheets/main.css deleted file mode 100644 index a0fcb3c..0000000 --- a/play-compute/public/stylesheets/main.css +++ /dev/null @@ -1,19 +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. - */ - http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/934cdb08/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d26e174..b2aa183 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.examples</groupId> <artifactId>jclouds-examples</artifactId> - <version>1.9.0</version> + <version>2.1.0</version> <packaging>pom</packaging> <name>jclouds examples</name> @@ -33,7 +33,7 @@ </scm> <properties> - <jclouds.version>1.9.0</jclouds.version> + <jclouds.version>2.1.0</jclouds.version> </properties> <repositories> @@ -65,22 +65,12 @@ <module>blobstore-uploader</module> <module>chef-basics</module> <module>compute-basics</module> - <module>google-lb</module> <module>glacier</module> + <module>google-lb</module> <module>openstack</module> <module>rackspace</module> -<!-- - TODO: These modules have bit-rotted: - <module>blobstore-hdfs</module> - <module>blobstore-karaf-shell</module> - <module>camel-notifications</module> - <module>cloudwatch-basics</module> - <module>ec2-computeservice-spot</module> - <module>ec2-createlamp</module> - <module>ec2-windows</module> - <module>minecraft-compute</module> ---> </modules> + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/934cdb08/rackspace/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace/pom.xml b/rackspace/pom.xml index 5dc1e98..2557e34 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -22,11 +22,11 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.examples</groupId> <artifactId>rackspace-examples</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <name>rackspace-examples</name> <properties> - <jclouds.version>2.0.0</jclouds.version> + <jclouds.version>2.1.0</jclouds.version> </properties> <repositories> @@ -98,7 +98,7 @@ <version>${jclouds.version}</version> </dependency> <dependency> - <groupId>org.apache.jclouds.labs</groupId> + <groupId>org.apache.jclouds.provider</groupId> <artifactId>rackspace-cloudnetworks-us</artifactId> <version>${jclouds.version}</version> </dependency> @@ -149,7 +149,7 @@ <version>${jclouds.version}</version> </dependency> <dependency> - <groupId>org.apache.jclouds.labs</groupId> + <groupId>org.apache.jclouds.provider</groupId> <artifactId>rackspace-cloudnetworks-uk</artifactId> <version>${jclouds.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/934cdb08/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java index 2b235cd..3ca88fe 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.Properties; import org.jclouds.ContextBuilder; -import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes; -import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; +import org.jclouds.openstack.keystone.auth.config.CredentialTypes; +import org.jclouds.openstack.keystone.config.KeystoneProperties; import org.jclouds.openstack.nova.v2_0.NovaApi; import com.google.common.io.Closeables; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/934cdb08/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjectsWithServiceNet.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjectsWithServiceNet.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjectsWithServiceNet.java index cb77c6f..68d9533 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjectsWithServiceNet.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjectsWithServiceNet.java @@ -34,7 +34,7 @@ import org.jclouds.blobstore.domain.Blob; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext; -import org.jclouds.openstack.v2_0.config.InternalUrlModule; +import org.jclouds.openstack.keystone.catalog.config.InternalUrlModule; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/934cdb08/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudnetworks/CreateSecurityGroup.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudnetworks/CreateSecurityGroup.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudnetworks/CreateSecurityGroup.java index d3ba679..e39cab3 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudnetworks/CreateSecurityGroup.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudnetworks/CreateSecurityGroup.java @@ -30,7 +30,7 @@ import org.jclouds.openstack.neutron.v2.domain.RuleEthertype; import org.jclouds.openstack.neutron.v2.domain.RuleProtocol; import org.jclouds.openstack.neutron.v2.domain.SecurityGroup; -import org.jclouds.openstack.neutron.v2.extensions.SecurityGroupApi; +import org.jclouds.openstack.neutron.v2.features.SecurityGroupApi; import com.google.common.io.Closeables; /** @@ -68,12 +68,12 @@ public class CreateSecurityGroup implements Closeable { } private void createSecurityGroup() { - SecurityGroupApi sgApi = neutronApi.getSecurityGroupApi(REGION).get(); + SecurityGroupApi sgApi = neutronApi.getSecurityGroupApi(REGION); Rule rule = null; SecurityGroup securityGroup = null; try { - sgApi = neutronApi.getSecurityGroupApi(REGION).get(); + sgApi = neutronApi.getSecurityGroupApi(REGION); securityGroup = sgApi.create( SecurityGroup.createBuilder().name("jclouds-test").description("jclouds test security group")
