You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by pa...@apache.org on 2012/07/16 15:53:03 UTC
svn commit: r1362038 - in
/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon: ./ lib/
src/org/apache/ace/nodelauncher/amazon/
Author: paulb
Date: Mon Jul 16 13:53:01 2012
New Revision: 1362038
URL: http://svn.apache.org/viewvc?rev=1362038&view=rev
Log:
Packaging jclouds in the amazon node launcher bundle. We might want to consider doing this different by using the jclouds OSGi jars directly, but this is a pain as far as I know because the huge amount of dependencies. The included groovy scripts can be run from the command line to help when upgrading to a newer jclouds version.
Added:
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-build-path.groovy
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-lib-includes.groovy
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-serviceloader-files.groovy
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aopalliance-1.0.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-common-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-ec2-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/bcprov-jdk16-1.46.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/commons-io-2.0.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/ec2-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/gson-2.2.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guava-12.0.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-3.0.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-assistedinject-3.0.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/javax.inject-1.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-bouncycastle-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-compute-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-core-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-scriptbuilder-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-slf4j-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-sshj-1.5.0-beta.6.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jersey-core-1.12.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr250-api-1.0.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr305-1.3.9.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/oauth-20100527.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/rocoto-6.1.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/slf4j-api-1.6.4.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/sshj-0.8.1.jar (with props)
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/org.jclouds.apis.ApiMetadata
Modified:
ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-build-path.groovy
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-build-path.groovy?rev=1362038&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-build-path.groovy (added)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-build-path.groovy Mon Jul 16 13:53:01 2012
@@ -0,0 +1,9 @@
+def libDir = new File("lib")
+def output = new File('buildpath.txt')
+output.text = ""
+
+libDir.listFiles().each {
+ output << "lib/${it.name};version=file,\\"
+ output << '\n'
+}
+
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-lib-includes.groovy
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-lib-includes.groovy?rev=1362038&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-lib-includes.groovy (added)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-lib-includes.groovy Mon Jul 16 13:53:01 2012
@@ -0,0 +1,9 @@
+def libDir = new File("lib")
+def output = new File('libs.txt')
+output.text = ""
+
+libDir.listFiles().each {
+ output << "@lib/${it.name},\\"
+ output << '\n'
+}
+
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-serviceloader-files.groovy
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-serviceloader-files.groovy?rev=1362038&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-serviceloader-files.groovy (added)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/generate-serviceloader-files.groovy Mon Jul 16 13:53:01 2012
@@ -0,0 +1,16 @@
+def libDir = new File("lib")
+def serviceProviders = []
+
+libDir.listFiles().each {
+ def zipFile = new java.util.zip.ZipFile(it)
+ def metaDataFile = zipFile.getEntry('META-INF/services/org.jclouds.apis.ApiMetadata')
+ if(metaDataFile) {
+ serviceProviders << zipFile.getInputStream(metaDataFile).text
+ }
+}
+
+def output = new File('org.jclouds.apis.ApiMetadata')
+serviceProviders.each {
+ output << it
+ output << '\n'
+}
\ No newline at end of file
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aopalliance-1.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aopalliance-1.0.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aopalliance-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-common-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-common-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-common-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-ec2-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-ec2-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/aws-ec2-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/bcprov-jdk16-1.46.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/bcprov-jdk16-1.46.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/bcprov-jdk16-1.46.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/commons-io-2.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/commons-io-2.0.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/commons-io-2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/ec2-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/ec2-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/ec2-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/gson-2.2.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/gson-2.2.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/gson-2.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guava-12.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guava-12.0.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guava-12.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-3.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-3.0.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-assistedinject-3.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-assistedinject-3.0.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/guice-assistedinject-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/javax.inject-1.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/javax.inject-1.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/javax.inject-1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-bouncycastle-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-bouncycastle-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-bouncycastle-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-compute-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-compute-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-compute-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-core-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-core-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-core-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-scriptbuilder-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-scriptbuilder-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-scriptbuilder-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-slf4j-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-slf4j-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-slf4j-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-sshj-1.5.0-beta.6.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-sshj-1.5.0-beta.6.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jclouds-sshj-1.5.0-beta.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jersey-core-1.12.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jersey-core-1.12.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jersey-core-1.12.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr250-api-1.0.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr250-api-1.0.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr250-api-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr305-1.3.9.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr305-1.3.9.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/jsr305-1.3.9.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/oauth-20100527.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/oauth-20100527.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/oauth-20100527.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/rocoto-6.1.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/rocoto-6.1.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/rocoto-6.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/slf4j-api-1.6.4.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/slf4j-api-1.6.4.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/slf4j-api-1.6.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/sshj-0.8.1.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/sshj-0.8.1.jar?rev=1362038&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/lib/sshj-0.8.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/org.jclouds.apis.ApiMetadata
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/org.jclouds.apis.ApiMetadata?rev=1362038&view=auto
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/org.jclouds.apis.ApiMetadata (added)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/org.jclouds.apis.ApiMetadata Mon Jul 16 13:53:01 2012
@@ -0,0 +1,2 @@
+org.jclouds.ec2.EC2ApiMetadata
+org.jclouds.compute.stub.StubApiMetadata
Modified: ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java?rev=1362038&r1=1362037&r2=1362038&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java (original)
+++ ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/src/org/apache/ace/nodelauncher/amazon/JcloudsNodeLauncherConfig.java Mon Jul 16 13:53:01 2012
@@ -21,6 +21,8 @@ package org.apache.ace.nodelauncher.amaz
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
import org.apache.ace.nodelauncher.NodeLauncherConfig;
+import org.jclouds.Context;
+import org.jclouds.ContextBuilder;
import org.jclouds.aws.ec2.reference.AWSEC2Constants;
import org.jclouds.compute.ComputeService;
import org.jclouds.compute.ComputeServiceContext;
@@ -253,8 +255,10 @@ public class JcloudsNodeLauncherConfig i
props.setProperty(AWSEC2Constants.PROPERTY_EC2_AMI_QUERY, "owner-id=" + m_ImageOwnerId + ";state=available;image-type=machine;root-device-type=ebs");
props.setProperty(AWSEC2Constants.PROPERTY_EC2_CC_AMI_QUERY, "");
}
-
- m_computeServiceContext = new ComputeServiceContextFactory().createContext("aws-ec2", m_accessKeyId, m_secretAccessKey, ImmutableSet.<Module>of(new SshjSshClientModule()), props);
+
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ m_computeServiceContext = ContextBuilder.newBuilder("aws-ec2").credentials(m_accessKeyId, m_secretAccessKey).modules(ImmutableSet.<Module>of(new SshjSshClientModule())).overrides(props).build(ComputeServiceContext.class);
+ //m_computeServiceContext = new ComputeServiceContextFactory().createContext("aws-ec2", m_accessKeyId, m_secretAccessKey, ImmutableSet.<Module>of(new SshjSshClientModule()), props);
}
public ComputeService getComputeService() {