You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/31 16:59:33 UTC

[1/3] git commit: synchronize registry calls, to avoid concurrent modifications

Repository: incubator-stratos
Updated Branches:
  refs/heads/master 720cee28e -> d2499fbd4


synchronize registry calls, to avoid concurrent modifications


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ab73ebd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ab73ebd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ab73ebd0

Branch: refs/heads/master
Commit: ab73ebd0f463326e5f91872494c3b463cf65edd9
Parents: 8fbb271
Author: Nirmal Fernando <ni...@apache.org>
Authored: Mon Mar 31 20:22:02 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Mon Mar 31 20:22:02 2014 +0530

----------------------------------------------------------------------
 .../stratos/cloud/controller/registry/RegistryManager.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab73ebd0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
index 8492acf..3162fca 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
@@ -78,7 +78,7 @@ public class RegistryManager {
      *
      * @param dataObj object to be persisted.
      */
-    public void persist(FasterLookUpDataHolder dataObj) throws RegistryException {
+    public synchronized void persist(FasterLookUpDataHolder dataObj) throws RegistryException {
         try {
         	
         	PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
@@ -104,7 +104,7 @@ public class RegistryManager {
         }
     }
 
-    public void persistTopology(Topology topology) throws RegistryException {
+    public synchronized void persistTopology(Topology topology) throws RegistryException {
         try {
         	
         	PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
@@ -131,7 +131,7 @@ public class RegistryManager {
     }
 
 
-    public Object retrieve() {
+    public synchronized Object retrieve() {
 
         try {
         	PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
@@ -153,7 +153,7 @@ public class RegistryManager {
 
     }
 
-    public Object retrieveTopology() {
+    public synchronized Object retrieveTopology() {
 
         try {
 			PrivilegedCarbonContext ctx = PrivilegedCarbonContext


[2/3] git commit: improving deployment policy validation, using Java concurrency

Posted by ni...@apache.org.
improving deployment policy validation, using Java concurrency


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3a54eff3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3a54eff3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3a54eff3

Branch: refs/heads/master
Commit: 3a54eff331a3808d7de0a3ffdddde37ec17fa219
Parents: ab73ebd
Author: Nirmal Fernando <ni...@apache.org>
Authored: Mon Mar 31 20:28:31 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Mon Mar 31 20:28:31 2014 +0530

----------------------------------------------------------------------
 .../concurrent/PartitionValidatorCallable.java  | 88 ++++++++++++++++++++
 .../impl/CloudControllerServiceImpl.java        | 67 ++++++---------
 .../runtime/FasterLookUpDataHolder.java         | 17 +++-
 3 files changed, 128 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3a54eff3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
new file mode 100644
index 0000000..2ae5274
--- /dev/null
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/concurrent/PartitionValidatorCallable.java
@@ -0,0 +1,88 @@
+/*
+ * 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.apache.stratos.cloud.controller.concurrent;
+
+import java.util.concurrent.Callable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.deployment.partition.Partition;
+import org.apache.stratos.cloud.controller.exception.InvalidIaasProviderException;
+import org.apache.stratos.cloud.controller.exception.InvalidPartitionException;
+import org.apache.stratos.cloud.controller.interfaces.Iaas;
+import org.apache.stratos.cloud.controller.pojo.Cartridge;
+import org.apache.stratos.cloud.controller.pojo.IaasProvider;
+import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
+import org.apache.stratos.cloud.controller.validate.interfaces.PartitionValidator;
+
+public class PartitionValidatorCallable implements Callable<IaasProvider> {
+	
+	private static final Log log = LogFactory.getLog(PartitionValidatorCallable.class);
+	private Partition partition;
+	private Cartridge cartridge;
+	
+	public PartitionValidatorCallable(Partition partition, Cartridge cartridge) {
+		this.partition = partition;
+		this.cartridge = cartridge;
+	}
+
+	@Override
+	public IaasProvider call() throws Exception {
+		String provider = partition.getProvider();
+        IaasProvider iaasProvider = cartridge.getIaasProvider(provider);
+
+        if (iaasProvider == null) {
+            String msg =
+                         "Invalid Partition - " + partition.toString() +
+                                 ". Cause: Iaas Provider is null for Provider: " + provider;
+            log.error(msg);
+            throw new InvalidPartitionException(msg);
+        }
+
+        Iaas iaas = iaasProvider.getIaas();
+        
+        if (iaas == null) {
+            
+            try {
+                iaas = CloudControllerUtil.getIaas(iaasProvider);
+            } catch (InvalidIaasProviderException e) {
+                String msg =
+                        "Invalid Partition - " + partition.toString() +
+                        ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider+". "+e.getMessage();
+                log.error(msg, e);
+                throw new InvalidPartitionException(msg, e);
+            }
+            
+        }
+        
+        PartitionValidator validator = iaas.getPartitionValidator();
+        validator.setIaasProvider(iaasProvider);
+        IaasProvider updatedIaasProvider =
+                                           validator.validate(partition.getId(),
+                                                              CloudControllerUtil.toJavaUtilProperties(partition.getProperties()));
+        
+        if (log.isDebugEnabled()) {
+        	log.debug("Partition "+partition.toString()+ " is validated successfully "
+        			+ "against the Cartridge: "+cartridge.getType());
+        }
+        
+        return updatedIaasProvider;
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3a54eff3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index adff085..05d98cb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -20,6 +20,7 @@ package org.apache.stratos.cloud.controller.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.concurrent.PartitionValidatorCallable;
 import org.apache.stratos.cloud.controller.concurrent.ThreadExecutor;
 import org.apache.stratos.cloud.controller.deployment.partition.Partition;
 import org.apache.stratos.cloud.controller.exception.*;
@@ -46,7 +47,9 @@ import org.wso2.carbon.registry.core.exceptions.RegistryException;
 
 import java.util.*;
 import java.util.Properties;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
 
 import com.google.common.net.InetAddresses;
 
@@ -1032,7 +1035,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
         
 	}
 
-		
 
     @Override
     public boolean validateDeploymentPolicy(String cartridgeType, Partition[] partitions) 
@@ -1048,48 +1050,27 @@ public class CloudControllerServiceImpl implements CloudControllerService {
             log.error(msg);
             throw new InvalidCartridgeTypeException(msg);
         }
-
-        for (Partition partition : partitions) {
-            String provider = partition.getProvider();
-            IaasProvider iaasProvider = cartridge.getIaasProvider(provider);
-
-            if (iaasProvider == null) {
-                String msg =
-                             "Invalid Partition - " + partition.toString() +
-                                     ". Cause: Iaas Provider is null for Provider: " + provider;
-                log.error(msg);
-                throw new InvalidPartitionException(msg);
-            }
-
-            Iaas iaas = iaasProvider.getIaas();
-            
-            if (iaas == null) {
-                
-                try {
-                    iaas = CloudControllerUtil.getIaas(iaasProvider);
-                } catch (InvalidIaasProviderException e) {
-                    String msg =
-                            "Invalid Partition - " + partition.toString() +
-                            ". Cause: Unable to build Iaas of this IaasProvider [Provider] : " + provider+". "+e.getMessage();
-                    log.error(msg, e);
-                    throw new InvalidPartitionException(msg, e);
-                }
-                
-            }
-            
-            PartitionValidator validator = iaas.getPartitionValidator();
-            validator.setIaasProvider(iaasProvider);
-            IaasProvider updatedIaasProvider =
-                                               validator.validate(partition.getId(),
-                                                                  CloudControllerUtil.toJavaUtilProperties(partition.getProperties()));
-            // add to a temporary Map
-            partitionToIaasProviders.put(partition.getId(), updatedIaasProvider);
-            
-            if (log.isDebugEnabled()) {
-            	log.debug("Partition "+partition.toString()+ " is validated successfully "
-            			+ "against the Cartridge: "+cartridgeType);
-            }
-
+        
+        Map<String, Future<IaasProvider>> jobList = new HashMap<String, Future<IaasProvider>>();
+
+		for (Partition partition : partitions) {
+			Callable<IaasProvider> worker = new PartitionValidatorCallable(
+					partition, cartridge);
+			Future<IaasProvider> job = FasterLookUpDataHolder.getInstance()
+					.getExecutor().submit(worker);
+			jobList.put(partition.getId(), job);
+		}
+        
+        // Retrieve the results of the concurrently performed sanity checks.
+        for (String partitionId : jobList.keySet()) {
+        	Future<IaasProvider> job = jobList.get(partitionId);
+            try {
+            	// add to a temporary Map
+            	partitionToIaasProviders.put(partitionId, job.get());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                throw new InvalidPartitionException(e.getMessage(), e);
+            } 
         }
 
         // if and only if the deployment policy valid

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3a54eff3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
index 0c1cb91..970e2c0 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/runtime/FasterLookUpDataHolder.java
@@ -32,6 +32,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * This object holds all runtime data and provides faster access. This is a Singleton class.
@@ -66,6 +68,11 @@ public class FasterLookUpDataHolder implements Serializable{
 	private Map<String, ClusterContext> clusterIdToContext = new ConcurrentHashMap<String, ClusterContext>();
 	
 	/**
+     * Thread pool used in this task to execute parallel tasks.
+     */
+    private transient ExecutorService executor = Executors.newFixedThreadPool(20);
+	
+	/**
 	 * List of registered {@link Cartridge}s
 	 */
 	private List<Cartridge> cartridges;
@@ -119,7 +126,7 @@ public class FasterLookUpDataHolder implements Serializable{
 	private FasterLookUpDataHolder() {
 
 		cartridges = new ArrayList<Cartridge>();
-
+		
 	}
 
 	public List<Cartridge> getCartridges() {
@@ -359,4 +366,12 @@ public class FasterLookUpDataHolder implements Serializable{
         this.clusterIdToContext = clusterIdToContext;
     }
 
+	public ExecutorService getExecutor() {
+		return executor;
+	}
+
+	public void setExecutor(ExecutorService executor) {
+		this.executor = executor;
+	}
+
 }
\ No newline at end of file


[3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos

Posted by ni...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d2499fbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d2499fbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d2499fbd

Branch: refs/heads/master
Commit: d2499fbd4f4850472ec087131319bc1b304b77d5
Parents: 3a54eff 720cee2
Author: Nirmal Fernando <ni...@apache.org>
Authored: Mon Mar 31 20:29:07 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Mon Mar 31 20:29:07 2014 +0530

----------------------------------------------------------------------
 .gitignore                                      |   3 +
 .../stratos/autoscaler/AutoscalerContext.java   |  20 +
 .../apache/stratos/autoscaler/Constants.java    |  21 +
 .../exception/InvalidPartitionException.java    |  21 +
 .../exception/PartitionValidationException.java |  21 +
 .../exception/PolicyValidationException.java    |  21 +
 .../autoscaler/exception/SpawningException.java |  21 +
 .../exception/TerminationException.java         |  21 +
 .../interfaces/AutoScalerServiceInterface.java  |  21 +
 .../autoscaler/registry/RegistryManager.java    |  21 +
 .../apache/stratos/autoscaler/rule/RuleLog.java |  21 +
 .../autoscaler/rule/RuleTasksDelegator.java     |  21 +
 .../stratos/autoscaler/util/Serializer.java     |  21 +
 .../autoscaler/util/ServiceReferenceHolder.java |  21 +
 .../stratos/autoscaler/TestBasicRules.java      |  60 --
 .../stratos/cartridge/agent/CartridgeAgent.java |  21 +
 .../config/CartridgeAgentConfiguration.java     |  21 +
 .../publisher/CartridgeAgentEventPublisher.java |  21 +
 .../stratos/cli/beans/topology/Cluster.java     |  21 +
 .../stratos/cli/beans/topology/Member.java      |  21 +
 .../cli/beans/topology/MemberStatus.java        |  21 +
 .../apache/stratos/cli/beans/topology/Port.java |  21 +
 .../console/data/cartridge_deployments.json     |  10 -
 .../console/data/cartridges.json                |  35 -
 .../console/data/clusters.json                  | 122 ---
 .../console/data/config_status.json             |   4 -
 .../console/data/dashboard.json                 | 197 ----
 .../console/data/elbs.json                      |  20 -
 .../console/data/lbs.json                       |  10 -
 .../console/data/mt_service_deployments.json    |  10 -
 .../console/data/mycartridges.json              |  35 -
 .../console/data/node_mem_cpu.json              | 114 ---
 .../console/data/partition_deployments.json     |  22 -
 .../console/data/policy_deployments.json        |  10 -
 .../console/data/tenants.json                   |  19 -
 .../console/subscribe_cartridge.jag             |   4 +
 .../console/themes/theme1/pages/index.hbs       |   2 -
 .../console/themes/theme1/pages/plain.hbs       |   1 -
 .../theme1/partials/subscribe_cartridge.hbs     |   7 +-
 .../theme1/renderers/subscribe_cartridge.js     |   1 +
 .../themes/theme1/ui/custom-fonts/Read Me.txt   |   5 -
 .../theme1/ui/custom-fonts/fonts/stratos.eot    | Bin 6660 -> 0 bytes
 .../theme1/ui/custom-fonts/fonts/stratos.svg    |  21 -
 .../theme1/ui/custom-fonts/fonts/stratos.ttf    | Bin 6496 -> 0 bytes
 .../theme1/ui/custom-fonts/fonts/stratos.woff   | Bin 6572 -> 0 bytes
 .../theme1/ui/custom-fonts/selection.json       | 268 ------
 .../themes/theme1/ui/custom-fonts/style.css     |  61 --
 .../console/themes/theme1/ui/js/main.js         |   1 -
 .../vendor/modernizr-2.6.2-respond-1.1.0.min.js |  11 -
 .../themes/theme1/ui/js/vendor/raphael-min.js   |  11 -
 .../console/util/utility.jag                    |   4 +
 .../messaging/message/filter/MessageFilter.java |  20 +
 .../filter/topology/TopologyMemberFilter.java   |  20 +
 .../stat/HealthStatMessageProcessorChain.java   |  20 +
 .../stat/HealthStatEventMessageQueue.java       |  23 +-
 .../stratos/rest/endpoint/bean/Error.java       |  20 +
 .../openstack-nova/1.7.1-stratos/README.txt     |   3 +
 .../apis/openstack-nova/1.7.1-stratos/pom.xml   | 143 +++
 .../jclouds/openstack/nova/v2_0/NovaApi.java    | 208 +++++
 .../openstack/nova/v2_0/NovaApiMetadata.java    | 125 +++
 .../openstack/nova/v2_0/NovaAsyncApi.java       | 214 +++++
 .../v2_0/binders/BindKeyPairToJsonPayload.java  |  47 +
 .../v2_0/binders/BindMetadataToJsonPayload.java |  47 +
 .../BindSecurityGroupRuleToJsonPayload.java     |  71 ++
 .../nova/v2_0/compute/NovaComputeService.java   | 183 ++++
 .../v2_0/compute/NovaComputeServiceAdapter.java | 288 ++++++
 .../config/NovaComputeServiceContextModule.java | 286 ++++++
 .../compute/extensions/NovaImageExtension.java  | 140 +++
 .../extensions/NovaSecurityGroupExtension.java  | 373 ++++++++
 .../AllocateAndAddFloatingIpToNode.java         | 112 +++
 .../functions/CreateSecurityGroupIfNeeded.java  |  93 ++
 .../functions/FlavorInZoneToHardware.java       |  60 ++
 .../compute/functions/ImageInZoneToImage.java   |  70 ++
 .../functions/ImageToOperatingSystem.java       | 128 +++
 .../NovaSecurityGroupInZoneToSecurityGroup.java |  75 ++
 .../NovaSecurityGroupToSecurityGroup.java       |  69 ++
 .../functions/OrphanedGroupsByZoneId.java       |  77 ++
 .../RemoveFloatingIpFromNodeAndDeallocate.java  |  74 ++
 .../SecurityGroupRuleToIpPermission.java        |  99 ++
 .../functions/ServerInZoneToNodeMetadata.java   | 199 ++++
 .../compute/loaders/CreateUniqueKeyPair.java    |  79 ++
 .../loaders/FindSecurityGroupOrCreate.java      |  86 ++
 .../loaders/LoadFloatingIpsForInstance.java     |  63 ++
 .../compute/options/NovaTemplateOptions.java    | 649 +++++++++++++
 .../predicates/AllNodesInGroupTerminated.java   |  56 ++
 ...desWithGroupEncodedIntoNameThenAddToSet.java | 165 ++++
 .../nova/v2_0/config/NovaParserModule.java      | 159 ++++
 .../nova/v2_0/config/NovaProperties.java        |  43 +
 .../nova/v2_0/config/NovaRestClientModule.java  | 191 ++++
 .../openstack/nova/v2_0/domain/Address.java     | 138 +++
 .../openstack/nova/v2_0/domain/BackupType.java  |  41 +
 .../openstack/nova/v2_0/domain/Flavor.java      | 211 +++++
 .../openstack/nova/v2_0/domain/FloatingIP.java  | 173 ++++
 .../openstack/nova/v2_0/domain/Host.java        | 127 +++
 .../nova/v2_0/domain/HostAggregate.java         | 250 +++++
 .../nova/v2_0/domain/HostResourceUsage.java     | 180 ++++
 .../openstack/nova/v2_0/domain/Image.java       | 303 +++++++
 .../openstack/nova/v2_0/domain/Ingress.java     | 160 ++++
 .../openstack/nova/v2_0/domain/KeyPair.java     | 189 ++++
 .../openstack/nova/v2_0/domain/Network.java     | 173 ++++
 .../openstack/nova/v2_0/domain/Quota.java       | 356 ++++++++
 .../openstack/nova/v2_0/domain/QuotaClass.java  |  62 ++
 .../openstack/nova/v2_0/domain/RebootType.java  |  35 +
 .../nova/v2_0/domain/SecurityGroup.java         | 188 ++++
 .../nova/v2_0/domain/SecurityGroupRule.java     | 174 ++++
 .../openstack/nova/v2_0/domain/Server.java      | 476 ++++++++++
 .../nova/v2_0/domain/ServerCreated.java         | 127 +++
 .../v2_0/domain/ServerExtendedAttributes.java   | 156 ++++
 .../nova/v2_0/domain/ServerExtendedStatus.java  | 155 ++++
 .../v2_0/domain/ServerWithSecurityGroups.java   | 128 +++
 .../nova/v2_0/domain/SimpleServerUsage.java     | 312 +++++++
 .../nova/v2_0/domain/SimpleTenantUsage.java     | 245 +++++
 .../nova/v2_0/domain/TenantIdAndName.java       | 127 +++
 .../nova/v2_0/domain/VirtualInterface.java      | 128 +++
 .../openstack/nova/v2_0/domain/Volume.java      | 346 +++++++
 .../nova/v2_0/domain/VolumeAttachment.java      | 172 ++++
 .../nova/v2_0/domain/VolumeSnapshot.java        | 239 +++++
 .../openstack/nova/v2_0/domain/VolumeType.java  | 192 ++++
 .../domain/zonescoped/AvailabilityZone.java     |  73 ++
 .../v2_0/domain/zonescoped/FlavorInZone.java    |  46 +
 .../v2_0/domain/zonescoped/ImageInZone.java     |  46 +
 .../domain/zonescoped/SecurityGroupInZone.java  |  46 +
 .../v2_0/domain/zonescoped/ServerInZone.java    |  46 +
 .../nova/v2_0/domain/zonescoped/ZoneAndId.java  |  86 ++
 .../v2_0/domain/zonescoped/ZoneAndName.java     | 111 +++
 .../ZoneSecurityGroupNameAndPorts.java          |  62 ++
 .../nova/v2_0/domain/zonescoped/ZoneState.java  |  61 ++
 .../v2_0/extensions/AvailabilityZoneAPI.java    |  40 +
 .../extensions/AvailabilityZoneAsyncApi.java    |  58 ++
 .../v2_0/extensions/ExtensionNamespaces.java    | 110 +++
 .../v2_0/extensions/FlavorExtraSpecsApi.java    |  77 ++
 .../extensions/FlavorExtraSpecsAsyncApi.java    | 118 +++
 .../nova/v2_0/extensions/FloatingIPApi.java     |  98 ++
 .../v2_0/extensions/FloatingIPAsyncApi.java     | 145 +++
 .../v2_0/extensions/HostAdministrationApi.java  | 103 +++
 .../extensions/HostAdministrationAsyncApi.java  | 157 ++++
 .../nova/v2_0/extensions/HostAggregateApi.java  |  87 ++
 .../v2_0/extensions/HostAggregateAsyncApi.java  | 161 ++++
 .../nova/v2_0/extensions/KeyPairApi.java        |  65 ++
 .../nova/v2_0/extensions/KeyPairAsyncApi.java   | 101 +++
 .../nova/v2_0/extensions/QuotaApi.java          |  57 ++
 .../nova/v2_0/extensions/QuotaAsyncApi.java     |  89 ++
 .../nova/v2_0/extensions/QuotaClassApi.java     |  51 ++
 .../v2_0/extensions/QuotaClassAsyncApi.java     |  78 ++
 .../nova/v2_0/extensions/SecurityGroupApi.java  |  89 ++
 .../v2_0/extensions/SecurityGroupAsyncApi.java  | 152 ++++
 .../nova/v2_0/extensions/ServerAdminApi.java    | 120 +++
 .../v2_0/extensions/ServerAdminAsyncApi.java    | 175 ++++
 .../extensions/ServerWithSecurityGroupsApi.java |  49 +
 .../ServerWithSecurityGroupsAsyncApi.java       |  62 ++
 .../v2_0/extensions/SimpleTenantUsageApi.java   |  50 +
 .../extensions/SimpleTenantUsageAsyncApi.java   |  77 ++
 .../v2_0/extensions/VirtualInterfaceApi.java    |  43 +
 .../extensions/VirtualInterfaceAsyncApi.java    |  59 ++
 .../nova/v2_0/extensions/VolumeApi.java         | 147 +++
 .../nova/v2_0/extensions/VolumeAsyncApi.java    | 254 ++++++
 .../v2_0/extensions/VolumeAttachmentApi.java    |  87 ++
 .../extensions/VolumeAttachmentAsyncApi.java    | 107 +++
 .../nova/v2_0/extensions/VolumeTypeApi.java     | 101 +++
 .../v2_0/extensions/VolumeTypeAsyncApi.java     | 161 ++++
 .../openstack/nova/v2_0/features/FlavorApi.java |  78 ++
 .../nova/v2_0/features/FlavorAsyncApi.java      | 144 +++
 .../openstack/nova/v2_0/features/ImageApi.java  | 142 +++
 .../nova/v2_0/features/ImageAsyncApi.java       | 206 +++++
 .../openstack/nova/v2_0/features/ServerApi.java | 276 ++++++
 .../nova/v2_0/features/ServerAsyncApi.java      | 356 ++++++++
 .../functions/FieldValueResponseParsers.java    | 105 +++
 .../nova/v2_0/functions/OverLimitParser.java    |  92 ++
 .../ParseImageIdFromLocationHeader.java         |  39 +
 .../internal/OnlyMetadataValueOrNull.java       |  63 ++
 .../functions/internal/ParseDiagnostics.java    |  47 +
 .../functions/internal/ParseFlavorDetails.java  |  94 ++
 .../v2_0/functions/internal/ParseFlavors.java   |  96 ++
 .../functions/internal/ParseImageDetails.java   |  95 ++
 .../v2_0/functions/internal/ParseImages.java    |  96 ++
 .../v2_0/functions/internal/ParseKeyPairs.java  |  64 ++
 .../functions/internal/ParseServerDetails.java  |  94 ++
 .../v2_0/functions/internal/ParseServers.java   |  96 ++
 .../nova/v2_0/handlers/NovaErrorHandler.java    | 129 +++
 .../options/CreateBackupOfServerOptions.java    | 105 +++
 .../nova/v2_0/options/CreateServerOptions.java  | 557 ++++++++++++
 .../nova/v2_0/options/CreateVolumeOptions.java  | 220 +++++
 .../options/CreateVolumeSnapshotOptions.java    | 138 +++
 .../v2_0/options/CreateVolumeTypeOptions.java   | 101 +++
 .../nova/v2_0/options/ListOptions.java          | 107 +++
 .../nova/v2_0/options/RebuildServerOptions.java | 142 +++
 .../FindSecurityGroupWithNameAndReturnTrue.java |  84 ++
 .../nova/v2_0/predicates/ImagePredicates.java   |  55 ++
 .../nova/v2_0/predicates/KeyPairPredicates.java |  77 ++
 .../predicates/SecurityGroupPredicates.java     | 213 +++++
 .../services/org.jclouds.apis.ApiMetadata       |   1 +
 ...tKeyAndTenantIdAuthenticationExpectTest.java |  75 ++
 ...antNamePropertyAuthenticationExpectTest.java |  75 ++
 ...KeyAndSecretKeyAuthenticationExpectTest.java |  69 ++
 .../nova/v2_0/EndpointIdIsRandomExpectTest.java |  72 ++
 .../nova/v2_0/NovaApiMetadataTest.java          |  32 +
 .../v2_0/PasswordAuthenticationExpectTest.java  |  60 ++
 ...dAuthenticationWithTenantNameExpectTest.java |  69 ++
 .../NovaComputeServiceAdapterExpectTest.java    | 321 +++++++
 .../compute/NovaComputeServiceExpectTest.java   | 382 ++++++++
 .../compute/NovaComputeServiceLiveTest.java     |  96 ++
 .../NovaImageExtensionExpectTest.java           |  92 ++
 .../extensions/NovaImageExtensionLiveTest.java  |  43 +
 .../NovaSecurityGroupExtensionExpectTest.java   | 433 +++++++++
 .../NovaSecurityGroupExtensionLiveTest.java     |  35 +
 ...llocateAndAddFloatingIpToNodeExpectTest.java | 133 +++
 .../functions/FlavorInZoneToHardwareTest.java   |  90 ++
 .../functions/ImageInZoneToImageTest.java       |  95 ++
 .../functions/ImageToOperatingSystemTest.java   | 192 ++++
 ...aSecurityGroupInZoneToSecurityGroupTest.java |  94 ++
 .../NovaSecurityGroupToSecurityGroupTest.java   | 155 ++++
 .../functions/OrphanedGroupsByZoneIdTest.java   |  96 ++
 .../SecurityGroupRuleToIpPermissionTest.java    |  81 ++
 .../ServerInZoneToNodeMetadataTest.java         | 311 +++++++
 .../loaders/CreateUniqueKeyPairTest.java        | 111 +++
 .../loaders/FindSecurityGroupOrCreateTest.java  | 144 +++
 .../loaders/LoadFloatingIpsForInstanceTest.java | 108 +++
 .../options/NovaTemplateOptionsTest.java        | 263 ++++++
 .../extensions/AdminActionsApiExpectTest.java   | 350 +++++++
 .../extensions/AdminActionsApiLiveTest.java     | 195 ++++
 .../AvailabilityZoneApiExpectTest.java          |  64 ++
 .../AvailabilityZonesApiLiveTest.java           |  45 +
 .../FlavorExtraSpecsApiExpectTest.java          | 142 +++
 .../extensions/FlavorExtraSpecsApiLiveTest.java | 123 +++
 .../extensions/FloatingIPApiExpectTest.java     | 191 ++++
 .../v2_0/extensions/FloatingIPApiLiveTest.java  | 171 ++++
 .../HostAdministrationApiExpectTest.java        | 241 +++++
 .../HostAdministrationApiLiveTest.java          | 116 +++
 .../extensions/HostAggregateApiExpectTest.java  | 179 ++++
 .../extensions/HostAggregateApiLiveTest.java    | 148 +++
 .../v2_0/extensions/KeyPairApiExpectTest.java   | 142 +++
 .../v2_0/extensions/KeyPairApiLiveTest.java     |  76 ++
 .../v2_0/extensions/QuotaApiExpectTest.java     | 125 +++
 .../nova/v2_0/extensions/QuotaApiLiveTest.java  | 100 ++
 .../extensions/QuotaClassApiExpectTest.java     | 105 +++
 .../v2_0/extensions/QuotaClassApiLiveTest.java  |  73 ++
 .../extensions/SecurityGroupApiExpectTest.java  | 235 +++++
 .../extensions/SecurityGroupApiLiveTest.java    | 100 ++
 .../ServerWithSecurityGroupsApiExpectTest.java  |  63 ++
 .../ServerWithSecurityGroupsApiLiveTest.java    |  80 ++
 .../SimpleTenantUsageApiExpectTest.java         |  99 ++
 .../SimpleTenantUsageApiLiveTest.java           |  51 ++
 .../VirtualInterfaceApiExpectTest.java          |  64 ++
 .../extensions/VirtualInterfaceApiLiveTest.java |  68 ++
 .../v2_0/extensions/VolumeApiExpectTest.java    | 460 ++++++++++
 .../nova/v2_0/extensions/VolumeApiLiveTest.java | 274 ++++++
 .../VolumeAttachmentApiExpectTest.java          | 168 ++++
 .../extensions/VolumeAttachmentApiLiveTest.java | 156 ++++
 .../extensions/VolumeTypeApiExpectTest.java     | 259 ++++++
 .../v2_0/extensions/VolumeTypeApiLiveTest.java  | 126 +++
 .../v2_0/features/ExtensionApiExpectTest.java   | 115 +++
 .../v2_0/features/ExtensionApiLiveTest.java     |  84 ++
 .../nova/v2_0/features/FlavorApiExpectTest.java | 164 ++++
 .../nova/v2_0/features/FlavorApiLiveTest.java   | 105 +++
 .../nova/v2_0/features/ImageApiExpectTest.java  | 377 ++++++++
 .../nova/v2_0/features/ImageApiLiveTest.java    | 101 +++
 .../nova/v2_0/features/ServerApiExpectTest.java | 746 +++++++++++++++
 .../nova/v2_0/features/ServerApiLiveTest.java   | 206 +++++
 .../CreateSecurityGroupIfNeededTest.java        | 168 ++++
 ...ityGroupWithNameAndReturnTrueExpectTest.java | 102 +++
 .../v2_0/functions/InternalURLLiveTest.java     |  64 ++
 .../v2_0/handlers/NovaErrorHandlerTest.java     | 225 +++++
 .../v2_0/internal/BaseNovaApiExpectTest.java    |  28 +
 .../nova/v2_0/internal/BaseNovaApiLiveTest.java | 120 +++
 ...BaseNovaComputeServiceContextExpectTest.java |  87 ++
 .../BaseNovaComputeServiceExpectTest.java       |  35 +
 .../nova/v2_0/internal/BaseNovaExpectTest.java  |  84 ++
 ...eComputeServiceTypicalSecurityGroupTest.java |  76 ++
 .../nova/v2_0/parse/ParseCreateFlavorTest.java  |  58 ++
 .../nova/v2_0/parse/ParseCreatedServerTest.java |  80 ++
 .../parse/ParseExtensionListNormalTest.java     |  76 ++
 .../nova/v2_0/parse/ParseExtensionListTest.java |  88 ++
 .../nova/v2_0/parse/ParseExtensionTest.java     |  71 ++
 .../nova/v2_0/parse/ParseFlavorListTest.java    |  85 ++
 .../nova/v2_0/parse/ParseFlavorTest.java        |  70 ++
 .../v2_0/parse/ParseFloatingIPListTest.java     |  59 ++
 .../nova/v2_0/parse/ParseFloatingIPTest.java    |  53 ++
 .../nova/v2_0/parse/ParseImageListTest.java     |  85 ++
 .../nova/v2_0/parse/ParseImageTest.java         |  98 ++
 .../nova/v2_0/parse/ParseKeyPairListTest.java   |  68 ++
 .../nova/v2_0/parse/ParseKeyPairTest.java       |  61 ++
 .../nova/v2_0/parse/ParseMetadataItemTest.java  |  58 ++
 .../nova/v2_0/parse/ParseMetadataListTest.java  |  63 ++
 .../v2_0/parse/ParseMetadataUpdateTest.java     |  64 ++
 .../v2_0/parse/ParseSecurityGroupListTest.java  |  72 ++
 .../nova/v2_0/parse/ParseSecurityGroupTest.java |  69 ++
 .../v2_0/parse/ParseServerDetailsEssexTest.java | 170 ++++
 .../nova/v2_0/parse/ParseServerDiagnostics.java |  57 ++
 .../nova/v2_0/parse/ParseServerListTest.java    |  85 ++
 .../nova/v2_0/parse/ParseServerTest.java        | 117 +++
 .../parse/ParseServerWithAllExtensionsTest.java | 104 +++
 .../ParseServerWithInternetAddressesTest.java   |  99 ++
 ...ublicIpsInPrivateAddressBlockExpectTest.java |  99 ++
 .../v2_0/predicates/ImagePredicatesTest.java    |  44 +
 .../predicates/SecurityGroupPredicatesTest.java | 129 +++
 .../src/test/resources/attachment_details.json  |   1 +
 .../src/test/resources/attachment_list.json     |   1 +
 .../src/test/resources/extension_details.json   |  21 +
 .../src/test/resources/extension_list.json      |  42 +
 .../src/test/resources/extension_list_full.json | 281 ++++++
 .../test/resources/extension_list_normal.json   |  31 +
 .../resources/extension_list_openstack.json     | 115 +++
 .../src/test/resources/flavor_details.json      |  19 +
 .../src/test/resources/flavor_list.json         |  32 +
 .../src/test/resources/flavor_list_detail.json  |   1 +
 .../resources/flavor_list_detail_openstack.json |  83 ++
 .../src/test/resources/flavor_new.json          |  10 +
 .../src/test/resources/floatingip_details.json  |   9 +
 .../src/test/resources/floatingip_list.json     |  16 +
 .../1.7.1-stratos/src/test/resources/host.json  |   1 +
 .../test/resources/host_aggregate_details.json  |   1 +
 .../src/test/resources/host_aggregate_list.json |   1 +
 .../host_aggregate_with_host_details.json       |   1 +
 .../src/test/resources/hosts_list.json          |   1 +
 .../src/test/resources/image_active.json        |  41 +
 .../src/test/resources/image_details.json       |  41 +
 .../src/test/resources/image_list.json          |  32 +
 .../src/test/resources/image_list_detail.json   |   1 +
 .../image_list_detail_imageextension.json       | 121 +++
 .../resources/image_list_detail_openstack.json  |  81 ++
 .../src/test/resources/keypair_created.json     |   9 +
 .../keypair_created_computeservice.json         |   9 +
 .../src/test/resources/keypair_list.json        |  18 +
 .../test/resources/listAvailabilityZones.json   |  11 +
 .../src/test/resources/metadata_item.json       |   5 +
 .../src/test/resources/metadata_list.json       |   6 +
 .../src/test/resources/metadata_updated.json    |   7 +
 .../src/test/resources/new_server.json          |  41 +
 .../resources/new_server_disk_config_auto.json  |  42 +
 .../new_server_disk_config_manual.json          |  42 +
 .../src/test/resources/new_server_in_zone.json  |  41 +
 .../resources/new_server_networks_response.json |  42 +
 .../test/resources/new_server_no_adminpass.json |  40 +
 .../resources/new_server_nova_networks.json     |  41 +
 .../src/test/resources/quota_class.json         |  15 +
 .../src/test/resources/quotas.json              |  15 +
 .../test/resources/securitygroup_created.json   |   9 +
 .../test/resources/securitygroup_details.json   |  34 +
 ...itygroup_details_computeservice_typical.json |  51 ++
 .../securitygroup_details_extension.json        |  34 +
 ...securitygroup_details_extension_norules.json |  10 +
 .../resources/securitygroup_details_port22.json |  19 +
 .../src/test/resources/securitygroup_list.json  |  51 ++
 ...oup_list_details_computeservice_typical.json |  53 ++
 .../resources/securitygroup_list_extension.json |  51 ++
 .../resources/securitygrouprule_created.json    |  12 +
 .../securitygrouprule_created_cidr.json         |  13 +
 .../securitygrouprule_created_group.json        |  14 +
 .../src/test/resources/server_details.json      |  86 ++
 .../test/resources/server_details_devstack.json |  44 +
 .../resources/server_details_openstack.json     |  46 +
 .../src/test/resources/server_diagnostics.json  |  17 +
 .../src/test/resources/server_list.json         |  32 +
 .../src/test/resources/server_list_details.json |  79 ++
 .../resources/server_list_details_essex.json    | 152 ++++
 .../resources/server_public_ip_in_private.json  |  51 ++
 .../resources/server_with_security_groups.json  |   1 +
 .../server_with_security_groups_extension.json  |   1 +
 .../src/test/resources/simple_tenant_usage.json |   1 +
 .../test/resources/simple_tenant_usages.json    |   1 +
 .../src/test/resources/snapshot_details.json    |   1 +
 .../src/test/resources/snapshot_list.json       |   1 +
 .../test/resources/snapshot_list_detail.json    |   1 +
 .../test/resources/virtual_interfaces_list.json |   1 +
 .../src/test/resources/volume_details.json      |   1 +
 .../src/test/resources/volume_list.json         |   1 +
 .../src/test/resources/volume_list_detail.json  |   1 +
 .../src/test/resources/volume_type.json         |   9 +
 .../test/resources/volume_type_extra_specs.json |   1 +
 .../src/test/resources/volume_type_list.json    |   1 +
 .../apis/vcloud/1.7.1-stratos/README.txt        |   6 +
 .../jclouds/apis/vcloud/1.7.1-stratos/pom.xml   | 129 +++
 .../vcloud/TaskInErrorStateException.java       |  39 +
 .../vcloud/TaskStillRunningException.java       |  39 +
 .../main/java/org/jclouds/vcloud/VCloudApi.java |  91 ++
 .../org/jclouds/vcloud/VCloudApiMetadata.java   | 103 +++
 .../org/jclouds/vcloud/VCloudMediaType.java     | 221 +++++
 .../jclouds/vcloud/VCloudResponseException.java |  69 ++
 .../java/org/jclouds/vcloud/VCloudToken.java    |  37 +
 .../org/jclouds/vcloud/VCloudVersionsApi.java   |  38 +
 .../binders/BindCPUCountToXmlPayload.java       |  79 ++
 .../BindCaptureVAppParamsToXmlPayload.java      | 124 +++
 .../binders/BindCatalogItemToXmlPayload.java    | 126 +++
 .../binders/BindCloneParamsToXmlPayload.java    | 133 +++
 .../BindCloneVAppParamsToXmlPayload.java        |  65 ++
 ...BindCloneVAppTemplateParamsToXmlPayload.java |  60 ++
 .../BindDeployVAppParamsToXmlPayload.java       |  42 +
 ...ndGuestCustomizationSectionToXmlPayload.java | 112 +++
 ...stantiateVAppTemplateParamsToXmlPayload.java | 221 +++++
 .../vcloud/binders/BindMemoryToXmlPayload.java  |  80 ++
 ...indNetworkConnectionSectionToXmlPayload.java | 106 +++
 .../vcloud/binders/BindParamsToXmlPayload.java  |  81 ++
 .../BindUndeployVAppParamsToXmlPayload.java     |  42 +
 .../OrgNameAndCatalogNameToEndpoint.java        |  79 ++
 .../binders/OrgNameAndVDCNameToEndpoint.java    |  78 ++
 .../OrgNameCatalogNameItemNameToEndpoint.java   |  77 ++
 ...meCatalogNameVAppTemplateNameToEndpoint.java |  90 ++
 .../OrgNameVDCNameNetworkNameToEndpoint.java    |  54 ++
 ...NameVDCNameResourceEntityNameToEndpoint.java |  54 ++
 .../OrgNameVDCNameResourceNameToEndpoint.java   |  81 ++
 .../VCloudComputeServiceContextModule.java      |  39 +
 .../VCloudComputeServiceDependenciesModule.java | 154 ++++
 .../functions/FindLocationForResource.java      |  69 ++
 .../compute/functions/HardwareForVApp.java      |  71 ++
 .../functions/HardwareForVAppTemplate.java      |  84 ++
 .../compute/functions/ImageForVAppTemplate.java |  82 ++
 .../compute/functions/VAppToNodeMetadata.java   | 112 +++
 ...dHardwareBuilderFromResourceAllocations.java |  43 +
 ...EnvelopeOrThrowIllegalArgumentException.java |  77 ++
 .../internal/VCloudTemplateBuilderImpl.java     |  48 +
 .../compute/options/VCloudTemplateOptions.java  | 350 +++++++
 ...edIntoNameThenCustomizeDeployAndPowerOn.java | 302 +++++++
 ...etworkConfigurationForNetworkAndOptions.java |  80 ++
 .../strategy/VCloudComputeServiceAdapter.java   | 263 ++++++
 .../vcloud/compute/util/VCloudComputeUtils.java | 116 +++
 .../vcloud/config/DefaultCatalogForOrg.java     |  63 ++
 .../vcloud/config/DefaultNetworkForVDC.java     |  65 ++
 .../vcloud/config/DefaultOrgForUser.java        |  58 ++
 .../vcloud/config/DefaultTasksListForOrg.java   |  53 ++
 .../config/DefaultVCloudReferencesModule.java   | 165 ++++
 .../jclouds/vcloud/config/DefaultVDCForOrg.java |  63 ++
 .../vcloud/config/VCloudHttpApiModule.java      | 538 +++++++++++
 .../jclouds/vcloud/domain/AllocationModel.java  |  70 ++
 .../org/jclouds/vcloud/domain/Capacity.java     | 108 +++
 .../java/org/jclouds/vcloud/domain/Catalog.java |  69 ++
 .../org/jclouds/vcloud/domain/CatalogItem.java  |  37 +
 .../domain/GuestCustomizationSection.java       | 440 +++++++++
 .../domain/InstantiateVAppTemplateParams.java   |  96 ++
 .../vcloud/domain/NetworkConnection.java        | 233 +++++
 .../vcloud/domain/NetworkConnectionSection.java | 218 +++++
 .../java/org/jclouds/vcloud/domain/Org.java     |  86 ++
 .../jclouds/vcloud/domain/ReferenceType.java    |  55 ++
 .../java/org/jclouds/vcloud/domain/Status.java  | 246 +++++
 .../java/org/jclouds/vcloud/domain/Task.java    |  72 ++
 .../org/jclouds/vcloud/domain/TaskStatus.java   |  71 ++
 .../org/jclouds/vcloud/domain/TasksList.java    |  37 +
 .../java/org/jclouds/vcloud/domain/VApp.java    |  87 ++
 .../org/jclouds/vcloud/domain/VAppTemplate.java |  97 ++
 .../org/jclouds/vcloud/domain/VCloudError.java  | 123 +++
 .../jclouds/vcloud/domain/VCloudSession.java    |  29 +
 .../java/org/jclouds/vcloud/domain/VDC.java     | 146 +++
 .../org/jclouds/vcloud/domain/VDCStatus.java    |  57 ++
 .../main/java/org/jclouds/vcloud/domain/Vm.java | 108 +++
 .../vcloud/domain/internal/CatalogImpl.java     | 193 ++++
 .../vcloud/domain/internal/CatalogItemImpl.java | 111 +++
 .../vcloud/domain/internal/ErrorImpl.java       | 119 +++
 .../jclouds/vcloud/domain/internal/OrgImpl.java | 171 ++++
 .../domain/internal/ReferenceTypeImpl.java      | 103 +++
 .../vcloud/domain/internal/TaskImpl.java        | 165 ++++
 .../vcloud/domain/internal/TasksListImpl.java   |  81 ++
 .../vcloud/domain/internal/VAppImpl.java        | 166 ++++
 .../domain/internal/VAppTemplateImpl.java       | 205 +++++
 .../jclouds/vcloud/domain/internal/VDCImpl.java | 292 ++++++
 .../jclouds/vcloud/domain/internal/VmImpl.java  | 217 +++++
 .../vcloud/domain/network/DhcpService.java      | 106 +++
 .../jclouds/vcloud/domain/network/Features.java |  95 ++
 .../vcloud/domain/network/FenceMode.java        |  70 ++
 .../vcloud/domain/network/FirewallService.java  |  86 ++
 .../domain/network/IpAddressAllocationMode.java |  52 ++
 .../jclouds/vcloud/domain/network/IpRange.java  |  76 ++
 .../jclouds/vcloud/domain/network/IpScope.java  | 170 ++++
 .../vcloud/domain/network/NatService.java       | 115 +++
 .../vcloud/domain/network/NetworkConfig.java    | 167 ++++
 .../vcloud/domain/network/OrgNetwork.java       | 121 +++
 .../domain/network/firewall/FirewallPolicy.java |  54 ++
 .../network/firewall/FirewallProtocols.java     |  73 ++
 .../domain/network/firewall/FirewallRule.java   | 125 +++
 .../domain/network/internal/OrgNetworkImpl.java | 202 +++++
 .../vcloud/domain/network/nat/NatPolicy.java    |  54 ++
 .../vcloud/domain/network/nat/NatProtocol.java  |  48 +
 .../vcloud/domain/network/nat/NatRule.java      |  35 +
 .../vcloud/domain/network/nat/NatType.java      |  61 ++
 .../domain/network/nat/rules/MappingMode.java   |  54 ++
 .../network/nat/rules/OneToOneVmRule.java       | 110 +++
 .../network/nat/rules/PortForwardingRule.java   | 111 +++
 .../vcloud/domain/network/nat/rules/VmRule.java | 128 +++
 .../EditableResourceAllocationSettingData.java  | 302 +++++++
 .../vcloud/domain/ovf/VCloudHardDisk.java       | 330 +++++++
 .../vcloud/domain/ovf/VCloudNetworkAdapter.java | 332 +++++++
 .../vcloud/domain/ovf/VCloudNetworkSection.java |  80 ++
 .../ovf/VCloudOperatingSystemSection.java       | 118 +++
 .../ovf/VCloudVirtualHardwareSection.java       | 179 ++++
 .../org/jclouds/vcloud/endpoints/Catalog.java   |  37 +
 .../org/jclouds/vcloud/endpoints/Network.java   |  37 +
 .../java/org/jclouds/vcloud/endpoints/Org.java  |  37 +
 .../org/jclouds/vcloud/endpoints/OrgList.java   |  37 +
 .../org/jclouds/vcloud/endpoints/TasksList.java |  37 +
 .../jclouds/vcloud/endpoints/VCloudLogin.java   |  38 +
 .../java/org/jclouds/vcloud/endpoints/VDC.java  |  37 +
 .../org/jclouds/vcloud/features/CatalogApi.java | 144 +++
 .../org/jclouds/vcloud/features/NetworkApi.java |  61 ++
 .../org/jclouds/vcloud/features/OrgApi.java     |  86 ++
 .../org/jclouds/vcloud/features/TaskApi.java    |  82 ++
 .../org/jclouds/vcloud/features/VAppApi.java    | 261 ++++++
 .../vcloud/features/VAppTemplateApi.java        | 180 ++++
 .../org/jclouds/vcloud/features/VDCApi.java     |  73 ++
 .../java/org/jclouds/vcloud/features/VmApi.java | 295 ++++++
 ...ddVCloudAuthorizationAndCookieToRequest.java |  63 ++
 .../vcloud/functions/CatalogItemsInCatalog.java |  64 ++
 .../vcloud/functions/CatalogItemsInOrg.java     |  57 ++
 .../jclouds/vcloud/functions/CatalogsInOrg.java |  73 ++
 .../functions/DefaultNetworkNameInTemplate.java |  47 +
 .../jclouds/vcloud/functions/NetworksInOrg.java |  57 ++
 .../vcloud/functions/OrgNameToEndpoint.java     |  57 ++
 .../functions/OrgNameToTasksListEndpoint.java   |  62 ++
 .../vcloud/functions/OrgsForLocations.java      |  73 ++
 .../jclouds/vcloud/functions/OrgsForNames.java  |  56 ++
 .../ParseLoginResponseFromHeaders.java          | 105 +++
 .../functions/VAppTemplatesForCatalogItems.java |  66 ++
 .../vcloud/functions/VAppTemplatesInOrg.java    |  65 ++
 .../org/jclouds/vcloud/functions/VDCsInOrg.java |  57 ++
 .../ParseVCloudErrorFromHttpResponse.java       | 121 +++
 .../http/filters/VCloudBasicAuthentication.java |  58 ++
 .../http/filters/VCloudSupportedVersions.java   |  35 +
 .../jclouds/vcloud/internal/VCloudLoginApi.java |  44 +
 .../org/jclouds/vcloud/loaders/OVFLoader.java   |  47 +
 .../vcloud/loaders/VAppTemplateLoader.java      |  47 +
 .../org/jclouds/vcloud/location/DefaultVDC.java |  74 ++
 .../location/OrgAndVDCToLocationSupplier.java   |  93 ++
 .../vcloud/options/CaptureVAppOptions.java      |  51 ++
 .../vcloud/options/CatalogItemOptions.java      |  77 ++
 .../jclouds/vcloud/options/CloneOptions.java    |  53 ++
 .../vcloud/options/CloneVAppOptions.java        |  88 ++
 .../options/CloneVAppTemplateOptions.java       |  42 +
 .../options/InstantiateVAppTemplateOptions.java | 178 ++++
 .../jclouds/vcloud/predicates/TaskSuccess.java  |  65 ++
 .../vcloud/reference/VCloudConstants.java       |  51 ++
 .../jclouds/vcloud/reference/package-info.java  |  21 +
 ...thNameMatchingConfigurationKeyOrDefault.java |  99 ++
 .../vcloud/suppliers/VAppTemplatesSupplier.java |  86 ++
 .../java/org/jclouds/vcloud/util/Utils.java     |  71 ++
 .../org/jclouds/vcloud/util/VCloudUtils.java    |  67 ++
 .../org/jclouds/vcloud/xml/CatalogHandler.java  | 104 +++
 .../jclouds/vcloud/xml/CatalogItemHandler.java  |  81 ++
 .../org/jclouds/vcloud/xml/ErrorHandler.java    |  45 +
 .../xml/GuestCustomizationSectionHandler.java   | 137 +++
 .../vcloud/xml/NetworkConnectionHandler.java    |  87 ++
 .../xml/NetworkConnectionSectionHandler.java    | 103 +++
 .../java/org/jclouds/vcloud/xml/OrgHandler.java | 112 +++
 .../org/jclouds/vcloud/xml/OrgListHandler.java  |  54 ++
 .../jclouds/vcloud/xml/OrgNetworkHandler.java   | 325 +++++++
 .../vcloud/xml/SupportedVersionsHandler.java    |  60 ++
 .../org/jclouds/vcloud/xml/TaskHandler.java     | 128 +++
 .../jclouds/vcloud/xml/TasksListHandler.java    |  74 ++
 .../org/jclouds/vcloud/xml/VAppHandler.java     | 151 ++++
 .../jclouds/vcloud/xml/VAppTemplateHandler.java | 152 ++++
 .../xml/VCloudVirtualHardwareHandler.java       |  72 ++
 .../java/org/jclouds/vcloud/xml/VDCHandler.java | 167 ++++
 .../java/org/jclouds/vcloud/xml/VmHandler.java  | 178 ++++
 .../xml/ovf/VCloudNetworkSectionHandler.java    |  69 ++
 .../xml/ovf/VCloudOperatingSystemHandler.java   |  81 ++
 ...oudResourceAllocationSettingDataHandler.java |  89 ++
 .../services/org.jclouds.apis.ApiMetadata       |   1 +
 .../jclouds/vcloud/VCloudApiMetadataTest.java   |  32 +
 .../java/org/jclouds/vcloud/VCloudApiTest.java  |  64 ++
 .../vcloud/VCloudSessionRefreshLiveTest.java    |  41 +
 .../jclouds/vcloud/VCloudVersionsApiTest.java   |  69 ++
 .../BindCatalogItemToXmlPayloadTest.java        |  53 ++
 .../BindCloneVAppParamsToXmlPayloadTest.java    |  81 ++
 ...CloneVAppTemplateParamsToXmlPayloadTest.java |  89 ++
 .../BindDeployVAppParamsToXmlPayloadTest.java   |  61 ++
 ...tiateVAppTemplateParamsToXmlPayloadTest.java | 179 ++++
 ...etworkConnectionSectionToXmlPayloadTest.java |  68 ++
 .../BindUndeployVAppParamsToXmlPayloadTest.java |  61 ++
 .../BaseVCloudComputeServiceExpectTest.java     | 160 ++++
 .../compute/VCloudComputeServiceLiveTest.java   |  54 ++
 .../functions/FindLocationForResourceTest.java  |  64 ++
 .../functions/ListImagesInVCloudExpectTest.java |  89 ++
 .../functions/VAppToNodeMetadataTest.java       | 228 +++++
 .../options/VCloudTemplateOptionsTest.java      | 197 ++++
 ...ThenCustomizeDeployAndPowerOnExpectTest.java | 171 ++++
 .../VCloudComputeServiceAdapterTest.java        |  89 ++
 .../vcloud/features/CatalogApiLiveTest.java     |  53 ++
 .../jclouds/vcloud/features/CatalogApiTest.java | 131 +++
 .../vcloud/features/NetworkApiLiveTest.java     |  29 +
 .../jclouds/vcloud/features/NetworkApiTest.java |  75 ++
 .../jclouds/vcloud/features/OrgApiLiveTest.java |  42 +
 .../org/jclouds/vcloud/features/OrgApiTest.java |  91 ++
 .../vcloud/features/TaskApiLiveTest.java        |  29 +
 .../jclouds/vcloud/features/TaskApiTest.java    | 108 +++
 .../vcloud/features/VAppApiLiveTest.java        |  53 ++
 .../jclouds/vcloud/features/VAppApiTest.java    | 315 +++++++
 .../features/VAppTemplateApiLiveTest.java       | 168 ++++
 .../vcloud/features/VAppTemplateApiTest.java    | 238 +++++
 .../jclouds/vcloud/features/VDCApiLiveTest.java |  29 +
 .../org/jclouds/vcloud/features/VDCApiTest.java | 102 +++
 .../jclouds/vcloud/features/VmApiLiveTest.java  | 163 ++++
 .../org/jclouds/vcloud/features/VmApiTest.java  | 320 +++++++
 ...loudAuthorizationAndCookieToRequestTest.java |  55 ++
 .../ParseLoginResponseFromHeadersTest.java      | 147 +++
 .../ParseVCloudErrorFromHttpResponseTest.java   |  96 ++
 .../vcloud/internal/BasePayloadTest.java        |  51 ++
 .../vcloud/internal/BaseVCloudApiLiveTest.java  |  59 ++
 .../vcloud/internal/BaseVCloudApiTest.java      | 272 ++++++
 .../vcloud/internal/VCloudLoginApiTest.java     |  97 ++
 .../InstantiateVAppTemplateOptionsTest.java     |  74 ++
 ...meMatchingConfigurationKeyOrDefaultTest.java | 115 +++
 .../org/jclouds/vcloud/utils/TestUtils.java     |  32 +
 .../jclouds/vcloud/xml/CatalogHandlerTest.java  | 135 +++
 .../vcloud/xml/CatalogItemHandlerTest.java      |  86 ++
 .../GuestCustomizationSectionHandlerTest.java   |  75 ++
 .../xml/NetworkConnectionHandlerTest.java       |  57 ++
 .../NetworkConnectionSectionHandlerTest.java    |  63 ++
 .../org/jclouds/vcloud/xml/OrgHandlerTest.java  | 124 +++
 .../jclouds/vcloud/xml/OrgListHandlerTest.java  |  57 ++
 .../vcloud/xml/OrgNetworkHandlerTest.java       | 104 +++
 .../xml/SupportedVersionsHandlerTest.java       |  53 ++
 .../org/jclouds/vcloud/xml/TaskHandlerTest.java | 135 +++
 .../vcloud/xml/TasksListHandlerTest.java        |  82 ++
 .../org/jclouds/vcloud/xml/VAppHandlerTest.java |  77 ++
 .../vcloud/xml/VAppTemplateHandlerTest.java     | 164 ++++
 .../org/jclouds/vcloud/xml/VDCHandlerTest.java  | 136 +++
 .../org/jclouds/vcloud/xml/VmHandlerTest.java   |  79 ++
 ...VCloudOperatingSystemSectionHandlerTest.java |  61 ++
 ...VCloudVirtualHardwareSectionHandlerTest.java | 153 ++++
 .../src/test/resources/captureVApp-default.xml  |   1 +
 .../src/test/resources/captureVApp.xml          |   1 +
 .../src/test/resources/catalog-blank.xml        |   7 +
 .../src/test/resources/catalog-hosting.xml      |  25 +
 .../src/test/resources/catalog.xml              |  27 +
 .../src/test/resources/catalog1.0-vcd15.xml     |   9 +
 ...alogItem-carrenza-with-default-namespace.xml |   8 +
 ...talogItem-carrenza-with-vcloud-namespace.xml |   8 +
 .../src/test/resources/catalogItem-hosting.xml  |  14 +
 .../test/resources/catalogItem-terremark.xml    |  16 +
 .../src/test/resources/catalogItem1.0-vcd15.xml |   8 +
 .../src/test/resources/copyVApp-default.xml     |   1 +
 .../src/test/resources/copyVApp.xml             |   1 +
 .../test/resources/copyVAppTemplate-default.xml |   1 +
 .../src/test/resources/copyVAppTemplate.xml     |   1 +
 .../src/test/resources/cpuItem.xml              |   1 +
 .../src/test/resources/guestCustomization.xml   |  23 +
 .../resources/guestCustomizationSection.xml     |   3 +
 .../src/test/resources/instantiatedvapp.xml     |  13 +
 .../instantiationparams-description.xml         |   1 +
 .../resources/instantiationparams-network.xml   |   1 +
 .../src/test/resources/instantiationparams.xml  |   1 +
 .../1.7.1-stratos/src/test/resources/log4j.xml  | 151 ++++
 .../src/test/resources/memoryItem.xml           |   1 +
 .../src/test/resources/moveVApp.xml             |   1 +
 .../src/test/resources/moveVAppTemplate.xml     |   1 +
 .../src/test/resources/networkconnection.xml    |   7 +
 .../test/resources/networkconnectionsection.xml |  18 +
 .../src/test/resources/org-1.0.xml              |  24 +
 .../src/test/resources/org-hosting.xml          |  12 +
 .../src/test/resources/org-savvis.xml           |  13 +
 .../1.7.1-stratos/src/test/resources/org.xml    |   5 +
 .../src/test/resources/org1.0-vcd15.xml         |  11 +
 .../src/test/resources/orgList1.0-vcd15.xml     |   4 +
 .../src/test/resources/orglist-savvis.xml       |   3 +
 .../src/test/resources/orglist.xml              |   3 +
 .../src/test/resources/orgnetwork-bridged.xml   |  20 +
 .../src/test/resources/orgnetwork-isolated.xml  |  31 +
 .../1.7.1-stratos/src/test/resources/os.xml     |  11 +
 .../src/test/resources/ovf-multi-vm.xml         | 285 ++++++
 .../src/test/resources/ovf-ubuntu64.xml         | 148 +++
 .../src/test/resources/task-1.0.xml             |   9 +
 .../src/test/resources/task-error.xml           |   9 +
 .../src/test/resources/task-hosting.xml         |  12 +
 .../src/test/resources/task-self.xml            |  11 +
 .../src/test/resources/task-vcd15.xml           |   5 +
 .../1.7.1-stratos/src/test/resources/task.xml   |   8 +
 .../src/test/resources/taskslist-hosting.xml    |  14 +
 .../src/test/resources/taskslist.xml            |  27 +
 .../resources/template1.0-vcd15-multi-vm.xml    |  68 ++
 .../src/test/resources/template1.0-vcd15.xml    |  72 ++
 .../src/test/resources/vAppTemplate-copying.xml |  41 +
 .../src/test/resources/vAppTemplate.xml         | 143 +++
 .../vAppTemplate1.0-vcd15_withNewlines.xml      | 109 +++
 .../src/test/resources/vapp-hosting.xml         | 235 +++++
 .../src/test/resources/vapp-none.xml            | 237 +++++
 .../src/test/resources/vapp-pool.xml            | 227 +++++
 .../src/test/resources/vapp-rhel-off-static.xml | 325 +++++++
 .../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 +++++
 .../src/test/resources/vapp-unresolved.xml      |  21 +
 .../src/test/resources/vapp-win-off-static.xml  | 219 +++++
 .../src/test/resources/vdc-1.0.xml              |  49 +
 .../src/test/resources/vdc-hosting.xml          |  60 ++
 .../src/test/resources/vdc-nonet.xml            |  22 +
 .../1.7.1-stratos/src/test/resources/vdc.xml    |  36 +
 .../src/test/resources/vdc1.0-vcd15.xml         |  47 +
 .../src/test/resources/versions-vcd15.xml       | 906 +++++++++++++++++++
 .../src/test/resources/versions.xml             |   7 +
 .../test/resources/virtualhardwaresection.xml   | 118 +++
 .../src/test/resources/vm-rhel-off-static.xml   | 197 ++++
 .../openstack-nova/1.7.1-stratos/README.txt     |   3 -
 .../openstack-nova/1.7.1-stratos/pom.xml        | 143 ---
 .../jclouds/openstack/nova/v2_0/NovaApi.java    | 208 -----
 .../openstack/nova/v2_0/NovaApiMetadata.java    | 125 ---
 .../openstack/nova/v2_0/NovaAsyncApi.java       | 214 -----
 .../v2_0/binders/BindKeyPairToJsonPayload.java  |  47 -
 .../v2_0/binders/BindMetadataToJsonPayload.java |  47 -
 .../BindSecurityGroupRuleToJsonPayload.java     |  71 --
 .../nova/v2_0/compute/NovaComputeService.java   | 183 ----
 .../v2_0/compute/NovaComputeServiceAdapter.java | 288 ------
 .../config/NovaComputeServiceContextModule.java | 286 ------
 .../compute/extensions/NovaImageExtension.java  | 140 ---
 .../extensions/NovaSecurityGroupExtension.java  | 373 --------
 .../AllocateAndAddFloatingIpToNode.java         | 112 ---
 .../functions/CreateSecurityGroupIfNeeded.java  |  93 --
 .../functions/FlavorInZoneToHardware.java       |  60 --
 .../compute/functions/ImageInZoneToImage.java   |  70 --
 .../functions/ImageToOperatingSystem.java       | 128 ---
 .../NovaSecurityGroupInZoneToSecurityGroup.java |  75 --
 .../NovaSecurityGroupToSecurityGroup.java       |  69 --
 .../functions/OrphanedGroupsByZoneId.java       |  77 --
 .../RemoveFloatingIpFromNodeAndDeallocate.java  |  74 --
 .../SecurityGroupRuleToIpPermission.java        |  99 --
 .../functions/ServerInZoneToNodeMetadata.java   | 199 ----
 .../compute/loaders/CreateUniqueKeyPair.java    |  79 --
 .../loaders/FindSecurityGroupOrCreate.java      |  86 --
 .../loaders/LoadFloatingIpsForInstance.java     |  63 --
 .../compute/options/NovaTemplateOptions.java    | 649 -------------
 .../predicates/AllNodesInGroupTerminated.java   |  56 --
 ...desWithGroupEncodedIntoNameThenAddToSet.java | 165 ----
 .../nova/v2_0/config/NovaParserModule.java      | 159 ----
 .../nova/v2_0/config/NovaProperties.java        |  43 -
 .../nova/v2_0/config/NovaRestClientModule.java  | 191 ----
 .../openstack/nova/v2_0/domain/Address.java     | 138 ---
 .../openstack/nova/v2_0/domain/BackupType.java  |  41 -
 .../openstack/nova/v2_0/domain/Flavor.java      | 211 -----
 .../openstack/nova/v2_0/domain/FloatingIP.java  | 173 ----
 .../openstack/nova/v2_0/domain/Host.java        | 127 ---
 .../nova/v2_0/domain/HostAggregate.java         | 250 -----
 .../nova/v2_0/domain/HostResourceUsage.java     | 180 ----
 .../openstack/nova/v2_0/domain/Image.java       | 303 -------
 .../openstack/nova/v2_0/domain/Ingress.java     | 160 ----
 .../openstack/nova/v2_0/domain/KeyPair.java     | 189 ----
 .../openstack/nova/v2_0/domain/Network.java     | 173 ----
 .../openstack/nova/v2_0/domain/Quota.java       | 356 --------
 .../openstack/nova/v2_0/domain/QuotaClass.java  |  62 --
 .../openstack/nova/v2_0/domain/RebootType.java  |  35 -
 .../nova/v2_0/domain/SecurityGroup.java         | 188 ----
 .../nova/v2_0/domain/SecurityGroupRule.java     | 174 ----
 .../openstack/nova/v2_0/domain/Server.java      | 476 ----------
 .../nova/v2_0/domain/ServerCreated.java         | 127 ---
 .../v2_0/domain/ServerExtendedAttributes.java   | 156 ----
 .../nova/v2_0/domain/ServerExtendedStatus.java  | 155 ----
 .../v2_0/domain/ServerWithSecurityGroups.java   | 128 ---
 .../nova/v2_0/domain/SimpleServerUsage.java     | 312 -------
 .../nova/v2_0/domain/SimpleTenantUsage.java     | 245 -----
 .../nova/v2_0/domain/TenantIdAndName.java       | 127 ---
 .../nova/v2_0/domain/VirtualInterface.java      | 128 ---
 .../openstack/nova/v2_0/domain/Volume.java      | 346 -------
 .../nova/v2_0/domain/VolumeAttachment.java      | 172 ----
 .../nova/v2_0/domain/VolumeSnapshot.java        | 239 -----
 .../openstack/nova/v2_0/domain/VolumeType.java  | 192 ----
 .../domain/zonescoped/AvailabilityZone.java     |  73 --
 .../v2_0/domain/zonescoped/FlavorInZone.java    |  46 -
 .../v2_0/domain/zonescoped/ImageInZone.java     |  46 -
 .../domain/zonescoped/SecurityGroupInZone.java  |  46 -
 .../v2_0/domain/zonescoped/ServerInZone.java    |  46 -
 .../nova/v2_0/domain/zonescoped/ZoneAndId.java  |  86 --
 .../v2_0/domain/zonescoped/ZoneAndName.java     | 111 ---
 .../ZoneSecurityGroupNameAndPorts.java          |  62 --
 .../nova/v2_0/domain/zonescoped/ZoneState.java  |  61 --
 .../v2_0/extensions/AvailabilityZoneAPI.java    |  40 -
 .../extensions/AvailabilityZoneAsyncApi.java    |  58 --
 .../v2_0/extensions/ExtensionNamespaces.java    | 110 ---
 .../v2_0/extensions/FlavorExtraSpecsApi.java    |  77 --
 .../extensions/FlavorExtraSpecsAsyncApi.java    | 118 ---
 .../nova/v2_0/extensions/FloatingIPApi.java     |  98 --
 .../v2_0/extensions/FloatingIPAsyncApi.java     | 145 ---
 .../v2_0/extensions/HostAdministrationApi.java  | 103 ---
 .../extensions/HostAdministrationAsyncApi.java  | 157 ----
 .../nova/v2_0/extensions/HostAggregateApi.java  |  87 --
 .../v2_0/extensions/HostAggregateAsyncApi.java  | 161 ----
 .../nova/v2_0/extensions/KeyPairApi.java        |  65 --
 .../nova/v2_0/extensions/KeyPairAsyncApi.java   | 101 ---
 .../nova/v2_0/extensions/QuotaApi.java          |  57 --
 .../nova/v2_0/extensions/QuotaAsyncApi.java     |  89 --
 .../nova/v2_0/extensions/QuotaClassApi.java     |  51 --
 .../v2_0/extensions/QuotaClassAsyncApi.java     |  78 --
 .../nova/v2_0/extensions/SecurityGroupApi.java  |  89 --
 .../v2_0/extensions/SecurityGroupAsyncApi.java  | 152 ----
 .../nova/v2_0/extensions/ServerAdminApi.java    | 120 ---
 .../v2_0/extensions/ServerAdminAsyncApi.java    | 175 ----
 .../extensions/ServerWithSecurityGroupsApi.java |  49 -
 .../ServerWithSecurityGroupsAsyncApi.java       |  62 --
 .../v2_0/extensions/SimpleTenantUsageApi.java   |  50 -
 .../extensions/SimpleTenantUsageAsyncApi.java   |  77 --
 .../v2_0/extensions/VirtualInterfaceApi.java    |  43 -
 .../extensions/VirtualInterfaceAsyncApi.java    |  59 --
 .../nova/v2_0/extensions/VolumeApi.java         | 147 ---
 .../nova/v2_0/extensions/VolumeAsyncApi.java    | 254 ------
 .../v2_0/extensions/VolumeAttachmentApi.java    |  87 --
 .../extensions/VolumeAttachmentAsyncApi.java    | 107 ---
 .../nova/v2_0/extensions/VolumeTypeApi.java     | 101 ---
 .../v2_0/extensions/VolumeTypeAsyncApi.java     | 161 ----
 .../openstack/nova/v2_0/features/FlavorApi.java |  78 --
 .../nova/v2_0/features/FlavorAsyncApi.java      | 144 ---
 .../openstack/nova/v2_0/features/ImageApi.java  | 142 ---
 .../nova/v2_0/features/ImageAsyncApi.java       | 206 -----
 .../openstack/nova/v2_0/features/ServerApi.java | 276 ------
 .../nova/v2_0/features/ServerAsyncApi.java      | 356 --------
 .../functions/FieldValueResponseParsers.java    | 105 ---
 .../nova/v2_0/functions/OverLimitParser.java    |  92 --
 .../ParseImageIdFromLocationHeader.java         |  39 -
 .../internal/OnlyMetadataValueOrNull.java       |  63 --
 .../functions/internal/ParseDiagnostics.java    |  47 -
 .../functions/internal/ParseFlavorDetails.java  |  94 --
 .../v2_0/functions/internal/ParseFlavors.java   |  96 --
 .../functions/internal/ParseImageDetails.java   |  95 --
 .../v2_0/functions/internal/ParseImages.java    |  96 --
 .../v2_0/functions/internal/ParseKeyPairs.java  |  64 --
 .../functions/internal/ParseServerDetails.java  |  94 --
 .../v2_0/functions/internal/ParseServers.java   |  96 --
 .../nova/v2_0/handlers/NovaErrorHandler.java    | 129 ---
 .../options/CreateBackupOfServerOptions.java    | 105 ---
 .../nova/v2_0/options/CreateServerOptions.java  | 557 ------------
 .../nova/v2_0/options/CreateVolumeOptions.java  | 220 -----
 .../options/CreateVolumeSnapshotOptions.java    | 138 ---
 .../v2_0/options/CreateVolumeTypeOptions.java   | 101 ---
 .../nova/v2_0/options/ListOptions.java          | 107 ---
 .../nova/v2_0/options/RebuildServerOptions.java | 142 ---
 .../FindSecurityGroupWithNameAndReturnTrue.java |  84 --
 .../nova/v2_0/predicates/ImagePredicates.java   |  55 --
 .../nova/v2_0/predicates/KeyPairPredicates.java |  77 --
 .../predicates/SecurityGroupPredicates.java     | 213 -----
 .../services/org.jclouds.apis.ApiMetadata       |   1 -
 ...tKeyAndTenantIdAuthenticationExpectTest.java |  75 --
 ...antNamePropertyAuthenticationExpectTest.java |  75 --
 ...KeyAndSecretKeyAuthenticationExpectTest.java |  69 --
 .../nova/v2_0/EndpointIdIsRandomExpectTest.java |  72 --
 .../nova/v2_0/NovaApiMetadataTest.java          |  32 -
 .../v2_0/PasswordAuthenticationExpectTest.java  |  60 --
 ...dAuthenticationWithTenantNameExpectTest.java |  69 --
 .../NovaComputeServiceAdapterExpectTest.java    | 321 -------
 .../compute/NovaComputeServiceExpectTest.java   | 382 --------
 .../compute/NovaComputeServiceLiveTest.java     |  96 --
 .../NovaImageExtensionExpectTest.java           |  92 --
 .../extensions/NovaImageExtensionLiveTest.java  |  43 -
 .../NovaSecurityGroupExtensionExpectTest.java   | 433 ---------
 .../NovaSecurityGroupExtensionLiveTest.java     |  35 -
 ...llocateAndAddFloatingIpToNodeExpectTest.java | 133 ---
 .../functions/FlavorInZoneToHardwareTest.java   |  90 --
 .../functions/ImageInZoneToImageTest.java       |  95 --
 .../functions/ImageToOperatingSystemTest.java   | 192 ----
 ...aSecurityGroupInZoneToSecurityGroupTest.java |  94 --
 .../NovaSecurityGroupToSecurityGroupTest.java   | 155 ----
 .../functions/OrphanedGroupsByZoneIdTest.java   |  96 --
 .../SecurityGroupRuleToIpPermissionTest.java    |  81 --
 .../ServerInZoneToNodeMetadataTest.java         | 311 -------
 .../loaders/CreateUniqueKeyPairTest.java        | 111 ---
 .../loaders/FindSecurityGroupOrCreateTest.java  | 144 ---
 .../loaders/LoadFloatingIpsForInstanceTest.java | 108 ---
 .../options/NovaTemplateOptionsTest.java        | 263 ------
 .../extensions/AdminActionsApiExpectTest.java   | 350 -------
 .../extensions/AdminActionsApiLiveTest.java     | 195 ----
 .../AvailabilityZoneApiExpectTest.java          |  64 --
 .../AvailabilityZonesApiLiveTest.java           |  45 -
 .../FlavorExtraSpecsApiExpectTest.java          | 142 ---
 .../extensions/FlavorExtraSpecsApiLiveTest.java | 123 ---
 .../extensions/FloatingIPApiExpectTest.java     | 191 ----
 .../v2_0/extensions/FloatingIPApiLiveTest.java  | 171 ----
 .../HostAdministrationApiExpectTest.java        | 241 -----
 .../HostAdministrationApiLiveTest.java          | 116 ---
 .../extensions/HostAggregateApiExpectTest.java  | 179 ----
 .../extensions/HostAggregateApiLiveTest.java    | 148 ---
 .../v2_0/extensions/KeyPairApiExpectTest.java   | 142 ---
 .../v2_0/extensions/KeyPairApiLiveTest.java     |  76 --
 .../v2_0/extensions/QuotaApiExpectTest.java     | 125 ---
 .../nova/v2_0/extensions/QuotaApiLiveTest.java  | 100 --
 .../extensions/QuotaClassApiExpectTest.java     | 105 ---
 .../v2_0/extensions/QuotaClassApiLiveTest.java  |  73 --
 .../extensions/SecurityGroupApiExpectTest.java  | 235 -----
 .../extensions/SecurityGroupApiLiveTest.java    | 100 --
 .../ServerWithSecurityGroupsApiExpectTest.java  |  63 --
 .../ServerWithSecurityGroupsApiLiveTest.java    |  80 --
 .../SimpleTenantUsageApiExpectTest.java         |  99 --
 .../SimpleTenantUsageApiLiveTest.java           |  51 --
 .../VirtualInterfaceApiExpectTest.java          |  64 --
 .../extensions/VirtualInterfaceApiLiveTest.java |  68 --
 .../v2_0/extensions/VolumeApiExpectTest.java    | 460 ----------
 .../nova/v2_0/extensions/VolumeApiLiveTest.java | 274 ------
 .../VolumeAttachmentApiExpectTest.java          | 168 ----
 .../extensions/VolumeAttachmentApiLiveTest.java | 156 ----
 .../extensions/VolumeTypeApiExpectTest.java     | 259 ------
 .../v2_0/extensions/VolumeTypeApiLiveTest.java  | 126 ---
 .../v2_0/features/ExtensionApiExpectTest.java   | 115 ---
 .../v2_0/features/ExtensionApiLiveTest.java     |  84 --
 .../nova/v2_0/features/FlavorApiExpectTest.java | 164 ----
 .../nova/v2_0/features/FlavorApiLiveTest.java   | 105 ---
 .../nova/v2_0/features/ImageApiExpectTest.java  | 377 --------
 .../nova/v2_0/features/ImageApiLiveTest.java    | 101 ---
 .../nova/v2_0/features/ServerApiExpectTest.java | 746 ---------------
 .../nova/v2_0/features/ServerApiLiveTest.java   | 206 -----
 .../CreateSecurityGroupIfNeededTest.java        | 168 ----
 ...ityGroupWithNameAndReturnTrueExpectTest.java | 102 ---
 .../v2_0/functions/InternalURLLiveTest.java     |  64 --
 .../v2_0/handlers/NovaErrorHandlerTest.java     | 225 -----
 .../v2_0/internal/BaseNovaApiExpectTest.java    |  28 -
 .../nova/v2_0/internal/BaseNovaApiLiveTest.java | 120 ---
 ...BaseNovaComputeServiceContextExpectTest.java |  87 --
 .../BaseNovaComputeServiceExpectTest.java       |  35 -
 .../nova/v2_0/internal/BaseNovaExpectTest.java  |  84 --
 ...eComputeServiceTypicalSecurityGroupTest.java |  76 --
 .../nova/v2_0/parse/ParseCreateFlavorTest.java  |  58 --
 .../nova/v2_0/parse/ParseCreatedServerTest.java |  80 --
 .../parse/ParseExtensionListNormalTest.java     |  76 --
 .../nova/v2_0/parse/ParseExtensionListTest.java |  88 --
 .../nova/v2_0/parse/ParseExtensionTest.java     |  71 --
 .../nova/v2_0/parse/ParseFlavorListTest.java    |  85 --
 .../nova/v2_0/parse/ParseFlavorTest.java        |  70 --
 .../v2_0/parse/ParseFloatingIPListTest.java     |  59 --
 .../nova/v2_0/parse/ParseFloatingIPTest.java    |  53 --
 .../nova/v2_0/parse/ParseImageListTest.java     |  85 --
 .../nova/v2_0/parse/ParseImageTest.java         |  98 --
 .../nova/v2_0/parse/ParseKeyPairListTest.java   |  68 --
 .../nova/v2_0/parse/ParseKeyPairTest.java       |  61 --
 .../nova/v2_0/parse/ParseMetadataItemTest.java  |  58 --
 .../nova/v2_0/parse/ParseMetadataListTest.java  |  63 --
 .../v2_0/parse/ParseMetadataUpdateTest.java     |  64 --
 .../v2_0/parse/ParseSecurityGroupListTest.java  |  72 --
 .../nova/v2_0/parse/ParseSecurityGroupTest.java |  69 --
 .../v2_0/parse/ParseServerDetailsEssexTest.java | 170 ----
 .../nova/v2_0/parse/ParseServerDiagnostics.java |  57 --
 .../nova/v2_0/parse/ParseServerListTest.java    |  85 --
 .../nova/v2_0/parse/ParseServerTest.java        | 117 ---
 .../parse/ParseServerWithAllExtensionsTest.java | 104 ---
 .../ParseServerWithInternetAddressesTest.java   |  99 --
 ...ublicIpsInPrivateAddressBlockExpectTest.java |  99 --
 .../v2_0/predicates/ImagePredicatesTest.java    |  44 -
 .../predicates/SecurityGroupPredicatesTest.java | 129 ---
 .../src/test/resources/attachment_details.json  |   1 -
 .../src/test/resources/attachment_list.json     |   1 -
 .../src/test/resources/extension_details.json   |  21 -
 .../src/test/resources/extension_list.json      |  42 -
 .../src/test/resources/extension_list_full.json | 281 ------
 .../test/resources/extension_list_normal.json   |  31 -
 .../resources/extension_list_openstack.json     | 115 ---
 .../src/test/resources/flavor_details.json      |  19 -
 .../src/test/resources/flavor_list.json         |  32 -
 .../src/test/resources/flavor_list_detail.json  |   1 -
 .../resources/flavor_list_detail_openstack.json |  83 --
 .../src/test/resources/flavor_new.json          |  10 -
 .../src/test/resources/floatingip_details.json  |   9 -
 .../src/test/resources/floatingip_list.json     |  16 -
 .../1.7.1-stratos/src/test/resources/host.json  |   1 -
 .../test/resources/host_aggregate_details.json  |   1 -
 .../src/test/resources/host_aggregate_list.json |   1 -
 .../host_aggregate_with_host_details.json       |   1 -
 .../src/test/resources/hosts_list.json          |   1 -
 .../src/test/resources/image_active.json        |  41 -
 .../src/test/resources/image_details.json       |  41 -
 .../src/test/resources/image_list.json          |  32 -
 .../src/test/resources/image_list_detail.json   |   1 -
 .../image_list_detail_imageextension.json       | 121 ---
 .../resources/image_list_detail_openstack.json  |  81 --
 .../src/test/resources/keypair_created.json     |   9 -
 .../keypair_created_computeservice.json         |   9 -
 .../src/test/resources/keypair_list.json        |  18 -
 .../test/resources/listAvailabilityZones.json   |  11 -
 .../src/test/resources/metadata_item.json       |   5 -
 .../src/test/resources/metadata_list.json       |   6 -
 .../src/test/resources/metadata_updated.json    |   7 -
 .../src/test/resources/new_server.json          |  41 -
 .../resources/new_server_disk_config_auto.json  |  42 -
 .../new_server_disk_config_manual.json          |  42 -
 .../src/test/resources/new_server_in_zone.json  |  41 -
 .../resources/new_server_networks_response.json |  42 -
 .../test/resources/new_server_no_adminpass.json |  40 -
 .../resources/new_server_nova_networks.json     |  41 -
 .../src/test/resources/quota_class.json         |  15 -
 .../src/test/resources/quotas.json              |  15 -
 .../test/resources/securitygroup_created.json   |   9 -
 .../test/resources/securitygroup_details.json   |  34 -
 ...itygroup_details_computeservice_typical.json |  51 --
 .../securitygroup_details_extension.json        |  34 -
 ...securitygroup_details_extension_norules.json |  10 -
 .../resources/securitygroup_details_port22.json |  19 -
 .../src/test/resources/securitygroup_list.json  |  51 --
 ...oup_list_details_computeservice_typical.json |  53 --
 .../resources/securitygroup_list_extension.json |  51 --
 .../resources/securitygrouprule_created.json    |  12 -
 .../securitygrouprule_created_cidr.json         |  13 -
 .../securitygrouprule_created_group.json        |  14 -
 .../src/test/resources/server_details.json      |  86 --
 .../test/resources/server_details_devstack.json |  44 -
 .../resources/server_details_openstack.json     |  46 -
 .../src/test/resources/server_diagnostics.json  |  17 -
 .../src/test/resources/server_list.json         |  32 -
 .../src/test/resources/server_list_details.json |  79 --
 .../resources/server_list_details_essex.json    | 152 ----
 .../resources/server_public_ip_in_private.json  |  51 --
 .../resources/server_with_security_groups.json  |   1 -
 .../server_with_security_groups_extension.json  |   1 -
 .../src/test/resources/simple_tenant_usage.json |   1 -
 .../test/resources/simple_tenant_usages.json    |   1 -
 .../src/test/resources/snapshot_details.json    |   1 -
 .../src/test/resources/snapshot_list.json       |   1 -
 .../test/resources/snapshot_list_detail.json    |   1 -
 .../test/resources/virtual_interfaces_list.json |   1 -
 .../src/test/resources/volume_details.json      |   1 -
 .../src/test/resources/volume_list.json         |   1 -
 .../src/test/resources/volume_list_detail.json  |   1 -
 .../src/test/resources/volume_type.json         |   9 -
 .../test/resources/volume_type_extra_specs.json |   1 -
 .../src/test/resources/volume_type_list.json    |   1 -
 .../provider/aws-ec2/1.7.1-stratos/pom.xml      |  29 +-
 .../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java  |   2 +-
 .../BindLaunchSpecificationToFormParams.java    |  13 +-
 .../aws/ec2/compute/AWSEC2TemplateOptions.java  |  59 +-
 .../AWSEC2CreateNodesInGroupThenAddToSet.java   |  39 +-
 ...curityGroupsAsNeededAndReturnRunOptions.java |  16 +-
 .../aws/ec2/domain/AWSRunningInstance.java      |  29 +-
 .../aws/ec2/domain/LaunchSpecification.java     |  43 +-
 .../aws/ec2/options/AWSRunInstancesOptions.java |  27 +-
 .../aws/ec2/xml/LaunchSpecificationHandler.java |  20 +-
 .../features/PlacementGroupApiExpectTest.java   |   4 +-
 .../ec2/features/SpotInstanceApiExpectTest.java |   4 +-
 ...InstanceRequestToAWSRunningInstanceTest.java |   4 +-
 .../src/test/resources/describe_instances_1.xml |   2 +-
 .../src/test/resources/describe_instances_2.xml |   2 +-
 .../src/test/resources/describe_instances_3.xml |   2 +-
 .../resources/describe_instances_latest.xml     |   2 +-
 .../resources/describe_instances_pending.xml    |   2 +-
 .../resources/describe_security_groups_vpc.xml  |   2 +-
 .../test/resources/describe_spot_instance.xml   |   2 +-
 .../describe_spot_instance_requests.xml         |   2 +-
 .../resources/describe_spot_instance_tags.xml   |   2 +-
 .../resources/describe_spot_instances_1.xml     |   2 +-
 .../resources/describe_spot_price_history.xml   |   2 +-
 .../resources/request_spot_instances-ebs.xml    |   2 +-
 .../test/resources/request_spot_instances.xml   |   2 +-
 .../src/test/resources/run_instances_1.xml      |   2 +-
 .../jclouds/vcloud/1.7.1-stratos/README.txt     |   6 -
 .../jclouds/vcloud/1.7.1-stratos/pom.xml        | 129 ---
 .../vcloud/TaskInErrorStateException.java       |  39 -
 .../vcloud/TaskStillRunningException.java       |  39 -
 .../main/java/org/jclouds/vcloud/VCloudApi.java |  91 --
 .../org/jclouds/vcloud/VCloudApiMetadata.java   | 103 ---
 .../org/jclouds/vcloud/VCloudMediaType.java     | 221 -----
 .../jclouds/vcloud/VCloudResponseException.java |  69 --
 .../java/org/jclouds/vcloud/VCloudToken.java    |  37 -
 .../org/jclouds/vcloud/VCloudVersionsApi.java   |  38 -
 .../binders/BindCPUCountToXmlPayload.java       |  79 --
 .../BindCaptureVAppParamsToXmlPayload.java      | 124 ---
 .../binders/BindCatalogItemToXmlPayload.java    | 126 ---
 .../binders/BindCloneParamsToXmlPayload.java    | 133 ---
 .../BindCloneVAppParamsToXmlPayload.java        |  65 --
 ...BindCloneVAppTemplateParamsToXmlPayload.java |  60 --
 .../BindDeployVAppParamsToXmlPayload.java       |  42 -
 ...ndGuestCustomizationSectionToXmlPayload.java | 112 ---
 ...stantiateVAppTemplateParamsToXmlPayload.java | 221 -----
 .../vcloud/binders/BindMemoryToXmlPayload.java  |  80 --
 ...indNetworkConnectionSectionToXmlPayload.java | 106 ---
 .../vcloud/binders/BindParamsToXmlPayload.java  |  81 --
 .../BindUndeployVAppParamsToXmlPayload.java     |  42 -
 .../OrgNameAndCatalogNameToEndpoint.java        |  79 --
 .../binders/OrgNameAndVDCNameToEndpoint.java    |  78 --
 .../OrgNameCatalogNameItemNameToEndpoint.java   |  77 --
 ...meCatalogNameVAppTemplateNameToEndpoint.java |  90 --
 .../OrgNameVDCNameNetworkNameToEndpoint.java    |  54 --
 ...NameVDCNameResourceEntityNameToEndpoint.java |  54 --
 .../OrgNameVDCNameResourceNameToEndpoint.java   |  81 --
 .../VCloudComputeServiceContextModule.java      |  39 -
 .../VCloudComputeServiceDependenciesModule.java | 154 ----
 .../functions/FindLocationForResource.java      |  69 --
 .../compute/functions/HardwareForVApp.java      |  71 --
 .../functions/HardwareForVAppTemplate.java      |  84 --
 .../compute/functions/ImageForVAppTemplate.java |  82 --
 .../compute/functions/VAppToNodeMetadata.java   | 112 ---
 ...dHardwareBuilderFromResourceAllocations.java |  43 -
 ...EnvelopeOrThrowIllegalArgumentException.java |  77 --
 .../internal/VCloudTemplateBuilderImpl.java     |  48 -
 .../compute/options/VCloudTemplateOptions.java  | 350 -------
 ...edIntoNameThenCustomizeDeployAndPowerOn.java | 302 -------
 ...etworkConfigurationForNetworkAndOptions.java |  80 --
 .../strategy/VCloudComputeServiceAdapter.java   | 263 ------
 .../vcloud/compute/util/VCloudComputeUtils.java | 116 ---
 .../vcloud/config/DefaultCatalogForOrg.java     |  63 --
 .../vcloud/config/DefaultNetworkForVDC.java     |  65 --
 .../vcloud/config/DefaultOrgForUser.java        |  58 --
 .../vcloud/config/DefaultTasksListForOrg.java   |  53 --
 .../config/DefaultVCloudReferencesModule.java   | 165 ----
 .../jclouds/vcloud/config/DefaultVDCForOrg.java |  63 --
 .../vcloud/config/VCloudHttpApiModule.java      | 538 -----------
 .../jclouds/vcloud/domain/AllocationModel.java  |  70 --
 .../org/jclouds/vcloud/domain/Capacity.java     | 108 ---
 .../java/org/jclouds/vcloud/domain/Catalog.java |  69 --
 .../org/jclouds/vcloud/domain/CatalogItem.java  |  37 -
 .../domain/GuestCustomizationSection.java       | 440 ---------
 .../domain/InstantiateVAppTemplateParams.java   |  96 --
 .../vcloud/domain/NetworkConnection.java        | 233 -----
 .../vcloud/domain/NetworkConnectionSection.java | 218 -----
 .../java/org/jclouds/vcloud/domain/Org.java     |  86 --
 .../jclouds/vcloud/domain/ReferenceType.java    |  55 --
 .../java/org/jclouds/vcloud/domain/Status.java  | 246 -----
 .../java/org/jclouds/vcloud/domain/Task.java    |  72 --
 .../org/jclouds/vcloud/domain/TaskStatus.java   |  71 --
 .../org/jclouds/vcloud/domain/TasksList.java    |  37 -
 .../java/org/jclouds/vcloud/domain/VApp.java    |  87 --
 .../org/jclouds/vcloud/domain/VAppTemplate.java |  97 --
 .../org/jclouds/vcloud/domain/VCloudError.java  | 123 ---
 .../jclouds/vcloud/domain/VCloudSession.java    |  29 -
 .../java/org/jclouds/vcloud/domain/VDC.java     | 146 ---
 .../org/jclouds/vcloud/domain/VDCStatus.java    |  57 --
 .../main/java/org/jclouds/vcloud/domain/Vm.java | 108 ---
 .../vcloud/domain/internal/CatalogImpl.java     | 193 ----
 .../vcloud/domain/internal/CatalogItemImpl.java | 111 ---
 .../vcloud/domain/internal/ErrorImpl.java       | 119 ---
 .../jclouds/vcloud/domain/internal/OrgImpl.java | 171 ----
 .../domain/internal/ReferenceTypeImpl.java      | 103 ---
 .../vcloud/domain/internal/TaskImpl.java        | 165 ----
 .../vcloud/domain/internal/TasksListImpl.java   |  81 --
 .../vcloud/domain/internal/VAppImpl.java        | 166 ----
 .../domain/internal/VAppTemplateImpl.java       | 205 -----
 .../jclouds/vcloud/domain/internal/VDCImpl.java | 292 ------
 .../jclouds/vcloud/domain/internal/VmImpl.java  | 217 -----
 .../vcloud/domain/network/DhcpService.java      | 106 ---
 .../jclouds/vcloud/domain/network/Features.java |  95 --
 .../vcloud/domain/network/FenceMode.java        |  70 --
 .../vcloud/domain/network/FirewallService.java  |  86 --
 .../domain/network/IpAddressAllocationMode.java |  52 --
 .../jclouds/vcloud/domain/network/IpRange.java  |  76 --
 .../jclouds/vcloud/domain/network/IpScope.java  | 170 ----
 .../vcloud/domain/network/NatService.java       | 115 ---
 .../vcloud/domain/network/NetworkConfig.java    | 167 ----
 .../vcloud/domain/network/OrgNetwork.java       | 121 ---
 .../domain/network/firewall/FirewallPolicy.java |  54 --
 .../network/firewall/FirewallProtocols.java     |  73 --
 .../domain/network/firewall/FirewallRule.java   | 125 ---
 .../domain/network/internal/OrgNetworkImpl.java | 202 -----
 .../vcloud/domain/network/nat/NatPolicy.java    |  54 --
 .../vcloud/domain/network/nat/NatProtocol.java  |  48 -
 .../vcloud/domain/network/nat/NatRule.java      |  35 -
 .../vcloud/domain/network/nat/NatType.java      |  61 --
 .../domain/network/nat/rules/MappingMode.java   |  54 --
 .../network/nat/rules/OneToOneVmRule.java       | 110 ---
 .../network/nat/rules/PortForwardingRule.java   | 111 ---
 .../vcloud/domain/network/nat/rules/VmRule.java | 128 ---
 .../EditableResourceAllocationSettingData.java  | 302 -------
 .../vcloud/domain/ovf/VCloudHardDisk.java       | 330 -------
 .../vcloud/domain/ovf/VCloudNetworkAdapter.java | 332 -------
 .../vcloud/domain/ovf/VCloudNetworkSection.java |  80 --
 .../ovf/VCloudOperatingSystemSection.java       | 118 ---
 .../ovf/VCloudVirtualHardwareSection.java       | 179 ----
 .../org/jclouds/vcloud/endpoints/Catalog.java   |  37 -
 .../org/jclouds/vcloud/endpoints/Network.java   |  37 -
 .../java/org/jclouds/vcloud/endpoints/Org.java  |  37 -
 .../org/jclouds/vcloud/endpoints/OrgList.java   |  37 -
 .../org/jclouds/vcloud/endpoints/TasksList.java |  37 -
 .../jclouds/vcloud/endpoints/VCloudLogin.java   |  38 -
 .../java/org/jclouds/vcloud/endpoints/VDC.java  |  37 -
 .../org/jclouds/vcloud/features/CatalogApi.java | 144 ---
 .../org/jclouds/vcloud/features/NetworkApi.java |  61 --
 .../org/jclouds/vcloud/features/OrgApi.java     |  86 --
 .../org/jclouds/vcloud/features/TaskApi.java    |  82 --
 .../org/jclouds/vcloud/features/VAppApi.java    | 261 ------
 .../vcloud/features/VAppTemplateApi.java        | 180 ----
 .../org/jclouds/vcloud/features/VDCApi.java     |  73 --
 .../java/org/jclouds/vcloud/features/VmApi.java | 295 ------
 ...ddVCloudAuthorizationAndCookieToRequest.java |  63 --
 .../vcloud/functions/CatalogItemsInCatalog.java |  64 --
 .../vcloud/functions/CatalogItemsInOrg.java     |  57 --
 .../jclouds/vcloud/functions/CatalogsInOrg.java |  73 --
 .../functions/DefaultNetworkNameInTemplate.java |  47 -
 .../jclouds/vcloud/functions/NetworksInOrg.java |  57 --
 .../vcloud/functions/OrgNameToEndpoint.java     |  57 --
 .../functions/OrgNameToTasksListEndpoint.java   |  62 --
 .../vcloud/functions/OrgsForLocations.java      |  73 --
 .../jclouds/vcloud/functions/OrgsForNames.java  |  56 --
 .../ParseLoginResponseFromHeaders.java          | 105 ---
 .../functions/VAppTemplatesForCatalogItems.java |  66 --
 .../vcloud/functions/VAppTemplatesInOrg.java    |  65 --
 .../org/jclouds/vcloud/functions/VDCsInOrg.java |  57 --
 .../ParseVCloudErrorFromHttpResponse.java       | 121 ---
 .../http/filters/VCloudBasicAuthentication.java |  58 --
 .../http/filters/VCloudSupportedVersions.java   |  35 -
 .../jclouds/vcloud/internal/VCloudLoginApi.java |  44 -
 .../org/jclouds/vcloud/loaders/OVFLoader.java   |  47 -
 .../vcloud/loaders/VAppTemplateLoader.java      |  47 -
 .../org/jclouds/vcloud/location/DefaultVDC.java |  74 --
 .../location/OrgAndVDCToLocationSupplier.java   |  93 --
 .../vcloud/options/CaptureVAppOptions.java      |  51 --
 .../vcloud/options/CatalogItemOptions.java      |  77 --
 .../jclouds/vcloud/options/CloneOptions.java    |  53 --
 .../vcloud/options/CloneVAppOptions.java        |  88 --
 .../options/CloneVAppTemplateOptions.java       |  42 -
 .../options/InstantiateVAppTemplateOptions.java | 178 ----
 .../jclouds/vcloud/predicates/TaskSuccess.java  |  65 --
 .../vcloud/reference/VCloudConstants.java       |  51 --
 .../jclouds/vcloud/reference/package-info.java  |  21 -
 ...thNameMatchingConfigurationKeyOrDefault.java |  99 --
 .../vcloud/suppliers/VAppTemplatesSupplier.java |  86 --
 .../java/org/jclouds/vcloud/util/Utils.java     |  71 --
 .../org/jclouds/vcloud/util/VCloudUtils.java    |  67 --
 .../org/jclouds/vcloud/xml/CatalogHandler.java  | 104 ---
 .../jclouds/vcloud/xml/CatalogItemHandler.java  |  81 --
 .../org/jclouds/vcloud/xml/ErrorHandler.java    |  45 -
 .../xml/GuestCustomizationSectionHandler.java   | 137 ---
 .../vcloud/xml/NetworkConnectionHandler.java    |  87 --
 .../xml/NetworkConnectionSectionHandler.java    | 103 ---
 .../java/org/jclouds/vcloud/xml/OrgHandler.java | 112 ---
 .../org/jclouds/vcloud/xml/OrgListHandler.java  |  54 --
 .../jclouds/vcloud/xml/OrgNetworkHandler.java   | 325 -------
 .../vcloud/xml/SupportedVersionsHandler.java    |  60 --
 .../org/jclouds/vcloud/xml/TaskHandler.java     | 128 ---
 .../jclouds/vcloud/xml/TasksListHandler.java    |  74 --
 .../org/jclouds/vcloud/xml/VAppHandler.java     | 151 ----
 .../jclouds/vcloud/xml/VAppTemplateHandler.java | 152 ----
 .../xml/VCloudVirtualHardwareHandler.java       |  72 --
 .../java/org/jclouds/vcloud/xml/VDCHandler.java | 167 ----
 .../java/org/jclouds/vcloud/xml/VmHandler.java  | 178 ----
 .../xml/ovf/VCloudNetworkSectionHandler.java    |  69 --
 .../xml/ovf/VCloudOperatingSystemHandler.java   |  81 --
 ...oudResourceAllocationSettingDataHandler.java |  89 --
 .../services/org.jclouds.apis.ApiMetadata       |   1 -
 .../jclouds/vcloud/VCloudApiMetadataTest.java   |  32 -
 .../java/org/jclouds/vcloud/VCloudApiTest.java  |  64 --
 .../vcloud/VCloudSessionRefreshLiveTest.java    |  41 -
 .../jclouds/vcloud/VCloudVersionsApiTest.java   |  69 --
 .../BindCatalogItemToXmlPayloadTest.java        |  53 --
 .../BindCloneVAppParamsToXmlPayloadTest.java    |  81 --
 ...CloneVAppTemplateParamsToXmlPayloadTest.java |  89 --
 .../BindDeployVAppParamsToXmlPayloadTest.java   |  61 --
 ...tiateVAppTemplateParamsToXmlPayloadTest.java | 179 ----
 ...etworkConnectionSectionToXmlPayloadTest.java |  68 --
 .../BindUndeployVAppParamsToXmlPayloadTest.java |  61 --
 .../BaseVCloudComputeServiceExpectTest.java     | 160 ----
 .../compute/VCloudComputeServiceLiveTest.java   |  54 --
 .../functions/FindLocationForResourceTest.java  |  64 --
 .../functions/ListImagesInVCloudExpectTest.java |  89 --
 .../functions/VAppToNodeMetadataTest.java       | 228 -----
 .../options/VCloudTemplateOptionsTest.java      | 197 ----
 ...ThenCustomizeDeployAndPowerOnExpectTest.java | 171 ----
 .../VCloudComputeServiceAdapterTest.java        |  89 --
 .../vcloud/features/CatalogApiLiveTest.java     |  53 --
 .../jclouds/vcloud/features/CatalogApiTest.java | 131 ---
 .../vcloud/features/NetworkApiLiveTest.java     |  29 -
 .../jclouds/vcloud/features/NetworkApiTest.java |  75 --
 .../jclouds/vcloud/features/OrgApiLiveTest.java |  42 -
 .../org/jclouds/vcloud/features/OrgApiTest.java |  91 --
 .../vcloud/features/TaskApiLiveTest.java        |  29 -
 .../jclouds/vcloud/features/TaskApiTest.java    | 108 ---
 .../vcloud/features/VAppApiLiveTest.java        |  53 --
 .../jclouds/vcloud/features/VAppApiTest.java    | 315 -------
 .../features/VAppTemplateApiLiveTest.java       | 168 ----
 .../vcloud/features/VAppTemplateApiTest.java    | 238 -----
 .../jclouds/vcloud/features/VDCApiLiveTest.java |  29 -
 .../org/jclouds/vcloud/features/VDCApiTest.java | 102 ---
 .../jclouds/vcloud/features/VmApiLiveTest.java  | 163 ----
 .../org/jclouds/vcloud/features/VmApiTest.java  | 320 -------
 ...loudAuthorizationAndCookieToRequestTest.java |  55 --
 .../ParseLoginResponseFromHeadersTest.java      | 147 ---
 .../ParseVCloudErrorFromHttpResponseTest.java   |  96 --
 .../vcloud/internal/BasePayloadTest.java        |  51 --
 .../vcloud/internal/BaseVCloudApiLiveTest.java  |  59 --
 .../vcloud/internal/BaseVCloudApiTest.java      | 272 ------
 .../vcloud/internal/VCloudLoginApiTest.java     |  97 --
 .../InstantiateVAppTemplateOptionsTest.java     |  74 --
 ...meMatchingConfigurationKeyOrDefaultTest.java | 115 ---
 .../org/jclouds/vcloud/utils/TestUtils.java     |  32 -
 .../jclouds/vcloud/xml/CatalogHandlerTest.java  | 135 ---
 .../vcloud/xml/CatalogItemHandlerTest.java      |  86 --
 .../GuestCustomizationSectionHandlerTest.java   |  75 --
 .../xml/NetworkConnectionHandlerTest.java       |  57 --
 .../NetworkConnectionSectionHandlerTest.java    |  63 --
 .../org/jclouds/vcloud/xml/OrgHandlerTest.java  | 124 ---
 .../jclouds/vcloud/xml/OrgListHandlerTest.java  |  57 --
 .../vcloud/xml/OrgNetworkHandlerTest.java       | 104 ---
 .../xml/SupportedVersionsHandlerTest.java       |  53 --
 .../org/jclouds/vcloud/xml/TaskHandlerTest.java | 135 ---
 .../vcloud/xml/TasksListHandlerTest.java        |  82 --
 .../org/jclouds/vcloud/xml/VAppHandlerTest.java |  77 --
 .../vcloud/xml/VAppTemplateHandlerTest.java     | 164 ----
 .../org/jclouds/vcloud/xml/VDCHandlerTest.java  | 136 ---
 .../org/jclouds/vcloud/xml/VmHandlerTest.java   |  79 --
 ...VCloudOperatingSystemSectionHandlerTest.java |  61 --
 ...VCloudVirtualHardwareSectionHandlerTest.java | 153 ----
 .../src/test/resources/captureVApp-default.xml  |   1 -
 .../src/test/resources/captureVApp.xml          |   1 -
 .../src/test/resources/catalog-blank.xml        |   7 -
 .../src/test/resources/catalog-hosting.xml      |  25 -
 .../src/test/resources/catalog.xml              |  27 -
 .../src/test/resources/catalog1.0-vcd15.xml     |   9 -
 ...alogItem-carrenza-with-default-namespace.xml |   8 -
 ...talogItem-carrenza-with-vcloud-namespace.xml |   8 -
 .../src/test/resources/catalogItem-hosting.xml  |  14 -
 .../test/resources/catalogItem-terremark.xml    |  16 -
 .../src/test/resources/catalogItem1.0-vcd15.xml |   8 -
 .../src/test/resources/copyVApp-default.xml     |   1 -
 .../src/test/resources/copyVApp.xml             |   1 -
 .../test/resources/copyVAppTemplate-default.xml |   1 -
 .../src/test/resources/copyVAppTemplate.xml     |   1 -
 .../src/test/resources/cpuItem.xml              |   1 -
 .../src/test/resources/guestCustomization.xml   |  23 -
 .../resources/guestCustomizationSection.xml     |   3 -
 .../src/test/resources/instantiatedvapp.xml     |  13 -
 .../instantiationparams-description.xml         |   1 -
 .../resources/instantiationparams-network.xml   |   1 -
 .../src/test/resources/instantiationparams.xml  |   1 -
 .../1.7.1-stratos/src/test/resources/log4j.xml  | 151 ----
 .../src/test/resources/memoryItem.xml           |   1 -
 .../src/test/resources/moveVApp.xml             |   1 -
 .../src/test/resources/moveVAppTemplate.xml     |   1 -
 .../src/test/resources/networkconnection.xml    |   7 -
 .../test/resources/networkconnectionsection.xml |  18 -
 .../src/test/resources/org-1.0.xml              |  24 -
 .../src/test/resources/org-hosting.xml          |  12 -
 .../src/test/resources/org-savvis.xml           |  13 -
 .../1.7.1-stratos/src/test/resources/org.xml    |   5 -
 .../src/test/resources/org1.0-vcd15.xml         |  11 -
 .../src/test/resources/orgList1.0-vcd15.xml     |   4 -
 .../src/test/resources/orglist-savvis.xml       |   3 -
 .../src/test/resources/orglist.xml              |   3 -
 .../src/test/resources/orgnetwork-bridged.xml   |  20 -
 .../src/test/resources/orgnetwork-isolated.xml  |  31 -
 .../1.7.1-stratos/src/test/resources/os.xml     |  11 -
 .../src/test/resources/ovf-multi-vm.xml         | 285 ------
 .../src/test/resources/ovf-ubuntu64.xml         | 148 ---
 .../src/test/resources/task-1.0.xml             |   9 -
 .../src/test/resources/task-error.xml           |   9 -
 .../src/test/resources/task-hosting.xml         |  12 -
 .../src/test/resources/task-self.xml            |  11 -
 .../src/test/resources/task-vcd15.xml           |   5 -
 .../1.7.1-stratos/src/test/resources/task.xml   |   8 -
 .../src/test/resources/taskslist-hosting.xml    |  14 -
 .../src/test/resources/taskslist.xml            |  27 -
 .../resources/template1.0-vcd15-multi-vm.xml    |  68 --
 .../src/test/resources/template1.0-vcd15.xml    |  72 --
 .../src/test/resources/vAppTemplate-copying.xml |  41 -
 .../src/test/resources/vAppTemplate.xml         | 143 ---
 .../vAppTemplate1.0-vcd15_withNewlines.xml      | 109 ---
 .../src/test/resources/vapp-hosting.xml         | 235 -----
 .../src/test/resources/vapp-none.xml            | 237 -----
 .../src/test/resources/vapp-pool.xml            | 227 -----
 .../src/test/resources/vapp-rhel-off-static.xml | 325 -------
 .../src/test/resources/vapp-ubuntu-off-dhcp.xml | 213 -----
 .../src/test/resources/vapp-unresolved.xml      |  21 -
 .../src/test/resources/vapp-win-off-static.xml  | 219 -----
 .../src/test/resources/vdc-1.0.xml              |  49 -
 .../src/test/resources/vdc-hosting.xml          |  60 --
 .../src/test/resources/vdc-nonet.xml            |  22 -
 .../1.7.1-stratos/src/test/resources/vdc.xml    |  36 -
 .../src/test/resources/vdc1.0-vcd15.xml         |  47 -
 .../src/test/resources/versions-vcd15.xml       | 906 -------------------
 .../src/test/resources/versions.xml             |   7 -
 .../test/resources/virtualhardwaresection.xml   | 118 ---
 .../src/test/resources/vm-rhel-off-static.xml   | 197 ----
 dependencies/pom.xml                            |   4 +-
 .../HealthStatisticsEventBuilder.xml            |  21 +
 .../InstanceStatusStatisticsBuilder.xml         |  21 +
 .../LoadBalancerStatisticsEventBuilder.xml      |  21 +
 .../AverageInFlightRequestsEventFormatter.xml   |  21 +
 .../AverageLoadAverageEventFormatter.xml        |  21 +
 .../AverageMemoryConsumptionEventFormatter.xml  |  21 +
 .../FaultMessageEventFormatter.xml              |  21 +
 .../GradientInFlightRequestsEventFormatter.xml  |  21 +
 .../GradientLoadAverageEventFormatter.xml       |  21 +
 .../GradientMemoryConsumptionEventFormatter.xml |  21 +
 .../MemberAverageLoadAverageEventFormatter.xml  |  21 +
 ...erAverageMemoryConsumptionEventFormatter.xml |  21 +
 .../MemberGradientLoadAverageEventFormatter.xml |  21 +
 ...rGradientMemoryConsumptionEventFormatter.xml |  21 +
 ...econdDerivativeLoadAverageEventFormatter.xml |  21 +
 ...erivativeMemoryConsumptionEventFormatter.xml |  21 +
 ...DerivativeInFlightRequestsEventFormatter.xml |  21 +
 ...econdDerivativeLoadAverageEventFormatter.xml |  21 +
 ...erivativeMemoryConsumptionEventFormatter.xml |  21 +
 .../executionplans/AverageHeathRequest.xml      |  21 +
 .../AverageInFlightRequestsFinder.xml           |  21 +
 .../executionplans/GradientOfHealthRequest.xml  |  21 +
 .../GradientOfRequestsInFlightFinder.xml        |  21 +
 .../SecondDerivativeOfHealthRequest.xml         |  21 +
 ...SecondDerivativeOfRequestsInFlightFinder.xml |  21 +
 .../DefaultWSO2EventInputAdaptor.xml            |  21 +
 .../DefaultWSO2EventOutputAdaptor.xml           |  21 +
 .../outputeventadaptors/JMSOutputAdaptor.xml    |  21 +
 .../streamdefinitions/stream-manager-config.xml |  22 +
 .../distribution/src/main/conf/jndi.properties  |  21 +
 .../src/test/resources/automation.properties    |  21 +
 .../src/test/resources/jndi.properties          |  23 +-
 .../modules/scripts/ec2/clean.sh                |  20 +
 .../src/main/conf/cipher-tool.properties        |  21 +
 .../distribution/src/main/conf/jndi.properties  |  21 +
 products/stratos-manager/conf/jndi.properties   |  21 +
 products/stratos-manager/conf/log4j.properties  |   6 +-
 .../conf/temp-artifacts/carbon/module.xml       |  24 +-
 .../carbon/scripts/registry/artifacts.js        |  21 +
 .../carbon/scripts/registry/registry-osgi.js    |  21 +
 .../carbon/scripts/registry/registry-ws.js      |  23 +-
 .../carbon/scripts/registry/registry.js         |  23 +-
 .../carbon/scripts/server/config.js             |  23 +-
 .../carbon/scripts/server/osgi.js               |  23 +-
 .../carbon/scripts/server/server.js             |  23 +-
 .../carbon/scripts/server/tenant.js             |  23 +-
 .../carbon/scripts/user/registry-space.js       |  23 +-
 .../temp-artifacts/carbon/scripts/user/space.js |  23 +-
 .../carbon/scripts/user/user-manager.js         |  21 +
 .../temp-artifacts/carbon/scripts/user/user.js  |  21 +
 .../conf/temp-artifacts/sso/module.xml          |  24 +-
 .../temp-artifacts/sso/scripts/sso.client.js    |  21 +
 products/stratos/conf/jndi.properties           |  24 +-
 .../conf/temp-artifacts/carbon/module.xml       |  24 +-
 .../carbon/scripts/registry/artifacts.js        |  21 +
 .../carbon/scripts/registry/registry-osgi.js    |  21 +
 .../carbon/scripts/registry/registry-ws.js      |  23 +-
 .../carbon/scripts/registry/registry.js         |  23 +-
 .../carbon/scripts/server/config.js             |  23 +-
 .../carbon/scripts/server/osgi.js               |  23 +-
 .../carbon/scripts/server/server.js             |  23 +-
 .../carbon/scripts/server/tenant.js             |  23 +-
 .../carbon/scripts/user/registry-space.js       |  23 +-
 .../temp-artifacts/carbon/scripts/user/space.js |  23 +-
 .../carbon/scripts/user/user-manager.js         |  21 +
 .../temp-artifacts/carbon/scripts/user/user.js  |  21 +
 .../stratos/conf/temp-artifacts/sso/module.xml  |  24 +-
 .../temp-artifacts/sso/scripts/sso.client.js    |  21 +
 products/stratos/modules/distribution/pom.xml   |  17 +
 .../modules/distribution/src/assembly/bin.xml   |   8 +
 .../src/main/conf/cipher-tool.properties        |  21 +
 .../DefaultWSO2EventInputAdaptor.xml            |  21 +
 .../DefaultWSO2EventOutputAdaptor.xml           |  21 +
 .../distribution/src/main/conf/jndi.properties  |  21 +
 tools/cartridge-create/README                   |  50 -
 tools/cartridge-create/configure-software       | 383 --------
 tools/cartridge-create/create-kvm-image.sh      |  24 -
 tools/cartridge-create/image-action.sh          | 165 ----
 .../init-scripts/default/default                |  43 -
 .../init-scripts/default/default.ctrg           |  51 --
 .../init-scripts/default/get-launch-params.rb   |  55 --
 .../default/stratos-openstack-init.sh           |  57 --
 .../init-scripts/default/stratos.pem            |  16 -
 .../init-scripts/mysql/ec2/get-launch-params.rb |  51 --
 .../init-scripts/mysql/ec2/healthcheck.sh       |  32 -
 .../init-scripts/mysql/ec2/stratos-init.sh      | 152 ----
 .../init-scripts/mysql/get-launch-params.rb     |  55 --
 tools/cartridge-create/init-scripts/mysql/mysql |  46 -
 .../init-scripts/mysql/mysql.ctrg               |  58 --
 .../mysql/openstack/get-launch-params.rb        |  55 --
 .../init-scripts/mysql/openstack/healthcheck.sh |  30 -
 .../mysql/openstack/stratos-init.sh             | 165 ----
 .../init-scripts/mysql/stratos.pem              |  16 -
 .../init-scripts/mysql/vcloud/stratos-init.sh   | 152 ----
 .../php/cartridge-data-publisher-1.0.2.zip      | Bin 2832200 -> 0 bytes
 tools/cartridge-create/init-scripts/php/default |  59 --
 .../init-scripts/php/default-ssl                | 190 ----
 .../init-scripts/php/ec2/get-launch-params.rb   |  54 --
 .../init-scripts/php/ec2/healthcheck.sh         |  32 -
 .../init-scripts/php/ec2/stratos-init.sh        | 304 -------
 .../init-scripts/php/get-launch-params.rb       |  55 --
 .../php/openstack/get-launch-params.rb          |  55 --
 .../init-scripts/php/openstack/healthcheck.sh   |  30 -
 .../init-scripts/php/openstack/stratos-init.sh  | 293 ------
 tools/cartridge-create/init-scripts/php/php     |  49 -
 .../cartridge-create/init-scripts/php/php.ctrg  |  65 --
 .../init-scripts/php/thrift-0.8.0.tar.gz        | Bin 2379006 -> 0 bytes
 .../cartridge-create/init-scripts/php/wso2.pem  |  16 -
 tools/cartridge-create/init-scripts/php/x.sh    |  50 -
 tools/cartridge-create/init-scripts/php/y.sh    |  32 -
 .../init-scripts/tomcat/get-launch-params.rb    |  53 --
 .../tomcat/openstack/get-launch-params.rb       |  55 --
 .../tomcat/openstack/healthcheck.sh             |  30 -
 .../tomcat/openstack/stratos-init.sh            | 289 ------
 .../init-scripts/tomcat/payload/README          |  21 -
 .../init-scripts/tomcat/payload/launch-params   |  18 -
 .../init-scripts/tomcat/stratos-init.sh         | 274 ------
 .../init-scripts/tomcat/stratos.pem             |  16 -
 tools/cartridge-create/stratos-image            | 100 --
 tools/cartridge-create/stratos-image-local      | 310 -------
 tools/cartridge-create/uploadimg.sh             |  32 -
 tools/puppet3-agent/config.sh                   |   6 +-
 tools/puppet3/auth.conf                         |  17 +
 tools/puppet3/autosign.conf                     |  16 +
 tools/puppet3/fileserver.conf                   |  17 +
 tools/puppet3/manifests/nodes.pp                |  47 +-
 tools/puppet3/manifests/site.pp                 |  17 +
 tools/puppet3/modules/agent/manifests/init.pp   |  17 +
 .../modules/agent/manifests/initialize.pp       |  33 +-
 .../modules/agent/manifests/push_templates.pp   |  33 +-
 tools/puppet3/modules/agent/manifests/start.pp  |  33 +-
 .../templates/extensions/addons/_mysql.erb      |  17 +
 .../agent/templates/extensions/addons/_ruby.erb |  17 +
 tools/puppet3/modules/autoscaler/LICENSE        |  13 -
 .../autoscaler/files/configs/bin/stratos.sh     | 298 ------
 .../configs/repository/conf/autoscaler.xml      |  34 -
 .../modules/autoscaler/manifests/clean.pp       |  45 -
 .../modules/autoscaler/manifests/deploy.pp      |  43 -
 .../modules/autoscaler/manifests/init.pp        |  97 --
 .../modules/autoscaler/manifests/initialize.pp  |  59 --
 .../modules/autoscaler/manifests/params.pp      |  66 --
 .../autoscaler/manifests/push_templates.pp      |  26 -
 .../modules/autoscaler/manifests/start.pp       |  27 -
 .../templates/conf/autoscaler.xml.erb           |  39 -
 .../templates/conf/axis2/axis2.xml.erb          | 701 --------------
 .../autoscaler/templates/conf/carbon.xml.erb    | 625 -------------
 .../templates/conf/jndi.properties.erb          |   4 -
 .../economy-autoscale.xml.erb                   |  26 -
 .../economy-deployment.xml.erb                  |  23 -
 .../server/partitions/partitions.xml.erb        |  19 -
 tools/puppet3/modules/cc/LICENSE                |  13 -
 .../modules/cc/files/configs/bin/stratos.sh     | 299 ------
 .../repository/conf/cloud-controller.xml        |  81 --
 ....stratos.cloud.controller_4.0.0.SNAPSHOT.jar | Bin 183364 -> 0 bytes
 tools/puppet3/modules/cc/manifests/clean.pp     |  45 -
 tools/puppet3/modules/cc/manifests/deploy.pp    |  43 -
 tools/puppet3/modules/cc/manifests/init.pp      |  96 --
 .../puppet3/modules/cc/manifests/initialize.pp  |  59 --
 tools/puppet3/modules/cc/manifests/params.pp    |  66 --
 .../modules/cc/manifests/push_templates.pp      |  26 -
 tools/puppet3/modules/cc/manifests/start.pp     |  27 -
 .../cc/templates/conf/axis2/axis2.xml.erb       | 703 --------------
 .../modules/cc/templates/conf/carbon.xml.erb    | 625 -------------
 .../cc/templates/conf/jndi.properties.erb       |   4 -
 tools/puppet3/modules/cep/LICENSE               |  13 -
 .../modules/cep/files/configs/bin/wso2server.sh | 304 -------
 .../dropins/activemq_client_5.8.0_1.0.0.jar     | Bin 1032400 -> 0 bytes
 .../dropins/andes_client_0.13.wso2v8_1.0.0.jar  | Bin 1854829 -> 0 bytes
 ...che.stratos.cep.extension-1.0.0-SNAPSHOT.jar | Bin 16495 -> 0 bytes
 .../repository/conf/siddhi/siddhi.extension     |   3 -
 .../repository/conf/stream-manager-config.xml   | 177 ----
 .../HealthStatisticsEventBuilder.xml            |  10 -
 .../InstanceStatusStatisticsBuilder.xml         |  10 -
 .../LoadBalancerStatisticsEventBuilder.xml      |  10 -
 .../AverageInFlightRequestsEventFormatter.xml   |  11 -
 .../AverageLoadAverageEventFormatter.xml        |  11 -
 .../AverageMemoryConsumptionEventFormatter.xml  |  11 -
 .../FaultMessageEventFormatter.xml              |  11 -
 .../GradientInFlightRequestsEventFormatter.xml  |  11 -
 .../GradientLoadAverageEventFormatter.xml       |  11 -
 .../GradientMemoryConsumptionEventFormatter.xml |  11 -
 .../MemberAverageLoadAverageEventFormatter.xml  |  11 -
 ...erAverageMemoryConsumptionEventFormatter.xml |  11 -
 .../MemberGradientLoadAverageEventFormatter.xml |  11 -
 ...rGradientMemoryConsumptionEventFormatter.xml |  11 -
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 -
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 -
 ...DerivativeInFlightRequestsEventFormatter.xml |  11 -
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 -
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 -
 .../executionplans/AverageHeathRequest.xml      |  29 -
 .../AverageInFlightRequestsFinder.xml           |  19 -
 .../executionplans/GradientOfHealthRequest.xml  |  30 -
 .../GradientOfRequestsInFlightFinder.xml        |  18 -
 .../SecondDerivativeOfHealthRequest.xml         |  27 -
 ...SecondDerivativeOfRequestsInFlightFinder.xml |  19 -
 .../DefaultWSO2EventInputAdaptor.xml            |   3 -
 .../DefaultWSO2EventOutputAdaptor.xml           |   8 -
 .../outputeventadaptors/JMSOutputAdaptor.xml    |   8 -
 .../streamdefinitions/stream-manager-config.xml | 269 ------
 tools/puppet3/modules/cep/manifests/clean.pp    |  45 -
 tools/puppet3/modules/cep/manifests/deploy.pp   |  43 -
 tools/puppet3/modules/cep/manifests/init.pp     | 101 ---
 .../puppet3/modules/cep/manifests/initialize.pp |  59 --
 tools/puppet3/modules/cep/manifests/params.pp   |  69 --
 .../modules/cep/manifests/push_templates.pp     |  26 -
 tools/puppet3/modules/cep/manifests/start.pp    |  27 -
 .../cep/templates/conf/axis2/axis2.xml.erb      | 698 --------------
 .../modules/cep/templates/conf/carbon.xml.erb   | 609 -------------
 .../cep/templates/conf/jndi.properties.erb      |  32 -
 .../JMSOutputAdaptor.xml.erb                    |   8 -
 tools/puppet3/modules/java/manifests/init.pp    |  17 +
 .../modules/java/templates/java_home.sh.erb     |  17 +
 tools/puppet3/modules/lb/manifests/clean.pp     |  33 +-
 tools/puppet3/modules/lb/manifests/deploy.pp    |  33 +-
 tools/puppet3/modules/lb/manifests/init.pp      |  33 +-
 .../puppet3/modules/lb/manifests/initialize.pp  |  33 +-
 tools/puppet3/modules/lb/manifests/params.pp    |  33 +-
 .../modules/lb/manifests/push_templates.pp      |  33 +-
 tools/puppet3/modules/lb/manifests/start.pp     |  33 +-
 tools/puppet3/modules/manager/LICENSE           |  13 -
 .../manager/files/configs/bin/stratos.sh        | 301 ------
 .../lib/mysql-connector-java-5.1.26-bin.jar     | Bin 855948 -> 0 bytes
 .../repository/conf/cartridge-config.properties |  63 --
 .../conf/datasources/master-datasources.xml     |  27 -
 .../conf/datasources/stratos-datasources.xml    |  66 --
 .../repository/conf/stratos-datasources.xml     |  66 --
 .../puppet3/modules/manager/manifests/clean.pp  |  45 -
 .../puppet3/modules/manager/manifests/deploy.pp |  43 -
 tools/puppet3/modules/manager/manifests/init.pp |  99 --
 .../modules/manager/manifests/initialize.pp     |  59 --
 .../puppet3/modules/manager/manifests/params.pp |  66 --
 .../modules/manager/manifests/push_templates.pp |  26 -
 .../puppet3/modules/manager/manifests/start.pp  |  27 -
 .../manager/templates/conf/axis2/axis2.xml.erb  | 702 --------------
 .../manager/templates/conf/carbon.xml.erb       | 625 -------------
 .../conf/cartridge-config.properties.erb        |  73 --
 .../conf/datasources/master-datasources.xml.erb |  27 -
 .../datasources/stratos-datasources.xml.erb     |  66 --
 .../manager/templates/conf/jndi.properties.erb  |   4 -
 tools/puppet3/modules/messagebroker/LICENSE     |  13 -
 .../files/configs/bin/wso2server.sh             | 300 ------
 .../modules/messagebroker/manifests/clean.pp    |  45 -
 .../modules/messagebroker/manifests/deploy.pp   |  43 -
 .../modules/messagebroker/manifests/init.pp     |  99 --
 .../messagebroker/manifests/initialize.pp       |  59 --
 .../modules/messagebroker/manifests/params.pp   |  66 --
 .../messagebroker/manifests/push_templates.pp   |  26 -
 .../modules/messagebroker/manifests/start.pp    |  27 -
 .../templates/conf/axis2/axis2.xml.erb          | 719 ---------------
 .../messagebroker/templates/conf/carbon.xml.erb | 583 ------------
 tools/puppet3/modules/mysql/manifests/init.pp   |  17 +
 .../modules/mysql/templates/000-default.erb     |  17 +
 .../puppet3/modules/mysql/templates/my.cnf.erb  |  17 +
 .../modules/mysql/templates/phpMyAdmin.conf.erb |  17 +
 tools/puppet3/modules/nodejs/manifests/init.pp  |  17 +
 .../modules/php/lib/facter/stratos_facts.rb     |  17 +
 .../puppet3/modules/php/manifests/init.pp.cent  |  17 +
 tools/puppet3/modules/php/manifests/init.pp.deb |  17 +
 tools/puppet3/modules/php/manifests/init.pp.rpm |  17 +
 .../modules/php/templates/httpd/httpd.conf.erb  |  17 +
 tools/puppet3/modules/ruby/manifests/init.pp    |  17 +
 .../modules/ruby/templates/ruby-start.sh.erb    |  18 +
 tools/puppet3/modules/tomcat/manifests/init.pp  |  17 +
 .../puppet3/modules/wordpress/manifests/init.pp |  17 +
 .../wordpress/templates/httpd/httpd.conf.erb    |  17 +
 tools/puppet3/puppet.conf                       |  17 +
 .../config/as/repository/conf/jndi.properties   |  21 +
 .../config/cc/repository/conf/jndi.properties   |  21 +
 .../config/sm/repository/conf/jndi.properties   |  21 +
 tools/stratos-installer/stratos-db-clean.sh     |  20 +
 1613 files changed, 67183 insertions(+), 81158 deletions(-)
----------------------------------------------------------------------