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/11/17 17:21:39 UTC

[32/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.

JCLOUDS-780 Remove vcloud-director.


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

Branch: refs/heads/master
Commit: 775b89fdb3472d8a2bc81097962e9a203c602c20
Parents: db7a37c
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Nov 16 21:39:15 2014 -0800
Committer: Adrian Cole <ad...@apache.org>
Committed: Mon Nov 17 08:20:46 2014 -0800

----------------------------------------------------------------------
 pom.xml                                         |    1 -
 vcloud-director/pom.xml                         |  142 --
 .../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    |   94 --
 .../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 |  902 -----------
 .../jclouds/dmtf/cim/VirtualSystemCaption.java  |   28 -
 .../dmtf/cim/VirtualSystemChangeableType.java   |   28 -
 .../dmtf/cim/VirtualSystemSettingData.java      |  719 ---------
 .../HardwareBuilderFromResourceAllocations.java |   70 -
 .../java/org/jclouds/dmtf/cim/package-info.java |   39 -
 .../org/jclouds/dmtf/ovf/Configuration.java     |  146 --
 .../dmtf/ovf/DeploymentOptionSection.java       |  121 --
 .../main/java/org/jclouds/dmtf/ovf/Disk.java    |  237 ---
 .../java/org/jclouds/dmtf/ovf/DiskSection.java  |  126 --
 .../main/java/org/jclouds/dmtf/ovf/Item.java    |  192 ---
 .../main/java/org/jclouds/dmtf/ovf/MsgType.java |  141 --
 .../main/java/org/jclouds/dmtf/ovf/Network.java |  111 --
 .../org/jclouds/dmtf/ovf/NetworkSection.java    |  123 --
 .../dmtf/ovf/OperatingSystemSection.java        |  155 --
 .../org/jclouds/dmtf/ovf/ProductSection.java    |  299 ----
 .../dmtf/ovf/ProductSectionProperty.java        |   34 -
 .../java/org/jclouds/dmtf/ovf/Property.java     |  301 ----
 .../ovf/PropertyConfigurationValueType.java     |   54 -
 .../java/org/jclouds/dmtf/ovf/SectionType.java  |  141 --
 .../org/jclouds/dmtf/ovf/StartupSection.java    |  123 --
 .../jclouds/dmtf/ovf/StartupSectionItem.java    |   62 -
 .../dmtf/ovf/VirtualHardwareSection.java        |  198 ---
 .../dmtf/ovf/environment/EntityType.java        |   91 --
 .../dmtf/ovf/environment/EnvironmentType.java   |  114 --
 .../ovf/environment/PlatformSectionType.java    |  140 --
 .../jclouds/dmtf/ovf/environment/Property.java  |   78 -
 .../ovf/environment/PropertySectionType.java    |  103 --
 .../dmtf/ovf/environment/SectionType.java       |   90 --
 .../dmtf/ovf/environment/package-info.java      |   37 -
 .../jclouds/dmtf/ovf/internal/BaseEnvelope.java |  176 ---
 .../dmtf/ovf/internal/BaseVirtualSystem.java    |  170 --
 .../jclouds/dmtf/ovf/internal/package-info.java |   35 -
 .../java/org/jclouds/dmtf/ovf/package-info.java |   35 -
 .../v1_5/VCloudDirectorApiMetadata.java         |   90 --
 .../director/v1_5/VCloudDirectorConstants.java  |   43 -
 .../director/v1_5/VCloudDirectorContext.java    |   46 -
 .../director/v1_5/VCloudDirectorException.java  |   79 -
 .../director/v1_5/VCloudDirectorMediaType.java  |  228 ---
 .../v1_5/admin/VCloudDirectorAdminApi.java      |   87 -
 .../vcloud/director/v1_5/annotations/Login.java |   34 -
 .../director/v1_5/annotations/Session.java      |   34 -
 .../v1_5/binders/BindMapAsMetadata.java         |   47 -
 .../v1_5/binders/BindStringAsMetadataValue.java |   64 -
 ...rgAndPasswordAsBasicAuthorizationHeader.java |   55 -
 .../director/v1_5/binders/package-info.java     |   33 -
 .../functions/FindLocationForResource.java      |   66 -
 .../functions/HardwareForVAppTemplate.java      |   85 -
 .../v1_5/compute/functions/HardwareForVm.java   |   73 -
 .../compute/functions/ImageForVAppTemplate.java |   84 -
 ...dHardwareBuilderFromResourceAllocations.java |   38 -
 ...EnvelopeOrThrowIllegalArgumentException.java |   79 -
 .../compute/functions/VmToNodeMetadata.java     |   93 --
 .../util/VCloudDirectorComputeUtils.java        |  144 --
 .../config/VCloudDirectorHttpApiModule.java     |  158 --
 .../director/v1_5/domain/AbstractVApp.java      |  227 ---
 .../director/v1_5/domain/AccessSetting.java     |  120 --
 .../director/v1_5/domain/AdminCatalog.java      |   63 -
 .../vcloud/director/v1_5/domain/AdminVdc.java   |  298 ----
 .../director/v1_5/domain/Capabilities.java      |  120 --
 .../vcloud/director/v1_5/domain/Capacity.java   |  163 --
 .../director/v1_5/domain/CapacityWithUsage.java |  172 --
 .../vcloud/director/v1_5/domain/Catalog.java    |  176 ---
 .../director/v1_5/domain/CatalogItem.java       |  121 --
 .../director/v1_5/domain/CatalogReference.java  |   73 -
 .../director/v1_5/domain/ComputeCapacity.java   |  133 --
 .../vcloud/director/v1_5/domain/Entity.java     |  208 ---
 .../vcloud/director/v1_5/domain/Error.java      |  251 ---
 .../vcloud/director/v1_5/domain/File.java       |  173 --
 .../vcloud/director/v1_5/domain/Group.java      |  177 ---
 .../vcloud/director/v1_5/domain/Link.java       |  238 ---
 .../vcloud/director/v1_5/domain/Media.java      |  202 ---
 .../vcloud/director/v1_5/domain/Metadata.java   |  198 ---
 .../director/v1_5/domain/MetadataEntry.java     |  177 ---
 .../vcloud/director/v1_5/domain/Owner.java      |  108 --
 .../v1_5/domain/ProductSectionList.java         |  201 ---
 .../vcloud/director/v1_5/domain/Property.java   |  108 --
 .../director/v1_5/domain/RasdItemsList.java     |  197 ---
 .../vcloud/director/v1_5/domain/Reference.java  |  198 ---
 .../vcloud/director/v1_5/domain/References.java |  132 --
 .../vcloud/director/v1_5/domain/Resource.java   |  199 ---
 .../director/v1_5/domain/ResourceEntity.java    |  224 ---
 .../vcloud/director/v1_5/domain/Role.java       |   69 -
 .../director/v1_5/domain/RoleReference.java     |   73 -
 .../director/v1_5/domain/RoleReferences.java    |   70 -
 .../director/v1_5/domain/ScreenTicket.java      |  106 --
 .../vcloud/director/v1_5/domain/Session.java    |  174 --
 .../director/v1_5/domain/SessionWithToken.java  |  117 --
 .../vcloud/director/v1_5/domain/Task.java       |  412 -----
 .../vcloud/director/v1_5/domain/TasksList.java  |  207 ---
 .../vcloud/director/v1_5/domain/User.java       |  591 -------
 .../vcloud/director/v1_5/domain/VApp.java       |  239 ---
 .../director/v1_5/domain/VAppChildren.java      |  137 --
 .../director/v1_5/domain/VAppReference.java     |   73 -
 .../director/v1_5/domain/VAppTemplate.java      |  310 ----
 .../director/v1_5/domain/VMWareTools.java       |   99 --
 .../vcloud/director/v1_5/domain/Vdc.java        |  358 -----
 .../jclouds/vcloud/director/v1_5/domain/Vm.java |  172 --
 .../director/v1_5/domain/VmPendingQuestion.java |  149 --
 .../director/v1_5/domain/VmQuestionAnswer.java  |  126 --
 .../v1_5/domain/VmQuestionAnswerChoice.java     |  126 --
 .../director/v1_5/domain/dmtf/Envelope.java     |   59 -
 .../director/v1_5/domain/dmtf/RasdItem.java     |  186 ---
 .../v1_5/domain/dmtf/VirtualSystem.java         |  145 --
 .../director/v1_5/domain/dmtf/package-info.java |   33 -
 .../v1_5/domain/network/DhcpService.java        |  146 --
 .../v1_5/domain/network/ExternalNetwork.java    |  115 --
 .../v1_5/domain/network/FirewallRule.java       |  341 ----
 .../domain/network/FirewallRuleProtocols.java   |  163 --
 .../v1_5/domain/network/FirewallService.java    |  176 ---
 .../v1_5/domain/network/IpAddresses.java        |  105 --
 .../director/v1_5/domain/network/IpRange.java   |  119 --
 .../director/v1_5/domain/network/IpRanges.java  |  105 --
 .../director/v1_5/domain/network/IpScope.java   |  254 ---
 .../v1_5/domain/network/IpsecVpnLocalPeer.java  |   67 -
 .../domain/network/IpsecVpnManagedPeer.java     |  108 --
 .../v1_5/domain/network/IpsecVpnPeer.java       |   27 -
 .../v1_5/domain/network/IpsecVpnRemotePeer.java |  178 ---
 .../v1_5/domain/network/IpsecVpnService.java    |  179 ---
 .../domain/network/IpsecVpnThirdPartyPeer.java  |   44 -
 .../v1_5/domain/network/IpsecVpnTunnel.java     |  365 -----
 .../domain/network/IpsecVpnUnmanagedPeer.java   |   25 -
 .../domain/network/NatOneToOneBasicRule.java    |  162 --
 .../v1_5/domain/network/NatOneToOneVmRule.java  |  185 ---
 .../domain/network/NatPortForwardingRule.java   |  209 ---
 .../director/v1_5/domain/network/NatRule.java   |  211 ---
 .../v1_5/domain/network/NatService.java         |  152 --
 .../director/v1_5/domain/network/NatVmRule.java |  236 ---
 .../director/v1_5/domain/network/Network.java   |  136 --
 .../v1_5/domain/network/NetworkAssignment.java  |  133 --
 .../domain/network/NetworkConfiguration.java    |  237 ---
 .../v1_5/domain/network/NetworkConnection.java  |  342 ----
 .../v1_5/domain/network/NetworkFeatures.java    |  109 --
 .../v1_5/domain/network/NetworkService.java     |   96 --
 .../v1_5/domain/network/RouterInfo.java         |   96 --
 .../v1_5/domain/network/SmtpServerSettings.java |  199 ---
 .../v1_5/domain/network/StaticRoute.java        |  183 ---
 .../domain/network/StaticRoutingService.java    |  124 --
 .../domain/network/SyslogServerSettings.java    |  117 --
 .../v1_5/domain/network/VAppNetwork.java        |  119 --
 .../network/VAppNetworkConfiguration.java       |  176 ---
 .../v1_5/domain/network/package-info.java       |   33 -
 .../director/v1_5/domain/org/AdminOrg.java      |  289 ----
 .../v1_5/domain/org/CustomOrgLdapSettings.java  |  576 -------
 .../vcloud/director/v1_5/domain/org/Org.java    |  133 --
 .../v1_5/domain/org/OrgEmailSettings.java       |  307 ----
 .../v1_5/domain/org/OrgGeneralSettings.java     |  234 ---
 .../v1_5/domain/org/OrgLdapGroupAttributes.java |  261 ---
 .../v1_5/domain/org/OrgLdapSettings.java        |  230 ---
 .../v1_5/domain/org/OrgLdapUserAttributes.java  |  378 -----
 .../v1_5/domain/org/OrgLeaseSettings.java       |  178 ---
 .../director/v1_5/domain/org/OrgList.java       |   92 --
 .../director/v1_5/domain/org/OrgNetwork.java    |  133 --
 .../domain/org/OrgPasswordPolicySettings.java   |  163 --
 .../director/v1_5/domain/org/OrgSettings.java   |  268 ----
 .../org/OrgVAppTemplateLeaseSettings.java       |  150 --
 .../director/v1_5/domain/org/package-info.java  |   33 -
 .../director/v1_5/domain/package-info.java      |   33 -
 .../v1_5/domain/params/CaptureVAppParams.java   |  220 ---
 .../v1_5/domain/params/CloneMediaParams.java    |  145 --
 .../v1_5/domain/params/CloneVAppParams.java     |   66 -
 .../domain/params/CloneVAppTemplateParams.java  |  158 --
 .../v1_5/domain/params/ComposeVAppParams.java   |  184 ---
 .../v1_5/domain/params/ControlAccessParams.java |  183 ---
 .../v1_5/domain/params/DeployVAppParams.java    |  180 ---
 .../domain/params/InstantiateVAppParams.java    |  207 ---
 .../params/InstantiateVAppTemplateParams.java   |  107 --
 .../v1_5/domain/params/InstantiationParams.java |  166 --
 .../domain/params/MediaInsertOrEjectParams.java |  100 --
 .../director/v1_5/domain/params/ParamsType.java |  133 --
 .../domain/params/PublishCatalogParams.java     |  104 --
 .../v1_5/domain/params/RecomposeVAppParams.java |  137 --
 .../v1_5/domain/params/RelocateParams.java      |   93 --
 .../params/SourcedCompositionItemParam.java     |  217 ---
 .../v1_5/domain/params/UndeployVAppParams.java  |  165 --
 .../domain/params/UploadVAppTemplateParams.java |  136 --
 .../v1_5/domain/params/VAppCreationParams.java  |  201 ---
 .../v1_5/domain/params/package-info.java        |   33 -
 .../v1_5/domain/query/CatalogReferences.java    |   67 -
 .../director/v1_5/domain/query/Container.java   |  165 --
 .../director/v1_5/domain/query/QueryList.java   |   84 -
 .../query/QueryResultAdminGroupRecord.java      |  167 --
 .../query/QueryResultAdminUserRecord.java       |  314 ----
 .../domain/query/QueryResultAdminVdcRecord.java |  545 -------
 .../domain/query/QueryResultCatalogRecord.java  |  307 ----
 .../query/QueryResultDatastoreRecord.java       |  507 ------
 .../domain/query/QueryResultMediaRecord.java    |  372 -----
 .../domain/query/QueryResultNetworkRecord.java  |  260 ---
 .../v1_5/domain/query/QueryResultRecord.java    |  217 ---
 .../v1_5/domain/query/QueryResultRecords.java   |  120 --
 .../domain/query/QueryResultReferences.java     |  120 --
 .../domain/query/QueryResultRightRecord.java    |  122 --
 .../domain/query/QueryResultRoleRecord.java     |  126 --
 .../query/QueryResultStrandedUserRecord.java    |  189 ---
 .../domain/query/QueryResultVAppRecord.java     |  332 ----
 .../query/QueryResultVAppTemplateRecord.java    |  357 -----
 .../v1_5/domain/query/QueryResultVMRecord.java  |  406 -----
 .../v1_5/domain/query/VAppReferences.java       |   67 -
 .../v1_5/domain/query/package-info.java         |   33 -
 .../domain/section/CustomizationSection.java    |  188 ---
 .../section/GuestCustomizationSection.java      |  553 -------
 .../domain/section/LeaseSettingsSection.java    |  260 ---
 .../domain/section/NetworkConfigSection.java    |  179 ---
 .../section/NetworkConnectionSection.java       |  224 ---
 .../domain/section/OperatingSystemSection.java  |  204 ---
 .../v1_5/domain/section/RuntimeInfoSection.java |  135 --
 .../domain/section/VirtualHardwareSection.java  |  187 ---
 .../v1_5/domain/section/package-info.java       |   33 -
 .../vcloud/director/v1_5/endpoints/Catalog.java |   31 -
 .../vcloud/director/v1_5/endpoints/Network.java |   31 -
 .../vcloud/director/v1_5/endpoints/Org.java     |   31 -
 .../vcloud/director/v1_5/endpoints/OrgList.java |   31 -
 .../director/v1_5/endpoints/TasksList.java      |   31 -
 .../director/v1_5/endpoints/VCloudLogin.java    |   31 -
 .../vcloud/director/v1_5/endpoints/Vdc.java     |   31 -
 .../director/v1_5/features/CatalogApi.java      |   79 -
 .../vcloud/director/v1_5/features/MediaApi.java |   94 --
 .../director/v1_5/features/MetadataApi.java     |   90 --
 .../director/v1_5/features/NetworkApi.java      |   44 -
 .../vcloud/director/v1_5/features/OrgApi.java   |   52 -
 .../vcloud/director/v1_5/features/QueryApi.java |  156 --
 .../vcloud/director/v1_5/features/TaskApi.java  |   67 -
 .../director/v1_5/features/UploadApi.java       |   32 -
 .../vcloud/director/v1_5/features/VAppApi.java  |  339 ----
 .../director/v1_5/features/VAppTemplateApi.java |  171 --
 .../vcloud/director/v1_5/features/VdcApi.java   |  155 --
 .../vcloud/director/v1_5/features/VmApi.java    |  404 -----
 .../v1_5/features/admin/AdminCatalogApi.java    |  128 --
 .../v1_5/features/admin/AdminNetworkApi.java    |   76 -
 .../v1_5/features/admin/AdminOrgApi.java        |  159 --
 .../v1_5/features/admin/AdminQueryApi.java      |  143 --
 .../v1_5/features/admin/AdminVdcApi.java        |   92 --
 .../director/v1_5/features/admin/GroupApi.java  |   69 -
 .../director/v1_5/features/admin/UserApi.java   |   84 -
 ...ddVCloudAuthorizationAndCookieToRequest.java |   51 -
 .../director/v1_5/functions/IdToAdminHref.java  |   63 -
 .../director/v1_5/functions/IdToHref.java       |   51 -
 .../v1_5/functions/RegexValueParser.java        |   52 -
 .../v1_5/functions/ReturnPayloadBytes.java      |   40 -
 .../director/v1_5/functions/SectionForVApp.java |   42 -
 .../v1_5/functions/SectionForVAppTemplate.java  |   47 -
 ...ateSessionAndRetryOn401AndLogoutOnClose.java |   87 -
 .../handlers/VCloudDirectorErrorHandler.java    |   74 -
 .../internal/VCloudDirectorContextImpl.java     |   71 -
 .../loaders/LoginUserInOrgWithPassword.java     |   55 -
 .../director/v1_5/loaders/ResolveEntity.java    |   47 -
 .../vcloud/director/v1_5/login/SessionApi.java  |   58 -
 .../SessionWithTokenFromXMLAndHeader.java       |   48 -
 .../v1_5/predicates/EntityPredicates.java       |  174 --
 .../v1_5/predicates/LinkPredicates.java         |  102 --
 .../v1_5/predicates/ReferencePredicates.java    |  151 --
 .../v1_5/predicates/TaskStatusEquals.java       |   85 -
 .../director/v1_5/predicates/TaskSuccess.java   |   72 -
 .../director/v1_5/user/VCloudDirectorApi.java   |  143 --
 .../services/org.jclouds.apis.ApiMetadata       |    1 -
 .../testng/FormatApiResultsListener.java        |   99 --
 .../director/v1_5/AbstractVAppApiLiveTest.java  |  415 -----
 .../v1_5/VCloudDirectorApiExpectTest.java       |   37 -
 .../VCloudDirectorApiExperimentLiveTest.java    |   43 -
 .../v1_5/VCloudDirectorApiLiveTest.java         |   47 -
 .../v1_5/VCloudDirectorApiMetadataTest.java     |   33 -
 .../v1_5/VCloudDirectorLiveTestConstants.java   |  106 --
 .../v1_5/binders/BindMapAsMetadataTest.java     |   54 -
 .../binders/BindStringAsMetadataValueTest.java  |   49 -
 .../vcloud/director/v1_5/domain/Checks.java     | 1493 ------------------
 .../v1_5/features/CatalogApiExpectTest.java     |  535 -------
 .../v1_5/features/CatalogApiLiveTest.java       |  259 ---
 .../v1_5/features/KeyPairsApiLiveTest.java      |  210 ---
 .../v1_5/features/MediaApiExpectTest.java       |  723 ---------
 .../v1_5/features/MediaApiLiveTest.java         |  351 ----
 .../v1_5/features/MetadataApiExpectTest.java    |  159 --
 .../v1_5/features/NetworkApiExpectTest.java     |  230 ---
 .../v1_5/features/NetworkApiLiveTest.java       |  128 --
 .../v1_5/features/OrgApiExpectTest.java         |  206 ---
 .../director/v1_5/features/OrgApiLiveTest.java  |  166 --
 .../v1_5/features/QueryApiExpectTest.java       |  174 --
 .../v1_5/features/QueryApiLiveTest.java         |  241 ---
 .../v1_5/features/TaskApiExpectTest.java        |  192 ---
 .../director/v1_5/features/TaskApiLiveTest.java |  128 --
 .../v1_5/features/UploadApiLiveTest.java        |   42 -
 .../v1_5/features/VAppApiExpectTest.java        | 1012 ------------
 .../director/v1_5/features/VAppApiLiveTest.java |  861 ----------
 .../v1_5/features/VAppNetworksLiveTest.java     |  330 ----
 .../features/VAppTemplateApiExpectTest.java     |  317 ----
 .../v1_5/features/VAppTemplateApiLiveTest.java  |  332 ----
 .../v1_5/features/VdcApiExpectTest.java         |  575 -------
 .../director/v1_5/features/VdcApiLiveTest.java  |  329 ----
 .../director/v1_5/features/VmApiExpectTest.java | 1303 ---------------
 .../director/v1_5/features/VmApiLiveTest.java   |  947 -----------
 .../admin/AdminCatalogApiExpectTest.java        |  378 -----
 .../features/admin/AdminCatalogApiLiveTest.java |  221 ---
 .../admin/AdminNetworkApiExpectTest.java        |  232 ---
 .../features/admin/AdminNetworkApiLiveTest.java |  209 ---
 .../features/admin/AdminOrgApiExpectTest.java   |  610 -------
 .../features/admin/AdminOrgApiLiveTest.java     |  345 ----
 .../features/admin/AdminQueryApiExpectTest.java |  133 --
 .../features/admin/AdminQueryApiLiveTest.java   |  130 --
 .../features/admin/AdminVdcApiExpectTest.java   |   60 -
 .../features/admin/AdminVdcApiLiveTest.java     |  205 ---
 .../v1_5/features/admin/GroupApiExpectTest.java |   94 --
 .../v1_5/features/admin/GroupApiLiveTest.java   |  132 --
 .../v1_5/features/admin/UserApiExpectTest.java  |  225 ---
 .../v1_5/features/admin/UserApiLiveTest.java    |  215 ---
 .../SystemAdminVAppApiExpectTest.java           |  517 ------
 .../systemadmin/SystemAdminVAppApiLiveTest.java |  109 --
 .../systemadmin/SystemAdminVmApiExpectTest.java |  515 ------
 .../systemadmin/SystemAdminVmApiLiveTest.java   |  125 --
 ...essionAndRetryOn401AndLogoutOnCloseTest.java |   85 -
 .../VCloudDirectorErrorHandlerTest.java         |   96 --
 .../internal/BaseVCloudDirectorApiLiveTest.java |  741 ---------
 .../internal/BaseVCloudDirectorExpectTest.java  |  176 ---
 .../VCloudDirectorAdminApiExpectTest.java       |   47 -
 .../v1_5/login/SessionApiExpectTest.java        |  125 --
 .../director/v1_5/login/SessionApiLiveTest.java |  103 --
 .../v1_5/predicates/LinkPredicatesTest.java     |   58 -
 .../predicates/ReferencePredicatesTest.java     |   74 -
 .../test/resources/catalog/adddCatalogItem.xml  |    9 -
 .../test/resources/catalog/admin/addCatalog.xml |   21 -
 .../catalog/admin/addCatalogSource.xml          |    4 -
 .../test/resources/catalog/admin/catalog.xml    |   21 -
 .../resources/catalog/admin/editCatalog.xml     |   21 -
 .../catalog/admin/editCatalogSource.xml         |   21 -
 .../resources/catalog/admin/editOwnerSource.xml |    4 -
 .../src/test/resources/catalog/admin/owner.xml  |    6 -
 .../catalog/admin/publishCatalogParams.xml      |    4 -
 .../src/test/resources/catalog/catalog.xml      |   12 -
 .../src/test/resources/catalog/catalogItem.xml  |    9 -
 .../resources/catalog/catalogItemMetadata.xml   |    9 -
 .../catalog/catalogItemMetadataValue.xml        |    5 -
 .../test/resources/catalog/catalogMetadata.xml  |    9 -
 .../resources/catalog/catalogMetadataValue.xml  |    5 -
 .../test/resources/catalog/editCatalogItem.xml  |    9 -
 .../catalog/mergeCatalogItemMetadata.xml        |    7 -
 .../resources/catalog/mergeMetadataTask.xml     |    7 -
 .../test/resources/catalog/newCatalogItem.xml   |    5 -
 .../catalog/removeMetadataEntryTask.xml         |    7 -
 .../catalog/setCatalogItemMetadataValue.xml     |    4 -
 .../resources/catalog/setMetadataValueTask.xml  |    7 -
 .../src/test/resources/group/editGroup.xml      |    0
 .../test/resources/group/editGroupSource.xml    |    0
 .../src/test/resources/group/group.xml          |    0
 vcloud-director/src/test/resources/logback.xml  |   84 -
 .../src/test/resources/media/addMedia.xml       |   14 -
 .../src/test/resources/media/addMediaSource.xml |    4 -
 .../src/test/resources/media/cloneMedia.xml     |   17 -
 .../test/resources/media/cloneMediaParams.xml   |    6 -
 .../src/test/resources/media/editMedia.xml      |   13 -
 .../src/test/resources/media/editMediaTask.xml  |    7 -
 .../src/test/resources/media/error400.xml       |    2 -
 .../test/resources/media/error403-catalog.xml   |    2 -
 .../src/test/resources/media/error403-fake.xml  |    2 -
 .../src/test/resources/media/media.xml          |   13 -
 .../src/test/resources/media/mergeMetadata.xml  |   12 -
 .../test/resources/media/mergeMetadataTask.xml  |    7 -
 .../src/test/resources/media/metadata.xml       |   12 -
 .../src/test/resources/media/metadataValue.xml  |    7 -
 .../src/test/resources/media/owner.xml          |    5 -
 .../test/resources/media/removeMediaTask.xml    |    7 -
 .../resources/media/removeMetadataEntryTask.xml |    7 -
 .../test/resources/media/setMetadataValue.xml   |    4 -
 .../resources/media/setMetadataValueTask.xml    |    7 -
 .../src/test/resources/media/test.iso           |    0
 .../network/admin/editNetworkSource.xml         |   36 -
 .../resources/network/admin/editNetworkTask.xml |    7 -
 .../test/resources/network/admin/orgNetwork.xml |   40 -
 .../network/admin/resetNetworkTask.xml          |    7 -
 .../src/test/resources/network/error400.xml     |    2 -
 .../test/resources/network/error403-catalog.xml |    2 -
 .../test/resources/network/error403-fake.xml    |    2 -
 .../src/test/resources/network/metadata.xml     |    8 -
 .../test/resources/network/metadataValue.xml    |    5 -
 .../src/test/resources/network/network.xml      |   36 -
 .../resources/org/admin/editEmailSettings.xml   |   14 -
 .../org/admin/editEmailSettingsSource.xml       |   14 -
 .../resources/org/admin/editPasswordPolicy.xml  |    7 -
 .../org/admin/editPasswordPolicySource.xml      |    7 -
 .../org/admin/editVAppLeaseSettings.xml         |    0
 .../org/admin/editVAppLeaseSettingsSource.xml   |    0
 .../test/resources/org/admin/emailSettings.xml  |   14 -
 .../test/resources/org/admin/ldapSettings.xml   |    4 -
 .../src/test/resources/org/admin/org.xml        |   86 -
 .../test/resources/org/admin/passwordPolicy.xml |    7 -
 .../resources/org/admin/vAppLeaseSettings.xml   |    0
 .../src/test/resources/org/error400.xml         |    2 -
 .../src/test/resources/org/error403-catalog.xml |    2 -
 .../src/test/resources/org/error403-fake.xml    |    2 -
 vcloud-director/src/test/resources/org/org.xml  |   12 -
 .../src/test/resources/org/orgMetadata.xml      |    9 -
 .../src/test/resources/org/orgMetadataValue.xml |    5 -
 .../src/test/resources/org/orglist.xml          |    4 -
 .../test/resources/query/admin/allGroups.xml    |    5 -
 .../src/test/resources/query/admin/allRoles.xml |    6 -
 .../resources/query/allCatalogReferences.xml    |    9 -
 .../src/test/resources/query/allCatalogs.xml    |    8 -
 .../src/test/resources/query/queryList.xml      |   58 -
 vcloud-director/src/test/resources/session.xml  |    7 -
 .../src/test/resources/task/error400.xml        |    2 -
 .../src/test/resources/task/error403.xml        |    2 -
 .../src/test/resources/task/task.xml            |    6 -
 .../src/test/resources/task/tasksList.xml       |   51 -
 .../src/test/resources/user/addUser.xml         |   21 -
 .../src/test/resources/user/addUserSource.xml   |   16 -
 .../src/test/resources/user/editUser.xml        |   21 -
 .../src/test/resources/user/editUserSource.xml  |   23 -
 .../src/test/resources/user/user.xml            |   22 -
 .../src/test/resources/vapp/vApp.xml            |  348 ----
 .../src/test/resources/vapp/vAppRebootTask.xml  |   15 -
 .../vapptemplate/customizationSection.xml       |   11 -
 .../test/resources/vapptemplate/error400.xml    |    5 -
 .../test/resources/vapptemplate/error403.xml    |    4 -
 .../vapptemplate/guestCustomizationSection.xml  |   19 -
 .../vapptemplate/leaseSettingsSection.xml       |    8 -
 .../test/resources/vapptemplate/metadata.xml    |    8 -
 .../resources/vapptemplate/metadataValue.xml    |    3 -
 .../vapptemplate/networkConfigSection.xml       |   64 -
 .../resources/vapptemplate/relocateParams.xml   |    6 -
 .../resources/vapptemplate/vAppTemplate.xml     |   33 -
 .../src/test/resources/vdc/admin/vdc.xml        |    0
 .../src/test/resources/vdc/error400.xml         |    2 -
 .../src/test/resources/vdc/error403-fake.xml    |    2 -
 .../src/test/resources/vdc/instantiateVApp.xml  |   22 -
 .../resources/vdc/instantiateVAppTemplate.xml   |   23 -
 .../src/test/resources/vdc/metadata.xml         |    8 -
 vcloud-director/src/test/resources/vdc/vdc.xml  |   59 -
 vcloud-director/src/test/resources/vm/vm.xml    |  241 ---
 .../src/test/resources/vm/vmRebootTask.xml      |    9 -
 441 files changed, 60064 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bc521f8..5035366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,6 @@
   <modules>
     <module>azurecompute</module>
     <module>docker</module>
-    <module>vcloud-director</module>
     <module>cdmi</module>
     <module>cloudsigma2</module>
     <module>cloudsigma2-hnl</module>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/pom.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/pom.xml b/vcloud-director/pom.xml
deleted file mode 100644
index f84723d..0000000
--- a/vcloud-director/pom.xml
+++ /dev/null
@@ -1,142 +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: when out of labs, switch to org.jclouds.api -->
-  <groupId>org.apache.jclouds.labs</groupId>
-  <artifactId>vcloud-director</artifactId>
-  <name>jclouds vcloud-director api</name>
-  <description>jclouds components to access an implementation of VMware vCloud Director 1.5+</description>
-  <packaging>bundle</packaging>
-
-  <properties>
-    <test.vcloud-director.endpoint>https://vcloudbeta.bluelock.com/api</test.vcloud-director.endpoint>
-    <test.vcloud-director.api-version>1.5</test.vcloud-director.api-version>
-    <test.vcloud-director.build-version>1.5.0.464915</test.vcloud-director.build-version>
-    <test.vcloud-director.identity>FIXME_USERNAME_WHICH_MIGHT_BE_EMAIL@JClouds</test.vcloud-director.identity>
-    <test.vcloud-director.credential>FIXME_PASSWORD</test.vcloud-director.credential>
-    <test.vcloud-director.template />
-    <!-- URN format: ex. urn:vcloud:catalog:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
-    <test.vcloud-director.catalog-id />
-    <!-- URN format: ex. urn:vcloud:media:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
-    <test.vcloud-director.media-id />
-    <!-- URN format: ex. urn:vcloud:vapptemplate:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
-    <test.vcloud-director.vapptemplate-id />
-    <!-- URN format: ex. urn:vcloud:network:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
-    <test.vcloud-director.network-id />
-    <!-- URN format: ex. urn:vcloud:vdc:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
-    <test.vcloud-director.vdc-id />
-    <!-- URN format: ex. urn:vcloud:user:7212e451-76e1-4631-b2de-ba1dfd8080e4 -->
-    <test.vcloud-director.user-id />
-
-    <jclouds.osgi.export>org.jclouds.vcloud.director.v1_5*;version="${project.version}",org.jclouds.dmtf*;version="${jclouds.version}"</jclouds.osgi.export>
-    <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.jamesmurty.utils</groupId>
-      <artifactId>java-xmlbuilder</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds</groupId>
-      <artifactId>jclouds-compute</artifactId>
-      <version>${jclouds.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds</groupId>
-      <artifactId>jclouds-core</artifactId>
-      <version>${jclouds.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds</groupId>
-      <artifactId>jclouds-compute</artifactId>
-      <version>${jclouds.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.driver</groupId>
-      <artifactId>jclouds-sshj</artifactId>
-      <version>${jclouds.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jclouds.driver</groupId>
-      <artifactId>jclouds-slf4j</artifactId>
-      <version>${jclouds.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  
-  <profiles>
-    <profile>
-      <id>live</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
-                <configuration>
-                  <systemPropertyVariables>
-                    <test.vcloud-director.endpoint>${test.vcloud-director.endpoint}</test.vcloud-director.endpoint>
-                    <test.vcloud-director.api-version>${test.vcloud-director.api-version}</test.vcloud-director.api-version>
-                    <test.vcloud-director.build-version>${test.vcloud-director.build-version}</test.vcloud-director.build-version>
-                    <test.vcloud-director.identity>${test.vcloud-director.identity}</test.vcloud-director.identity>
-                    <test.vcloud-director.credential>${test.vcloud-director.credential}</test.vcloud-director.credential>
-                    <test.vcloud-director.template>${test.vcloud-director.template}</test.vcloud-director.template>
-                    <test.vcloud-director.catalog-id>${test.vcloud-director.catalog-id}</test.vcloud-director.catalog-id>
-                    <test.vcloud-director.media-id>${test.vcloud-director.media-id}</test.vcloud-director.media-id>
-                    <test.vcloud-director.vapptemplate-id>${test.vcloud-director.vapptemplate-id}</test.vcloud-director.vapptemplate-id>
-                    <test.vcloud-director.network-id>${test.vcloud-director.network-id}</test.vcloud-director.network-id>
-                    <test.vcloud-director.vdc-id>${test.vcloud-director.vdc-id}</test.vcloud-director.vdc-id>
-                    <test.vcloud-director.user-id>${test.vcloud-director.user-id}</test.vcloud-director.user-id>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java b/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java
deleted file mode 100644
index 8fc0671..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java b/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java
deleted file mode 100644
index 47eced7..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
deleted file mode 100644
index 80c0459..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
deleted file mode 100644
index b788df9..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
deleted file mode 100644
index 61d7211..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimReference.java
deleted file mode 100644
index 517e35b..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
deleted file mode 100644
index 676dc22..0000000
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ /dev/null
@@ -1,94 +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.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 Objects.toStringHelper("").add("value", value).toString();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedInt.java
deleted file mode 100644
index 2fd5406..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedLong.java
deleted file mode 100644
index cbf7b3e..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimUnsignedShort.java
deleted file mode 100644
index 5f888e5..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/OSType.java
deleted file mode 100644
index 004c7d1..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationCaption.java
deleted file mode 100644
index 1b3305a..0000000
--- a/vcloud-director/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/775b89fd/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationChangeableType.java
deleted file mode 100644
index 14fda0d..0000000
--- a/vcloud-director/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 {
-
-
-}