You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/11/08 16:56:11 UTC

[7/7] git commit: updated refs/heads/vmware-wsdl to b30ea9e

Generate JAX-WS client binding for VMware wsdl


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b30ea9e7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b30ea9e7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b30ea9e7

Branch: refs/heads/vmware-wsdl
Commit: b30ea9e7f10fa9c9b7e61e73582478bf598bb93c
Parents: fdb3b49
Author: Darren Shepherd <da...@gmail.com>
Authored: Mon Sep 23 21:13:31 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Fri Nov 8 08:55:02 2013 -0700

----------------------------------------------------------------------
 pom.xml                                         |     5 +
 vmware-base/pom.xml                             |    56 +-
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |     1 -
 vmware-base/wsdl/vim/vim.wsdl                   | 21965 ++++++++++++++
 vmware-base/wsdl/vim/vimService.wsdl            |    16 +
 vmware-base/wsdl/vim25/core-types.xsd           |   277 +
 vmware-base/wsdl/vim25/query-messagetypes.xsd   |    85 +
 vmware-base/wsdl/vim25/query-types.xsd          |   254 +
 vmware-base/wsdl/vim25/reflect-messagetypes.xsd |    15 +
 vmware-base/wsdl/vim25/reflect-types.xsd        |    14 +
 vmware-base/wsdl/vim25/vim-messagetypes.xsd     |  3709 +++
 vmware-base/wsdl/vim25/vim-types.xsd            | 26456 +++++++++++++++++
 vmware-base/wsdl/vim25/vim.wsdl                 | 23427 +++++++++++++++
 vmware-base/wsdl/vim25/vimService.wsdl          |    16 +
 14 files changed, 76277 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b30ea9e7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cee084..23291df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -447,6 +447,11 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.cxf</groupId>
+          <artifactId>cxf-codegen-plugin</artifactId>
+          <version>2.7.6</version>
+        </plugin>
+        <plugin>
           <artifactId>maven-clean-plugin</artifactId>
           <configuration>
             <excludeDefaultDirectories>true</excludeDefaultDirectories>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b30ea9e7/vmware-base/pom.xml
----------------------------------------------------------------------
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 3c415d3..8a9d5eb 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -31,6 +31,12 @@
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-utils</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+            <groupId>org.owasp.esapi</groupId>
+            <artifactId>esapi</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
@@ -46,23 +52,37 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.cloud.com.vmware</groupId>
-      <artifactId>vmware-vim25</artifactId>
-      <version>${cs.vmware.api.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.axis</groupId>
-      <artifactId>axis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.axis</groupId>
-      <artifactId>axis-jaxrpc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-    </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-codegen-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-sources</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <sourceRoot>${project.build.directory}/generated/cxf</sourceRoot>
+              <wsdlOptions>
+                <wsdlOption>
+                  <wsdl>${basedir}/wsdl/vim25/vimService.wsdl</wsdl>
+                  <extraargs>
+                    <extraarg>-client</extraarg>
+                    <extraarg>-frontend</extraarg>
+                    <extraarg>jaxws21</extraarg>
+                    <extraarg>-p</extraarg>
+                    <extraarg>com.vmware.vim25</extraarg>
+                  </extraargs>
+                </wsdlOption>
+              </wsdlOptions>
+            </configuration>
+            <goals>
+              <goal>wsdl2java</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b30ea9e7/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
index c4836a8..93c1bc0 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
-import org.apache.xerces.impl.xs.identity.Selector.Matcher;
 
 import com.cloud.hypervisor.vmware.util.VmwareContext;
 import com.cloud.hypervisor.vmware.util.VmwareHelper;