Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 458: updated dist to include scriptbuilder and adjusted dependencies for gae and enterprise

This commit is contained in:
Adrian Cole 2011-02-01 10:17:40 -08:00
parent 5201b80793
commit fe2a58da57
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assemblies/src/main/resources/assemblies/package-descriptor.xml
View File

@ -28,7 +28,7 @@
LICENSE.txt
README.txt
core
+ lib <- core, blobstore, compute and loadbalancer JARs and dependencies for core
+ lib <- core, blobstore, compute (w/scriptbuilder) and loadbalancer JARs and dependencies for core
+ docs <- javadoc for core, blobstore, compute and loadbalancer
+ src <- expanded or source jar for core, blobstore, compute and loadbalancer
drivers
@ -85,6 +85,13 @@
</includes>
<outputDirectory>core/lib</outputDirectory>
</fileSet>
<fileSet>
<directory>scriptbuilder/target</directory>
<includes>
<include>jclouds-scriptbuilder-${project.version}.jar</include>
</includes>
<outputDirectory>core/lib</outputDirectory>
</fileSet>
<fileSet>
<directory>compute/target</directory>
<includes>
@ -113,6 +120,13 @@
</includes>
<outputDirectory>core/src</outputDirectory>
</fileSet>
<fileSet>
<directory>scriptbuilder/target</directory>
<includes>
<include>jclouds-scriptbuilder-${project.version}-sources.jar</include>
</includes>
<outputDirectory>core/src</outputDirectory>
</fileSet>
<fileSet>
<directory>compute/target</directory>
<includes>
@ -135,6 +149,10 @@
<directory>blobstore/target/apidocs</directory>
<outputDirectory>core/docs</outputDirectory>
</fileSet>
<fileSet>
<directory>scriptbuilder/target/apidocs</directory>
<outputDirectory>core/docs</outputDirectory>
</fileSet>
<fileSet>
<directory>compute/target/apidocs</directory>
<outputDirectory>core/docs</outputDirectory>

11
drivers/enterprise/pom.xml
View File

@ -63,11 +63,22 @@
<artifactId>jclouds-joda</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-bouncycastle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>1.44</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-ssl</artifactId>

5
drivers/gae/pom.xml
View File

@ -56,11 +56,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jclouds-joda</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api</artifactId>

2
drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java
View File

@ -25,7 +25,6 @@ import org.jclouds.concurrent.MoreExecutors;
import org.jclouds.concurrent.SingleThreaded;
import org.jclouds.concurrent.config.ConfiguresExecutorService;
import org.jclouds.concurrent.config.ExecutorServiceModule;
import org.jclouds.date.joda.config.JodaDateServiceModule;
import org.jclouds.gae.GaeHttpCommandExecutorService;
import org.jclouds.http.HttpCommandExecutorService;
import org.jclouds.http.TransformingHttpCommandExecutorService;
@ -54,7 +53,6 @@ public class GoogleAppEngineConfigurationModule extends ExecutorServiceModule {
@Override
protected void configure() {
super.configure();
install(new JodaDateServiceModule());
bind(TransformingHttpCommandExecutorService.class).to(TransformingHttpCommandExecutorServiceImpl.class);
}