From 0e3fb8d686e5c0cdd11ca0dbbd5a3cc4be8bad50 Mon Sep 17 00:00:00 2001
From: "sharedocs1@gmail.com"
 <sharedocs1@gmail.com@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Sun, 20 Dec 2009 22:35:47 +0000
Subject: [PATCH] Removed vcloud as a provider in the package and instead made
 terremark and hostingdotcom include it as a library. This is more consistent
 with the way blobstore is used by other providers. See issue 127.

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2483 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 package-descriptor.xml                        | 35 ++++-------------
 vcloud/core/pom.xml                           | 13 +++++++
 vcloud/hostingdotcom/README.txt               |  2 -
 .../hostingdotcom/dependencies-descriptor.xml | 39 +++++++++++++++++++
 vcloud/hostingdotcom/pom.xml                  | 20 ++++++++++
 vcloud/pom.xml                                | 26 ++++---------
 vcloud/terremark/README.txt                   |  2 -
 vcloud/terremark/dependencies-descriptor.xml  | 39 +++++++++++++++++++
 vcloud/terremark/pom.xml                      | 20 ++++++++++
 9 files changed, 147 insertions(+), 49 deletions(-)
 create mode 100644 vcloud/hostingdotcom/dependencies-descriptor.xml
 create mode 100644 vcloud/terremark/dependencies-descriptor.xml

diff --git a/package-descriptor.xml b/package-descriptor.xml
index 58d45dd4ed..a59ee7b649 100644
--- a/package-descriptor.xml
+++ b/package-descriptor.xml
@@ -227,6 +227,10 @@
             </includes>
             <outputDirectory>providers/hostingdotcom/lib</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>vcloud/hostingdotcom/target/jclouds-hostingdotcom-${project.version}-dependencies.dir</directory>
+            <outputDirectory>providers/hostingdotcom/lib</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>vcloud/hostingdotcom/target</directory>
             <includes>
@@ -374,6 +378,10 @@
             </includes>
             <outputDirectory>providers/terremark/lib</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>vcloud/terremark/target/jclouds-terremark-${project.version}-dependencies.dir</directory>
+            <outputDirectory>providers/terremark/lib</outputDirectory>
+        </fileSet>        
         <fileSet>
             <directory>vcloud/terremark/target</directory>
             <includes>
@@ -419,33 +427,6 @@
             </includes>
             <outputDirectory>providers/twitter</outputDirectory>            
         </fileSet> 
-        
-        <!-- providers: vcloud -->
-        <fileSet>
-            <directory>vcloud/core/target</directory>
-            <includes>
-                <include>jclouds-vcloud-${project.version}.jar</include>
-            </includes>
-            <outputDirectory>providers/vcloud/lib</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>vcloud/core/target</directory>
-            <includes>
-                <include>jclouds-vcloud-${project.version}-sources.jar</include>
-            </includes>
-            <outputDirectory>providers/vcloud/src</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>vcloud/core/target/apidocs</directory>
-            <outputDirectory>providers/vcloud/docs</outputDirectory>            
-        </fileSet>
-        <fileSet>
-            <directory>vcloud/core</directory>
-            <includes>
-                <include>README.txt</include>
-            </includes>
-            <outputDirectory>providers/vcloud</outputDirectory>            
-        </fileSet>
 
         <!-- extensions: bouncycastle -->
         <fileSet>
diff --git a/vcloud/core/pom.xml b/vcloud/core/pom.xml
index 1586a2a448..e9d893c6ae 100755
--- a/vcloud/core/pom.xml
+++ b/vcloud/core/pom.xml
@@ -46,5 +46,18 @@
         <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/vcloud/core</developerConnection>
         <url>http://jclouds.googlecode.com/svn/trunk/vcloud/core</url>
     </scm>
+    
+    <dependencies>
+        <dependency>
+            <groupId>com.jamesmurty.utils</groupId>
+            <artifactId>java-xmlbuilder</artifactId>
+            <version>0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jclouds-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/vcloud/hostingdotcom/README.txt b/vcloud/hostingdotcom/README.txt
index 611ac5e074..0a10e120c3 100644
--- a/vcloud/hostingdotcom/README.txt
+++ b/vcloud/hostingdotcom/README.txt
@@ -24,8 +24,6 @@
 #
 # The jclouds provider for Hosting.com's vCloud Express (http://www.hosting.com/vcloudexpress/) platform.
 #
-# Requires the jclouds-vcloud JAR to be on the classpath.
-#
 # TODO: Implementation status.
 # TODO: Supported features.
 # TODO: Usage example.
\ No newline at end of file
diff --git a/vcloud/hostingdotcom/dependencies-descriptor.xml b/vcloud/hostingdotcom/dependencies-descriptor.xml
new file mode 100644
index 0000000000..f54e4b39cf
--- /dev/null
+++ b/vcloud/hostingdotcom/dependencies-descriptor.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $HeadURL$ 
+    $Revision$ 
+    $Date$ 
+    
+    Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
+
+    ====================================================================
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0.html Unless required
+    by applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+    ====================================================================
+-->
+<assembly>
+    <id>dependencies</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <scope>runtime</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/vcloud/hostingdotcom/pom.xml b/vcloud/hostingdotcom/pom.xml
index 27e7a804e2..e3d65bc54f 100755
--- a/vcloud/hostingdotcom/pom.xml
+++ b/vcloud/hostingdotcom/pom.xml
@@ -62,4 +62,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>dependencies-descriptor.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>   
+        </plugins>
+    </build>         
 </project>
diff --git a/vcloud/pom.xml b/vcloud/pom.xml
index 85164916fb..fc9e367bd4 100755
--- a/vcloud/pom.xml
+++ b/vcloud/pom.xml
@@ -26,13 +26,13 @@
    ====================================================================
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>jclouds-project</artifactId>
         <groupId>org.jclouds</groupId>
+        <artifactId>jclouds-project</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>jclouds-vcloud-project</artifactId>
     <packaging>pom</packaging>
     <name>jclouds vcloud project</name>
@@ -42,28 +42,18 @@
         <module>hostingdotcom</module>
     </modules>
     <dependencies>
-        <dependency>
-            <groupId>com.jamesmurty.utils</groupId>
-            <artifactId>java-xmlbuilder</artifactId>
-            <version>0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-jsch</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jclouds-core</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
+        </dependency>    
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jclouds-jsch</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
            <groupId>log4j</groupId>
diff --git a/vcloud/terremark/README.txt b/vcloud/terremark/README.txt
index 9549846e04..287307e71f 100644
--- a/vcloud/terremark/README.txt
+++ b/vcloud/terremark/README.txt
@@ -24,8 +24,6 @@
 #
 # The jclouds provider for Terremark's vCloud Express (http://vcloudexpress.terremark.com/) platform.
 #
-# Requires the jclouds-vcloud JAR to be on the classpath.
-#
 # TODO: Implementation status.
 # TODO: Supported features.
 # See http://code.google.com/p/jclouds/wiki/QuickStartTerremark for example usage.
\ No newline at end of file
diff --git a/vcloud/terremark/dependencies-descriptor.xml b/vcloud/terremark/dependencies-descriptor.xml
new file mode 100644
index 0000000000..f54e4b39cf
--- /dev/null
+++ b/vcloud/terremark/dependencies-descriptor.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $HeadURL$ 
+    $Revision$ 
+    $Date$ 
+    
+    Copyright (C) 2009 Adrian Cole <adrian@jclouds.org>
+
+    ====================================================================
+    Licensed to the Apache Software Foundation (ASF) under one or
+    more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information regarding
+    copyright ownership. The ASF licenses this file to you under the
+    Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain
+    a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0.html Unless required
+    by applicable law or agreed to in writing, software distributed
+    under the License is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+    ====================================================================
+-->
+<assembly>
+    <id>dependencies</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <scope>runtime</scope>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/vcloud/terremark/pom.xml b/vcloud/terremark/pom.xml
index 6cbd326e34..ac4a6578f6 100755
--- a/vcloud/terremark/pom.xml
+++ b/vcloud/terremark/pom.xml
@@ -61,4 +61,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>dependencies-descriptor.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>   
+        </plugins>
+    </build>         
 </project>