diff --git a/allcompute/pom.xml b/allcompute/pom.xml index 1b69b056e9..d9a0084005 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -94,11 +94,6 @@ vcloud ${project.version} - - org.jclouds.api - vcloudexpress - ${project.version} - org.jclouds.provider trmk-vcloudexpress diff --git a/apis/pom.xml b/apis/pom.xml index f55bc2dd45..1d885467ac 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -44,7 +44,6 @@ cloudfiles cloudservers vcloud - vcloudexpress elasticstack atmos nova diff --git a/apis/vcloudexpress/README.txt b/apis/vcloudexpress/README.txt deleted file mode 100644 index d5f5145efe..0000000000 --- a/apis/vcloudexpress/README.txt +++ /dev/null @@ -1,25 +0,0 @@ -==== - - Copyright (C) 2011 Cloud Conscious, LLC. - - ==================================================================== - Licensed 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. - ==================================================================== -==== - -# -# The jclouds API for VMware vCloud (http://www.vmware.com/solutions/cloud-computing/public-cloud/vcloud-express.html). -# -# TODO: Implementation status. -# TODO: Supported features. -# TODO: Usage example. \ No newline at end of file diff --git a/apis/vcloudexpress/pom.xml b/apis/vcloudexpress/pom.xml deleted file mode 100644 index bc624aeee9..0000000000 --- a/apis/vcloudexpress/pom.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - 4.0.0 - - org.jclouds - jclouds-project - 1.1.0-SNAPSHOT - ../../project/pom.xml - - org.jclouds.api - vcloudexpress - jcloud vcloudexpress api - jclouds components to access an implementation of VMWare vCloud Express - bundle - - - - trmkrun-ccc,test.trmk-924 - FIXME - 1.0 - FIXME - FIXME - - - - - org.jclouds.common - vcloud-common - ${project.version} - - - org.jclouds.common - vcloud-common - ${project.version} - test-jar - test - - - org.jclouds - jclouds-core - ${project.version} - test-jar - test - - - org.jclouds - jclouds-compute - ${project.version} - - - org.jclouds - jclouds-compute - ${project.version} - test-jar - test - - - org.jclouds.driver - jclouds-jsch - ${project.version} - test - - - com.jcraft - jsch - test - - - log4j - log4j - 1.2.16 - test - - - org.jclouds.driver - jclouds-log4j - ${project.version} - test - - - com.jamesmurty.utils - java-xmlbuilder - 0.3 - - - org.jclouds - jclouds-core - ${project.version} - - - - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - - test.vcloudexpress.endpoint - ${test.vcloudexpress.endpoint} - - - test.vcloudexpress.apiversion - ${test.vcloudexpress.apiversion} - - - test.vcloudexpress.identity - ${test.vcloudexpress.identity} - - - test.vcloudexpress.credential - ${test.vcloudexpress.credential} - - - jclouds.compute.blacklist-nodes - ${jclouds.compute.blacklist-nodes} - - - - - - - - - - - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId} - org.jclouds.vcloud.*;version="${project.version}" - org.jclouds.*;version="${project.version}",* - - - - - - - diff --git a/common/trmk/pom.xml b/common/trmk/pom.xml index 9335fd308a..78375c4c8a 100644 --- a/common/trmk/pom.xml +++ b/common/trmk/pom.xml @@ -36,11 +36,6 @@ bundle - - org.jclouds.api - vcloudexpress - ${project.version} - org.jclouds.common vcloud-common @@ -67,13 +62,6 @@ test-jar test - - org.jclouds.api - vcloudexpress - ${project.version} - test-jar - test - org.jclouds.driver jclouds-log4j @@ -102,7 +90,7 @@ ${project.artifactId} - org.jclouds.vcloud.terremark.*;version="${project.version}" + org.jclouds.vcloud.terremark.*;version="${project.version}",org.jclouds.vcloud.*;version="${project.version}" org.jclouds.*;version="${project.version}",* diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java b/common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java rename to common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressAsyncClient.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java b/common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java rename to common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressClient.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java b/common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java rename to common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressContextBuilder.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressLoginAsyncClient.java b/common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressLoginAsyncClient.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressLoginAsyncClient.java rename to common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressLoginAsyncClient.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java b/common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java rename to common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressMediaType.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java b/common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java rename to common/trmk/src/main/java/org/jclouds/vcloud/VCloudExpressPropertiesBuilder.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayload.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayload.java rename to common/trmk/src/main/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayload.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java rename to common/trmk/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayload.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/VCloudExpressComputeClient.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressBindComputeStrategiesByClass.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModule.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ImageForVCloudExpressVAppTemplate.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressOrg.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ImagesInVCloudExpressVDC.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ParseOsFromVAppTemplateName.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ParseOsFromVAppTemplateName.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/ParseOsFromVAppTemplateName.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/ParseOsFromVAppTemplateName.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/functions/VCloudExpressVAppToNodeMetadata.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/internal/VCloudExpressComputeClientImpl.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/StartVAppWithGroupEncodedIntoName.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/StartVAppWithGroupEncodedIntoName.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/StartVAppWithGroupEncodedIntoName.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/StartVAppWithGroupEncodedIntoName.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressDestroyNodeStrategy.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressGetNodeMetadataStrategy.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressLifeCycleStrategy.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java b/common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java rename to common/trmk/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudExpressListNodesStrategy.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java b/common/trmk/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java rename to common/trmk/src/main/java/org/jclouds/vcloud/config/BaseVCloudExpressRestClientModule.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java b/common/trmk/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java rename to common/trmk/src/main/java/org/jclouds/vcloud/config/VCloudExpressRestClientModule.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVApp.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/VCloudExpressVAppTemplate.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppImpl.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/internal/VCloudExpressVAppTemplateImpl.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/network/VCloudExpressNetwork.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressNetworkImpl.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java b/common/trmk/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java rename to common/trmk/src/main/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapter.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/ParseTaskFromLocationHeader.java b/common/trmk/src/main/java/org/jclouds/vcloud/functions/ParseTaskFromLocationHeader.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/ParseTaskFromLocationHeader.java rename to common/trmk/src/main/java/org/jclouds/vcloud/functions/ParseTaskFromLocationHeader.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java b/common/trmk/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java rename to common/trmk/src/main/java/org/jclouds/vcloud/functions/VCloudExpressAllCatalogItemsInCatalog.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java b/common/trmk/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java rename to common/trmk/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForCatalogItems.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java b/common/trmk/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java rename to common/trmk/src/main/java/org/jclouds/vcloud/functions/VCloudExpressVAppTemplatesForResourceEntities.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java b/common/trmk/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java rename to common/trmk/src/main/java/org/jclouds/vcloud/options/CloneVAppOptions.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java b/common/trmk/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java rename to common/trmk/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java b/common/trmk/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java rename to common/trmk/src/main/java/org/jclouds/vcloud/xml/OrgNetworkFromVCloudExpressNetworkHandler.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressCatalogHandler.java b/common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressCatalogHandler.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressCatalogHandler.java rename to common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressCatalogHandler.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java b/common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java rename to common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandler.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java b/common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java rename to common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppHandler.java diff --git a/apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java b/common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java similarity index 100% rename from apis/vcloudexpress/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java rename to common/trmk/src/main/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandler.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/VCloudExpressAsyncClientTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/VCloudExpressClientLiveTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayloadTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayloadTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayloadTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/binders/BindCloneVCloudExpressVAppParamsToXmlPayloadTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/binders/BindInstantiateVCloudExpressVAppTemplateParamsToXmlPayloadTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/compute/config/VCloudComputeServiceContextModuleTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/compute/config/VCloudExpressComputeServiceContextModuleTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/domain/network/internal/VCloudExpressOrgNetworkAdapterTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptionsTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/xml/VCloudExpressNetworkHandlerTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/xml/VCloudExpressVAppTemplateHandlerTest.java diff --git a/apis/vcloudexpress/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java b/common/trmk/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java similarity index 100% rename from apis/vcloudexpress/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java rename to common/trmk/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudExpressVAppHandlerTest.java diff --git a/apis/vcloudexpress/src/test/resources/cloneVApp-default.xml b/common/trmk/src/test/resources/cloneVApp-default.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/cloneVApp-default.xml rename to common/trmk/src/test/resources/cloneVApp-default.xml diff --git a/apis/vcloudexpress/src/test/resources/cloneVApp.xml b/common/trmk/src/test/resources/cloneVApp.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/cloneVApp.xml rename to common/trmk/src/test/resources/cloneVApp.xml diff --git a/apis/vcloudexpress/src/test/resources/network-bluelock.xml b/common/trmk/src/test/resources/network-bluelock.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/network-bluelock.xml rename to common/trmk/src/test/resources/network-bluelock.xml diff --git a/apis/vcloudexpress/src/test/resources/network-hosting.xml b/common/trmk/src/test/resources/network-hosting.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/network-hosting.xml rename to common/trmk/src/test/resources/network-hosting.xml diff --git a/apis/vcloudexpress/src/test/resources/network-terremark.xml b/common/trmk/src/test/resources/network-terremark.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/network-terremark.xml rename to common/trmk/src/test/resources/network-terremark.xml diff --git a/apis/vcloudexpress/src/test/resources/newvapp-cpumemdisk.xml b/common/trmk/src/test/resources/newvapp-cpumemdisk.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/newvapp-cpumemdisk.xml rename to common/trmk/src/test/resources/newvapp-cpumemdisk.xml diff --git a/apis/vcloudexpress/src/test/resources/newvapp-hosting.xml b/common/trmk/src/test/resources/newvapp-hosting.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/newvapp-hosting.xml rename to common/trmk/src/test/resources/newvapp-hosting.xml diff --git a/apis/vcloudexpress/src/test/resources/newvapp-hostingcpumemdisk.xml b/common/trmk/src/test/resources/newvapp-hostingcpumemdisk.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/newvapp-hostingcpumemdisk.xml rename to common/trmk/src/test/resources/newvapp-hostingcpumemdisk.xml diff --git a/apis/vcloudexpress/src/test/resources/newvapp-hostingnetworknamedhcpfencemode.xml b/common/trmk/src/test/resources/newvapp-hostingnetworknamedhcpfencemode.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/newvapp-hostingnetworknamedhcpfencemode.xml rename to common/trmk/src/test/resources/newvapp-hostingnetworknamedhcpfencemode.xml diff --git a/apis/vcloudexpress/src/test/resources/newvapp-networknamedhcpfencemode.xml b/common/trmk/src/test/resources/newvapp-networknamedhcpfencemode.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/newvapp-networknamedhcpfencemode.xml rename to common/trmk/src/test/resources/newvapp-networknamedhcpfencemode.xml diff --git a/apis/vcloudexpress/src/test/resources/newvapp.xml b/common/trmk/src/test/resources/newvapp.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/newvapp.xml rename to common/trmk/src/test/resources/newvapp.xml diff --git a/apis/vcloudexpress/src/test/resources/vAppTemplate-hosting.xml b/common/trmk/src/test/resources/vAppTemplate-hosting.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/vAppTemplate-hosting.xml rename to common/trmk/src/test/resources/vAppTemplate-hosting.xml diff --git a/apis/vcloudexpress/src/test/resources/vAppTemplate-trmk.xml b/common/trmk/src/test/resources/vAppTemplate-trmk.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/vAppTemplate-trmk.xml rename to common/trmk/src/test/resources/vAppTemplate-trmk.xml diff --git a/apis/vcloudexpress/src/test/resources/vapp.xml b/common/trmk/src/test/resources/vapp.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/vapp.xml rename to common/trmk/src/test/resources/vapp.xml diff --git a/apis/vcloudexpress/src/test/resources/vapp2.xml b/common/trmk/src/test/resources/vapp2.xml similarity index 100% rename from apis/vcloudexpress/src/test/resources/vapp2.xml rename to common/trmk/src/test/resources/vapp2.xml diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml index 4e5ac83b73..4b0734dd8a 100644 --- a/providers/trmk-ecloud/pom.xml +++ b/providers/trmk-ecloud/pom.xml @@ -62,13 +62,6 @@ test-jar test - - org.jclouds.api - vcloudexpress - ${project.version} - test-jar - test - org.jclouds jclouds-core diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml index 272a91e6ab..c96e7de7cb 100644 --- a/providers/trmk-vcloudexpress/pom.xml +++ b/providers/trmk-vcloudexpress/pom.xml @@ -61,13 +61,6 @@ test-jar test - - org.jclouds.api - vcloudexpress - ${project.version} - test-jar - test - org.jclouds jclouds-core