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:32 UTC
[4/6] Fold dmtf into vcloud-director (its only user).
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
deleted file mode 100644
index 318a2bb..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSectionProperty.java
+++ /dev/null
@@ -1,34 +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.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Property element
- *
- * <pre>
- * <element name="Property" />
- * </pre>
- */
-@XmlType(name = "")
-@XmlRootElement(name = "Property")
-public class ProductSectionProperty extends Property {
- // TODO hashCode, equals, toString
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
deleted file mode 100644
index eb19fef..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ /dev/null
@@ -1,302 +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.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-@XmlType(name = "Property")
-@XmlSeeAlso({ ProductSectionProperty.class })
-public class Property {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromProperty(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public abstract static class Builder<B extends Builder<B>> {
-
- protected String key;
- protected Set<PropertyConfigurationValueType> values = Sets.newLinkedHashSet();
- protected MsgType label;
- protected MsgType description;
- protected String type;
- protected String qualifiers;
- protected Boolean userConfigurable;
- protected String defaultValue = "";
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see Property#getKey()
- */
- public B key(String key) {
- this.key = key;
- return self();
- }
-
- /**
- * @see Property#getValues()
- */
- public B values(Set<PropertyConfigurationValueType> values) {
- this.values = checkNotNull(values, "values");
- return self();
- }
-
- /**
- * @see Property#getValues()
- */
- public B value(PropertyConfigurationValueType value) {
- this.values.add(checkNotNull(value, "value"));
- return self();
- }
-
- /**
- * @see Property#getLabel()
- */
- public B label(MsgType label) {
- this.label = label;
- return self();
- }
-
- /**
- * @see Property#getDescription()
- */
- public B description(MsgType description) {
- this.description = description;
- return self();
- }
-
- /**
- * @see Property#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see Property#getQualifiers()
- */
- public B qualifiers(String qualifiers) {
- this.qualifiers = qualifiers;
- return self();
- }
-
- /**
- * @see Property#getQualifiers()
- */
- public B qualifiers(Iterable<String> qualifiers) {
- this.qualifiers = Joiner.on(',').join(qualifiers);
- return self();
- }
-
- /**
- * @see Property#getQualifiers()
- */
- public B qualifiers(String...qualifiers) {
- this.qualifiers = Joiner.on(',').join(qualifiers);
- return self();
- }
-
- /**
- * @see Property#isUserConfigurable()
- */
- public B isUserConfigurable(Boolean userConfigurable) {
- this.userConfigurable = userConfigurable;
- return self();
- }
-
- /**
- * @see Property#isUserConfigurable()
- */
- public B userConfigurable() {
- this.userConfigurable = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see Property#isUserConfigurable()
- */
- public B notUserConfigurable() {
- this.userConfigurable = Boolean.FALSE;
- return self();
- }
-
- /**
- * @see Property#getDefaultValue()
- */
- public B defaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- return self();
- }
-
- public Property build() {
- return new Property(this);
- }
-
- public B fromProperty(Property in) {
- return key(in.getKey()).values(in.getValues()).description(in.getDescription()).label(in.getLabel())
- .type(in.getType()).qualifiers(in.getQualifiers()).isUserConfigurable(in.isUserConfigurable()).defaultValue(in.getDefaultValue());
- }
- }
-
- @XmlAttribute
- private String key;
- @XmlElement(name = "Value")
- private Set<PropertyConfigurationValueType> values;
- @XmlElement(name = "Label")
- private MsgType label;
- @XmlElement(name = "Description")
- private MsgType description;
- @XmlAttribute(required = true)
- private String type;
- @XmlAttribute(required = true)
- private String qualifiers;
- @XmlAttribute
- private Boolean userConfigurable;
- @XmlAttribute(name = "value")
- private String defaultValue;
-
- protected Property(Builder<?> builder) {
- this.key = builder.key;
- this.values = builder.values;
- this.label = builder.label;
- this.description = builder.description;
- this.type = builder.type;
- this.qualifiers = builder.qualifiers;
- this.userConfigurable = builder.userConfigurable;
- this.defaultValue = builder.defaultValue;
- }
-
- protected Property() {
- // for JAXB
- }
-
- /**
- * Property identifier.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Description of property.
- */
- public MsgType getDescription() {
- return description;
- }
-
- /**
- * Short description of property.
- */
- public MsgType getLabel() {
- return label;
- }
-
- /**
- * Alternative default property values for different configuration
- */
- public Set<PropertyConfigurationValueType> getValues() {
- return values;
- }
-
- /**
- * Property type.
- */
- public String getType() {
- return type;
- }
-
- /**
- * A comma-separated set of type qualifiers.
- */
- public String getQualifiers() {
- return qualifiers;
- }
-
- /**
- * Determines whether the property value is configurable during installation.
- */
- public Boolean isUserConfigurable() {
- return userConfigurable;
- }
-
- /**
- * A Default value for property.
- */
- public String getDefaultValue() {
- if (defaultValue == null) {
- return "";
- } else {
- return defaultValue;
- }
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(key, values, label, description, type, qualifiers, userConfigurable, defaultValue);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Property that = Property.class.cast(obj);
- return equal(this.key, that.key) &&
- equal(this.values, that.values) &&
- equal(this.label, that.label) &&
- equal(this.description, that.description) &&
- equal(this.type, that.type) &&
- equal(this.qualifiers, that.qualifiers) &&
- equal(this.userConfigurable, that.userConfigurable) &&
- equal(this.defaultValue, that.defaultValue);
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper("")
- .add("key", key).add("values", values).add("label", label).add("description", description)
- .add("type", type).add("qualifiers", qualifiers).add("userConfigurable", userConfigurable).add("defaultValue", defaultValue)
- .toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
deleted file mode 100644
index 7efb08e..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/PropertyConfigurationValueType.java
+++ /dev/null
@@ -1,54 +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.ovf;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Type for alternative default values for properties when DeploymentOptionSection is used
- *
- * <pre>
- * <complexType name="PropertyConfigurationValue_Type">
- * </pre>
- */
-@XmlType(name = "PropertyConfigurationValue_Type")
-public class PropertyConfigurationValueType {
-
- // TODO Builder
-
- @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true)
- protected String value;
- @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1")
- protected String configuration;
-
- /**
- * Gets the value of the value property.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the value of the configuration property.
- */
- public String getConfiguration() {
- return configuration;
- }
-
- // TODO hashCode, equals, toString
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
deleted file mode 100644
index aadaf96..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ /dev/null
@@ -1,142 +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.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-
-/**
- * Metadata about a virtual machine or grouping of them.
- *
- * Base type for Sections, subclassing this is the most common form of extensibility. Subtypes define more specific elements.
- */
-@XmlType(name = "Section_Type")
-public abstract class SectionType {
-
- public abstract static class Builder<B extends Builder<B>> {
- private String info;
- private Boolean required;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- public abstract SectionType build();
-
- /**
- * @see SectionType#getInfo()
- */
- public B info(String info) {
- this.info = info;
- return self();
- }
-
- /**
- * @see SectionType#isRequired()
- */
- public B required(Boolean required) {
- this.required = required;
- return self();
- }
-
- /**
- * @see SectionType#isRequired()
- */
- public B required() {
- this.required = Boolean.TRUE;
- return self();
- }
-
- /**
- * @see SectionType#isRequired()
- */
- public B notRequired() {
- this.required = Boolean.FALSE;
- return self();
- }
-
- public B fromSectionType(SectionType in) {
- return info(in.getInfo()).required(in.isRequired());
- }
- }
-
- @XmlElement(name = "Info", required = true)
- private String info;
- @XmlAttribute(namespace = OVF_NS)
- private Boolean required;
-
- protected SectionType(Builder<?> builder) {
- this.info = builder.info;
- this.required = builder.required;
- }
-
- protected SectionType() {
- // For JAXB
- }
-
- /**
- * Info element describes the meaning of the Section, this is typically shown if the Section is not understood by an application
- *
- * @return ovf info
- */
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public Boolean isRequired() {
- return required;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(info, required);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SectionType other = (SectionType) obj;
- return equal(this.info, other.info) && equal(this.required, other.required);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("info", info).add("required", required);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
deleted file mode 100644
index 3acf05a..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ /dev/null
@@ -1,123 +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.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-/**
- * Specifies the order in which entities in a VirtualSystemCollection are powered on and shut down
- *
- * <pre>
- * <complexType name="StartupSection_Type" />
- * </pre>
- */
-@XmlRootElement(name = "StartupSection")
-@XmlType(name = "StartupSection_Type")
-public class StartupSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromStartupSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private List<StartupSectionItem> items = Lists.newArrayList();
-
- /**
- * @see StartupSection#getItem()
- */
- public B items(List<StartupSectionItem> items) {
- this.items = checkNotNull(items, "items");
- return self();
- }
-
- /**
- * @see StartupSection#getItem()
- */
- public B item(StartupSectionItem item) {
- this.items.add(checkNotNull(item, "item"));
- return self();
- }
-
- @Override
- public StartupSection build() {
- return new StartupSection(this);
- }
-
- public B fromStartupSection(StartupSection in) {
- return fromSectionType(in).items(in.getItems());
- }
- }
-
- @XmlElement(name = "Item")
- private List<StartupSectionItem> items = Lists.newArrayList();
-
- protected StartupSection() {
- // For JAXB
- }
-
- public StartupSection(Builder<?> builder) {
- super(builder);
- this.items = (items != null) ? ImmutableList.<StartupSectionItem>copyOf(builder.items) : ImmutableList.<StartupSectionItem>of();
- }
-
- /**
- * Gets the value of the item property.
- */
- public List<StartupSectionItem> getItems() {
- return items;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- StartupSection that = StartupSection.class.cast(o);
- return super.equals(that) && equal(this.items, that.items);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), items);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("items", items);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
deleted file mode 100644
index e1cd012..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSectionItem.java
+++ /dev/null
@@ -1,62 +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.ovf;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * Java class for Item element declaration.
- *
- * <pre>
- * <element name="Item">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- * <attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- * <attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- * <attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- * <attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
- * <attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
- * </pre>
- */
-@XmlType
-@XmlRootElement(name = "Item")
-public class StartupSectionItem extends Item {
-
- // TODO Builder
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- StartupSectionItem that = StartupSectionItem.class.cast(obj);
- return super.equals(that);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
deleted file mode 100644
index 0d4d0f9..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ /dev/null
@@ -1,199 +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.ovf;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
-import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
-import org.jclouds.dmtf.cim.VirtualSystemSettingData;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-/**
- * The virtual hardware required by a virtual machine is specified in VirtualHardwareSection.
- *
- * This specification supports abstract or incomplete hardware descriptions in which only the major
- * devices are described. The hypervisor is allowed to create additional virtual hardware
- * controllers and devices, as long as the required devices listed in the descriptor are realized.
- */
-public class VirtualHardwareSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromVirtualHardwareSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private VirtualSystemSettingData virtualSystem;
- private String transport;
- private Set<ResourceAllocationSettingData> items = Sets.newLinkedHashSet();
-
- /**
- * @see VirtualHardwareSection#getSystem()
- */
- public B system(VirtualSystemSettingData virtualSystem) {
- this.virtualSystem = virtualSystem;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getTransport()
- */
- public B transport(String transport) {
- this.transport = transport;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getTransport()
- */
- public B transport(Iterable<String> transports) {
- this.transport = Joiner.on(',').join(transports);
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getTransport()
- */
- public B transport(String...transports) {
- this.transport = Joiner.on(',').join(transports);
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getItems()
- */
- public B item(ResourceAllocationSettingData item) {
- this.items.add(checkNotNull(item, "item"));
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getItems()
- */
- public B items(Iterable<? extends ResourceAllocationSettingData> items) {
- this.items = Sets.newLinkedHashSet(checkNotNull(items, "items"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public VirtualHardwareSection build() {
- return new VirtualHardwareSection(this);
- }
-
- public B fromVirtualHardwareSection(VirtualHardwareSection in) {
- return fromSectionType(in)
- .items(in.getItems())
- .transport(in.getTransport())
- .system(in.getSystem());
- }
- }
-
- @XmlElement(name = "System")
- protected VirtualSystemSettingData virtualSystem;
- @XmlAttribute(name = "transport")
- protected String transport;
- @XmlElement(name = "Item")
- protected Set<? extends ResourceAllocationSettingData> items = Sets.newLinkedHashSet();
-
- protected VirtualHardwareSection(Builder<?> builder) {
- super(builder);
- this.virtualSystem = builder.virtualSystem;
- this.transport = builder.transport;
- this.items = builder.items != null ? ImmutableSet.copyOf(builder.items) : Sets.<ResourceAllocationSettingData>newLinkedHashSet();
- }
-
- protected VirtualHardwareSection() {
- // For JAXB
- }
-
- /**
- * Comma-separated list of supported transports types for the OVF descriptor.
- *
- * Transport types define methods by which the environment document is communicated from the
- * deployment platform to the guest software.
- * <p>
- * To enable interoperability, this specification defines an "iso" transport type which all
- * implementations that support CD-ROM devices are required to support. The iso transport
- * communicates the environment 1346 document by making a dynamically generated ISO image
- * available to the guest software. To support the iso transport type, prior to booting a virtual
- * machine, an implementation shall make an ISO 9660 read-only disk image available as backing
- * for a disconnected CD-ROM. If the iso transport is selected for a VirtualHardwareSection, at
- * least one disconnected CD-ROM device shall be present in this section.
- * <p>
- * Support for the "iso" transport type is not a requirement for virtual hardware architectures
- * or guest 1351 operating systems which do not have CD-ROM device support.
- *
- * @return
- */
- public String getTransport() {
- return transport;
- }
-
- public VirtualSystemSettingData getSystem() {
- return virtualSystem;
- }
-
- public Set<? extends ResourceAllocationSettingData> getItems() {
- return ImmutableSet.copyOf(items);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), transport, virtualSystem, items);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
- VirtualHardwareSection that = VirtualHardwareSection.class.cast(obj);
- return super.equals(that)
- && equal(this.transport, that.transport)
- && equal(this.virtualSystem, that.virtualSystem)
- && equal(this.items, that.items);
- }
-
- @Override
- protected MoreObjects.ToStringHelper string() {
- return super.string()
- .add("transport", transport)
- .add("virtualSystem", virtualSystem)
- .add("items", items);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
deleted file mode 100644
index aeedeaf..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EntityType.java
+++ /dev/null
@@ -1,91 +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.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Container of sections for a specific entity
- *
- * <pre>
- * <complexType name="Entity_Type">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Entity_Type")
-public class EntityType {
-
- @XmlElementRef(name = "Section", namespace = OVF_ENV_NS)
- protected Set<SectionType<?>> sections = Sets.newLinkedHashSet();
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
- @XmlAttribute(namespace = OVF_ENV_NS, required = true)
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
- /**
- * Gets the value of the sections property.
- */
- public Set<SectionType<?>> getSection() {
- return sections;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- /**
- * Gets the value of the id property.
- */
- public String getId() {
- return id;
- }
-
- /**
- * 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/ovf/environment/EnvironmentType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
deleted file mode 100644
index ee15f55..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/EnvironmentType.java
+++ /dev/null
@@ -1,114 +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.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-/**
- * Type for root OVF environment
- *
- * <pre>
- * <complexType name="Environment_Type">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="Entity" type="{http://schemas.dmtf.org/ovf/environment/1}Entity_Type" maxOccurs="unbounded" minOccurs="0"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Environment_Type")
-public class EnvironmentType {
-
- @XmlElementRef(name = "Section", namespace = OVF_ENV_NS)
- protected Set<SectionType<?>> sections = Sets.newLinkedHashSet();
- @XmlElement(name = "Entity")
- protected Set<EntityType> entities = Sets.newLinkedHashSet();
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
- @XmlAttribute(namespace = OVF_ENV_NS)
- protected String id;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
- /**
- * Entity independent meta-data sections Gets the value of the sections property.
- */
- public Set<SectionType<?>> getSections() {
- return sections;
- }
-
- /**
- * Gets the value of the entities property.
- */
- public Set<EntityType> getEntities() {
- return entities;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- /**
- * Gets the value of the id property.
- */
- public String getId() {
- if (id == null) {
- return "";
- } else {
- return id;
- }
- }
-
- /**
- * Sets the value of the id property.
- */
- public void setId(String value) {
- this.id = 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/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
deleted file mode 100644
index 0a766de..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ /dev/null
@@ -1,141 +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.ovf.environment;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.dmtf.cim.CimString;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-/**
- * Information about deployment platform
- *
- * <pre>
- * <complexType name="PlatformSection_Type">
- * <complexContent>
- * <extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- * <sequence>
- * <element name="Kind" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Version" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Vendor" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Locale" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- * <element name="Timezone" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlRootElement(name = "PlatformSection")
-@XmlType(name = "PlatformSection_Type")
-public class PlatformSectionType extends SectionType<PlatformSectionType> {
-
- @XmlElement(name = "Kind")
- protected CimString kind;
- @XmlElement(name = "Version")
- protected CimString version;
- @XmlElement(name = "Vendor")
- protected CimString vendor;
- @XmlElement(name = "Locale")
- protected CimString locale;
- @XmlElement(name = "Timezone")
- protected Integer timezone;
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the kind property.
- */
- public CimString getKind() {
- return kind;
- }
-
- /**
- * Gets the value of the version property.
- */
- public CimString getVersion() {
- return version;
- }
-
- /**
- * Gets the value of the vendor property.
- */
- public CimString getVendor() {
- return vendor;
- }
-
- /**
- * Gets the value of the locale property.
- */
- public CimString getLocale() {
- return locale;
- }
-
- /**
- * Gets the value of the timezone property.
- */
- public Integer getTimezone() {
- return timezone;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), version, vendor, timezone, locale, kind, any);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PlatformSectionType that = (PlatformSectionType) obj;
- return super.equals(that) &&
- Objects.equal(this.version, that.version) &&
- Objects.equal(this.vendor, that.vendor) &&
- Objects.equal(this.timezone, that.timezone) &&
- Objects.equal(this.locale, that.locale) &&
- Objects.equal(this.kind, that.kind) &&
- Objects.equal(this.any, that.any);
- }
-
- @Override
- protected MoreObjects.ToStringHelper string() {
- return super.string()
- .add("version", version).add("vendor", vendor).add("timezone", timezone)
- .add("locale", locale).add("kind", kind).add("any", any);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
deleted file mode 100644
index 2baf2bd..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/Property.java
+++ /dev/null
@@ -1,78 +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.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-/**
- * Java class for anonymous complex type.
- */
-@XmlType(name = "")
-public class Property {
-
- @XmlAttribute(namespace = OVF_ENV_NS, required = true)
- protected String key;
- @XmlAttribute(namespace = OVF_ENV_NS, required = true)
- protected String value;
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newHashMap();
-
- /**
- * Gets the value of the key property.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the value of the key property.
- */
- public void setKey(String value) {
- this.key = value;
- }
-
- /**
- * 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/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
deleted file mode 100644
index cb1229f..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ /dev/null
@@ -1,104 +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.ovf.environment;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-/**
- * Key/value pairs of assigned properties for an entity
- *
- * <pre>
- * <complexType name="PropertySection_Type">
- * <complexContent>
- * <extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- * <sequence>
- * <element name="Property" maxOccurs="unbounded" minOccurs="0">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
- * <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <anyAttribute processContents='lax'/>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlRootElement(name = "PropertySection")
-@XmlType(name = "PropertySection_Type")
-public class PropertySectionType extends SectionType<PropertySectionType> {
-
- @XmlElement(name = "Property")
- protected Set<Property> properties = Sets.newLinkedHashSet();
- @XmlAnyElement(lax = true)
- protected Set<Object> any = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the properties property.
- */
- public Set<Property> getProperties() {
- return properties;
- }
-
- /**
- * Gets the value of the any property.
- */
- public Set<Object> getAny() {
- return any;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), properties, any);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PropertySectionType that = (PropertySectionType) obj;
- return super.equals(that) &&
- Objects.equal(this.properties, that.properties) &&
- Objects.equal(this.any, that.any);
- }
-
- @Override
- protected MoreObjects.ToStringHelper string() {
- return super.string()
- .add("properties", properties).add("any", any);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
deleted file mode 100644
index 6f8e653..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
+++ /dev/null
@@ -1,91 +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.ovf.environment;
-
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.Maps;
-
-/**
- * Abstract type for all sections in
- * environment
- *
- * <p>Java class for Section_Type complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Section_Type">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <anyAttribute processContents='lax'/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlType(name = "Section_Type")
-@XmlSeeAlso({
- PlatformSectionType.class,
- PropertySectionType.class
-})
-public abstract class SectionType<T extends SectionType<T>> {
-
- @XmlAnyAttribute
- private Map<QName, String> otherAttributes = Maps.newLinkedHashMap();
-
- /**
- * 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(otherAttributes);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- SectionType<?> that = (SectionType<?>) obj;
- return Objects.equal(this.otherAttributes, that.otherAttributes);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("otherAttributes", otherAttributes);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.java
deleted file mode 100644
index 303b2f0..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/package-info.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.
- */
-@XmlSchema(namespace = OVF_ENV_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS),
- @XmlNs(prefix = "env", namespaceURI = OVF_ENV_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.ovf.environment;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_ENV_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
deleted file mode 100644
index f105f78..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
+++ /dev/null
@@ -1,177 +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.ovf.internal;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Set;
-
-import org.jclouds.dmtf.ovf.DiskSection;
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.SectionType;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-public abstract class BaseEnvelope<V extends BaseVirtualSystem, E extends BaseEnvelope<V, E>> {
-
- public abstract Builder<?, V, E> toBuilder();
-
- public abstract static class Builder<B extends Builder<B, V, E>, V extends BaseVirtualSystem, E extends BaseEnvelope<V, E>> {
-
- protected Set<DiskSection> diskSections = Sets.newLinkedHashSet();
- protected Set<NetworkSection> networkSections = Sets.newLinkedHashSet();
- protected Set<SectionType> additionalSections = Sets.newLinkedHashSet();
- protected V virtualSystem;
-
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see BaseEnvelope#getDiskSections
- */
- public B diskSection(DiskSection diskSection) {
- this.diskSections.add(checkNotNull(diskSection, "diskSection"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getDiskSections
- */
- public B diskSections(Iterable<? extends DiskSection> diskSections) {
- this.diskSections = ImmutableSet.<DiskSection> copyOf(checkNotNull(diskSections, "diskSections"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getNetworkSections
- */
- public B networkSection(NetworkSection networkSection) {
- this.networkSections.add(checkNotNull(networkSection, "networkSection"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getNetworkSections
- */
- public B networkSections(Iterable<? extends NetworkSection> networkSections) {
- this.networkSections = ImmutableSet.<NetworkSection> copyOf(checkNotNull(networkSections, "networkSections"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getAdditionalSections
- */
- public B additionalSection(SectionType additionalSection) {
- this.additionalSections.add(checkNotNull(additionalSection, "additionalSection"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getAdditionalSections
- */
- public B additionalSections(Iterable<? extends SectionType> additionalSections) {
- this.additionalSections = ImmutableSet.<SectionType> copyOf(checkNotNull(additionalSections, "additionalSections"));
- return self();
- }
-
- /**
- * @see BaseEnvelope#getVirtualSystem
- */
- public B virtualSystem(V virtualSystem) {
- this.virtualSystem = virtualSystem;
- return self();
- }
-
- public abstract E build();
-
- public B fromEnvelope(BaseEnvelope<V, E> in) {
- return virtualSystem(in.getVirtualSystem())
- .diskSections(in.getDiskSections())
- .networkSections(networkSections)
- .additionalSections(in.getAdditionalSections());
- }
-
- }
-
- private Set<DiskSection> diskSections;
- private Set<NetworkSection> networkSections;
- private Set<SectionType> additionalSections;
- private V virtualSystem;
-
- protected BaseEnvelope(Builder<?, V, E> builder) {
- this.diskSections = ImmutableSet.copyOf(checkNotNull(builder.diskSections, "diskSections"));
- this.networkSections = ImmutableSet.copyOf(checkNotNull(builder.networkSections, "networkSections"));
- this.additionalSections = ImmutableSet.copyOf(checkNotNull(builder.additionalSections, "additionalSections"));
- this.virtualSystem = checkNotNull(builder.virtualSystem, "virtualSystem");
- }
-
- protected BaseEnvelope() {
- // for JAXB
- }
-
- public V getVirtualSystem() {
- return virtualSystem;
- }
-
- public Set<DiskSection> getDiskSections() {
- return diskSections;
- }
-
- public Set<NetworkSection> getNetworkSections() {
- return networkSections;
- }
-
- public Set<SectionType> getAdditionalSections() {
- return additionalSections;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(additionalSections, diskSections, networkSections, virtualSystem);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- BaseEnvelope<?, ?> other = (BaseEnvelope<?, ?>) obj;
- return Objects.equal(additionalSections, other.additionalSections)
- && Objects.equal(diskSections, other.diskSections)
- && Objects.equal(networkSections, other.networkSections)
- && Objects.equal(virtualSystem, other.virtualSystem);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("")
- .add("diskSections", diskSections)
- .add("networkSections", networkSections)
- .add("additionalSections", additionalSections)
- .add("virtualSystem", virtualSystem);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
deleted file mode 100644
index 4a82f74..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
+++ /dev/null
@@ -1,171 +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.ovf.internal;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-
-import org.jclouds.dmtf.ovf.ProductSection;
-import org.jclouds.dmtf.ovf.SectionType;
-
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-public abstract class BaseVirtualSystem extends SectionType {
-
- public abstract static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private String id;
- private String name;
- private Set<ProductSection> productSections = Sets.newLinkedHashSet();
- private Set<SectionType> additionalSections = Sets.newLinkedHashSet();
-
- /**
- * @see BaseVirtualSystem#getName()
- */
- public B name(String name) {
- this.name = name;
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getId()
- */
- public B id(String id) {
- this.id = id;
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getProductSections()
- */
- public B productSection(ProductSection productSection) {
- this.productSections.add(checkNotNull(productSection, "productSection"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getProductSections()
- */
- public B productSections(Iterable<ProductSection> productSections) {
- this.productSections = Sets.newLinkedHashSet(checkNotNull(productSections, "productSections"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getAdditionalSections()
- */
- public B additionalSection(SectionType additionalSection) {
- this.additionalSections.add(checkNotNull(additionalSection, "additionalSection"));
- return self();
- }
-
- /**
- * @see BaseVirtualSystem#getAdditionalSections()
- */
- public B additionalSections(Iterable<? extends SectionType> additionalSections) {
- this.additionalSections = Sets.newLinkedHashSet(checkNotNull(additionalSections, "additionalSections"));
- return self();
- }
-
- public B fromBaseVirtualSystem(BaseVirtualSystem in) {
- return fromSectionType(in)
- .id(in.getId())
- .name(in.getName())
- .productSections(in.getProductSections())
- .additionalSections(in.getAdditionalSections());
- }
- }
-
- @XmlAttribute(namespace = OVF_NS)
- private String id;
- @XmlElement(name = "Name")
- private String name;
- @XmlElement(name = "ProductSection")
- private Set<ProductSection> productSections;
- @XmlElementRef
- private Set<SectionType> additionalSections;
-
- protected BaseVirtualSystem(Builder<?> builder) {
- super(builder);
- this.id = builder.id;
- this.name = builder.name;
- this.productSections = ImmutableSet.copyOf(checkNotNull(builder.productSections, "productSections"));
- this.additionalSections = ImmutableSet.copyOf(checkNotNull(builder.additionalSections, "additionalSections"));
- }
-
- protected BaseVirtualSystem() {
- // For JAXB
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- /**
- * Specifies product-information for a package, such as product name and version, along with a
- * set of properties that can be configured
- */
- public Set<ProductSection> getProductSections() {
- return productSections;
- }
-
- public Set<SectionType> getAdditionalSections() {
- return additionalSections;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), id, name, productSections, additionalSections);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- BaseVirtualSystem other = (BaseVirtualSystem) obj;
- return super.equals(other)
- && equal(id, other.id)
- && equal(name, other.name)
- && equal(productSections, other.productSections)
- && equal(additionalSections, other.additionalSections);
- }
-
- @Override
- protected MoreObjects.ToStringHelper string() {
- return super.string()
- .add("id", id)
- .add("name", name)
- .add("productSections", productSections)
- .add("additionalSections", additionalSections);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java
deleted file mode 100644
index 1d2fb9e..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/package-info.java
+++ /dev/null
@@ -1,35 +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.
- */
-@XmlSchema(namespace = OVF_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.ovf.internal;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/dmtf/src/main/java/org/jclouds/dmtf/ovf/package-info.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/package-info.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/package-info.java
deleted file mode 100644
index 94516cf..0000000
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/package-info.java
+++ /dev/null
@@ -1,35 +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.
- */
-@XmlSchema(namespace = OVF_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "cim", namespaceURI = CIM_NS),
- @XmlNs(prefix = "ovf", namespaceURI = OVF_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.dmtf.ovf;
-
-import static org.jclouds.dmtf.DMTFConstants.CIM_NS;
-import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9140562..85242a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@
<module>docker</module>
<module>virtualbox</module>
<module>vcloud-director</module>
- <module>dmtf</module>
<module>cdmi</module>
<module>cloudsigma2</module>
<module>cloudsigma2-lvs</module>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/vcloud-director/pom.xml
----------------------------------------------------------------------
diff --git a/vcloud-director/pom.xml b/vcloud-director/pom.xml
index eb0e64f..f84723d 100644
--- a/vcloud-director/pom.xml
+++ b/vcloud-director/pom.xml
@@ -52,21 +52,15 @@
<!-- 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}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${jclouds.version}",
- org.jclouds.rest.internal;version="${jclouds.version}",
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
+ <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>0.4</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
@@ -74,11 +68,6 @@
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>dmtf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
<version>${jclouds.version}</version>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7ec7f077/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
new file mode 100644
index 0000000..8fc0671
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/CIMPredicates.java
@@ -0,0 +1,53 @@
+/*
+ * 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/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
new file mode 100644
index 0000000..47eced7
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/DMTFConstants.java
@@ -0,0 +1,37 @@
+/*
+ * 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/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
new file mode 100644
index 0000000..80c0459
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleType.java
@@ -0,0 +1,69 @@
+/*
+ * 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>
+ * <complexType name="cimAnySimpleType" />
+ * </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/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
new file mode 100644
index 0000000..b788df9
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimAnySimpleTypeAdapter.java
@@ -0,0 +1,36 @@
+/*
+ * 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/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
new file mode 100644
index 0000000..61d7211
--- /dev/null
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimBoolean.java
@@ -0,0 +1,79 @@
+/*
+ * 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>
+ * <complexType name="cimBoolean" />
+ * </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;
+ }
+
+}