Issue 129: readying ant plugin for multiple cloud providers

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2388 3d8758e0-26b5-11de-8745-db77d3ebf521

core/src/main/java/org/jclouds/compute/ComputeServiceFactory.java

@@ -0,0 +1,59 @@
+package org.jclouds.compute;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.net.URI;
+import java.util.Properties;
+
+import javax.inject.Inject;
+
+import org.jclouds.domain.Credentials;
+import org.jclouds.http.HttpPropertiesBuilder;
+import org.jclouds.rest.RestContextBuilder;
+
+import com.google.inject.Module;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class ComputeServiceFactory {
+   private final Properties properties;
+
+   @Inject
+   public ComputeServiceFactory(Properties properties) {
+      this.properties = properties;
+   }
+
+   public ComputeService create(URI provider, Module... modules) {
+      return create(provider, Credentials.parse(provider), modules);
+   }
+
+   @SuppressWarnings("unchecked")
+   public ComputeService create(URI provider, Credentials creds, Module... modules) {
+      String hint = checkNotNull(provider.getHost(), "host");
+      String account = checkNotNull(creds.account, "account");
+      String key = creds.key;
+      String propertiesBuilderKey = String.format("%s.propertiesbuilder", hint);
+      String propertiesBuilderClassName = checkNotNull(
+               properties.getProperty(propertiesBuilderKey), propertiesBuilderKey);
+
+      String contextBuilderKey = String.format("%s.contextbuilder", hint);
+      String contextBuilderClassName = checkNotNull(properties.getProperty(contextBuilderKey),
+               contextBuilderKey);
+
+      try {
+         Class<HttpPropertiesBuilder> propertiesBuilderClass = (Class<HttpPropertiesBuilder>) Class
+                  .forName(propertiesBuilderClassName);
+         Class<RestContextBuilder<?, ?>> contextBuilderClass = (Class<RestContextBuilder<?, ?>>) Class
+                  .forName(contextBuilderClassName);
+
+         HttpPropertiesBuilder builder = propertiesBuilderClass.getConstructor(String.class,
+                  String.class).newInstance(account, key);
+         return contextBuilderClass.getConstructor(Properties.class).newInstance(builder.build())
+                  .withModules(modules).buildInjector().getInstance(ComputeService.class);
+      } catch (Exception e) {
+         throw new RuntimeException("error instantiating " + contextBuilderClassName, e);
+      }
+   }
+}

core/src/main/resources/compute.properties

@@ -1,2 +1,2 @@
-rimuhosting.contextBuilder=org.jclouds.rimuhosting.miro.RimuHostingContextBuilder
+rimuhosting.contextbuilder=org.jclouds.rimuhosting.miro.RimuHostingContextBuilder
-rimuhosting.propertiesBuilder=org.jclouds.rimuhosting.miro.RimuHostingPropertiesBuilder
+rimuhosting.propertiesbuilder=org.jclouds.rimuhosting.miro.RimuHostingPropertiesBuilder

tools/ant-plugin/build.xml

@@ -24,17 +24,16 @@
 
 -->
 <project name="ex6" default="demo" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-    <artifact:localRepository id="jclouds.repository" path="c:\\Users\\Ivan\\.m2\\repository" />
+	<artifact:localRepository id="jclouds.repository" path="${user.home}/.m2/repository" />
-<artifact:dependencies pathId="jclouds.classpath">
+	<artifact:dependencies pathId="jclouds.classpath">
- <dependency groupId="org.jclouds" artifactId="jclouds-ant-plugin" version="1.0-SNAPSHOT" />
+		<dependency groupId="org.jclouds" artifactId="jclouds-ant-plugin" version="1.0-SNAPSHOT" />
- <localRepository refid="jclouds.repository" />
+		<localRepository refid="jclouds.repository" />
-</artifact:dependencies>
+	</artifact:dependencies>
 
 
-   <typedef name="compute"  classname="org.jclouds.tools.ant.ComputeTask"  classpathref="jclouds.classpath" />
+	<typedef name="compute" classname="org.jclouds.tools.ant.ComputeTask" classpathref="jclouds.classpath" />
-   <target name="demo">
-      <compute action="create"/>
 
-
+	<target name="demo">
-   </target>
+		<compute action="create" provider="compute://accountkey:accountkey@rimuhosting" />
+	</target>
 </project>

tools/ant-plugin/src/main/java/org/jclouds/tools/ant/ComputeTask.java

@@ -31,11 +31,12 @@ import java.util.Properties;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.jclouds.compute.ComputeService;
-import org.jclouds.rimuhosting.miro.RimuHostingContextBuilder;
+import org.jclouds.compute.ComputeServiceFactory;
-import org.jclouds.rimuhosting.miro.RimuHostingPropertiesBuilder;
+import org.jclouds.http.HttpUtils;
 
+import com.google.common.base.Function;
+import com.google.common.collect.MapMaker;
 import com.google.common.io.Resources;
-import com.google.inject.Injector;
 
 /**
  * @author Ivan Meredith
@@ -44,7 +45,7 @@ public class ComputeTask extends Task {
    private final Map<URI, ComputeService> computeMap;
 
    public ComputeTask() throws IOException {
-      this(null);//TODO MapMaker
+      this(buildComputeMap(loadDefaultProperties()));
    }
 
    static Properties loadDefaultProperties() throws IOException {
@@ -54,25 +55,33 @@ public class ComputeTask extends Task {
       return properties;
    }
 
+   static Map<URI, ComputeService> buildComputeMap(final Properties props) {
+      return new MapMaker().makeComputingMap(new Function<URI, ComputeService>() {
+
+         @Override
+         public ComputeService apply(URI from) {
+            return new ComputeServiceFactory(props).create(from);
+         }
+
+      });
+
+   }
+
    public ComputeTask(Map<URI, ComputeService> computeMap) {
       this.computeMap = computeMap;
    }
 
    private final String ACTION_CREATE = "create";
 
+   private String provider;
    private String action;
    private ServerElement serverElement;
 
    public void execute() throws BuildException {
       if (ACTION_CREATE.equalsIgnoreCase(action)) {
-         if (getServerElement() != null) {
+         ComputeService computeService = computeMap.get(HttpUtils.createUri(provider));
-            Injector injector = new RimuHostingContextBuilder(new RimuHostingPropertiesBuilder(
+         log("hello");
-                     "test", "Test").relaxSSLHostname().build()).buildInjector();
+         computeService.createServerAndWait("test.com", "MIRO1B", "lenny");
-
-            ComputeService computeService = injector.getInstance(ComputeService.class);
-
-            computeService.createServerAndWait("test.com", "MIRO1B", "lenny");
-         }
       }
    }
 
@@ -91,4 +100,12 @@ public class ComputeTask extends Task {
    public void setServerElement(ServerElement serverElement) {
       this.serverElement = serverElement;
    }
+
+   public void setProvider(String provider) {
+      this.provider = provider;
+   }
+
+   public String getProvider() {
+      return provider;
+   }
 }

tools/ant-plugin/src/test/java/org/jclouds/tools/ant/ComputeTaskTest.java

@@ -0,0 +1,21 @@
+package org.jclouds.tools.ant;
+
+import java.io.IOException;
+
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", testName = "compute.ComputeTaskTest")
+public class ComputeTaskTest {
+   private ComputeTask task;
+   private ServerElement serverElement;
+
+   @BeforeTest
+   protected void setUp() throws IOException {
+      this.task = new ComputeTask();
+
+   }
+}