You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/12 05:45:34 UTC

[6/6] git commit: Fold dmtf into vcloud-director (its only user).

Fold dmtf into vcloud-director (its only user).


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/7ec7f077
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/7ec7f077
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/7ec7f077

Branch: refs/heads/master
Commit: 7ec7f07719c4bcd8620ee94f29bbb6d2ac7dc007
Parents: a58cf0c
Author: Adrian Cole <ad...@gmail.com>
Authored: Sat Oct 11 10:55:22 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sat Oct 11 20:39:24 2014 -0700

----------------------------------------------------------------------
 dmtf/pom.xml                                    |  52 --
 .../java/org/jclouds/dmtf/CIMPredicates.java    |  53 --
 .../java/org/jclouds/dmtf/DMTFConstants.java    |  37 -
 .../org/jclouds/dmtf/cim/CimAnySimpleType.java  |  69 --
 .../dmtf/cim/CimAnySimpleTypeAdapter.java       |  36 -
 .../java/org/jclouds/dmtf/cim/CimBoolean.java   |  79 --
 .../java/org/jclouds/dmtf/cim/CimReference.java |  95 --
 .../java/org/jclouds/dmtf/cim/CimString.java    |  95 --
 .../org/jclouds/dmtf/cim/CimUnsignedInt.java    |  79 --
 .../org/jclouds/dmtf/cim/CimUnsignedLong.java   |  88 --
 .../org/jclouds/dmtf/cim/CimUnsignedShort.java  |  95 --
 .../main/java/org/jclouds/dmtf/cim/OSType.java  | 198 ----
 .../dmtf/cim/ResourceAllocationCaption.java     |  28 -
 .../cim/ResourceAllocationChangeableType.java   |  28 -
 .../dmtf/cim/ResourceAllocationSettingData.java | 903 -------------------
 .../jclouds/dmtf/cim/VirtualSystemCaption.java  |  28 -
 .../dmtf/cim/VirtualSystemChangeableType.java   |  28 -
 .../dmtf/cim/VirtualSystemSettingData.java      | 720 ---------------
 .../HardwareBuilderFromResourceAllocations.java |  70 --
 .../java/org/jclouds/dmtf/cim/package-info.java |  39 -
 .../org/jclouds/dmtf/ovf/Configuration.java     | 147 ---
 .../dmtf/ovf/DeploymentOptionSection.java       | 122 ---
 .../main/java/org/jclouds/dmtf/ovf/Disk.java    | 237 -----
 .../java/org/jclouds/dmtf/ovf/DiskSection.java  | 127 ---
 .../main/java/org/jclouds/dmtf/ovf/Item.java    | 193 ----
 .../main/java/org/jclouds/dmtf/ovf/MsgType.java | 142 ---
 .../main/java/org/jclouds/dmtf/ovf/Network.java | 111 ---
 .../org/jclouds/dmtf/ovf/NetworkSection.java    | 124 ---
 .../dmtf/ovf/OperatingSystemSection.java        | 156 ----
 .../org/jclouds/dmtf/ovf/ProductSection.java    | 300 ------
 .../dmtf/ovf/ProductSectionProperty.java        |  34 -
 .../java/org/jclouds/dmtf/ovf/Property.java     | 302 -------
 .../ovf/PropertyConfigurationValueType.java     |  54 --
 .../java/org/jclouds/dmtf/ovf/SectionType.java  | 142 ---
 .../org/jclouds/dmtf/ovf/StartupSection.java    | 123 ---
 .../jclouds/dmtf/ovf/StartupSectionItem.java    |  62 --
 .../dmtf/ovf/VirtualHardwareSection.java        | 199 ----
 .../dmtf/ovf/environment/EntityType.java        |  91 --
 .../dmtf/ovf/environment/EnvironmentType.java   | 114 ---
 .../ovf/environment/PlatformSectionType.java    | 141 ---
 .../jclouds/dmtf/ovf/environment/Property.java  |  78 --
 .../ovf/environment/PropertySectionType.java    | 104 ---
 .../dmtf/ovf/environment/SectionType.java       |  91 --
 .../dmtf/ovf/environment/package-info.java      |  37 -
 .../jclouds/dmtf/ovf/internal/BaseEnvelope.java | 177 ----
 .../dmtf/ovf/internal/BaseVirtualSystem.java    | 171 ----
 .../jclouds/dmtf/ovf/internal/package-info.java |  35 -
 .../java/org/jclouds/dmtf/ovf/package-info.java |  35 -
 pom.xml                                         |   1 -
 vcloud-director/pom.xml                         |  17 +-
 .../java/org/jclouds/dmtf/CIMPredicates.java    |  53 ++
 .../java/org/jclouds/dmtf/DMTFConstants.java    |  37 +
 .../org/jclouds/dmtf/cim/CimAnySimpleType.java  |  69 ++
 .../dmtf/cim/CimAnySimpleTypeAdapter.java       |  36 +
 .../java/org/jclouds/dmtf/cim/CimBoolean.java   |  79 ++
 .../java/org/jclouds/dmtf/cim/CimReference.java |  95 ++
 .../java/org/jclouds/dmtf/cim/CimString.java    |  95 ++
 .../org/jclouds/dmtf/cim/CimUnsignedInt.java    |  79 ++
 .../org/jclouds/dmtf/cim/CimUnsignedLong.java   |  88 ++
 .../org/jclouds/dmtf/cim/CimUnsignedShort.java  |  95 ++
 .../main/java/org/jclouds/dmtf/cim/OSType.java  | 198 ++++
 .../dmtf/cim/ResourceAllocationCaption.java     |  28 +
 .../cim/ResourceAllocationChangeableType.java   |  28 +
 .../dmtf/cim/ResourceAllocationSettingData.java | 903 +++++++++++++++++++
 .../jclouds/dmtf/cim/VirtualSystemCaption.java  |  28 +
 .../dmtf/cim/VirtualSystemChangeableType.java   |  28 +
 .../dmtf/cim/VirtualSystemSettingData.java      | 720 +++++++++++++++
 .../HardwareBuilderFromResourceAllocations.java |  70 ++
 .../java/org/jclouds/dmtf/cim/package-info.java |  39 +
 .../org/jclouds/dmtf/ovf/Configuration.java     | 147 +++
 .../dmtf/ovf/DeploymentOptionSection.java       | 122 +++
 .../main/java/org/jclouds/dmtf/ovf/Disk.java    | 237 +++++
 .../java/org/jclouds/dmtf/ovf/DiskSection.java  | 127 +++
 .../main/java/org/jclouds/dmtf/ovf/Item.java    | 193 ++++
 .../main/java/org/jclouds/dmtf/ovf/MsgType.java | 142 +++
 .../main/java/org/jclouds/dmtf/ovf/Network.java | 111 +++
 .../org/jclouds/dmtf/ovf/NetworkSection.java    | 124 +++
 .../dmtf/ovf/OperatingSystemSection.java        | 156 ++++
 .../org/jclouds/dmtf/ovf/ProductSection.java    | 300 ++++++
 .../dmtf/ovf/ProductSectionProperty.java        |  34 +
 .../java/org/jclouds/dmtf/ovf/Property.java     | 302 +++++++
 .../ovf/PropertyConfigurationValueType.java     |  54 ++
 .../java/org/jclouds/dmtf/ovf/SectionType.java  | 142 +++
 .../org/jclouds/dmtf/ovf/StartupSection.java    | 123 +++
 .../jclouds/dmtf/ovf/StartupSectionItem.java    |  62 ++
 .../dmtf/ovf/VirtualHardwareSection.java        | 199 ++++
 .../dmtf/ovf/environment/EntityType.java        |  91 ++
 .../dmtf/ovf/environment/EnvironmentType.java   | 114 +++
 .../ovf/environment/PlatformSectionType.java    | 141 +++
 .../jclouds/dmtf/ovf/environment/Property.java  |  78 ++
 .../ovf/environment/PropertySectionType.java    | 104 +++
 .../dmtf/ovf/environment/SectionType.java       |  91 ++
 .../dmtf/ovf/environment/package-info.java      |  37 +
 .../jclouds/dmtf/ovf/internal/BaseEnvelope.java | 177 ++++
 .../dmtf/ovf/internal/BaseVirtualSystem.java    | 171 ++++
 .../jclouds/dmtf/ovf/internal/package-info.java |  35 +
 .../java/org/jclouds/dmtf/ovf/package-info.java |  35 +
 97 files changed, 6420 insertions(+), 6484 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/pom.xml
----------------------------------------------------------------------
diff --git a/dmtf/pom.xml b/dmtf/pom.xml
deleted file mode 100644
index e7cdc2d..0000000
--- a/dmtf/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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
-
-    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.
-
--->
-<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>
-    <groupId>org.apache.jclouds.labs</groupId>
-    <artifactId>jclouds-labs</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-
-  <!-- TODO: consider merging this with vcloud-director as it is not used anywhere else -->
-  <groupId>org.apache.jclouds.labs</groupId>
-  <artifactId>dmtf</artifactId>
-  <name>jclouds dmtf domain objects</name>
-  <description>jclouds implementation of DMTF OVF and CIM domain objects</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <jclouds.osgi.export>org.jclouds.dmtf.*;version="${project.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>
-      org.jclouds.labs*;version="${project.version}",
-      org.jclouds*;version="${jclouds.version}",
-      *
-    </jclouds.osgi.import>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jclouds</groupId>
-      <artifactId>jclouds-compute</artifactId>
-      <version>${jclouds.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/CIMPredicates.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/CIMPredicates.java b/dmtf/src/main/java/org/jclouds/dmtf/CIMPredicates.java
deleted file mode 100644
index 8fc0671..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/CIMPredicates.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData.ResourceType;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableSet;
-
-public class CIMPredicates {
-
-   /**
-    * Return resource allocations of the specific type.
-    * 
-    * @param type
-    *           type to match the items
-    * @return predicate
-    */
-   public static Predicate<ResourceAllocationSettingData> resourceTypeIn(final ResourceType... types) {
-      checkNotNull(types, "resourceTypes");
-      final Set<ResourceType> resourceTypes = ImmutableSet.copyOf(types);
-      return new Predicate<ResourceAllocationSettingData>() {
-         @Override
-         public boolean apply(ResourceAllocationSettingData in) {
-            return resourceTypes.contains(in.getResourceType());
-         }
-
-         @Override
-         public String toString() {
-            return "resourceTypeIn(" + resourceTypes + ")";
-         }
-      };
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/DMTFConstants.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/DMTFConstants.java b/dmtf/src/main/java/org/jclouds/dmtf/DMTFConstants.java
deleted file mode 100644
index 47eced7..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/DMTFConstants.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf;
-
-/**
- * Constants used by DMTF.
- */
-public final class DMTFConstants {
-
-   public static final String OVF_NS = "http://schemas.dmtf.org/ovf/envelope/1";
-
-   public static final String OVF_ENV_NS = "http://schemas.dmtf.org/ovf/environment/1";
-
-   public static final String CIM_NS = "http://schemas.dmtf.org/wbem/wscim/1/common";
-   
-   public static final String CIM_VSSD_NS = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData";
-   
-   public static final String CIM_RASD_NS = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData";
-
-   private DMTFConstants() {
-      throw new AssertionError("intentionally unimplemented");
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
deleted file mode 100644
index 80c0459..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * <p>Java class for cimAnySimpleType complex type.
- *
- * <pre>
- * &lt;complexType name="cimAnySimpleType" /&gt;
- * </pre>
- */
-@XmlType(name = "cimAnySimpleType", namespace = CIM_NS)
-public class CimAnySimpleType {
-
-    @XmlValue
-    @XmlJavaTypeAdapter(CimAnySimpleTypeAdapter.class)
-    @XmlSchemaType(name = "anySimpleType")
-    protected String value;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the value property.
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
deleted file mode 100644
index b788df9..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class CimAnySimpleTypeAdapter extends XmlAdapter<String, String> {
-
-   @Override
-   public String unmarshal(String value) {
-      return javax.xml.bind.DatatypeConverter.parseAnySimpleType(value);
-   }
-
-   @Override
-   public String marshal(String value) {
-      if (value == null) {
-         return null;
-      }
-      return javax.xml.bind.DatatypeConverter.printAnySimpleType(value);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
deleted file mode 100644
index 61d7211..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimBoolean complex type.
- *
- * <pre>
- * &lt;complexType name="cimBoolean" /&gt;
- * </pre>
- */
-@XmlType(name = "cimBoolean", namespace = CIM_NS)
-public class CimBoolean {
-
-    @XmlValue
-    protected boolean value;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the value property.
-     * 
-     */
-    public boolean isValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     */
-    public void setValue(boolean value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimReference.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimReference.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimReference.java
deleted file mode 100644
index 517e35b..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimReference.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimReference complex type.
- *
- * <pre>
- * &lt;complexType name="cimReference" /&gt;
- * </pre>
- */
-@XmlType(name = "cimReference", namespace = CIM_NS)
-public class CimReference {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the any property.
-     *
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     *
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     *
-     *
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     *
-     *
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = Lists.newArrayList();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     *
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     *
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     *
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
deleted file mode 100644
index 8f8b18d..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimString complex type.
- * 
- * <pre>
- * &lt;complexType name="cimString" /&gt;
- * </pre>
- */
-@XmlType(name = "cimString")
-public class CimString {
-
-   public CimString() {
-      // JAXB
-   }
-
-   public CimString(String value) {
-      this.value = value;
-   }
-
-   @XmlValue
-   protected String value;
-   @XmlAnyAttribute
-   private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-   /**
-    * Gets the value of the value property.
-    */
-   public String getValue() {
-      return value;
-   }
-
-   public void setValue(String value) {
-      this.value = value;
-   }
-
-   /**
-    * Gets a map that contains attributes that aren't bound to any typed property on this class.
-    */
-   public Map<QName, String> getOtherAttributes() {
-       return otherAttributes;
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(value);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      CimString that = CimString.class.cast(obj);
-      return equal(this.value, that.value);
-   }
-
-   @Override
-   public String toString() {
-      return MoreObjects.toStringHelper("").add("value", value).toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
deleted file mode 100644
index 2fd5406..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimUnsignedInt complex type.
- * 
- * <pre>
- * &lt;complexType name="cimUnsignedInt" /&gt;
- * </pre>
- */
-@XmlType(name = "cimUnsignedInt", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common")
-public class CimUnsignedInt {
-
-    @XmlValue
-    @XmlSchemaType(name = "unsignedInt")
-    protected long value;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the value property.
-     * 
-     */
-    public long getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     */
-    public void setValue(long value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
deleted file mode 100644
index cbf7b3e..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import java.math.BigInteger;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * Java class for cimUnsignedLong complex type.
- * 
- * <pre>
- * &lt;complexType name="cimUnsignedLong" /&gt;
- * </pre>
- */
-@XmlType(name = "cimUnsignedLong", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common")
-public class CimUnsignedLong {
-
-    @XmlValue
-    @XmlSchemaType(name = "unsignedLong")
-    protected BigInteger value;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setValue(BigInteger value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
deleted file mode 100644
index 5f888e5..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2012.02.08 at 02:47:44 PM GMT 
-//
-
-
-package org.jclouds.dmtf.cim;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-
-/**
- * <p>Java class for cimUnsignedShort complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="cimUnsignedShort">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>unsignedShort">
- *       &lt;anyAttribute processContents='lax'/>
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlType(name = "cimUnsignedShort", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common")
-public class CimUnsignedShort {
-
-    @XmlValue
-    @XmlSchemaType(name = "unsignedShort")
-    protected int value;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = Maps.newHashMap();
-
-    /**
-     * Gets the value of the value property.
-     * 
-     */
-    public int getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     */
-    public void setValue(int value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/OSType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/OSType.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/OSType.java
deleted file mode 100644
index 004c7d1..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/OSType.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import org.jclouds.compute.domain.OsFamily;
-
-/**
- * Operating system based on DMTF CIM model.
- * 
- * @see <a
- *      href="http://dmtf.org/sites/default/files/cim/cim_schema_v2280/cim_schema_2.28.0Final-Doc.zip"
- *      />
- */
-public enum OSType {
-
-   /** Other */
-   OTHER(1, "Other", OsFamily.UNRECOGNIZED, false),
-
-   /** MACOS */
-   MACOS(2, "MACOS", OsFamily.DARWIN, false),
-
-   /** Solaris */
-   SOLARIS(29, "Solaris", OsFamily.SOLARIS, false),
-
-   /** LINUX */
-   LINUX(36, "LINUX", OsFamily.LINUX, false),
-
-   /** FreeBSD */
-   FREEBSD(42, "FreeBSD", OsFamily.FREEBSD, false),
-
-   /** NetBSD */
-   NETBSD(43, "NetBSD", OsFamily.NETBSD, false),
-
-   /** OpenBSD */
-   OPENBSD(65, "OpenBSD", OsFamily.OPENBSD, false),
-
-   /** Not Applicable */
-   NOT_APPLICABLE(66, "Not Applicable", OsFamily.UNRECOGNIZED, false),
-
-   /** Microsoft Windows Server 2003 */
-   WINDOWS_SERVER_2003(69, "Microsoft Windows Server 2003", OsFamily.WINDOWS, false),
-
-   /** Microsoft Windows Server 2003 64-Bit */
-   WINDOWS_SERVER_2003_64(70, "Microsoft Windows Server 2003 64-Bit", OsFamily.WINDOWS, true),
-
-   /** Microsoft Windows Server 2008 */
-   WINDOWS_SERVER_2008(76, "Microsoft Windows Server 2008", OsFamily.WINDOWS, false),
-
-   /** Microsoft Windows Server 2008 64-Bit */
-   WINDOWS_SERVER_2008_64(77, "Microsoft Windows Server 2008 64-Bit", OsFamily.WINDOWS, true),
-
-   /** FreeBSD 64-Bit */
-   FREEBSD_64(78, "FreeBSD 64-Bit", OsFamily.FREEBSD, true),
-
-   /** RedHat Enterprise Linux */
-   RHEL(79, "RedHat Enterprise Linux", OsFamily.RHEL, false),
-
-   /** RedHat Enterprise Linux 64-Bit */
-   RHEL_64(80, "RedHat Enterprise Linux 64-Bit", OsFamily.RHEL, true),
-
-   /** Solaris 64-Bit */
-   SOLARIS_64(81, "Solaris 64-Bit", OsFamily.SOLARIS, true),
-
-   /** SUSE */
-   SUSE(82, "SUSE", OsFamily.SUSE, false),
-
-   /** SUSE 64-Bit */
-   SUSE_64(83, "SUSE 64-Bit", OsFamily.SUSE, true),
-
-   /** SLES */
-   SLES(84, "SLES", OsFamily.SUSE, false),
-
-   /** SLES 64-Bit */
-   SLES_64(85, "SLES 64-Bit", OsFamily.SUSE, true),
-
-   /** Novell OES */
-   NOVELL_OES(86, "Novell OES", OsFamily.SUSE, true),
-
-   /** Mandriva */
-   MANDRIVA(89, "Mandriva", OsFamily.MANDRIVA, false),
-
-   /** Mandriva 64-Bit */
-   MANDRIVA_64(90, "Mandriva 64-Bit", OsFamily.MANDRIVA, true),
-
-   /** TurboLinux */
-   TURBOLINUX(91, "TurboLinux", OsFamily.TURBOLINUX, false),
-
-   /** TurboLinux 64-Bit */
-   TURBOLINUX_64(92, "TurboLinux 64-Bit", OsFamily.TURBOLINUX, true),
-
-   /** Ubuntu */
-   UBUNTU(93, "Ubuntu", OsFamily.UBUNTU, false),
-
-   /** Ubuntu 64-Bit */
-   UBUNTU_64(94, "Ubuntu 64-Bit", OsFamily.UBUNTU, true),
-
-   /** Debian */
-   DEBIAN(95, "Debian", OsFamily.DEBIAN, false),
-
-   /** Debian 64-Bit */
-   DEBIAN_64(96, "Debian 64-Bit", OsFamily.DEBIAN, false),
-
-   /** Linux 2.4.x */
-   LINUX_2_4(97, "Linux 2.4.x", OsFamily.LINUX, false),
-
-   /** Linux 2.4.x 64-Bi */
-   LINUX_2_4_64(98, "Linux 2.4.x 64-Bit", OsFamily.LINUX, true),
-
-   /** Linux 2.6.x */
-   LINUX_2_6(99, "Linux 2.6.x", OsFamily.LINUX, false),
-
-   /** Linux 2.6.x 64-Bit */
-   LINUX_2_6_64(100, "Linux 2.6.x 64-Bit", OsFamily.LINUX, true),
-
-   /** Linux 64-Bit */
-   LINUX_64(101, "Linux 64-Bit", OsFamily.LINUX, true),
-
-   /** Other 64-Bit */
-   OTHER_64(102, "Other 64-Bit", OsFamily.UNRECOGNIZED, true),
-
-   /** Microsoft Windows Server 2008 R2 */
-   WINDOWS_SERVER_2008_R2(103, "Microsoft Windows Server 2008 R2", OsFamily.WINDOWS, true),
-
-   /** VMware ESXi */
-   ESXI(104, "VMware ESXi", OsFamily.ESX, true),
-
-   /** Microsoft Windows 7 */
-   WINDOWS_7(105, "Microsoft Windows 7", OsFamily.WINDOWS, false),
-
-   /** CentOS 32-bit */
-   CENTOS(106, "CentOS 32-bit", OsFamily.CENTOS, false),
-
-   /** CentOS 64-bit */
-   CENTOS_64(107, "CentOS 64-bit", OsFamily.CENTOS, true),
-
-   /** Oracle Enterprise Linux 32-bit */
-   ORACLE_ENTERPRISE_LINUX(108, "Oracle Enterprise Linux 32-bit", OsFamily.OEL, false),
-
-   /** Oracle Enterprise Linux 64-bit */
-   ORACLE_ENTERPRISE_LINUX_64(109, "Oracle Enterprise Linux 64-bit", OsFamily.OEL, true),
-
-   /** eComStation 32-bitx */
-   ECOMSTATION_32(109, "eComStation 32-bitx", OsFamily.UNRECOGNIZED, false),
-   
-   UNRECOGNIZED(Integer.MAX_VALUE, "UNRECOGNIZED", null, true);
-
-   private final int code;
-
-   public int getCode() {
-      return code;
-   }
-
-   public String getValue() {
-      return value;
-   }
-
-   public OsFamily getFamily() {
-      return family;
-   }
-
-   public boolean is64Bit() {
-      return is64Bit;
-   }
-
-   private final String value;
-   private final OsFamily family;
-   private final boolean is64Bit;
-
-   OSType(int code, String value, OsFamily family, boolean is64Bit) {
-      this.code = code;
-      this.value = value;
-      this.family = family;
-      this.is64Bit = is64Bit;
-   }
-
-   public static OSType fromValue(int code) {
-      for (OSType type : values()) {
-         if (type.code == code)
-            return type;
-      }
-      return UNRECOGNIZED;
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
deleted file mode 100644
index 1b3305a..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class ResourceAllocationCaption extends CimString {
-
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
deleted file mode 100644
index 14fda0d..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class ResourceAllocationChangeableType extends CimUnsignedShort {
-
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
deleted file mode 100644
index 8b76485..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.CIM_RASD_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import java.math.BigInteger;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * The ResourceAllocationSettingData class represents settings specifically
- * related to an allocated resource that are outside the scope of the CIM class
- * typically used to represent the resource itself.
- *
- * These settings include information specific to the allocation that may not
- * be visible to the consumer of the resource itself. For example, a virtual
- * processor may look like a 2 GHz processor to the consumer (virtual computer
- * system), however the virtualization system may use time-slicing to schedule
- * the the virtual processor to only allow it to use 1 GHz.
- * 
- * @see <a href="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2.22.0/CIM_ResourceAllocationSettingData.xsd">CIM_ResourceAllocationSettingData</a>
- */
-@XmlType(name = "CIM_ResourceAllocationSettingData_Type", namespace = OVF_NS,
-   propOrder = {
-      "address",
-      "addressOnParent",
-      "allocationUnits",
-      "automaticAllocation",
-      "automaticDeallocation",
-      "caption",
-      "connections",
-      "consumerVisibility",
-      "description",
-      "elementName",
-      "hostResources",
-      "instanceID",
-      "limit",
-      "mappingBehavior",
-      "otherResourceType",
-      "parent",
-      "poolID",
-      "reservation",
-      "resourceSubType",
-      "resourceType",
-      "virtualQuantity",
-      "virtualQuantityUnits",
-      "weight"
-   }
-)
-public class ResourceAllocationSettingData {
-
-   public static Builder<?> builder() {
-      return new ConcreteBuilder();
-   }
-
-   public Builder<?> toBuilder() {
-      return builder().fromResourceAllocationSettingData(this);
-   }
-
-   private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
-   }
-   
-   public static class Builder<B extends Builder<B>> {
-
-      private String elementName;
-      private String instanceID;
-      private String caption;
-      private String description;
-      private String address;
-      private String addressOnParent;
-      private String allocationUnits;
-      private Boolean automaticAllocation;
-      private Boolean automaticDeallocation;
-      private ConsumerVisibility consumerVisibility;
-      private BigInteger limit;
-      private MappingBehavior mappingBehavior;
-      private String otherResourceType;
-      private String parent;
-      private String poolID;
-      private BigInteger reservation;
-      private String resourceSubType;
-      private ResourceType resourceType;
-      private BigInteger virtualQuantity;
-      private String virtualQuantityUnits;
-      private Long weight;
-      private Set<CimString> connections = Sets.newLinkedHashSet();
-      private Set<CimString> hostResources = Sets.newLinkedHashSet();
-
-      @SuppressWarnings("unchecked")
-      protected B self() {
-         return (B) this;
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getElementName()
-       */
-      public B elementName(String elementName) {
-         this.elementName = elementName;
-         return self();
-      }
-
-      /**
-       *@see ResourceAllocationSettingData#getInstanceId()
-       */
-      public B instanceID(String instanceID) {
-         this.instanceID = instanceID;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getCaption()
-       */
-      public B caption(String caption) {
-         this.caption = caption;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getDescription()
-       */
-      public B description(String description) {
-         this.description = description;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getAddress
-       */
-      public B address(String address) {
-         this.address = address;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getAddressOnParent
-       */
-      public B addressOnParent(String addressOnParent) {
-         this.addressOnParent = addressOnParent;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getAllocationUnits
-       */
-      public B allocationUnits(String allocationUnits) {
-         this.allocationUnits = allocationUnits;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#isAutomaticAllocation()
-       */
-      public B automaticAllocation(Boolean automaticAllocation) {
-         this.automaticAllocation = automaticAllocation;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#isAutomaticDeallocation()
-       */
-      public B automaticDeallocation(Boolean automaticDeallocation) {
-         this.automaticDeallocation = automaticDeallocation;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getConsumerVisibility
-       */
-      public B consumerVisibility(ConsumerVisibility consumerVisibility) {
-         this.consumerVisibility = consumerVisibility;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getLimit
-       */
-      public B limit(BigInteger limit) {
-         this.limit = limit;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getMappingBehavior
-       */
-      public B mappingBehavior(MappingBehavior mappingBehavior) {
-         this.mappingBehavior = mappingBehavior;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getOtherResourceType
-       */
-      public B otherResourceType(String otherResourceType) {
-         this.otherResourceType = otherResourceType;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getParent
-       */
-      public B parent(String parent) {
-         this.parent = parent;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getPoolID
-       */
-      public B poolID(String poolID) {
-         this.poolID = poolID;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getReservation
-       */
-      public B reservation(BigInteger reservation) {
-         this.reservation = reservation;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getResourceSubType
-       */
-      public B resourceSubType(String resourceSubType) {
-         this.resourceSubType = resourceSubType;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getResourceType
-       */
-      public B resourceType(ResourceType resourceType) {
-         this.resourceType = resourceType;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getVirtualQuantity
-       */
-      public B virtualQuantity(BigInteger virtualQuantity) {
-         this.virtualQuantity = virtualQuantity;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getVirtualQuantityUnits
-       */
-      public B virtualQuantityUnits(String virtualQuantityUnits) {
-         this.virtualQuantityUnits = virtualQuantityUnits;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getWeight
-       */
-      public B weight(Long weight) {
-         this.weight = weight;
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getConnections()
-       */
-      public B connection(CimString connection) {
-         this.connections.add(checkNotNull(connection, "connection"));
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getConnections
-       */
-      public B connections(Iterable<CimString> connections) {
-         this.connections = Sets.newLinkedHashSet(checkNotNull(connections, "connections"));
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getHostResources()
-       */
-      public B hostResource(CimString hostResource) {
-         this.hostResources.add(checkNotNull(hostResource, "hostResource"));
-         return self();
-      }
-
-      /**
-       * @see ResourceAllocationSettingData#getHostResources
-       */
-      public B hostResources(Iterable<CimString> hostResources) {
-         this.hostResources = Sets.newLinkedHashSet(checkNotNull(hostResources, "hostResources"));
-         return self();
-      }
-
-      public ResourceAllocationSettingData build() {
-         return new ResourceAllocationSettingData(this);
-      }
-
-      public B fromResourceAllocationSettingData(ResourceAllocationSettingData in) {
-         return elementName(in.getElementName())
-               .instanceID(in.getInstanceID())
-               .caption(in.getCaption())
-               .description(in.getDescription())
-               .address(in.getAddress())
-               .addressOnParent(in.getAddressOnParent())
-               .allocationUnits(in.getAllocationUnits())
-               .automaticAllocation(in.isAutomaticAllocation())
-               .automaticDeallocation(in.isAutomaticDeallocation())
-               .consumerVisibility(in.getConsumerVisibility())
-               .limit(in.getLimit())
-               .mappingBehavior(in.getMappingBehavior())
-               .otherResourceType(in.getOtherResourceType())
-               .parent(in.getParent())
-               .poolID(in.getPoolID())
-               .reservation(in.getReservation())
-               .resourceSubType(in.getResourceSubType())
-               .resourceType(in.getResourceType())
-               .virtualQuantity(in.getVirtualQuantity())
-               .virtualQuantityUnits(in.getVirtualQuantityUnits())
-               .weight(in.getWeight())
-               .connections(in.getConnections())
-               .hostResources(in.getHostResources());
-      }
-   }
-
-   /**
-    * The type of resource this allocation setting represents.
-    */
-   @XmlType
-   @XmlEnum(Integer.class)
-   public static enum ResourceType {
-      @XmlEnumValue("1") OTHER(1),
-      @XmlEnumValue("2") COMPUTER_SYSTEM(2),
-      @XmlEnumValue("3") PROCESSOR(3),
-      @XmlEnumValue("4") MEMORY(4),
-      @XmlEnumValue("5") IDE_CONTROLLER(5),
-      @XmlEnumValue("6") PARALLEL_SCSI_HBA(6),
-      @XmlEnumValue("7") FC_HBA(7),
-      @XmlEnumValue("8") ISCSI_HBA(8),
-      @XmlEnumValue("9") IB_HCA(9),
-      @XmlEnumValue("10") ETHERNET_ADAPTER(10),
-      @XmlEnumValue("11") OTHER_NETWORK_ADAPTER(11),
-      @XmlEnumValue("12") IO_SLOT(12),
-      @XmlEnumValue("13") IO_DEVICE(13),
-      @XmlEnumValue("14") FLOPPY_DRIVE(14),
-      @XmlEnumValue("15") CD_DRIVE(15),
-      @XmlEnumValue("16") DVD_DRIVE(16),
-      @XmlEnumValue("17") DISK_DRIVE(17),
-      @XmlEnumValue("18") TAPE_DRIVE(18),
-      @XmlEnumValue("19") STORAGE_EXTENT(19),
-      @XmlEnumValue("20") OTHER_STORAGE_DEVICE(20),
-      @XmlEnumValue("21") SERIAL_PORT(21),
-      @XmlEnumValue("22") PARALLEL_PORT(22),
-      @XmlEnumValue("23") USB_CONTROLLER(23),
-      @XmlEnumValue("24") GRAPHICS_CONTROLLER(24),
-      @XmlEnumValue("25") IEEE_1394_CONTROLLER(25),
-      @XmlEnumValue("26") PARTITIONABLE_UNIT(26),
-      @XmlEnumValue("27") BASE_PARTITIONABLE_UNIT(27),
-      @XmlEnumValue("28") POWER(28),
-      @XmlEnumValue("29") COOLING_CAPACITY(29),
-      @XmlEnumValue("30") ETHERNET_SWITCH_PORT(30),
-      @XmlEnumValue("31") LOGICAL_DISK(31),
-      @XmlEnumValue("32") STORAGE_VOLUME(32),
-      @XmlEnumValue("33") ETHERNET_CONNECTION(33),
-      @XmlEnumValue("32768") DMTF_RESERVED(Integer.valueOf("8000", 16)),
-      @XmlEnumValue("65535") VENDOR_RESERVED(Integer.valueOf("FFFF", 16));
-
-      protected final int code;
-
-      ResourceType(int code) {
-         this.code = code;
-      }
-
-      public String value() {
-         return Integer.toString(code);
-      }
-
-      protected static final Map<Integer, ResourceType> RESOURCE_TYPE_BY_ID = Maps.uniqueIndex(
-            ImmutableSet.copyOf(ResourceType.values()), new Function<ResourceType, Integer>() {
-               @Override
-               public Integer apply(ResourceType input) {
-                  return input.code;
-               }
-            });
-
-      public static ResourceType fromValue(String type) {
-         return RESOURCE_TYPE_BY_ID.get(Integer.valueOf(checkNotNull(type, "type")));
-      }
-   }
-
-   /**
-    * Describes the consumers visibility to the allocated resource.
-    */
-   @XmlType
-   @XmlEnum(Integer.class)
-   public static enum ConsumerVisibility {
-      @XmlEnumValue("0") UNKNOWN(0),
-
-      /**
-       * indicates the underlying or host resource is utilized and passed
-       * through to the consumer, possibly using partitioning. At least one item
-       * shall be present in the HostResource property.
-       */
-      @XmlEnumValue("2") PASSED_THROUGH(2),
-
-      /**
-       * indicates the resource is virtualized and may not map directly to an
-       * underlying/host resource. Some implementations may support specific
-       * assignment for virtualized resources, in which case the host
-       * resource(s) are exposed using the HostResource property.
-       */
-      @XmlEnumValue("3") VIRTUALIZED(3),
-
-      /**
-       * indicates a representation of the resource does not exist within the
-       * context of the resource consumer.
-       */
-      @XmlEnumValue("4") NOT_REPRESENTED(4),
-      @XmlEnumValue("32768") DMTF_RESERVED(Integer.valueOf("8000", 16)),
-		@XmlEnumValue("65535") VENDOR_RESERVED(Integer.valueOf("FFFF", 16));
-
-      protected final int code;
-
-      ConsumerVisibility(int code) {
-         this.code = code;
-      }
-
-      public String value() {
-         return Integer.toString(code);
-      }
-
-      protected static final Map<Integer, ConsumerVisibility> MAPPING_BEHAVIOR_BY_ID = Maps.uniqueIndex(
-            ImmutableSet.copyOf(ConsumerVisibility.values()), new Function<ConsumerVisibility, Integer>() {
-               @Override
-               public Integer apply(ConsumerVisibility input) {
-                  return input.code;
-               }
-            });
-
-      public static ConsumerVisibility fromValue(String behavior) {
-         return MAPPING_BEHAVIOR_BY_ID.get(Integer.valueOf(checkNotNull(behavior, "behavior")));
-      }
-   }
-
-   /**
-    * Specifies how this resource maps to underlying resourcesIf the
-    * HostResource array contains any entries, this property reflects how the
-    * resource maps to those specific resources.
-    */
-   @XmlType
-   @XmlEnum(Integer.class)
-   public static enum MappingBehavior {
-      @XmlEnumValue("0") UNKNOWN(0),
-      @XmlEnumValue("2") NOT_SUPPORTED(2),
-      @XmlEnumValue("3") DEDICATED(3),
-      @XmlEnumValue("4") SOFT_AFFINITY(4),
-      @XmlEnumValue("5") HARD_AFFINITY(5),
-      @XmlEnumValue("32768") DMTF_RESERVED(Integer.valueOf("8000", 16)),
-		@XmlEnumValue("65535") VENDOR_RESERVED(Integer.valueOf("FFFF", 16));
-
-      protected final int code;
-
-      MappingBehavior(int code) {
-         this.code = code;
-      }
-
-      public String value() {
-         return Integer.toString(code);
-      }
-
-      protected static final Map<Integer, MappingBehavior> MAPPING_BEHAVIOR_BY_ID = Maps.uniqueIndex(
-            ImmutableSet.copyOf(MappingBehavior.values()), new Function<MappingBehavior, Integer>() {
-               @Override
-               public Integer apply(MappingBehavior input) {
-                  return input.code;
-               }
-            });
-
-      public static MappingBehavior fromValue(String behavior) {
-         return MAPPING_BEHAVIOR_BY_ID.get(Integer.valueOf(checkNotNull(behavior, "behavior")));
-      }
-   }
-   
-   @XmlElement(name = "ElementName", namespace = CIM_RASD_NS)
-   private String elementName;
-   @XmlElement(name = "InstanceID", namespace = CIM_RASD_NS)
-   private String instanceID;
-   @XmlElement(name = "Caption", namespace = CIM_RASD_NS)
-   private String caption;
-   @XmlElement(name = "Description", namespace = CIM_RASD_NS)
-   private String description;
-   @XmlElement(name = "Address", namespace = CIM_RASD_NS)
-   private String address;
-   @XmlElement(name = "AddressOnParent", namespace = CIM_RASD_NS)
-   private String addressOnParent;
-   @XmlElement(name = "AllocationUnits", namespace = CIM_RASD_NS)
-   private String allocationUnits;
-   @XmlElement(name = "AutomaticAllocation", namespace = CIM_RASD_NS)
-   private Boolean automaticAllocation;
-   @XmlElement(name = "AutomaticDeallocation", namespace = CIM_RASD_NS)
-   private Boolean automaticDeallocation;
-   @XmlElement(name = "ConsumerVisibility", namespace = CIM_RASD_NS)
-   private ConsumerVisibility consumerVisibility;
-   @XmlElement(name = "Limit", namespace = CIM_RASD_NS)
-   private BigInteger limit;
-   @XmlElement(name = "MappingBehavior", namespace = CIM_RASD_NS)
-   private MappingBehavior mappingBehavior;
-   @XmlElement(name = "OtherResourceType", namespace = CIM_RASD_NS)
-   private String otherResourceType;
-   @XmlElement(name = "Parent", namespace = CIM_RASD_NS)
-   private String parent;
-   @XmlElement(name = "PoolID", namespace = CIM_RASD_NS)
-   private String poolID;
-   @XmlElement(name = "Reservation", namespace = CIM_RASD_NS)
-   private BigInteger reservation;
-   @XmlElement(name = "ResourceSubType", namespace = CIM_RASD_NS)
-   private String resourceSubType;
-   @XmlElement(name = "ResourceType", namespace = CIM_RASD_NS)
-   private ResourceType resourceType;
-   @XmlElement(name = "VirtualQuantity", namespace = CIM_RASD_NS)
-   private BigInteger virtualQuantity;
-   @XmlElement(name = "VirtualQuantityUnits", namespace = CIM_RASD_NS)
-   private String virtualQuantityUnits;
-   @XmlElement(name = "Weight", namespace = CIM_RASD_NS)
-   private Long weight;
-   @XmlElement(name = "Connection", namespace = CIM_RASD_NS)
-   private Set<CimString> connections = Sets.newLinkedHashSet();
-   @XmlElement(name = "HostResource", namespace = CIM_RASD_NS)
-   private Set<CimString> hostResources = Sets.newLinkedHashSet();
-
-   protected ResourceAllocationSettingData(Builder<?> builder) {
-      this.elementName = builder.elementName;
-      this.instanceID = builder.instanceID;
-      this.caption = builder.caption;
-      this.description = builder.description;
-      this.address = builder.address;
-      this.addressOnParent = builder.addressOnParent;
-      this.allocationUnits = builder.allocationUnits;
-      this.automaticAllocation = builder.automaticAllocation;
-      this.automaticDeallocation = builder.automaticDeallocation;
-      this.consumerVisibility = builder.consumerVisibility;
-      this.limit = builder.limit;
-      this.mappingBehavior = builder.mappingBehavior;
-      this.otherResourceType = builder.otherResourceType;
-      this.parent = builder.parent;
-      this.poolID = builder.poolID;
-      this.reservation = builder.reservation;
-      this.resourceSubType = builder.resourceSubType;
-      this.resourceType = builder.resourceType;
-      this.virtualQuantity = builder.virtualQuantity;
-      this.virtualQuantityUnits = builder.virtualQuantityUnits;
-      this.weight = builder.weight;
-      this.connections = builder.connections != null ? ImmutableSet.copyOf(builder.connections) : ImmutableSet.<CimString>of();
-      this.hostResources = builder.hostResources != null ? ImmutableSet.copyOf(builder.hostResources) : ImmutableSet.<CimString>of();
-   }
-
-   protected ResourceAllocationSettingData() {
-      // for JAXB
-   }
-
-   /**
-    * The user-friendly name for this instance of SettingData. In addition, the user-friendly name
-    * can be used as an index property for a search or query. (Note: The name does not have to be
-    * unique within a namespace.)
-    */
-   public String getElementName() {
-      return elementName;
-   }
-
-   /**
-    * Within the scope of the instantiating Namespace, InstanceID opaquely and uniquely identifies
-    * an instance of this class.
-    */
-   public String getInstanceID() {
-      return instanceID;
-   }
-
-   /**
-    * The Caption property is a short textual description (one- line string) of the object.
-    */
-   public String getCaption() {
-      return caption;
-   }
-
-   /**
-    * The Description property provides a textual description of the object.
-    */
-   public String getDescription() {
-      return description;
-   }
-   
-   /**
-    * The address of the resource. For example, the MAC address of a Ethernet
-    * port.
-    */
-   public String getAddress() {
-      return address;
-   }
-
-   /**
-    * Describes the address of this resource in the context of the Parent. The
-    * Parent/AddressOnParent properties are used to describe the controller
-    * relationship as well the ordering of devices on a controller.For example,
-    * if the parent is a PCI Controller, this property would specify the PCI
-    * slot of this child device.
-    */
-   public String getAddressOnParent() {
-      return addressOnParent;
-   }
-
-   /**
-    * This property specifies the units of allocation used by the Reservation
-    * and Limit properties. For example, when ResourceType=Processor,
-    * AllocationUnits may be set to hertz*10^6 or percent. When
-    * ResourceType=Memory, AllocationUnits may be set to bytes*10^3. It is
-    * expected that profiles constrain the units that apply in context of
-    * particular resource types. The value of this property shall be a legal
-    * value of the Programmatic Units qualifier as defined in Annex C.1 of
-    * DSP0004 V2.5 or later.
-    */
-   public String getAllocationUnits() {
-      return allocationUnits;
-   }
-
-   /**
-    * This property specifies if the resource will be automatically allocated.
-    * For example when set to true, when the consuming virtual computer system
-    * is powered on, this resource would be allocated. A value of false
-    * indicates the resource must be explicitly allocated. For example, the
-    * setting may represent removable media (cdrom, floppy, etc.) where at power
-    * on time, the media is not present. An explicit operation is required to
-    * allocate the resource.
-    */
-   public Boolean isAutomaticAllocation() {
-      return automaticAllocation;
-   }
-
-   /**
-    * This property specifies if the resource will be automatically
-    * de-allocated. For example, when set to true, when the consuming virtual
-    * computer system is powered off, this resource would be de-allocated. When
-    * set to false, the resource will remain allocated and must be explicitly
-    * de-allocated.
-    */
-   public Boolean isAutomaticDeallocation() {
-      return automaticDeallocation;
-   }
-
-   /**
-    * Describes the consumers visibility to the allocated resource.
-    */
-   public ConsumerVisibility getConsumerVisibility() {
-      return consumerVisibility;
-   }
-
-   /**
-    * This property specifies the upper bound, or maximum amount of resource
-    * that will be granted for this allocation. For example, a system which
-    * supports memory paging may support setting the Limit of a Memory
-    * allocation below that of the VirtualQuantity, thus forcing paging to occur
-    * for this allocation. The value of the Limit property is expressed in the
-    * unit specified by the value of the AllocationUnits property.
-    */
-   public BigInteger getLimit() {
-      return limit;
-   }
-
-   /**
-    * Specifies how this resource maps to underlying resourcesIf the
-    * HostResource array contains any entries, this property reflects how the
-    * resource maps to those specific resources.
-    */
-   public MappingBehavior getMappingBehavior() {
-      return mappingBehavior;
-   }
-
-   /**
-    * A string that describes the resource type when a well defined value is not
-    * available and ResourceType has the value "Other".
-    */
-   public String getOtherResourceType() {
-      return otherResourceType;
-   }
-
-   /**
-    * The Parent of the resource. For example, a controller for the current
-    * allocation
-    */
-   public String getParent() {
-      return parent;
-   }
-
-   /**
-    * This property specifies which ResourcePool the resource is currently
-    * allocated from, or which ResourcePool the resource will be allocated from
-    * when the allocation occurs.
-    */
-   public String getPoolID() {
-      return poolID;
-   }
-
-   /**
-    * This property specifies the amount of resource guaranteed to be available
-    * for this allocation. On system which support over-commitment of resources,
-    * this value is typically used for admission control to prevent an an
-    * allocation from being accepted thus preventing starvation. The value of
-    * the Reservation property is expressed in the unit specified by the value
-    * of the AllocationUnits property.
-    */
-   public BigInteger getReservation() {
-      return reservation;
-   }
-
-   /**
-    * A string describing an implementation specific sub-type for this resource.
-    */
-   public String getResourceSubType() {
-      return resourceSubType;
-   }
-
-   /**
-    * The type of resource this allocation setting represents.
-    */
-   public ResourceType getResourceType() {
-      return resourceType;
-   }
-
-   /**
-    * This property specifies the quantity of resources presented to the
-    * consumer. For example, when ResourceType=Processor, this property would
-    * reflect the number of discrete Processors presented to the virtual
-    * computer system. When ResourceType=Memory, this property could reflect the
-    * number of MB reported to the virtual computer system. The value of the
-    * VirtualQuantity property should be expressed in units as defined by the
-    * value of the VirtualQuantityUnits property.
-    */
-   public BigInteger getVirtualQuantity() {
-      return virtualQuantity;
-   }
-
-   /**
-    * This property specifies the units used by the VirtualQuantity property.
-    * For example - if ResourceType=Processor, the value of the
-    * VirtualQuantityUnits property may be set to "count", indicating that the
-    * value of the VirtualQuantity property is expressed as a count. - if
-    * ResourceType=Memory, the value of the VirtualQuantityUnits property may be
-    * set to "bytes*10^3", indicating that the value of the VirtualQuantity
-    * property is expressed in kilobyte. It is expected that profiles constrain
-    * the units that apply in context of particular resource types. The value of
-    * this property shall be a legal value of the Programmatic Units qualifier
-    * as defined in Annex C.1 of DSP0004 V2.5 or later.
-    */
-   public String getVirtualQuantityUnits() {
-      return virtualQuantityUnits;
-   }
-
-   /**
-    * This property specifies a relative priority for this allocation in
-    * relation to other allocations from the same ResourcePool. This property
-    * has no unit of measure, and is only relevant when compared to other
-    * allocations vying for the same host resources.
-    */
-   public Long getWeight() {
-      return weight;
-   }
-
-   /**
-    * The thing to which this resource is connected. For example, a named
-    * network or switch port.
-    */
-   public Set<CimString> getConnections() {
-      return ImmutableSet.copyOf(connections);
-   }
-
-   /**
-    * This property exposes specific assignment of resources. Each non-null
-    * value of the HostResource property shall be formatted as a URI per RFC3986.
-    * If this resource is modeled then a value should be a WBEM URI (DSP0207).
-    * If the resource is not modeled then see the appropriate profile. Profiles
-    * may further constrain the type of URI. A NULL value or empty array
-    * requests the implementation decide the kind of host resource. If the
-    * virtual resource is mapped to more than one underlying resource, this
-    * property may be left NULL. If NULL, the DeviceAllocatedFromPool or
-    * ResourceAllocationFromPool associations may be used to determine the pool
-    * of host resources this virtual resource may use. If specific assignment is
-    * utilized, all underlying resources used by this virtual resource should be
-    * listed.The kind of dependency is specified by the ConsumerVisibility and
-    * the MappingBehavior properties. Typically the array contains one item,
-    * however multiple host resources may be specified. A client may set the
-    * value(s) to indicate that the requested virtual resource allocation be
-    * based on host resources that are identified by element values.
-    */
-   public Set<CimString> getHostResources() {
-      return ImmutableSet.copyOf(hostResources);
-   }
-
-   @Override
-   public String toString() {
-      return string().toString();
-   }
-
-   public ToStringHelper string() {
-      return MoreObjects.toStringHelper("")
-            .add("elementName", elementName)
-            .add("instanceID", instanceID)
-            .add("caption", caption)
-            .add("description", description)
-            .add("address", address)
-            .add("addressOnParent", addressOnParent)
-            .add("allocationUnits", allocationUnits)
-            .add("automaticAllocation", automaticAllocation)
-            .add("automaticDeallocation", automaticDeallocation)
-            .add("connections", connections)
-            .add("consumerVisibility", consumerVisibility)
-            .add("hostResources", hostResources)
-            .add("limit", limit)
-            .add("mappingBehavior", mappingBehavior)
-            .add("otherResourceType", otherResourceType)
-            .add("parent", parent)
-            .add("poolID", poolID)
-            .add("reservation", reservation)
-            .add("resourceSubType", resourceSubType)
-            .add("resourceType", resourceType)
-            .add("virtualQuantity", virtualQuantity)
-            .add("virtualQuantityUnits", virtualQuantityUnits)
-            .add("weight", weight);
-   }
-
-   @Override
-   public int hashCode() {
-      return Objects.hashCode(elementName, instanceID, caption, description,
-            address, addressOnParent, allocationUnits,
-            automaticAllocation, automaticDeallocation, connections,
-            consumerVisibility, hostResources, limit, mappingBehavior,
-            otherResourceType, parent, poolID, reservation, resourceSubType,
-            resourceType, virtualQuantity, virtualQuantityUnits, weight);
-   }
-
-   @Override
-   public boolean equals(Object obj) {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      ResourceAllocationSettingData that = ResourceAllocationSettingData.class.cast(obj);
-      return equal(this.elementName, that.elementName) &&
-            equal(this.instanceID, that.instanceID) &&
-            equal(this.caption, that.caption) &&
-            equal(this.description, that.description) &&
-            equal(this.address, that.address) &&
-            equal(this.addressOnParent, that.addressOnParent) &&
-            equal(this.allocationUnits, that.allocationUnits) &&
-            equal(this.automaticAllocation, that.automaticAllocation) &&
-            equal(this.automaticDeallocation, that.automaticDeallocation) &&
-            equal(this.connections, that.connections) &&
-            equal(this.consumerVisibility, that.consumerVisibility) &&
-            equal(this.hostResources, that.hostResources) &&
-            equal(this.limit, that.limit) &&
-            equal(this.mappingBehavior, that.mappingBehavior) &&
-            equal(this.otherResourceType, that.otherResourceType) &&
-            equal(this.parent, that.parent) &&
-            equal(this.poolID, that.poolID) &&
-            equal(this.reservation, that.reservation) &&
-            equal(this.resourceSubType, that.resourceSubType) &&
-            equal(this.resourceType, that.resourceType) &&
-            equal(this.virtualQuantity, that.virtualQuantity) &&
-            equal(this.virtualQuantityUnits, that.virtualQuantityUnits) &&
-            equal(this.weight, that.weight);
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java
deleted file mode 100644
index c246a0f..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemCaption.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * <p>Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class VirtualSystemCaption extends CimString {
-
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java
deleted file mode 100644
index dffd2f2..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemChangeableType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.jclouds.dmtf.cim;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class VirtualSystemChangeableType extends CimUnsignedShort {
-
-
-}