From 9b1b145192645633311da5e3727d5f0484f5d037 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <bhaisaab@apache.org>
Date: Mon, 15 Oct 2012 14:28:27 +0530
Subject: [PATCH] CLOUDSTACK-346: Replace vmware-lib-jaxrpc with axis-jaxrpc

vmware-lib-jaxrpc is now provided by axis-jaxrpc-1.4.jar, the former is
the same as latter (bit by bit) and only difference is the file name.

- Fix dependency in vmware-base's pom.xml
- Fix dependency in hypervisor-plugin-vmware's pom.xml
- Fix install-non-oss.sh by reverting commit:
    2e6ddc6c36f4ce79e67ad223647071bccfc41c52.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
---
 deps/install-non-oss.sh            |  1 -
 plugins/hypervisors/vmware/pom.xml | 11 +++++------
 vmware-base/pom.xml                |  6 ------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 827f59bd46d..9c65a311b94 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -23,4 +23,3 @@ mvn install:install-file -Dfile=cloud-manageontap.jar   -DgroupId=com.cloud.com.
 mvn install:install-file -Dfile=vmware-vim.jar          -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim      -Dversion=1.0   -Dpackaging=jar
 mvn install:install-file -Dfile=vmware-vim25.jar        -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25    -Dversion=1.0   -Dpackaging=jar
 mvn install:install-file -Dfile=vmware-apputils.jar     -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=1.0   -Dpackaging=jar
-mvn install:install-file -Dfile=vmware-lib-jaxrpc.jar   -DgroupId=com.cloud.com.vmware -DartifactId=vmware-lib-jaxrpc -Dversion=1.0  -Dpackaging=jar
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 9f1939c228f..0354e585ef1 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -49,12 +49,11 @@
       <artifactId>vmware-apputils</artifactId>
       <version>1.0</version>
       <scope>compile</scope>
-    </dependency>    
+    </dependency>
     <dependency>
-      <groupId>com.cloud.com.vmware</groupId>
-      <artifactId>vmware-lib-jaxrpc</artifactId>
-      <version>1.0</version>
-      <scope>runtime</scope>
-    </dependency>    
+      <groupId>org.apache.axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>${cs.axis.version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index e2bba78e44e..32f9d3fb105 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -55,12 +55,6 @@
       <version>1.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.cloud.com.vmware</groupId>
-      <artifactId>vmware-lib-jaxrpc</artifactId>
-      <version>1.0</version>
-      <scope>runtime</scope>
-    </dependency>    
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>