Fix runtime dependencies for vmware modules

The vmware modules should be listed as provided so they are never
packaged. However this also means that you have to put them in the
web-inf/lib directory by hand.

Set the version of the api in the central pom for easy reference.

Add wsdl4j as a runtime requirement. It is actually required by the
vmware implementation but it is easier to list it as a requirements for
the component here as vmware is not in any maven repo

put the dependency on vim back in the dependencies. It is not required
for compile, but is required as runtime by apputils.

deps/install-non-oss.sh

@@ -28,3 +28,4 @@ mvn install:install-file -Dfile=manageontap.jar   -DgroupId=com.cloud.com.netapp
 # Version: 4.1, Release-date: 2010-07-13, Build: 257238 
 mvn install:install-file -Dfile=vim25.jar        -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25    -Dversion=4.1   -Dpackaging=jar
 mvn install:install-file -Dfile=apputils.jar     -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=4.1   -Dpackaging=jar
+mvn install:install-file -Dfile=vim.jar          -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim      -Dversion=4.1   -Dpackaging=jar

plugins/hypervisors/vmware/pom.xml

@@ -35,19 +35,38 @@
     <dependency>
       <groupId>com.cloud.com.vmware</groupId>
       <artifactId>vmware-vim25</artifactId>
-      <version>4.1</version>
+      <version>${cs.vmware.api.version}</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.cloud.com.vmware</groupId>
+      <artifactId>vmware-vim</artifactId>
+      <version>${cs.vmware.api.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.cloud.com.vmware</groupId>
       <artifactId>vmware-apputils</artifactId>
-      <version>4.1</version>
+      <version>${cs.vmware.api.version}</version>
-      <scope>compile</scope>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${cs.axis.version}</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis-jaxrpc</artifactId>
       <version>${cs.axis.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+      <version>1.4</version>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
 </project>

pom.xml

@@ -80,6 +80,7 @@
     <cs.servlet.version>2.4</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>
     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
+    <cs.vmware.api.version>4.1</cs.vmware.api.version>
     <skipTests>true</skipTests>
 
   </properties>

vmware-base/pom.xml

@@ -40,24 +40,38 @@
     <dependency>
       <groupId>com.cloud.com.vmware</groupId>
       <artifactId>vmware-vim25</artifactId>
-      <version>4.1</version>
+      <version>${cs.vmware.api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.cloud.com.vmware</groupId>
+      <artifactId>vmware-vim</artifactId>
+      <version>${cs.vmware.api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.cloud.com.vmware</groupId>
       <artifactId>vmware-apputils</artifactId>
-      <version>4.1</version>
+      <version>${cs.vmware.api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>
       <version>${cs.axis.version}</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis-jaxrpc</artifactId>
       <version>${cs.axis.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+      <version>1.4</version>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
   <build>