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:24 UTC
[17/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
deleted file mode 100644
index e50c6d3..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
+++ /dev/null
@@ -1,204 +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.vcloud.director.v1_5.domain.section;
-
-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 static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_VMW_NS;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "OperatingSystemSection", namespace = OVF_NS)
-@XmlType(name = "OperatingSystemSection_Type")
-@XmlSeeAlso({ org.jclouds.dmtf.ovf.OperatingSystemSection.class })
-public class OperatingSystemSection extends org.jclouds.dmtf.ovf.OperatingSystemSection {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromOperatingSystemSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends org.jclouds.dmtf.ovf.OperatingSystemSection.Builder<B> {
-
- private String osType;
- private URI href;
- private String type;
- private Set<Link> links;
-
- /**
- * @see OperatingSystemSection#getOsType()
- */
- public B osType(String osType) {
- this.osType = osType;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see OperatingSystemSection#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public OperatingSystemSection build() {
- return new OperatingSystemSection(this);
- }
-
- public B fromOperatingSystemSection(OperatingSystemSection in) {
- return super.fromOperatingSystemSection(in)
- .osType(in.getOsType())
- .href(in.getHref())
- .type(in.getType())
- .links(in.getLinks());
- }
- }
-
- @XmlAttribute(namespace = VCLOUD_VMW_NS)
- protected String osType;
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- private URI href;
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- private String type;
- @XmlElement(name = "Link", namespace = VCLOUD_1_5_NS)
- private Set<Link> links = Sets.newLinkedHashSet();
-
- public OperatingSystemSection(Builder<?> builder) {
- super(builder);
- this.osType = builder.osType;
- this.href = builder.href;
- this.type = builder.type;
- this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
- }
-
- protected OperatingSystemSection() {
- // For Builders and JAXB
- }
-
- /**
- * Gets the osType
- */
- public String getOsType() {
- return osType;
- }
-
- /**
- * Contains the URI to the entity.
- *
- * @see ResourceType#getHref()
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Contains the type of the the entity.
- *
- * @see ResourceType#getType()
- */
- public String getType() {
- return type;
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- *
- * @see ResourceType#getLinks()
- */
- public Set<Link> getLinks() {
- return links != null ? ImmutableSet.copyOf(links) : Sets.<Link>newLinkedHashSet();
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), osType, href, type, links);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
-
- OperatingSystemSection that = (OperatingSystemSection) obj;
- return super.equals(that)
- && equal(this.osType, that.osType)
- && equal(this.href, that.href)
- && equal(this.links, that.links)
- && equal(this.type, that.type);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("osType", osType)
- .add("type", type)
- .add("href", href)
- .add("links", links);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
deleted file mode 100644
index f0a2cce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
+++ /dev/null
@@ -1,135 +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.vcloud.director.v1_5.domain.section;
-
-import static com.google.common.base.Objects.equal;
-
-import java.util.List;
-
-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.ovf.SectionType;
-import org.jclouds.vcloud.director.v1_5.domain.VMWareTools;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "RuntimeInfoSection")
-@XmlType(name = "RuntimeInfoSectionType")
-public class RuntimeInfoSection extends SectionType {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- public Builder<?> toBuilder() {
- return builder().fromRuntimeInfoSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends SectionType.Builder<B> {
-
- private VMWareTools vmWareTools;
- private List<Object> any = Lists.newArrayList();
-
- /**
- * @see RuntimeInfoSection#getVmWareTools()
- */
- public B vmWareTools(VMWareTools vmWareTools) {
- this.vmWareTools = vmWareTools;
- return self();
- }
-
- /**
- * @see RuntimeInfoSection#getAny()
- */
- public B any(List<Object> any) {
- this.any = any;
- return self();
- }
-
- @Override
- public RuntimeInfoSection build() {
- RuntimeInfoSection runtimeInfoSection = new RuntimeInfoSection(this);
- return runtimeInfoSection;
- }
-
- public B fromRuntimeInfoSection(RuntimeInfoSection in) {
- return fromSectionType(in)
- .vmWareTools(in.getVMWareTools())
- .any(in.getAny());
- }
- }
-
- protected RuntimeInfoSection() {
- // For JAXB and B use
- }
-
- protected RuntimeInfoSection(Builder<?> builder) {
- super(builder);
- this.vmWareTools = builder.vmWareTools;
- this.any = builder.any;
- }
-
-
- @XmlElement(name = "VMWareTools")
- private VMWareTools vmWareTools;
- @XmlAnyElement(lax = true)
- private List<Object> any = Lists.newArrayList();
-
- /**
- * Gets the value of the vmWareTools property.
- */
- public VMWareTools getVMWareTools() {
- return vmWareTools;
- }
-
- /**
- * Gets the value of the any property.
- */
- public List<Object> getAny() {
- return this.any;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- RuntimeInfoSection that = RuntimeInfoSection.class.cast(o);
- return super.equals(that) &&
- equal(vmWareTools, that.vmWareTools) && equal(any, that.any);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), vmWareTools, any);
- }
-
- @Override
- public ToStringHelper string() {
- return super.string().add("vmWareTools", vmWareTools).add("any", any);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
deleted file mode 100644
index d6a0591..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
+++ /dev/null
@@ -1,187 +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.vcloud.director.v1_5.domain.section;
-
-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 static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS;
-
-import java.net.URI;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jclouds.vcloud.director.v1_5.domain.Link;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "VirtualHardwareSection", namespace = OVF_NS)
-@XmlType(name = "VirtualHardwareSection_Type")
-@XmlSeeAlso({ org.jclouds.dmtf.ovf.VirtualHardwareSection.class })
-public class VirtualHardwareSection extends org.jclouds.dmtf.ovf.VirtualHardwareSection {
-
- public static Builder<?> builder() {
- return new ConcreteBuilder();
- }
-
- @Override
- public Builder<?> toBuilder() {
- return builder().fromVirtualHardwareSection(this);
- }
-
- private static class ConcreteBuilder extends Builder<ConcreteBuilder> {
- }
-
- public static class Builder<B extends Builder<B>> extends org.jclouds.dmtf.ovf.VirtualHardwareSection.Builder<B> {
-
- private URI href;
- private String type;
- private Set<Link> links = Sets.newLinkedHashSet();
-
- @Override
- @SuppressWarnings("unchecked")
- protected B self() {
- return (B) this;
- }
-
- /**
- * @see VirtualHardwareSection#getType()
- */
- public B type(String type) {
- this.type = type;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getHref()
- */
- public B href(URI href) {
- this.href = href;
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getLinks()
- */
- public B links(Set<Link> links) {
- this.links = Sets.newLinkedHashSet(checkNotNull(links, "links"));
- return self();
- }
-
- /**
- * @see VirtualHardwareSection#getLinks()
- */
- public B link(Link link) {
- this.links.add(checkNotNull(link, "link"));
- return self();
- }
-
- @Override
- public VirtualHardwareSection build() {
- return new VirtualHardwareSection(this);
- }
-
- public B fromVirtualHardwareSection(VirtualHardwareSection in) {
- return super.fromVirtualHardwareSection(in)
- .type(in.getType())
- .href(in.getHref())
- .links(in.getLinks());
- }
- }
-
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- protected String type;
- @XmlAttribute(namespace = VCLOUD_1_5_NS)
- @XmlSchemaType(name = "anyURI")
- protected URI href;
- @XmlElement(name = "Link", namespace = VCLOUD_1_5_NS)
- protected Set<Link> links = Sets.newLinkedHashSet();
-
-
- protected VirtualHardwareSection(Builder<?> builder) {
- super(builder);
- this.type = builder.type;
- this.href = builder.href;
- this.links = builder.links != null && builder.links.isEmpty() ? null : builder.links;
- }
-
- protected VirtualHardwareSection() {
- // for JAXB
- }
-
- /**
- * Contains the URI to the entity.
- *
- * @see ResourceType#getHref()
- */
- public String getType() {
- return type;
- }
-
- /**
- * Contains the type of the the entity.
- *
- * @see ResourceType#getType()
- */
- public URI getHref() {
- return href;
- }
-
- /**
- * Set of optional links to an entity or operation associated with this object.
- *
- * @see ResourceType#getLinks()
- */
- public Set<Link> getLinks() {
- return links != null ? ImmutableSet.copyOf(links) : Sets.<Link>newLinkedHashSet();
- }
-
- @Override
- public ToStringHelper string() {
- return super.string()
- .add("type", type)
- .add("href", href)
- .add("links", links);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(), type, href, links);
- }
-
- @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.type, that.type)
- && equal(this.href, that.href)
- && equal(this.links, that.links);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java
deleted file mode 100644
index f084095..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/package-info.java
+++ /dev/null
@@ -1,33 +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 = VCLOUD_1_5_NS,
- elementFormDefault = XmlNsForm.QUALIFIED,
- xmlns = {
- @XmlNs(prefix = "", namespaceURI = VCLOUD_1_5_NS)
- }
-)
-@XmlAccessorType(XmlAccessType.FIELD)
-package org.jclouds.vcloud.director.v1_5.domain.section;
-
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_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/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
deleted file mode 100644
index b37de68..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Catalog.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Catalog {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
deleted file mode 100644
index e50150a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Network.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Network {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
deleted file mode 100644
index b63207f..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Org.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Org {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
deleted file mode 100644
index 69b5067..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/OrgList.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface OrgList {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
deleted file mode 100644
index 87f8d2d..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/TasksList.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface TasksList {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java
deleted file mode 100644
index b23cc0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/VCloudLogin.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface VCloudLogin {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
deleted file mode 100644
index d1811ea..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/endpoints/Vdc.java
+++ /dev/null
@@ -1,31 +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.vcloud.director.v1_5.endpoints;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Retention(value = RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
-@Qualifier
-public @interface Vdc {
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.java
deleted file mode 100644
index effe33e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/CatalogApi.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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CATALOG_ITEM;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Catalog;
-import org.jclouds.vcloud.director.v1_5.domain.CatalogItem;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface CatalogApi {
-
- /** Returns the catalog or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Catalog get(@EndpointParam URI catalogHref);
-
- @POST
- @Path("/catalogItems")
- @Consumes(CATALOG_ITEM)
- @Produces(CATALOG_ITEM)
- @JAXBResponseParser
- CatalogItem addItem(@EndpointParam URI catalogHref, @BinderParam(BindToXMLPayload.class) CatalogItem catalogItem);
-
- /** Returns the item or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- CatalogItem getItem(@EndpointParam URI catalogItemHref);
-
- @PUT
- @Consumes(CATALOG_ITEM)
- @Produces(CATALOG_ITEM)
- @JAXBResponseParser
- CatalogItem editItem(@EndpointParam URI catalogItemHref,
- @BinderParam(BindToXMLPayload.class) CatalogItem catalogItem);
-
- @DELETE
- @Consumes
- @JAXBResponseParser
- void removeItem(@EndpointParam URI catalogItemHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.java
deleted file mode 100644
index 259a3a5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MediaApi.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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CLONE_MEDIA_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface MediaApi {
-
- /** Returns the media or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Media get(@EndpointParam URI mediaHref);
-
- /**
- * Creates a media (and present upload link for the floppy/iso file).
- *
- * @return The response will return a link to transfer site to be able to continue with uploading
- * the media.
- */
- @POST
- @Consumes(MEDIA)
- @Produces(MEDIA)
- @JAXBResponseParser
- Media add(@EndpointParam URI updateHref, @BinderParam(BindToXMLPayload.class) Media media);
-
- @POST
- @Path("/action/cloneMedia")
- @Consumes(MEDIA)
- @Produces(CLONE_MEDIA_PARAMS)
- @JAXBResponseParser
- Media clone(@EndpointParam URI mediaHref, @BinderParam(BindToXMLPayload.class) CloneMediaParams params);
-
- /** Updates the name/description of a media. */
- @PUT
- @Consumes(TASK)
- @Produces(MEDIA)
- @JAXBResponseParser
- Task edit(@EndpointParam URI mediaHref, @BinderParam(BindToXMLPayload.class) Media media);
-
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI mediaHref);
-
- @GET
- @Path("/owner")
- @Consumes
- @JAXBResponseParser
- Owner getOwner(@EndpointParam URI mediaHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
deleted file mode 100644
index ca8ae2e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/MetadataApi.java
+++ /dev/null
@@ -1,90 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.METADATA_VALUE;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.annotations.ResponseParser;
-import org.jclouds.vcloud.director.v1_5.binders.BindMapAsMetadata;
-import org.jclouds.vcloud.director.v1_5.binders.BindStringAsMetadataValue;
-import org.jclouds.vcloud.director.v1_5.domain.Metadata;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-import org.jclouds.vcloud.director.v1_5.functions.RegexValueParser;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface MetadataApi {
-
- /** Returns the metadata or null if the associated resource was not found. */
- @GET
- @Path("/metadata")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Metadata get();
-
- /** Returns the metadata value or null if the {@code key} was not found. */
- @GET
- @Path("/metadata/{key}")
- @Consumes
- @ResponseParser(RegexValueParser.class)
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- String get(@PathParam("key") String key);
-
- /** Merges the metadata for a media with the information provided. */
- @POST
- @Path("/metadata")
- @Consumes(TASK)
- @Produces(METADATA)
- @JAXBResponseParser
- Task putAll(@BinderParam(BindMapAsMetadata.class) Map<String, String> metadata);
-
- /** Replace the metadata value for the specified {@code key}. */
- @PUT
- @Path("/metadata/{key}")
- @Consumes(TASK)
- @Produces(METADATA_VALUE)
- @JAXBResponseParser
- Task put(@PathParam("key") String key, @BinderParam(BindStringAsMetadataValue.class) String metadataValue);
-
- @DELETE
- @Path("/metadata/{key}")
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@PathParam("key") String key);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
deleted file mode 100644
index f8e9c1e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/NetworkApi.java
+++ /dev/null
@@ -1,44 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.network.Network;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface NetworkApi {
-
- /** Returns the network or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Network get(@EndpointParam URI networkHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
deleted file mode 100644
index e48e18b..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/OrgApi.java
+++ /dev/null
@@ -1,52 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.org.Org;
-import org.jclouds.vcloud.director.v1_5.domain.org.OrgList;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface OrgApi {
-
- @GET
- @Path("/org/")
- @Consumes
- @JAXBResponseParser
- OrgList list();
-
- /** Returns the org or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Org get(@EndpointParam URI orgHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
deleted file mode 100644
index c1a5582..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryApi.java
+++ /dev/null
@@ -1,156 +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.vcloud.director.v1_5.features;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.QueryParam;
-
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.QueryParams;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences;
-import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface QueryApi {
-
- // TODO Add a typed object for filter syntax, or at least a fluent builder
-
- /**
- * Retrieves a list of entities.
- *
- * If filter is provided it will be applied to the corresponding result set.
- * Format determines the elements representation - references or records.
- * Default format is references.
- *
- * <pre>
- * GET /query
- * </pre>
- */
- @GET
- @Path("/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords queryAll(@QueryParam("type") String type);
-
- @GET
- @Path("/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords query(@QueryParam("type") String type, @QueryParam("filter") String filter);
-
- @GET
- @Path("/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords query(@QueryParam("page") Integer page, @QueryParam("pageSize") Integer pageSize,
- @QueryParam("format") String format, @QueryParam("type") String type, @QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link Catalog}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/catalogs/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords catalogsQueryAll();
-
- /**
- * Retrieves a list of {@link CatalogReference}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/catalogs/query")
- @Consumes
- @QueryParams(keys = { "format" }, values = { "references" })
- @JAXBResponseParser
- CatalogReferences catalogReferencesQueryAll();
-
- /**
- * Retrieves a list of {@link VAppTemplate}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/vAppTemplates/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppTemplatesQueryAll();
-
- @GET
- @Path("/vAppTemplates/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppTemplatesQuery(@QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link VApp}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/vApps/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppsQueryAll();
-
- @GET
- @Path("/vApps/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vAppsQuery(@QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link Vm}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/vms/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vmsQueryAll();
-
- @GET
- @Path("/vms/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords vmsQuery(@QueryParam("filter") String filter);
-
- /**
- * Retrieves a list of {@link Media}s.
- *
- * @see #queryAll(String)
- */
- @GET
- @Path("/mediaList/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords mediaListQueryAll();
-
- @GET
- @Path("/mediaList/query")
- @Consumes
- @JAXBResponseParser
- QueryResultRecords mediaListQuery(@QueryParam("filter") String filter);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
deleted file mode 100644
index efba9ce..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/TaskApi.java
+++ /dev/null
@@ -1,67 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.TasksList;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface TaskApi {
-
- /**
- * Returns the task list or null if not found.
- *
- * @param tasksListHref
- * from {@link Org#getLinks()} where {@link Link#getType} is
- * {@link VCloudDirectorMediaType#TASKS_LIST}
- */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- TasksList getTasksList(@EndpointParam URI tasksListHref);
-
- /** Returns the task or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Task get(@EndpointParam URI taskURI);
-
- @POST
- @Path("/action/cancel")
- @Consumes
- @JAXBResponseParser
- void cancel(@EndpointParam URI taskURI);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
deleted file mode 100644
index 6b576ad..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UploadApi.java
+++ /dev/null
@@ -1,32 +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.vcloud.director.v1_5.features;
-
-import java.net.URI;
-
-import javax.ws.rs.PUT;
-
-import org.jclouds.io.Payload;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface UploadApi {
-
- @PUT void upload(@EndpointParam URI location, Payload payload);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
deleted file mode 100644
index 8d08640..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppApi.java
+++ /dev/null
@@ -1,339 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CONTROL_ACCESS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.DEPLOY_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.LEASE_SETTINGS_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_CONFIG_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OWNER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PRODUCT_SECTION_LIST;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.RECOMPOSE_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.STARTUP_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.UNDEPLOY_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.dmtf.ovf.StartupSection;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.params.ControlAccessParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.DeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.RecomposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UndeployVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VAppApi {
-
- /** Returns the vApp or null if not found. */
- @GET
- @Consumes(VAPP)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- VApp get(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#edit(URI, VApp)
- */
- @PUT
- @Produces(VAPP)
- @Consumes(TASK)
- @JAXBResponseParser
- Task edit(@EndpointParam URI vAppHref, @BinderParam(BindToXMLPayload.class) VApp vApp);
-
- /**
- * @see VAppApi#remove(URI)
- */
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editControlAccess(URI, ControlAccessParams)
- */
- @POST
- @Path("/action/controlAccess")
- @Produces(CONTROL_ACCESS)
- @Consumes(CONTROL_ACCESS)
- @JAXBResponseParser
- ControlAccessParams editControlAccess(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) ControlAccessParams params);
-
- /**
- * @see VAppApi#deploy(URI, DeployVAppParams)
- */
- @POST
- @Path("/action/deploy")
- @Produces(DEPLOY_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task deploy(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) DeployVAppParams params);
-
- /**
- * @see VAppApi#discardSuspendedState(URI)
- */
- @POST
- @Path("/action/discardSuspendedState")
- @Consumes(TASK)
- @JAXBResponseParser
- Task discardSuspendedState(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#enterMaintenanceMode(URI)
- */
- @POST
- @Path("/action/enterMaintenanceMode")
- @Consumes
- @JAXBResponseParser
- void enterMaintenanceMode(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#exitMaintenanceMode(URI)
- */
- @POST
- @Path("/action/exitMaintenanceMode")
- @Consumes
- @JAXBResponseParser
- void exitMaintenanceMode(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#recompose(URI, RecomposeVAppParams)
- */
- @POST
- @Path("/action/recomposeVApp")
- @Produces(RECOMPOSE_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task recompose(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) RecomposeVAppParams params);
-
- /**
- * @see VAppApi#undeploy(URI, UndeployVAppParams)
- */
- @POST
- @Path("/action/undeploy")
- @Produces(UNDEPLOY_VAPP_PARAMS)
- @Consumes(TASK)
- @JAXBResponseParser
- Task undeploy(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) UndeployVAppParams params);
-
- /**
- * @see VAppApi#getAccessControl(URI)
- */
- @GET
- @Path("/controlAccess")
- @Consumes(CONTROL_ACCESS)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- ControlAccessParams getAccessControl(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#powerOff(URI)
- */
- @POST
- @Path("/power/action/powerOff")
- @Consumes(TASK)
- @JAXBResponseParser
- Task powerOff(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#powerOn(URI)
- */
- @POST
- @Path("/power/action/powerOn")
- @Consumes(TASK)
- @JAXBResponseParser
- Task powerOn(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#reboot(URI)
- */
- @POST
- @Path("/power/action/reboot")
- @Consumes(TASK)
- @JAXBResponseParser
- Task reboot(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#reset(URI)
- */
- @POST
- @Path("/power/action/reset")
- @Consumes(TASK)
- @JAXBResponseParser
- Task reset(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#shutdown(URI)
- */
- @POST
- @Path("/power/action/shutdown")
- @Consumes(TASK)
- @JAXBResponseParser
- Task shutdown(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#suspend(URI)
- */
- @POST
- @Path("/power/action/suspend")
- @Consumes(TASK)
- @JAXBResponseParser
- Task suspend(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#getLeaseSettingsSection(URI)
- */
- @GET
- @Path("/leaseSettingsSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- LeaseSettingsSection getLeaseSettingsSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editLeaseSettingsSection(URI, LeaseSettingsSection)
- */
- @PUT
- @Path("/leaseSettingsSection")
- @Produces(LEASE_SETTINGS_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editLeaseSettingsSection(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) LeaseSettingsSection section);
-
- /**
- * @see VAppApi#getNetworkConfigSection(URI)
- */
- @GET
- @Path("/networkConfigSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- NetworkConfigSection getNetworkConfigSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editNetworkConfigSection(URI, NetworkConfigSection)
- */
- @PUT
- @Path("/networkConfigSection")
- @Produces(NETWORK_CONFIG_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editNetworkConfigSection(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) NetworkConfigSection section);
-
- /**
- * @see VAppApi#getNetworkSection(URI)
- */
- @GET
- @Path("/networkSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- NetworkSection getNetworkSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#getOwner(URI)
- */
- @GET
- @Path("/owner")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- Owner getOwner(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editOwner(URI, Owner)
- */
- @PUT
- @Path("/owner")
- @Produces(OWNER)
- @Consumes(TASK)
- @JAXBResponseParser
- void editOwner(@EndpointParam URI vAppHref, @BinderParam(BindToXMLPayload.class) Owner owner);
-
- /**
- * @see VAppApi#getProductSections(URI)
- */
- @GET
- @Path("/productSections")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- ProductSectionList getProductSections(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editProductSections(URI, ProductSectionList)
- */
- @PUT
- @Path("/productSections")
- @Produces(PRODUCT_SECTION_LIST)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editProductSections(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) ProductSectionList sectionList);
-
- /**
- * @see VAppApi#getStartupSection(URI)
- */
- @GET
- @Path("/startupSection")
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- StartupSection getStartupSection(@EndpointParam URI vAppHref);
-
- /**
- * @see VAppApi#editStartupSection(URI, StartupSection)
- */
- @PUT
- @Path("/startupSection")
- @Produces(STARTUP_SECTION)
- @Consumes(TASK)
- @JAXBResponseParser
- Task editStartupSection(@EndpointParam URI vAppHref,
- @BinderParam(BindToXMLPayload.class) StartupSection section);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.java
deleted file mode 100644
index d9240f0..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateApi.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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CUSTOMIZATION_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.LEASE_SETTINGS_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_CONFIG_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NETWORK_SECTION;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.OWNER;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.PRODUCT_SECTION_LIST;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.TASK;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP_TEMPLATE;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.dmtf.ovf.NetworkSection;
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.domain.Owner;
-import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList;
-import org.jclouds.vcloud.director.v1_5.domain.References;
-import org.jclouds.vcloud.director.v1_5.domain.Task;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.dmtf.Envelope;
-import org.jclouds.vcloud.director.v1_5.domain.section.CustomizationSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.LeaseSettingsSection;
-import org.jclouds.vcloud.director.v1_5.domain.section.NetworkConfigSection;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VAppTemplateApi {
-
- /** Returns the vApp template or null if not found. */
- @GET
- @Consumes(VAPP_TEMPLATE)
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- VAppTemplate get(@EndpointParam URI reference);
-
- /**
- * Modifies only the name/description of a vApp template.
- */
- @PUT
- @Produces(VAPP_TEMPLATE)
- @Consumes(TASK)
- @JAXBResponseParser
- Task edit(@EndpointParam URI templateHref,
- @BinderParam(BindToXMLPayload.class) VAppTemplate template);
-
- @DELETE
- @Consumes(TASK)
- @JAXBResponseParser
- Task remove(@EndpointParam URI templateUri);
-
- /**
- * Disables the download link to the ovf of a vApp template.
- */
- @POST
- @Path("/action/disableDownload")
- @JAXBResponseParser
- void disableDownload(@EndpointParam URI templateHref);
-
- /**
- * Enables downloading of the ovf of a vApp template.
- */
- @POST
- @Consumes(TASK)
- @Path("/action/enableDownload")
- @JAXBResponseParser
- Task enableDownload(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(CUSTOMIZATION_SECTION)
- @Path("/customizationSection")
- @JAXBResponseParser
- CustomizationSection getCustomizationSection(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(LEASE_SETTINGS_SECTION)
- @Path("/leaseSettingsSection")
- @JAXBResponseParser
- LeaseSettingsSection getLeaseSettingsSection(@EndpointParam URI templateHref);
-
- @PUT
- @Produces(LEASE_SETTINGS_SECTION)
- @Consumes(TASK)
- @Path("/leaseSettingsSection")
- @JAXBResponseParser
- Task editLeaseSettingsSection(@EndpointParam URI templateHref,
- @BinderParam(BindToXMLPayload.class) LeaseSettingsSection settingsSection);
-
- @GET
- @Consumes(NETWORK_CONFIG_SECTION)
- @Path("/networkConfigSection")
- @JAXBResponseParser
- NetworkConfigSection getNetworkConfigSection(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(NETWORK_SECTION)
- @Path("/networkSection")
- @JAXBResponseParser
- NetworkSection getNetworkSection(@EndpointParam URI templateHref);
-
- /**
- * Retrieves an OVF descriptor of a vApp template.
- *
- * <p/> This OVF represents the vApp template as it is, with all vCloud specific information (like mac
- * address, parent networks, etc). The OVF which could be downloaded by enabling for download
- * will not contain this information. There are no specific states bound to this entity.
- */
- @GET
- @Consumes
- @Path("/ovf")
- @JAXBResponseParser
- Envelope getOvf(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(OWNER)
- @Path("/owner")
- @JAXBResponseParser
- Owner getOwner(@EndpointParam URI templateHref);
-
- @GET
- @Consumes(PRODUCT_SECTION_LIST)
- @Path("/productSections")
- @JAXBResponseParser
- ProductSectionList getProductSections(@EndpointParam URI templateHref);
-
- @PUT
- @Produces(PRODUCT_SECTION_LIST)
- @Consumes(TASK)
- @Path("/productSections")
- @JAXBResponseParser
- Task editProductSections(@EndpointParam URI templateHref,
- @BinderParam(BindToXMLPayload.class) ProductSectionList sections);
-
- @GET
- @Consumes
- @Path("/shadowVms")
- @JAXBResponseParser
- References getShadowVms(@EndpointParam URI templateHref);
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
deleted file mode 100644
index 64eef1c..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/VdcApi.java
+++ /dev/null
@@ -1,155 +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.vcloud.director.v1_5.features;
-
-import static org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CAPTURE_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CLONE_MEDIA_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.CLONE_VAPP_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.INSTANTIATE_VAPP_TEMPLATE_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.MEDIA;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.UPLOAD_VAPP_TEMPLATE_PARAMS;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP;
-import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.VAPP_TEMPLATE;
-
-import java.net.URI;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.rest.annotations.BinderParam;
-import org.jclouds.rest.annotations.EndpointParam;
-import org.jclouds.rest.annotations.Fallback;
-import org.jclouds.rest.annotations.JAXBResponseParser;
-import org.jclouds.rest.annotations.RequestFilters;
-import org.jclouds.rest.binders.BindToXMLPayload;
-import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
-import org.jclouds.vcloud.director.v1_5.domain.Media;
-import org.jclouds.vcloud.director.v1_5.domain.VApp;
-import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate;
-import org.jclouds.vcloud.director.v1_5.domain.Vdc;
-import org.jclouds.vcloud.director.v1_5.domain.params.CaptureVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneMediaParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.CloneVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.ComposeVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.InstantiateVAppParams;
-import org.jclouds.vcloud.director.v1_5.domain.params.UploadVAppTemplateParams;
-import org.jclouds.vcloud.director.v1_5.filters.AddVCloudAuthorizationAndCookieToRequest;
-
-@RequestFilters(AddVCloudAuthorizationAndCookieToRequest.class)
-public interface VdcApi {
-
- /** Returns the virtual datacenter or null if not found. */
- @GET
- @Consumes
- @JAXBResponseParser
- @Fallback(NullOnNotFoundOr404.class)
- @Nullable
- Vdc get(@EndpointParam URI vdcHref);
-
- /** Captures a vApp into vApp template. */
- @POST
- @Path("/action/captureVApp")
- @Consumes(VAPP_TEMPLATE)
- @Produces(CAPTURE_VAPP_PARAMS)
- @JAXBResponseParser
- VAppTemplate captureVApp(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) CaptureVAppParams params);
-
- /** Clones a media into new one. */
- @POST
- @Path("/action/cloneMedia")
- @Consumes(MEDIA)
- @Produces(CLONE_MEDIA_PARAMS)
- @JAXBResponseParser
- Media cloneMedia(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) CloneMediaParams params);
-
- /** Clones a vApp into new one. */
- @POST
- @Path("/action/cloneVApp")
- @Consumes(VAPP)
- @Produces(CLONE_VAPP_PARAMS)
- // TODO fix these etc.
- @JAXBResponseParser
- VApp cloneVApp(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) CloneVAppParams params);
-
- /** Clones a vApp template into new one. */
- @POST
- @Path("/action/cloneVAppTemplate")
- @Consumes(VAPP_TEMPLATE)
- @Produces(VCloudDirectorMediaType.CLONE_VAPP_TEMPLATE_PARAMS)
- @JAXBResponseParser
- VAppTemplate cloneVAppTemplate(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) CloneVAppTemplateParams params);
-
- /**
- * Composes a new vApp using VMs from other vApps or vApp templates.
- *
- * <p /> The composed vApp must be deployed and powered on before it can be used.
- */
- @POST
- @Path("/action/composeVApp")
- @Consumes(VAPP)
- @Produces(VCloudDirectorMediaType.COMPOSE_VAPP_PARAMS)
- @JAXBResponseParser
- VApp composeVApp(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) ComposeVAppParams params);
-
- /** Instantiate a vApp template into a new vApp. */
- @POST
- @Path("/action/instantiateVAppTemplate")
- @Consumes(VAPP)
- @Produces(INSTANTIATE_VAPP_TEMPLATE_PARAMS)
- @JAXBResponseParser
- VApp instantiateVApp(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) InstantiateVAppParams params);
-
- /**
- * Uploading vApp template to a vDC.
- *
- * The operation is separate on several steps:
- * <ol>
- * <li>creating empty vApp template entity
- * <li>uploading an OVF of vApp template
- * <li>uploading disks described from the OVF
- * <li>finishing task for uploading
- * </ol>
- */
- @POST
- @Path("/action/uploadVAppTemplate")
- @Consumes(VAPP_TEMPLATE)
- @Produces(UPLOAD_VAPP_TEMPLATE_PARAMS)
- @JAXBResponseParser
- VAppTemplate uploadVAppTemplate(@EndpointParam URI vdcHref,
- @BinderParam(BindToXMLPayload.class) UploadVAppTemplateParams params);
-
- /**
- * Creates a media (and present upload link for the floppy/iso file).
- *
- * @return The response will return a link to transfer site to be able to continue with uploading the media.
- */
- @POST
- @Path("/media")
- @Consumes(MEDIA)
- @Produces(MEDIA)
- @JAXBResponseParser
- Media addMedia(@EndpointParam URI vdcHref, @BinderParam(BindToXMLPayload.class) Media media);
-}