Return-Path: 
 <ace-commits-return-1074-apmail-incubator-ace-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ace-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1945B74E6
	for <apmail-incubator-ace-commits-archive@minotaur.apache.org>;
 Tue, 18 Oct 2011 22:05:40 +0000 (UTC)
Received: (qmail 68730 invoked by uid 500); 18 Oct 2011 22:05:40 -0000
Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org
Received: (qmail 68706 invoked by uid 500); 18 Oct 2011 22:05:39 -0000
Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ace-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ace-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ace-commits@incubator.apache.org>
List-Id: <ace-commits.incubator.apache.org>
Reply-To: ace-dev@incubator.apache.org
Delivered-To: mailing list ace-commits@incubator.apache.org
Received: (qmail 68698 invoked by uid 99); 18 Oct 2011 22:05:39 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Oct 2011 22:05:39 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Oct 2011 22:05:36 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 86ADC238889B;
	Tue, 18 Oct 2011 22:05:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1185900 - in
 /incubator/ace/trunk/ace-nodelauncher-amazon:
 pom.xml
 src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
Date: Tue, 18 Oct 2011 22:05:15 -0000
To: ace-commits@incubator.apache.org
From: marrs@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111018220515.86ADC238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: marrs
Date: Tue Oct 18 22:05:15 2011
New Revision: 1185900

URL: http://svn.apache.org/viewvc?rev=1185900&view=rev
Log:
ACE-187 applied the patch

Modified:
    incubator/ace/trunk/ace-nodelauncher-amazon/pom.xml
    incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java

Modified: incubator/ace/trunk/ace-nodelauncher-amazon/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-nodelauncher-amazon/pom.xml?rev=1185900&r1=1185899&r2=1185900&view=diff
==============================================================================
--- incubator/ace/trunk/ace-nodelauncher-amazon/pom.xml (original)
+++ incubator/ace/trunk/ace-nodelauncher-amazon/pom.xml Tue Oct 18 22:05:15 2011
@@ -84,48 +84,17 @@
             <groupId>org.apache.ace</groupId>
             <artifactId>org.apache.ace.nodelauncher.api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>1.0-beta-9b</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-compute</artifactId>
-            <version>1.0-beta-9b</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.common</groupId>
-            <artifactId>aws-common</artifactId>
-            <version>1.0-beta-9b</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.api</groupId>
-            <artifactId>ec2</artifactId>
-            <version>1.0-beta-9b</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.provider</groupId>
-            <artifactId>aws-ec2</artifactId>
-            <version>1.0-beta-9b</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-scriptbuilder</artifactId>
-            <version>1.0-beta-9b</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
+       <dependency>
             <groupId>org.jclouds.driver</groupId>
             <artifactId>jclouds-jsch</artifactId>
-            <version>1.0-beta-9b</version>
+            <version>1.1.1</version>
             <scope>compile</scope>
         </dependency>
+         <dependency>
+        <groupId>org.jclouds</groupId>
+        <artifactId>jclouds-allcompute</artifactId>
+        <version>1.1.1</version>
+   </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>

Modified: incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java?rev=1185900&r1=1185899&r2=1185900&view=diff
==============================================================================
--- incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java (original)
+++ incubator/ace/trunk/ace-nodelauncher-amazon/src/main/java/org/apache/ace/nodelauncher/amazon/AmazonNodeLauncher.java Tue Oct 18 22:05:15 2011
@@ -135,7 +135,6 @@ public class AmazonNodeLauncher implemen
     
     public void start() {
         Properties props = new Properties();
-        props.put(EC2Constants.PROPERTY_EC2_AMI_OWNERS, "");
         m_computeServiceContext = new ComputeServiceContextFactory().createContext("aws-ec2",
                 m_accessKeyId, m_secretAccessKey, (List) Arrays.asList(new JschSshClientModule()), props);
     }