From 3f3037c7296ecc47f2928d0542cc90221710f051 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Sun, 4 Nov 2012 21:47:20 +0000
Subject: [PATCH 1/2] Support for setting RunScriptOnNode.Factory

- Set default RunScriptOnNode.Factory impl using @ImplementedBy,
  rather than hardcoding the binding
---
 .../java/org/jclouds/compute/callables/RunScriptOnNode.java   | 2 ++
 .../compute/config/BaseComputeServiceContextModule.java       | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java
index 2c17e84a3e..2fa83ac9d3 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNode.java
@@ -27,6 +27,7 @@ import org.jclouds.scriptbuilder.domain.Statement;
 
 import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.ImplementedBy;
 
 /**
  * Separates out how one implements the ability to run a script on a node.
@@ -36,6 +37,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 @Beta
 public interface RunScriptOnNode extends Callable<ExecResponse> {
 
+   @ImplementedBy(org.jclouds.compute.config.BaseComputeServiceContextModule.RunScriptOnNodeFactoryImpl.class)
    public interface Factory {
 
       RunScriptOnNode create(NodeMetadata node, Statement script, RunScriptOptions options);
diff --git a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
index 9d761a1ae2..e405af259d 100644
--- a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
+++ b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
@@ -104,8 +104,6 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
 
       install(new PersistNodeCredentialsModule());
 
-      bind(RunScriptOnNode.Factory.class).to(RunScriptOnNodeFactoryImpl.class);
-
       install(new FactoryModuleBuilder().implement(new TypeLiteral<Callable<Void>>() {
       }, CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.class)
             .implement(new TypeLiteral<Function<AtomicReference<NodeMetadata>, Void>>() {
@@ -124,7 +122,7 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
    }
 
    @Singleton
-   static class RunScriptOnNodeFactoryImpl implements RunScriptOnNode.Factory {
+   public static class RunScriptOnNodeFactoryImpl implements RunScriptOnNode.Factory {
 
       static interface Factory {
 

From 43d6155341e6ae42edeb8a78d73d9d300d78d584 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Sun, 4 Nov 2012 21:48:05 +0000
Subject: [PATCH 2/2] Set EC2 windows-template image id for testing

- Identify the windows-template AMI using id rather than name-matching
---
 apis/ec2/pom.xml          | 4 ++--
 providers/aws-ec2/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 8e9463c262..7edbc91eb4 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -41,8 +41,8 @@
     <test.ec2.credential>${test.aws.credential}</test.ec2.credential>
     <test.ec2.template></test.ec2.template>
     <test.ec2.ebs-template>hardwareId=m1.small,imageId=us-west-2/ami-38c64a08</test.ec2.ebs-template>
-    <test.ec2.windows-template>hardwareId=m1.small,imageNameMatches=Windows_Server-2008-R2_SP1-English-64Bit-Base-WinRM-</test.ec2.windows-template>
-    <test.ec2.windows-owner>449550055360</test.ec2.windows-owner>
+    <!-- Windows_Server-2008-R2 with WinRM enabled (setup instructions at http://www.frontiertown.co.uk/2011/12/overthere-control-windows-from-java/) -->
+    <test.ec2.windows-template>hardwareId=m1.small,imageId=us-east-1/ami-0cb76d65</test.ec2.windows-template>
     <jclouds.osgi.export>org.jclouds.ec2*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index 204744fe45..854246fc85 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -41,8 +41,8 @@
     <test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
     <test.aws-ec2.template></test.aws-ec2.template>
     <test.aws-ec2.ebs-template>hardwareId=m1.small,imageId=us-west-2/ami-38c64a08</test.aws-ec2.ebs-template>
-    <test.aws-ec2.windows-template>hardwareId=m1.small,imageNameMatches=Windows_Server-2008-R2_SP1-English-64Bit-Base-WinRM-</test.aws-ec2.windows-template>
-    <test.aws-ec2.windows-owner>449550055360</test.aws-ec2.windows-owner>
+    <!-- Windows_Server-2008-R2 with WinRM enabled (setup instructions at http://www.frontiertown.co.uk/2011/12/overthere-control-windows-from-java/) -->
+    <test.aws-ec2.windows-template>hardwareId=m1.small,imageId=us-east-1/ami-0cb76d65</test.aws-ec2.windows-template>
     <jclouds.osgi.export>org.jclouds.aws.ec2*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
       org.jclouds.compute.internal;version="${project.version}",