Repository: jclouds-examples Updated Branches: refs/heads/master ddb0cfbd4 -> acf8dbdc9
Upgrade compute examples to 2.0.0 Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/acf8dbdc Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/acf8dbdc Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/acf8dbdc Branch: refs/heads/master Commit: acf8dbdc9ee4147997879e65681bac7b16644b24 Parents: ddb0cfb Author: Ignasi Barrera <[email protected]> Authored: Thu Nov 24 19:37:40 2016 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Thu Nov 24 19:37:40 2016 +0100 ---------------------------------------------------------------------- chef-basics/pom.xml | 9 ++------- .../jclouds/examples/chef/basics/MainApp.java | 18 +++++++++++------- chef-basics/src/main/resources/logback.xml | 2 +- compute-basics/pom.xml | 14 ++------------ compute-basics/src/main/resources/logback.xml | 2 +- openstack/pom.xml | 4 ++-- rackspace/pom.xml | 9 ++++----- .../rackspace/clouddatabases/CreateDatabase.java | 5 +---- .../rackspace/clouddatabases/CreateUser.java | 5 +---- 9 files changed, 25 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/chef-basics/pom.xml ---------------------------------------------------------------------- diff --git a/chef-basics/pom.xml b/chef-basics/pom.xml index 4569fce..39853dc 100644 --- a/chef-basics/pom.xml +++ b/chef-basics/pom.xml @@ -22,12 +22,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.examples</groupId> <artifactId>chef-basics</artifactId> - <version>1.8.0</version> + <version>2.0.0</version> <name>chef-basics</name> <description>jclouds chef example that adds a node to a group, then installs an Apache web server on all nodes</description> <properties> - <jclouds.version>1.9.0</jclouds.version> + <jclouds.version>2.0.0</jclouds.version> </properties> <dependencies> @@ -46,11 +46,6 @@ <artifactId>jclouds-allcompute</artifactId> <version>${jclouds.version}</version> </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>joyentcloud</artifactId> - <version>${jclouds.version}</version> - </dependency> <!-- note that if you want a smaller distribution remove the above dependency and place something like below --> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/chef-basics/src/main/java/org/apache/jclouds/examples/chef/basics/MainApp.java ---------------------------------------------------------------------- diff --git a/chef-basics/src/main/java/org/apache/jclouds/examples/chef/basics/MainApp.java b/chef-basics/src/main/java/org/apache/jclouds/examples/chef/basics/MainApp.java index 589ce70..65adada 100644 --- a/chef-basics/src/main/java/org/apache/jclouds/examples/chef/basics/MainApp.java +++ b/chef-basics/src/main/java/org/apache/jclouds/examples/chef/basics/MainApp.java @@ -30,6 +30,7 @@ import static org.jclouds.compute.options.TemplateOptions.Builder.overrideLoginC import static org.jclouds.compute.options.TemplateOptions.Builder.runScript; import static org.jclouds.compute.predicates.NodePredicates.TERMINATED; import static org.jclouds.compute.predicates.NodePredicates.inGroup; +import static org.jclouds.util.Closeables2.closeQuietly; import java.io.File; import java.util.List; @@ -42,8 +43,8 @@ import java.util.concurrent.TimeUnit; import org.jclouds.ContextBuilder; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.Apis; +import org.jclouds.chef.ChefApi; import org.jclouds.chef.ChefApiMetadata; -import org.jclouds.chef.ChefContext; import org.jclouds.chef.ChefService; import org.jclouds.chef.config.ChefProperties; import org.jclouds.chef.domain.BootstrapConfig; @@ -70,6 +71,7 @@ import org.jclouds.scriptbuilder.statements.git.CloneGitRepo; import org.jclouds.scriptbuilder.statements.git.InstallGit; import org.jclouds.scriptbuilder.statements.login.AdminAccess; import org.jclouds.sshj.config.SshjSshClientModule; +import org.jclouds.util.Closeables2; import com.google.common.base.Predicates; import com.google.common.base.Splitter; @@ -132,6 +134,7 @@ public class MainApp { action != Action.DESTROY ? getLoginForCommandExecution(action) : null; ComputeService compute = initComputeService(provider, identity, credential); + ChefApi chefApi = null; try { switch (action) { @@ -194,9 +197,8 @@ public class MainApp { break; case CHEF: // Create the connection to the Chef server - ChefService chef = - initChefService(System.getProperty("chef.client"), - System.getProperty("chef.validator")); + chefApi = initChefService(System.getProperty("chef.client"), System.getProperty("chef.validator")); + ChefService chef = chefApi.chefService(); // Build the runlist for the deployed nodes System.out.println("Configuring node runlist in the Chef server..."); @@ -232,6 +234,9 @@ public class MainApp { error = 1; } finally { compute.getContext().close(); + if (chefApi != null) { + closeQuietly(chefApi); + } System.exit(error); } } @@ -283,7 +288,7 @@ public class MainApp { return builder.buildView(ComputeServiceContext.class).getComputeService(); } - private static ChefService initChefService(final String client, final String validator) { + private static ChefApi initChefService(final String client, final String validator) { try { Properties chefConfig = new Properties(); chefConfig.put(ChefProperties.CHEF_VALIDATOR_NAME, validator); @@ -297,8 +302,7 @@ public class MainApp { System.out.printf(">> initializing %s%n", builder.getApiMetadata()); - ChefContext context = builder.buildView(ChefContext.class); - return context.getChefService(); + return builder.buildApi(ChefApi.class); } catch (Exception e) { System.err.println("error reading private key " + e.getMessage()); System.exit(1); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/chef-basics/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/chef-basics/src/main/resources/logback.xml b/chef-basics/src/main/resources/logback.xml index 46429a6..ce9d43a 100644 --- a/chef-basics/src/main/resources/logback.xml +++ b/chef-basics/src/main/resources/logback.xml @@ -20,7 +20,7 @@ <configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <encoder> - <pattern>- %msg%n</pattern> + <pattern>%msg%n</pattern> </encoder> </appender> <root level="info"> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/compute-basics/pom.xml ---------------------------------------------------------------------- diff --git a/compute-basics/pom.xml b/compute-basics/pom.xml index ebb6b2a..f814b6f 100644 --- a/compute-basics/pom.xml +++ b/compute-basics/pom.xml @@ -22,12 +22,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.examples</groupId> <artifactId>compute-basics</artifactId> - <version>1.9.2</version> + <version>2.0.0</version> <name>compute-basics</name> <description>jclouds compute example that adds a node to a group, then executes "echo hello" on all nodes</description> <properties> - <jclouds.version>1.9.2</jclouds.version> + <jclouds.version>2.0.0</jclouds.version> </properties> <dependencies> @@ -41,16 +41,6 @@ <artifactId>jclouds-allcompute</artifactId> <version>${jclouds.version}</version> </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>joyentcloud</artifactId> - <version>${jclouds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> - <artifactId>google-compute-engine</artifactId> - <version>${jclouds.version}</version> - </dependency> <!-- note that if you want a smaller distribution remove the above dependency and place something like below --> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/compute-basics/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/compute-basics/src/main/resources/logback.xml b/compute-basics/src/main/resources/logback.xml index 46429a6..ce9d43a 100644 --- a/compute-basics/src/main/resources/logback.xml +++ b/compute-basics/src/main/resources/logback.xml @@ -20,7 +20,7 @@ <configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <encoder> - <pattern>- %msg%n</pattern> + <pattern>%msg%n</pattern> </encoder> </appender> <root level="info"> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/openstack/pom.xml ---------------------------------------------------------------------- diff --git a/openstack/pom.xml b/openstack/pom.xml index 4811ed1..74403a7 100644 --- a/openstack/pom.xml +++ b/openstack/pom.xml @@ -22,11 +22,11 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.examples</groupId> <artifactId>openstack-examples</artifactId> - <version>1.8.0</version> + <version>2.0.0</version> <name>openstack-examples</name> <properties> - <jclouds.version>1.9.0</jclouds.version> + <jclouds.version>2.0.0</jclouds.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/rackspace/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace/pom.xml b/rackspace/pom.xml index e76fdba..5dc1e98 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>1.9.1</version> + <version>2.0.0</version> <name>rackspace-examples</name> <properties> - <jclouds.version>1.9.1</jclouds.version> + <jclouds.version>2.0.0</jclouds.version> </properties> <repositories> @@ -52,10 +52,9 @@ <version>${jclouds.version}</version> </dependency> <dependency> - <groupId>org.apache.jclouds.labs</groupId> + <groupId>org.apache.jclouds.api</groupId> <artifactId>docker</artifactId> - <!-- TODO: Update version to variable jclouds.version on next release --> - <version>2.0.0-SNAPSHOT</version> + <version>${jclouds.version}</version> </dependency> <!-- Rackspace US dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java index 0cd8122..f919e5e 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java @@ -87,10 +87,7 @@ public class CreateDatabase implements Closeable { private void createDatabase() throws TimeoutException { System.out.format("Create Database%n"); - - boolean result = databaseApi.create(NAME); - - System.out.format(" %s%n", result); + databaseApi.create(NAME); } /** http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/acf8dbdc/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java index b888749..eec6f7b 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java @@ -85,10 +85,7 @@ public class CreateUser implements Closeable { private void createUser() throws TimeoutException { System.out.format("Create User%n"); - - boolean result = userApi.create(NAME, PASSWORD, NAME); - - System.out.format(" %s%n", result); + userApi.create(NAME, PASSWORD, NAME); } /**
