You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/04/06 21:18:29 UTC

[1/4] git commit: Fixed issue of member status not being set to activated when topology is read from loadbalancer.conf

Repository: incubator-stratos
Updated Branches:
  refs/heads/master 7c43d6ff9 -> 1a825faaf


Fixed issue of member status not being set to activated when topology is read from loadbalancer.conf


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

Branch: refs/heads/master
Commit: 53891c5c3087a1cc9d2948e2d2d748d2fdc7de33
Parents: 93ea71a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Mar 9 23:40:46 2014 -0500
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Mar 9 23:40:46 2014 -0500

----------------------------------------------------------------------
 .../stratos/load/balancer/conf/LoadBalancerConfiguration.java       | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/53891c5c/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index 1acf574..9014199 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -474,6 +474,7 @@ public class LoadBalancerConfiguration {
                                 Port port = new Port(portNode.getName(), Integer.valueOf(value), Integer.valueOf(proxy));
                                 member.addPort(port);
                             }
+                            member.setStatus(MemberStatus.Activated);
                             cluster.addMember(member);
                         }
                         // Add cluster to service


[4/4] git commit: Fixed regex expression to make port and slash optional

Posted by im...@apache.org.
Fixed regex expression to make port and slash optional


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

Branch: refs/heads/master
Commit: 1a825faaf28688a7458776e68c4b2a473d07472f
Parents: 0b418de
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Apr 7 00:47:44 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Apr 7 00:47:44 2014 +0530

----------------------------------------------------------------------
 .../src/main/conf/synapse-configs/default/sequences/main.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1a825faa/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml b/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
index 5e24684..1d6c4a6 100644
--- a/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
+++ b/products/load-balancer/modules/distribution/src/main/conf/synapse-configs/default/sequences/main.xml
@@ -40,10 +40,10 @@
 
         <!-- Updating location value in response header -->
         <filter regex=".+" source="$trp:Location">
-            <property expression="$ctx:SERVICE_PREFIX" group="2" name="LB_SP_HOST_NAME" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
-            <property expression="$trp:Location" group="1" name="EP_RESPONSE_LOC_PROTOCOL" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
-            <property expression="$trp:Location" group="2" name="EP_RESPONSE_LOC_HOST_NAME" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
-            <property expression="$trp:Location" group="4" name="EP_RESPONSE_LOC_PATH" pattern="(^http.?:\/\/\b)(\d*.\d.\d.\d*.\d*)(?::(\d*))?(.*)"/>
+            <property expression="$ctx:SERVICE_PREFIX" group="2" name="LB_SP_HOST_NAME" pattern="(^http.?://\b)(.*)(?:(\d*))(.*)"/>
+            <property expression="$trp:Location" group="1" name="EP_RESPONSE_LOC_PROTOCOL" pattern="(^http.?://\b)(.*)(?:(\d*))(.*)"/>
+            <property expression="$trp:Location" group="2" name="EP_RESPONSE_LOC_HOST_NAME" pattern="(^http.?://\b)(.*)(?:(\d*))(.*)"/>
+            <property expression="$trp:Location" group="4" name="EP_RESPONSE_LOC_PATH" pattern="(^http.?://\b)(.*)(?:(\d*))(.*)"/>
 
             <switch source="fn:lower-case($ctx:EP_RESPONSE_LOC_PROTOCOL)">
                 <case regex="https://">


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

Posted by im...@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/373590e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/373590e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/373590e8

Branch: refs/heads/master
Commit: 373590e8824a2cdfdd03bde2443007e136dc0812
Parents: 53891c5 418421d
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sat Mar 15 20:22:52 2014 -0400
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sat Mar 15 20:22:52 2014 -0400

----------------------------------------------------------------------
 .../stratos/autoscaler/PartitionContext.java    |  20 +-
 .../topology/AutoscalerTopologyReceiver.java    |  23 +-
 .../stratos/cartridge/agent/CartridgeAgent.java | 282 +-----
 .../synchronizer/RepositoryInformation.java     |   1 -
 .../config/CartridgeAgentConfiguration.java     | 159 +++-
 .../publisher/CartridgeAgentEventPublisher.java |   1 -
 .../agent/executor/ExtensionExecutor.java       |  86 ++
 .../impl/KeepAgentLiveExtensionExecutor.java    |  68 ++
 .../impl/LogPublisherExtensionExecutor.java     | 102 +++
 .../PersistenceVolumeExtensionExecutor.java     |  76 ++
 .../executor/impl/ScriptExtensionExecutor.java  |  74 ++
 .../impl/StartListenersExtensionExecutor.java   | 228 +++++
 .../impl/WaitTillActivateExtensionExecutor.java | 121 +++
 .../stratos/cartridge/agent/phase/Phase.java    | 109 +++
 .../agent/phase/impl/CleanUpPhase.java          |  62 ++
 .../agent/phase/impl/InitializingPhase.java     |  60 ++
 .../agent/phase/impl/StartingPhase.java         |  60 ++
 .../agent/phase/impl/WorkingPhase.java          |  57 ++
 .../cartridge/agent/runtime/DataHolder.java     |  55 ++
 .../agent/util/CartridgeAgentConstants.java     |   8 +-
 .../cartridge/agent/util/ExtensionUtils.java    |   2 +-
 .../agent/config/AgentFlowFileLoadTest.java     |  64 ++
 .../src/test/resources/agent-flow.conf          |   6 +
 .../stratos/cli/RestCommandLineService.java     |  21 +-
 .../apache/stratos/cli/StratosApplication.java  |   6 +-
 .../stratos/cli/beans/cartridge/Cartridge.java  |   6 +-
 .../stratos/cli/commands/CartridgesCommand.java |  67 --
 .../cli/commands/ListCartridgeInfoCommand.java  | 127 ---
 .../cli/commands/ListCartridgesCommand.java     |  67 ++
 .../stratos/cli/commands/ListCommand.java       | 120 ---
 .../ListSubscribedCartridgesCommand.java        | 120 +++
 .../stratos/cli/commands/SubscribeCommand.java  |   2 +-
 .../SubscribedCartridgeInfoCommand.java         | 127 +++
 .../org.apache.stratos.cloud.controller/pom.xml |   2 +-
 .../TenantAwareLoadBalanceEndpoint.java         |  18 +-
 .../console/cartridge_info.jag                  |  25 +-
 .../console/cartridges.jag                      |   9 +-
 .../console/configure_stratos.jag               |  52 +-
 .../console/configure_stratos_wizard.jag        |  50 +-
 .../console/dashboard.jag                       |  13 +
 .../console/data/clusters.json                  | 301 ++++++
 .../console/data/elbs.json                      |  20 +
 .../console/data/node_mem_cpu.json              | 114 +++
 .../console/index.jag                           |   8 +-
 .../console/subscribe_cartridge.jag             |  12 +-
 .../console/tenant_management.jag               |  10 +-
 .../console/tenant_new.jag                      |   5 -
 .../console/themes/theme1/pages/index.hbs       |   2 +-
 .../themes/theme1/partials/dashboard.hbs        | 560 ++++++++++++
 .../themes/theme1/partials/error_page.hbs       |  19 +
 .../console/themes/theme1/partials/header.hbs   |   2 +-
 .../themes/theme1/renderers/cartridge_info.js   | 111 ++-
 .../themes/theme1/renderers/cartridges.js       | 164 ++--
 .../theme1/renderers/configure_stratos.js       | 270 +++---
 .../renderers/configure_stratos_wizard.js       | 264 +++---
 .../themes/theme1/renderers/dashboard.js        |  76 ++
 .../console/themes/theme1/renderers/index.js    | 164 ++--
 .../theme1/renderers/subscribe_cartridge.js     | 108 ++-
 .../theme1/renderers/tenant_management.js       | 105 ++-
 .../themes/theme1/renderers/tenant_new.js       | 105 ++-
 .../theme1/subthemes/theme2/ui/css/main.css     | 579 ++++++++++++
 .../themes/theme1/ui/fonts/dropped text.txt     |   1 +
 .../console/themes/theme1/ui/img/btn-down.png   | Bin 0 -> 738 bytes
 .../themes/theme1/ui/img/btn-restart.png        | Bin 0 -> 801 bytes
 .../console/themes/theme1/ui/img/btn-start.png  | Bin 0 -> 644 bytes
 .../console/themes/theme1/ui/img/confirm.gif    | Bin 0 -> 2324 bytes
 .../console/themes/theme1/ui/img/dash.png       | Bin 0 -> 927 bytes
 .../console/themes/theme1/ui/img/details.png    | Bin 0 -> 21148 bytes
 .../console/themes/theme1/ui/img/diagram.png    | Bin 0 -> 75441 bytes
 .../console/themes/theme1/ui/img/error.gif      | Bin 0 -> 2258 bytes
 .../console/themes/theme1/ui/img/icon-plus.png  | Bin 0 -> 178 bytes
 .../themes/theme1/ui/img/icon-problem-dark.png  | Bin 0 -> 495 bytes
 .../themes/theme1/ui/img/icon-problem-light.png | Bin 0 -> 499 bytes
 .../themes/theme1/ui/img/icon-problem.png       | Bin 0 -> 499 bytes
 .../console/themes/theme1/ui/img/image_10.png   | Bin 0 -> 49844 bytes
 .../console/themes/theme1/ui/img/info.gif       | Bin 0 -> 2349 bytes
 .../console/themes/theme1/ui/img/overlay.png    | Bin 0 -> 144 bytes
 .../console/themes/theme1/ui/img/warning.gif    | Bin 0 -> 2345 bytes
 .../console/themes/theme1/ui/js/wizard.js       |  58 +-
 .../console/util/utility.jag                    |  47 +-
 .../behaviour/CartridgeMgtBehaviour.java        | 139 ++-
 .../stratos/manager/deploy/service/Service.java |  81 +-
 .../service/ServiceDeploymentManager.java       | 489 +++++-----
 .../service/multitenant/MultiTenantService.java |  12 +-
 .../multitenant/lb/MultiTenantLBService.java    |  15 +-
 .../category/DefaultLoadBalancerCategory.java   |  24 +
 .../category/ExistingLoadBalancerCategory.java  |  53 ++
 .../manager/lb/category/LBDataContext.java      | 107 +++
 .../lb/category/LoadBalancerCategory.java       | 119 +++
 .../ServiceLevelLoadBalancerCategory.java       |  44 +
 .../manager/lookup/LookupDataHolder.java        |  13 +-
 .../lookup/RepoUrlToCartridgeSubscriptions.java | 116 +++
 .../manager/CartridgeSubscriptionManager.java   | 272 ++++--
 .../RegistryBasedPersistenceManager.java        |   5 +-
 .../repository/RepositoryNotification.java      |  71 ++
 .../DataInsertionAndRetrievalManager.java       |  23 +-
 .../ApplicationCartridgeSubscription.java       |   3 +-
 .../subscription/CartridgeSubscription.java     |  38 +-
 .../subscription/DataCartridgeSubscription.java |   3 +-
 .../FrameworkCartridgeSubscription.java         |  19 +
 .../subscription/LBCartridgeSubscription.java   |  66 +-
 .../subscription/PersistenceContext.java        |  67 ++
 .../manager/subscription/SubscriptionData.java  |  22 +-
 .../factory/CartridgeSubscriptionFactory.java   |  46 +-
 .../SubscriptionSingleTenantBehaviour.java      |  34 +-
 .../tenancy/SubscriptionTenancyBehaviour.java   |  27 +-
 .../utils/CartridgeSubscriptionUtils.java       | 297 +++++-
 .../model/TopologyClusterInformationModel.java  | 554 ++++--------
 .../StratosManagerTopologyReceiver.java         | 149 +--
 .../repositoryNotificationInfoBean/Payload.java |  34 +
 .../Repository.java                             |  43 +
 .../stratos/rest/endpoint/mock/MockContext.java | 103 ++-
 .../rest/endpoint/mock/StratosTestAdmin.java    |  97 +-
 .../rest/endpoint/services/ServiceUtils.java    | 384 +-------
 .../rest/endpoint/services/StratosAdmin.java    |  18 +-
 .../webapp/stratos-test/WEB-INF/cxf-servlet.xml |   6 +-
 .../main/webapp/stratos/WEB-INF/cxf-servlet.xml |   1 +
 .../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                            |  41 +
 .../pom.xml                                     |   4 +-
 pom.xml                                         |   2 +
 .../distribution/src/main/assembly/bin.xml      |   8 +
 .../distribution/src/main/bin/stratos.sh        |   1 +
 .../distribution/src/main/conf/agent-flow.conf  |  14 +
 .../modules/agent/templates/bin/stratos.sh.erb  |   1 +
 tools/stratos-installer/clean.sh                |  34 +-
 tools/stratos-installer/conf/setup.conf         |   2 +-
 tools/stratos-installer/setup.sh                |   2 +-
 442 files changed, 36799 insertions(+), 2662 deletions(-)
----------------------------------------------------------------------



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

Posted by im...@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/0b418de4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/0b418de4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/0b418de4

Branch: refs/heads/master
Commit: 0b418de4b5c99803683618a2558e6d9827b4a751
Parents: 373590e 7c43d6f
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Apr 6 22:11:32 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Apr 6 22:11:32 2014 +0530

----------------------------------------------------------------------
 .gitignore                                      |    3 +
 README.md                                       |  151 +-
 .../stratos/autoscaler/AutoscalerContext.java   |   28 +-
 .../apache/stratos/autoscaler/Constants.java    |   21 +
 .../autoscaler/NetworkPartitionContext.java     |    2 +-
 .../stratos/autoscaler/PartitionContext.java    |    4 +-
 .../algorithm/AutoscaleAlgorithm.java           |    2 +-
 .../autoscaler/algorithm/OneAfterAnother.java   |    2 +-
 .../autoscaler/algorithm/RoundRobin.java        |    2 +-
 .../autoscaler/api/AutoScalerServiceImpl.java   |   46 +-
 .../cloud/controller/CloudControllerClient.java |   20 +-
 .../autoscaler/commands/PartitionsCommands.java |    2 +-
 .../deployment/policy/DeploymentPolicy.java     |    2 +-
 .../exception/InvalidPartitionException.java    |   21 +
 .../exception/PartitionValidationException.java |   21 +
 .../exception/PolicyValidationException.java    |   21 +
 .../autoscaler/exception/SpawningException.java |   21 +
 .../exception/TerminationException.java         |   21 +
 .../interfaces/AutoScalerServiceInterface.java  |   27 +-
 .../internal/AutoscalerServerComponent.java     |    2 +-
 .../health/AutoscalerHealthStatReceiver.java    |   46 +-
 .../topology/AutoscalerTopologyReceiver.java    |  149 +-
 .../topology/TopologyEventMessageListener.java  |   53 +
 .../topology/TopologyEventMessageQueue.java     |   38 +
 .../autoscaler/partition/PartitionGroup.java    |    4 +-
 .../autoscaler/partition/PartitionManager.java  |    2 +-
 .../partition/deployers/PartitionDeployer.java  |    2 +-
 .../partition/deployers/PartitionReader.java    |    4 +-
 .../autoscaler/policy/PolicyManager.java        |    2 +-
 .../deployers/DeploymentPolicyReader.java       |    5 +-
 .../policy/model/AutoscalePolicy.java           |    2 +-
 .../autoscaler/registry/RegistryManager.java    |   23 +-
 .../apache/stratos/autoscaler/rule/RuleLog.java |   21 +
 .../autoscaler/rule/RuleTasksDelegator.java     |   23 +-
 .../stratos/autoscaler/util/AutoscalerUtil.java |    8 +-
 .../stratos/autoscaler/util/Serializer.java     |   21 +
 .../autoscaler/util/ServiceReferenceHolder.java |   21 +
 .../stratos/autoscaler/TestBasicRules.java      |   60 -
 .../stratos/autoscaler/TestMinimumRule.java     |    2 +-
 .../stratos/autoscaler/TestRulesPackaged.java   |    8 +-
 .../policy/PartitionDeployerTest.java           |    3 +-
 .../src/test/resources/autoscaler.drl           |    4 +-
 .../resources/test-minimum-autoscaler-rule.drl  |    4 +-
 .../test-terminating-obsoleted-members-rule.drl |    4 +-
 .../stratos/cartridge/agent/CartridgeAgent.java |  324 ++++-
 .../apache/stratos/cartridge/agent/Main.java    |   27 +-
 .../cartridge/agent/RepositoryFileListener.java |    8 +-
 .../synchronizer/RepositoryInformation.java     |    1 +
 .../git/impl/GitBasedArtifactRepository.java    |   90 +-
 .../config/CartridgeAgentConfiguration.java     |  219 ++-
 .../publisher/CartridgeAgentEventPublisher.java |   22 +
 .../exception/ParameterNotFoundException.java   |   39 +
 .../agent/executor/ExtensionExecutor.java       |   86 --
 .../impl/KeepAgentLiveExtensionExecutor.java    |   68 -
 .../impl/LogPublisherExtensionExecutor.java     |  102 --
 .../PersistenceVolumeExtensionExecutor.java     |   76 -
 .../executor/impl/ScriptExtensionExecutor.java  |   74 -
 .../impl/StartListenersExtensionExecutor.java   |  228 ---
 .../impl/WaitTillActivateExtensionExecutor.java |  121 --
 .../stratos/cartridge/agent/phase/Phase.java    |  109 --
 .../agent/phase/impl/CleanUpPhase.java          |   62 -
 .../agent/phase/impl/InitializingPhase.java     |   60 -
 .../agent/phase/impl/StartingPhase.java         |   60 -
 .../agent/phase/impl/WorkingPhase.java          |   57 -
 .../cartridge/agent/runtime/DataHolder.java     |   55 -
 .../publisher/HealthStatisticsNotifier.java     |   22 +-
 .../publisher/HealthStatisticsReader.java       |    6 +-
 .../agent/util/CartridgeAgentConstants.java     |    9 +-
 .../agent/util/CartridgeAgentUtils.java         |   19 +-
 .../cartridge/agent/util/ExtensionUtils.java    |    2 +-
 .../agent/config/AgentFlowFileLoadTest.java     |   64 -
 .../src/test/resources/agent-flow.conf          |    6 -
 components/org.apache.stratos.cli/pom.xml       |    8 +-
 .../java/org/apache/stratos/cli/Command.java    |    2 +-
 .../stratos/cli/CommandLineApplication.java     |   10 +-
 .../apache/stratos/cli/CommandLineService.java  |   10 +-
 .../apache/stratos/cli/GenericRestClient.java   |   15 +-
 .../java/org/apache/stratos/cli/RestClient.java |   73 +-
 .../stratos/cli/RestCommandLineService.java     |  260 ++--
 .../apache/stratos/cli/StratosApplication.java  |   79 +-
 .../apache/stratos/cli/WebClientWrapper.java    |    1 +
 .../cli/beans/cartridge/CartridgeInfoBean.java  |   30 +-
 .../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 +
 .../stratos/cli/commands/SubscribeCommand.java  |   41 +-
 .../SubscribedCartridgeInfoCommand.java         |   50 +-
 .../stratos/cli/commands/SyncCommand.java       |    8 +-
 .../apache/stratos/cli/utils/CliConstants.java  |    6 +-
 .../org.apache.stratos.cloud.controller/pom.xml |   15 +-
 .../concurrent/PartitionValidatorCallable.java  |   88 ++
 .../cloud/controller/iaases/AWSEC2Iaas.java     |   57 +-
 .../controller/iaases/OpenstackNovaIaas.java    |  136 +-
 .../cloud/controller/iaases/VCloudIaas.java     |  145 +-
 .../impl/CloudControllerServiceImpl.java        |  251 ++--
 .../interfaces/CloudControllerService.java      |   25 +-
 .../cloud/controller/interfaces/Iaas.java       |   16 +-
 .../cloud/controller/pojo/Cartridge.java        |   12 +
 .../cloud/controller/pojo/CartridgeConfig.java  |   12 +
 .../cloud/controller/pojo/ClusterContext.java   |   18 +-
 .../cloud/controller/pojo/IaasConfig.java       |   17 +
 .../cloud/controller/pojo/IaasProvider.java     |   20 +
 .../cloud/controller/pojo/NetworkInterface.java |  101 ++
 .../controller/pojo/NetworkInterfaces.java      |   53 +
 .../TopologySynchronizerTaskScheduler.java      |   91 +-
 .../controller/registry/RegistryManager.java    |    8 +-
 .../runtime/FasterLookUpDataHolder.java         |   17 +-
 .../controller/topology/TopologyBuilder.java    |   17 +
 .../util/CloudControllerConstants.java          |   11 +-
 .../controller/util/CloudControllerUtil.java    |    7 +-
 .../OpenstackNovaPartitionValidator.java        |    2 +-
 .../balancer/cache/AlgorithmContextCache.java   |   10 +-
 .../console/README                              |   35 +-
 .../console/README.md                           |   11 -
 .../console/app.js                              |   21 +
 .../console/cartridge_info.jag                  |   28 +-
 .../console/cartridges.jag                      |   22 +-
 .../console/config/console.js                   |   21 +
 .../console/configure_stratos.jag               |   22 +-
 .../console/configure_stratos_wizard.jag        |   22 +-
 .../console/controllers/acs.jag                 |   22 +-
 .../controllers/cartridgeDefintionSubmit.jag    |   23 +-
 .../controllers/cartridgeSubscribeSubmit.jag    |   55 +-
 .../controllers/cartridgeUnsubscribeSubmit.jag  |   22 +-
 .../console/controllers/checkAvailability.jag   |   22 +-
 .../console/controllers/dashboard.jag           |   35 +
 .../console/controllers/lbDefinitionSubmit.jag  |   22 +-
 .../console/controllers/login.jag               |   22 +-
 .../console/controllers/loginSubmit.jag         |   22 +-
 .../console/controllers/logout.jag              |   23 +-
 .../console/controllers/manageTenants.jag       |   22 +-
 .../console/controllers/mycartridges.jag        |   35 +
 .../console/controllers/newTenantSubmit.jag     |   36 +-
 .../controllers/partitionDefinitionSubmit.jag   |   22 +-
 .../console/controllers/payloadFactory.jag      |   22 +-
 .../controllers/policyDefinitionSubmit.jag      |   22 +-
 .../console/controllers/profileClient.jag       |   22 +-
 .../console/controllers/router.jag              |   20 +
 .../console/controllers/wizardSubmit.jag        |   22 +-
 .../console/dashboard.jag                       |   22 +-
 .../console/data/cartridge_deployments.json     |   10 -
 .../console/data/cartridges.json                |   35 -
 .../console/data/clusters.json                  |  301 ----
 .../console/data/config_status.json             |    4 -
 .../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/default_page.jag                    |   22 +-
 .../console/index.jag                           |   23 +-
 .../console/js/dialog.js                        |   21 +
 .../console/js/main.js                          |   23 +-
 .../console/login.jag                           |   22 +-
 .../console/modules/file.js                     |   23 +-
 .../console/modules/mime.js                     |   23 +-
 .../console/modules/pinch.min.js                |   23 +-
 .../modules/security/security.manager.js        |   21 +
 .../modules/security/security.provider.js       |   21 +
 .../console/permission-mapping.txt              |   19 -
 .../console/root-js                             |  369 -----
 .../console/subscribe_cartridge.jag             |   28 +-
 .../console/tenant_management.jag               |   22 +-
 .../console/tenant_new.jag                      |   22 +-
 .../console/themes/theme1/pages/index.hbs       |   47 +-
 .../console/themes/theme1/pages/plain.hbs       |   24 +-
 .../console/themes/theme1/partials/404.hbs      |   21 +
 .../themes/theme1/partials/cartridge_info.hbs   |  219 +--
 .../themes/theme1/partials/cartridges.hbs       |  168 ++-
 .../theme1/partials/configure_stratos.hbs       |   31 +-
 .../partials/configure_stratos_wizard.hbs       |  107 +-
 .../themes/theme1/partials/dashboard.hbs        |  586 +-------
 .../themes/theme1/partials/error_page.hbs       |   21 +
 .../console/themes/theme1/partials/header.hbs   |  655 ++++-----
 .../console/themes/theme1/partials/login.hbs    |   73 +-
 .../themes/theme1/partials/mycartridges.hbs     |  142 +-
 .../theme1/partials/subscribe_cartridge.hbs     |  424 +++---
 .../theme1/partials/tenant_management.hbs       |   83 +-
 .../themes/theme1/partials/tenant_new.hbs       |   29 +-
 .../console/themes/theme1/partials/title.hbs    |   23 +-
 .../themes/theme1/renderers/account_recovery.js |   67 +-
 .../themes/theme1/renderers/cartridge_info.js   |   25 +-
 .../themes/theme1/renderers/cartridges.js       |   65 +-
 .../theme1/renderers/configure_stratos.js       |  298 ++--
 .../renderers/configure_stratos_wizard.js       |  289 ++--
 .../themes/theme1/renderers/dashboard.js        |   26 +-
 .../themes/theme1/renderers/default_page.js     |   23 +-
 .../console/themes/theme1/renderers/index.js    |   78 +-
 .../console/themes/theme1/renderers/login.js    |   31 +-
 .../theme1/renderers/subscribe_cartridge.js     |   34 +-
 .../theme1/renderers/tenant_management.js       |   23 +-
 .../themes/theme1/renderers/tenant_new.js       |  129 +-
 .../theme1/subthemes/theme2/ui/css/main.css     |   23 +-
 .../console/themes/theme1/theme.js              |   23 +-
 .../console/themes/theme1/ui/404.html           |  157 --
 .../themes/theme1/ui/Open_Sans/LICENSE.txt      |  202 +++
 .../theme1/ui/Open_Sans/OpenSans-Bold.ttf       |  Bin 0 -> 224592 bytes
 .../theme1/ui/Open_Sans/OpenSans-BoldItalic.ttf |  Bin 0 -> 213292 bytes
 .../theme1/ui/Open_Sans/OpenSans-ExtraBold.ttf  |  Bin 0 -> 222584 bytes
 .../ui/Open_Sans/OpenSans-ExtraBoldItalic.ttf   |  Bin 0 -> 213420 bytes
 .../theme1/ui/Open_Sans/OpenSans-Italic.ttf     |  Bin 0 -> 212896 bytes
 .../theme1/ui/Open_Sans/OpenSans-Light.ttf      |  Bin 0 -> 222412 bytes
 .../ui/Open_Sans/OpenSans-LightItalic.ttf       |  Bin 0 -> 213128 bytes
 .../theme1/ui/Open_Sans/OpenSans-Regular.ttf    |  Bin 0 -> 217360 bytes
 .../theme1/ui/Open_Sans/OpenSans-Semibold.ttf   |  Bin 0 -> 221328 bytes
 .../ui/Open_Sans/OpenSans-SemiboldItalic.ttf    |  Bin 0 -> 212820 bytes
 .../themes/theme1/ui/Open_Sans/open_sans.css    |   39 +
 .../ui/apple-touch-icon-114x114-precomposed.png |  Bin 1189 -> 0 bytes
 .../ui/apple-touch-icon-144x144-precomposed.png |  Bin 1475 -> 0 bytes
 .../ui/apple-touch-icon-57x57-precomposed.png   |  Bin 730 -> 0 bytes
 .../ui/apple-touch-icon-72x72-precomposed.png   |  Bin 854 -> 0 bytes
 .../theme1/ui/apple-touch-icon-precomposed.png  |  Bin 730 -> 0 bytes
 .../themes/theme1/ui/apple-touch-icon.png       |  Bin 730 -> 0 bytes
 .../console/themes/theme1/ui/crossdomain.xml    |   15 -
 .../console/themes/theme1/ui/css/dialog.css     |   21 +
 .../console/themes/theme1/ui/css/main.css       | 1250 ++++++++--------
 .../theme1/ui/custom-font-new/LICENSE.txt       |   21 +
 .../themes/theme1/ui/custom-font-new/README.txt |   75 +
 .../theme1/ui/custom-font-new/config.json       | 1272 +++++++++++++++++
 .../theme1/ui/custom-font-new/css/animation.css |   85 ++
 .../ui/custom-font-new/css/fontello-codes.css   |  186 +++
 .../custom-font-new/css/fontello-embedded.css   |  239 ++++
 .../custom-font-new/css/fontello-ie7-codes.css  |  186 +++
 .../ui/custom-font-new/css/fontello-ie7.css     |  197 +++
 .../theme1/ui/custom-font-new/css/fontello.css  |  237 ++++
 .../themes/theme1/ui/custom-font-new/demo.html  |  545 +++++++
 .../theme1/ui/custom-font-new/font/fontello.eot |  Bin 0 -> 42600 bytes
 .../theme1/ui/custom-font-new/font/fontello.svg |  196 +++
 .../theme1/ui/custom-font-new/font/fontello.ttf |  Bin 0 -> 42432 bytes
 .../ui/custom-font-new/font/fontello.woff       |  Bin 0 -> 30096 bytes
 .../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/favicon.ico        |  Bin 766 -> 0 bytes
 .../ui/font-awesome/css/font-awesome-ie7.css    | 1203 ----------------
 .../font-awesome/css/font-awesome-ie7.min.css   |  384 -----
 .../theme1/ui/font-awesome/css/font-awesome.css | 1338 ------------------
 .../ui/font-awesome/css/font-awesome.min.css    |    4 -
 .../theme1/ui/font-awesome/font/FontAwesome.otf |  Bin 61896 -> 0 bytes
 .../font-awesome/font/fontawesome-webfont.eot   |  Bin 37405 -> 0 bytes
 .../font-awesome/font/fontawesome-webfont.svg   |  399 ------
 .../font-awesome/font/fontawesome-webfont.ttf   |  Bin 79076 -> 0 bytes
 .../font-awesome/font/fontawesome-webfont.woff  |  Bin 43572 -> 0 bytes
 .../ui/font-awesome/fonts/FontAwesome.otf       |  Bin 62856 -> 0 bytes
 .../font-awesome/fonts/fontawesome-webfont.eot  |  Bin 38205 -> 0 bytes
 .../font-awesome/fonts/fontawesome-webfont.svg  |  414 ------
 .../font-awesome/fonts/fontawesome-webfont.ttf  |  Bin 80652 -> 0 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff |  Bin 44432 -> 0 bytes
 .../themes/theme1/ui/fonts/dropped text.txt     |    1 -
 .../ui/fonts/glyphicons-halflings-regular.eot   |  Bin 14079 -> 0 bytes
 .../ui/fonts/glyphicons-halflings-regular.svg   |  228 ---
 .../ui/fonts/glyphicons-halflings-regular.ttf   |  Bin 29512 -> 0 bytes
 .../ui/fonts/glyphicons-halflings-regular.woff  |  Bin 16448 -> 0 bytes
 .../console/themes/theme1/ui/fonts/stratos.eot  |  Bin 6316 -> 0 bytes
 .../console/themes/theme1/ui/fonts/stratos.svg  |   20 -
 .../console/themes/theme1/ui/fonts/stratos.ttf  |  Bin 6152 -> 0 bytes
 .../console/themes/theme1/ui/fonts/stratos.woff |  Bin 6228 -> 0 bytes
 .../console/themes/theme1/ui/img/panel-back.png |  Bin 0 -> 152 bytes
 .../themes/theme1/ui/img/tmp-details.png        |  Bin 0 -> 63979 bytes
 .../themes/theme1/ui/js/configure_stratos.js    |   21 +
 .../console/themes/theme1/ui/js/dashboard.js    |  417 ++++++
 .../console/themes/theme1/ui/js/login.js        |   23 +-
 .../console/themes/theme1/ui/js/main.js         |    1 -
 .../console/themes/theme1/ui/js/mycartridges.js |   34 +-
 .../console/themes/theme1/ui/js/popup.js        |   23 +-
 .../themes/theme1/ui/js/tenant_management.js    |   33 +-
 .../console/themes/theme1/ui/js/utils.js        |   23 +-
 .../vendor/modernizr-2.6.2-respond-1.1.0.min.js |   11 -
 .../themes/theme1/ui/js/vendor/raphael-min.js   |   11 -
 .../console/themes/theme1/ui/js/wizard.js       |   21 +
 .../console/util/acl.jag                        |   22 +-
 .../console/util/utility.jag                    |   43 +-
 .../modules/console/module.xml                  |   22 +
 .../modules/console/scripts/server.js           |   21 +
 .../sso/views/login.jag                         |  277 ++--
 .../sso/views/stratos-resources/css/main.css    |  313 ++--
 components/org.apache.stratos.manager/pom.xml   |    1 +
 .../behaviour/CartridgeMgtBehaviour.java        |   32 +-
 .../manager/client/AutoscalerServiceClient.java |   31 +-
 .../client/CloudControllerServiceClient.java    |   17 +-
 .../org/apache/stratos/manager/dao/Cluster.java |   22 +-
 .../stratos/manager/deploy/service/Service.java |    4 +-
 .../service/ServiceDeploymentManager.java       |   15 +-
 .../service/multitenant/MultiTenantService.java |    4 +-
 .../multitenant/lb/MultiTenantLBService.java    |    4 +-
 .../apache/stratos/manager/dto/Cartridge.java   |   19 +-
 .../category/DefaultLoadBalancerCategory.java   |   93 ++
 .../category/ExistingLoadBalancerCategory.java  |    4 +-
 .../manager/lb/category/LBDataContext.java      |    7 +-
 .../lb/category/LoadBalancerCategory.java       |   38 +-
 .../ServiceLevelLoadBalancerCategory.java       |    2 +-
 .../manager/CartridgeSubscriptionManager.java   |  101 +-
 .../manager/payload/BasicPayloadData.java       |    2 +-
 .../CartridgeSubscriptionDataPublisher.java     |  169 +++
 .../InstanceNotificationPublisher.java          |    1 -
 .../repository/RepositoryNotification.java      |   39 +-
 .../manager/service/RepositoryInfoBean.java     |   12 +-
 .../ApplicationCartridgeSubscription.java       |    2 +-
 .../subscription/CartridgeSubscription.java     |    4 +-
 .../subscription/DataCartridgeSubscription.java |    4 +-
 .../FrameworkCartridgeSubscription.java         |    2 +-
 .../InternalRepoBasedCartridgeSubscription.java |   78 +
 .../subscription/LBCartridgeSubscription.java   |   41 +-
 .../subscription/PersistenceContext.java        |    2 +-
 .../manager/subscription/SubscriptionData.java  |   21 +-
 .../factory/CartridgeSubscriptionFactory.java   |    5 +-
 .../SubscriptionMultiTenantBehaviour.java       |    4 +-
 .../utils/CartridgeSubscriptionUtils.java       |   68 +-
 .../model/TopologyClusterInformationModel.java  |   47 +-
 .../StratosManagerTopologyReceiver.java         |   36 +-
 .../utils/ApplicationManagementUtil.java        |   17 +-
 .../manager/utils/CartridgeConstants.java       |   26 +
 .../manager/utils/RepoPasswordMgtUtil.java      |   25 +-
 .../manager/utils/RepositoryCreator.java        |   18 +-
 .../manager/test/CartridgeSubscriptionTest.java |    2 +-
 .../manager/test/LookupDataHolderTest.java      |    2 +-
 .../broker/publish/TopicPublisher.java          |   12 +-
 .../messaging/message/filter/MessageFilter.java |   20 +
 .../filter/topology/TopologyMemberFilter.java   |   20 +
 .../stat/HealthStatMessageProcessorChain.java   |   20 +
 .../ClusterCreatedMessageProcessor.java         |   16 +-
 .../ClusterRemovedMessageProcessor.java         |   17 +-
 .../CompleteTopologyMessageProcessor.java       |  138 +-
 .../InstanceSpawnedMessageProcessor.java        |   31 +-
 .../MemberActivatedMessageProcessor.java        |   26 +-
 .../MemberMaintenanceModeProcessor.java         |   21 +-
 .../MemberReadyToShutdownMessageProcessor.java  |   21 +-
 .../topology/MemberStartedMessageProcessor.java |   21 +-
 .../MemberSuspendedMessageProcessor.java        |   21 +-
 .../MemberTerminatedMessageProcessor.java       |   23 +-
 .../ServiceCreatedMessageProcessor.java         |   19 +-
 .../ServiceRemovedMessageProcessor.java         |   15 +-
 .../topology/TopologyMessageProcessorChain.java |    1 +
 .../stat/HealthStatEventMessageQueue.java       |   23 +-
 .../health/stat/HealthStatReceiver.java         |    4 +-
 .../topology/TopologyEventMessageDelegator.java |   14 +-
 .../receiver/topology/TopologyReceiver.java     |   18 +-
 .../rest/endpoint/bean/CartridgeInfoBean.java   |   19 +
 .../stratos/rest/endpoint/bean/Error.java       |   20 +
 .../definition/CartridgeDefinitionBean.java     |    2 +
 .../cartridge/definition/IaasProviderBean.java  |   19 +-
 .../definition/NetworkInterfaceBean.java        |   51 +
 .../bean/util/converter/PojoConverter.java      |   46 +-
 .../handlers/StratosAuthorizingHandler.java     |    2 +-
 .../stratos/rest/endpoint/mock/MockContext.java |    9 +-
 .../rest/endpoint/mock/StratosTestAdmin.java    |    7 +-
 .../rest/endpoint/services/ServiceUtils.java    |   82 +-
 .../rest/endpoint/services/StratosAdmin.java    |   18 +
 .../src/main/resources/addTenantRequest.txt     |    4 -
 .../src/main/resources/getTenantList.txt        |    1 -
 .../webapp/stratos-test/WEB-INF/cxf-servlet.xml |    4 +
 .../jclouds/apis/ec2/1.7.1-stratos/README.txt   |   15 +
 .../jclouds/apis/ec2/1.7.1-stratos/pom.xml      |  141 ++
 .../src/main/clojure/org/jclouds/ec2/ami2.clj   |   84 ++
 .../src/main/clojure/org/jclouds/ec2/ebs2.clj   |  286 ++++
 .../clojure/org/jclouds/ec2/elastic_ip2.clj     |   80 ++
 .../clojure/org/jclouds/ec2/security_group2.clj |   99 ++
 .../src/main/java/org/jclouds/ec2/EC2Api.java   |  167 +++
 .../java/org/jclouds/ec2/EC2ApiMetadata.java    |   91 ++
 .../main/java/org/jclouds/ec2/EC2Fallbacks.java |   50 +
 ...ndBlockDeviceMappingToIndexedFormParams.java |   67 +
 .../BindBundleIdsToIndexedFormParams.java       |   37 +
 .../binders/BindFiltersToIndexedFormParams.java |   57 +
 .../BindGroupIdsToIndexedFormParams.java        |   37 +
 .../BindGroupNamesToIndexedFormParams.java      |   37 +
 .../BindInstanceIdsToIndexedFormParams.java     |   37 +
 .../BindIpPermissionToIndexedFormParams.java    |   40 +
 .../BindIpPermissionsToIndexedFormParams.java   |   48 +
 .../BindKeyNamesToIndexedFormParams.java        |   37 +
 .../BindProductCodesToIndexedFormParams.java    |   37 +
 .../BindPublicIpsToIndexedFormParams.java       |   42 +
 .../BindResourceIdsToIndexedFormParams.java     |   40 +
 .../binders/BindS3UploadPolicyAndSignature.java |   57 +
 .../binders/BindTagKeysToIndexedFormParams.java |   46 +
 .../binders/BindTagsToIndexedFormParams.java    |   54 +
 .../BindUserGroupsToIndexedFormParams.java      |   52 +
 ...roupPairToSourceSecurityGroupFormParams.java |   49 +
 .../binders/BindUserIdsToIndexedFormParams.java |   37 +
 .../BindVolumeIdsToIndexedFormParams.java       |   37 +
 ...fNotNullBindAvailabilityZoneToFormParam.java |   55 +
 .../jclouds/ec2/compute/EC2ComputeService.java  |  331 +++++
 .../ec2/compute/EC2ComputeServiceContext.java   |   32 +
 .../config/EC2BindComputeStrategiesByClass.java |   97 ++
 .../config/EC2BindComputeSuppliersByClass.java  |   41 +
 .../config/EC2ComputeServiceContextModule.java  |  144 ++
 .../EC2ComputeServiceDependenciesModule.java    |  197 +++
 .../compute/config/EC2ResolveImagesModule.java  |   36 +
 .../ec2/compute/domain/EC2HardwareBuilder.java  |  599 ++++++++
 .../domain/PasswordDataAndPrivateKey.java       |   76 +
 .../ec2/compute/domain/RegionAndName.java       |  111 ++
 .../domain/RegionNameAndIngressRules.java       |   44 +
 .../compute/extensions/EC2ImageExtension.java   |  143 ++
 .../extensions/EC2SecurityGroupExtension.java   |  380 +++++
 .../functions/AddElasticIpsToNodemetadata.java  |   77 +
 .../compute/functions/CreateUniqueKeyPair.java  |   79 ++
 .../functions/CredentialsForInstance.java       |   79 ++
 .../ec2/compute/functions/EC2ImageParser.java   |  148 ++
 .../functions/EC2SecurityGroupIdFromName.java   |   51 +
 .../EC2SecurityGroupToSecurityGroup.java        |   98 ++
 .../functions/ImagesToRegionAndIdMap.java       |   55 +
 .../PasswordCredentialsFromWindowsInstance.java |  122 ++
 .../ec2/compute/functions/PresentInstances.java |   84 ++
 .../RunningInstanceToNodeMetadata.java          |  257 ++++
 ...indowsLoginCredentialsFromEncryptedData.java |   79 ++
 .../internal/EC2ComputeServiceContextImpl.java  |   47 +
 .../internal/EC2TemplateBuilderImpl.java        |  117 ++
 .../loaders/CreateSecurityGroupIfNeeded.java    |  106 ++
 .../loaders/LoadPublicIpForInstanceOrNull.java  |   60 +
 .../ec2/compute/loaders/RegionAndIdToImage.java |   68 +
 .../ec2/compute/options/EC2TemplateOptions.java |  624 ++++++++
 .../compute/predicates/EC2ImagePredicates.java  |   50 +
 .../predicates/SecurityGroupPresent.java        |   68 +
 ...curityGroupsAsNeededAndReturnRunOptions.java |  200 +++
 .../strategy/DescribeImagesParallel.java        |   86 ++
 .../EC2CreateNodesInGroupThenAddToSet.java      |  244 ++++
 .../strategy/EC2DestroyNodeStrategy.java        |  105 ++
 .../compute/strategy/EC2GetImageStrategy.java   |   70 +
 .../strategy/EC2GetNodeMetadataStrategy.java    |   71 +
 .../compute/strategy/EC2ListNodesStrategy.java  |  164 +++
 ...DefaultLoginCredentialsForImageStrategy.java |   75 +
 .../compute/strategy/EC2RebootNodeStrategy.java |   53 +
 .../compute/strategy/EC2ResumeNodeStrategy.java |   53 +
 .../strategy/EC2SuspendNodeStrategy.java        |   53 +
 .../ec2/compute/strategy/ReviseParsedImage.java |   44 +
 .../compute/suppliers/EC2HardwareSupplier.java  |   46 +
 .../ec2/compute/suppliers/EC2ImageSupplier.java |  120 ++
 .../suppliers/RegionAndNameToImageSupplier.java |   53 +
 .../ec2/compute/util/EC2ComputeUtils.java       |   35 +
 .../ec2/config/BaseEC2HttpApiModule.java        |   61 +
 .../jclouds/ec2/config/EC2HttpApiModule.java    |   37 +
 .../java/org/jclouds/ec2/domain/Attachment.java |  226 +++
 .../ec2/domain/AvailabilityZoneInfo.java        |  129 ++
 .../org/jclouds/ec2/domain/BlockDevice.java     |  109 ++
 .../jclouds/ec2/domain/BlockDeviceMapping.java  |  234 +++
 .../ec2/domain/BundleInstanceS3Storage.java     |  150 ++
 .../java/org/jclouds/ec2/domain/BundleTask.java |  295 ++++
 .../java/org/jclouds/ec2/domain/Hypervisor.java |   49 +
 .../main/java/org/jclouds/ec2/domain/Image.java |  496 +++++++
 .../org/jclouds/ec2/domain/ImageAttribute.java  |   98 ++
 .../org/jclouds/ec2/domain/InstanceState.java   |   97 ++
 .../jclouds/ec2/domain/InstanceStateChange.java |  119 ++
 .../org/jclouds/ec2/domain/InstanceType.java    |  388 +++++
 .../java/org/jclouds/ec2/domain/KeyPair.java    |  206 +++
 .../org/jclouds/ec2/domain/PasswordData.java    |  153 ++
 .../java/org/jclouds/ec2/domain/Permission.java |   93 ++
 .../ec2/domain/PublicIpInstanceIdPair.java      |  111 ++
 .../org/jclouds/ec2/domain/Reservation.java     |  228 +++
 .../ec2/domain/ReservedInstancesOffering.java   |  182 +++
 .../org/jclouds/ec2/domain/RootDeviceType.java  |   48 +
 .../org/jclouds/ec2/domain/RunningInstance.java |  525 +++++++
 .../org/jclouds/ec2/domain/SecurityGroup.java   |  229 +++
 .../java/org/jclouds/ec2/domain/Snapshot.java   |  235 +++
 .../java/org/jclouds/ec2/domain/Subnet.java     |  253 ++++
 .../main/java/org/jclouds/ec2/domain/Tag.java   |  196 +++
 .../org/jclouds/ec2/domain/UserIdGroupPair.java |  100 ++
 .../jclouds/ec2/domain/VirtualizationType.java  |   47 +
 .../java/org/jclouds/ec2/domain/Volume.java     |  296 ++++
 .../java/org/jclouds/ec2/features/AMIApi.java   |  366 +++++
 .../features/AvailabilityZoneAndRegionApi.java  |   90 ++
 .../ec2/features/ElasticBlockStoreApi.java      |  602 ++++++++
 .../ec2/features/ElasticIPAddressApi.java       |  200 +++
 .../org/jclouds/ec2/features/InstanceApi.java   |  803 +++++++++++
 .../org/jclouds/ec2/features/KeyPairApi.java    |  159 +++
 .../jclouds/ec2/features/SecurityGroupApi.java  |  324 +++++
 .../org/jclouds/ec2/features/SubnetApi.java     |   94 ++
 .../java/org/jclouds/ec2/features/TagApi.java   |  201 +++
 .../org/jclouds/ec2/features/WindowsApi.java    |  229 +++
 ...vertUnencodedBytesToBase64EncodedString.java |   43 +
 .../functions/EncodedRSAPublicKeyToBase64.java  |   51 +
 .../options/BundleInstanceS3StorageOptions.java |   95 ++
 .../jclouds/ec2/options/CreateImageOptions.java |   94 ++
 .../ec2/options/CreateSnapshotOptions.java      |   70 +
 .../DescribeAvailabilityZonesOptions.java       |   68 +
 .../ec2/options/DescribeImagesOptions.java      |  115 ++
 .../ec2/options/DescribeRegionsOptions.java     |   68 +
 .../ec2/options/DescribeSnapshotsOptions.java   |  109 ++
 .../ec2/options/DetachVolumeOptions.java        |   86 ++
 .../RegisterImageBackedByEbsOptions.java        |  235 +++
 .../ec2/options/RegisterImageOptions.java       |  128 ++
 .../ec2/options/RunInstancesOptions.java        |  206 +++
 .../options/internal/BaseEC2RequestOptions.java |   59 +
 .../ec2/predicates/InstanceHasIpAddress.java    |   66 +
 .../ec2/predicates/InstanceStateRunning.java    |   69 +
 .../ec2/predicates/InstanceStateStopped.java    |   62 +
 .../ec2/predicates/InstanceStateTerminated.java |   68 +
 .../ec2/predicates/SnapshotCompleted.java       |   60 +
 .../jclouds/ec2/predicates/VolumeAttached.java  |   63 +
 .../jclouds/ec2/predicates/VolumeAvailable.java |   57 +
 .../jclouds/ec2/predicates/VolumeDetached.java  |   69 +
 .../org/jclouds/ec2/reference/EC2Constants.java |   49 +
 .../DescribeAvailabilityZonesInRegion.java      |   92 ++
 .../suppliers/DescribeRegionsForRegionURIs.java |   50 +
 .../org/jclouds/ec2/util/IpPermissions.java     |  197 +++
 .../jclouds/ec2/util/SubnetFilterBuilder.java   |  251 ++++
 .../org/jclouds/ec2/util/TagFilterBuilder.java  |  223 +++
 .../main/java/org/jclouds/ec2/util/Tags.java    |  101 ++
 .../ec2/xml/AllocateAddressResponseHandler.java |   56 +
 .../org/jclouds/ec2/xml/AttachmentHandler.java  |   86 ++
 .../jclouds/ec2/xml/BaseReservationHandler.java |  217 +++
 .../ec2/xml/BlockDeviceMappingHandler.java      |   82 ++
 .../jclouds/ec2/xml/BooleanValueHandler.java    |   46 +
 .../org/jclouds/ec2/xml/BundleTaskHandler.java  |  111 ++
 .../ec2/xml/CreateVolumeResponseHandler.java    |  198 +++
 .../xml/DescribeAddressesResponseHandler.java   |   80 ++
 ...escribeAvailabilityZonesResponseHandler.java |  104 ++
 .../xml/DescribeBundleTasksResponseHandler.java |   73 +
 .../ec2/xml/DescribeImagesResponseHandler.java  |  223 +++
 .../xml/DescribeInstancesResponseHandler.java   |  109 ++
 .../xml/DescribeKeyPairsResponseHandler.java    |   84 ++
 .../ec2/xml/DescribeRegionsResponseHandler.java |   67 +
 .../DescribeSecurityGroupsResponseHandler.java  |  126 ++
 .../xml/DescribeSnapshotsResponseHandler.java   |   76 +
 .../ec2/xml/DescribeSubnetsResponseHandler.java |   91 ++
 .../ec2/xml/DescribeTagsResponseHandler.java    |   99 ++
 .../ec2/xml/DescribeVolumesResponseHandler.java |   79 ++
 .../xml/GetConsoleOutputResponseHandler.java    |   55 +
 .../ec2/xml/GetPasswordDataResponseHandler.java |   61 +
 .../org/jclouds/ec2/xml/ImageIdHandler.java     |   49 +
 ...nstanceInitiatedShutdownBehaviorHandler.java |   48 +
 .../ec2/xml/InstanceStateChangeHandler.java     |  112 ++
 .../jclouds/ec2/xml/InstanceTypeHandler.java    |   47 +
 .../jclouds/ec2/xml/IpPermissionHandler.java    |   94 ++
 .../jclouds/ec2/xml/KeyPairResponseHandler.java |   79 ++
 .../org/jclouds/ec2/xml/PermissionHandler.java  |   55 +
 .../ec2/xml/RunInstancesResponseHandler.java    |   48 +
 .../jclouds/ec2/xml/SecurityGroupHandler.java   |  143 ++
 .../org/jclouds/ec2/xml/SnapshotHandler.java    |  107 ++
 .../org/jclouds/ec2/xml/StringValueHandler.java |   47 +
 .../java/org/jclouds/ec2/xml/SubnetHandler.java |   95 ++
 .../java/org/jclouds/ec2/xml/TagHandler.java    |   77 +
 .../java/org/jclouds/ec2/xml/TagSetHandler.java |   78 +
 .../ec2/xml/UnencodeStringValueHandler.java     |   37 +
 .../services/org.jclouds.apis.ApiMetadata       |    1 +
 ...dApplicationArchitecturesEC2ApiLiveTest.java |  427 ++++++
 .../org/jclouds/ec2/EBSBootEC2ApiLiveTest.java  |  607 ++++++++
 .../org/jclouds/ec2/EC2ApiMetadataTest.java     |   32 +
 .../org/jclouds/ec2/EC2ContextBuilderText.java  |   36 +
 ...ockDeviceMappingToIndexedFormParamsTest.java |   70 +
 .../BindBundleIdsToIndexedFormParamsTest.java   |   57 +
 .../BindFiltersToIndexedFormParamsTest.java     |   63 +
 .../BindGroupNamesToIndexedFormParamsTest.java  |   57 +
 .../BindInstanceIdsToIndexedFormParamsTest.java |   57 +
 .../BindKeyNamesToIndexedFormParamsTest.java    |   57 +
 ...BindProductCodesToIndexedFormParamsTest.java |   58 +
 .../BindPublicIpsToIndexedFormParamsTest.java   |   57 +
 .../BindResourceIdsToIndexedFormParamsTest.java |   57 +
 .../BindS3UploadPolicyAndSignatureTest.java     |   61 +
 .../BindTagKeysToIndexedFormParamsTest.java     |   54 +
 .../BindTagsToIndexedFormParamsTest.java        |   62 +
 .../BindUserGroupsToIndexedFormParamsTest.java  |   63 +
 ...PairToSourceSecurityGroupFormParamsTest.java |   60 +
 .../BindUserIdsToIndexedFormParamsTest.java     |   58 +
 .../BindVolumeIdsToIndexedFormParamsTest.java   |   57 +
 ...NullBindAvailabilityZoneToFormParamTest.java |   59 +
 .../compute/EC2ComputeServiceExpectTest.java    |  148 ++
 .../ec2/compute/EC2ComputeServiceLiveTest.java  |  362 +++++
 .../ec2/compute/EC2TemplateBuilderLiveTest.java |   94 ++
 .../ec2/compute/EC2TemplateBuilderTest.java     |  240 ++++
 .../compute/TestCanRecreateGroupLiveTest.java   |   57 +
 .../EC2ComputeServiceContextModuleTest.java     |   65 +
 .../extensions/EC2ImageExtensionExpectTest.java |   84 ++
 .../extensions/EC2ImageExtensionLiveTest.java   |   64 +
 .../EC2SecurityGroupExtensionExpectTest.java    |  583 ++++++++
 .../EC2SecurityGroupExtensionLiveTest.java      |   36 +
 .../AddElasticIpsToNodemetadataTest.java        |   90 ++
 .../functions/CreateUniqueKeyPairTest.java      |  116 ++
 .../compute/functions/EC2ImageParserTest.java   |  124 ++
 .../EC2SecurityGroupToSecurityGroupTest.java    |   83 ++
 .../compute/functions/PresentInstancesTest.java |   69 +
 .../RunningInstanceToNodeMetadataTest.java      |  298 ++++
 ...wsLoginCredentialsFromEncryptedDataTest.java |   77 +
 .../BaseEC2ComputeServiceContextExpectTest.java |   42 +
 .../BaseEC2ComputeServiceExpectTest.java        |  246 ++++
 .../internal/EC2TemplateBuilderImplTest.java    |  237 ++++
 .../CreateSecurityGroupIfNeededTest.java        |  108 ++
 .../LoadPublicIpForInstanceOrNullTest.java      |  106 ++
 .../compute/loaders/RegionAndIdToImageTest.java |  143 ++
 .../compute/options/EC2TemplateOptionsTest.java |  288 ++++
 ...tyGroupsAsNeededAndReturnRunOptionsTest.java |  577 ++++++++
 .../EC2CreateNodesInGroupThenAddToSetTest.java  |  343 +++++
 .../strategy/EC2DestroyNodeStrategyTest.java    |  189 +++
 .../ec2/config/EC2HttpApiModuleExpectTest.java  |  145 ++
 .../jclouds/ec2/features/AMIApiExpectTest.java  |   76 +
 .../jclouds/ec2/features/AMIApiLiveTest.java    |  249 ++++
 .../org/jclouds/ec2/features/AMIApiTest.java    |  521 +++++++
 .../AvailabilityZoneAndRegionApiLiveTest.java   |   91 ++
 .../AvailabilityZoneAndRegionApiTest.java       |  116 ++
 .../jclouds/ec2/features/BaseEC2ApiTest.java    |  145 ++
 .../EC2ElasticBlockStoreApiExpectTest.java      |  172 +++
 .../features/ElasticBlockStoreApiLiveTest.java  |  291 ++++
 .../ec2/features/ElasticBlockStoreApiTest.java  |  401 ++++++
 .../features/ElasticIPAddressApiExpectTest.java |  102 ++
 .../features/ElasticIPAddressApiLiveTest.java   |   77 +
 .../ec2/features/ElasticIPAddressApiTest.java   |  140 ++
 .../ec2/features/InstanceApiExpectTest.java     |  101 ++
 .../ec2/features/InstanceApiLiveTest.java       |   97 ++
 .../jclouds/ec2/features/InstanceApiTest.java   |  593 ++++++++
 .../ec2/features/KeyPairApiExpectTest.java      |   76 +
 .../ec2/features/KeyPairApiLiveTest.java        |  143 ++
 .../jclouds/ec2/features/KeyPairApiTest.java    |   88 ++
 .../features/SecurityGroupApiExpectTest.java    |   76 +
 .../ec2/features/SecurityGroupApiLiveTest.java  |  334 +++++
 .../ec2/features/SecurityGroupApiTest.java      |  236 +++
 .../ec2/features/SubnetApiExpectTest.java       |  119 ++
 .../jclouds/ec2/features/SubnetApiLiveTest.java |   84 ++
 .../jclouds/ec2/features/TagApiExpectTest.java  |  285 ++++
 .../ec2/features/WindowsApiExpectTest.java      |  115 ++
 .../ec2/features/WindowsApiLiveTest.java        |   37 +
 .../jclouds/ec2/features/WindowsApiTest.java    |  162 +++
 .../features/internal/BaseTagApiLiveTest.java   |  159 +++
 ...UnencodedBytesToBase64EncodedStringTest.java |   44 +
 .../EncodedRSAPublicKeyToBase64Test.java        |   44 +
 .../ec2/internal/BaseEC2ApiExpectTest.java      |   67 +
 .../ec2/internal/BaseEC2ApiLiveTest.java        |   30 +
 .../jclouds/ec2/internal/BaseEC2ExpectTest.java |   85 ++
 .../BundleInstanceS3StorageOptionsTest.java     |   74 +
 .../ec2/options/CreateImageOptionsTest.java     |   80 ++
 .../ec2/options/CreateSnapshotOptionsTest.java  |   66 +
 .../ec2/options/DescribeImagesOptionsTest.java  |  134 ++
 .../options/DescribeSnapshotsOptionsTest.java   |  129 ++
 .../ec2/options/DetachVolumeOptionsTest.java    |   91 ++
 .../RegisterImageBackedByEbsOptionsTest.java    |  329 +++++
 .../ec2/options/RegisterImageOptionsTest.java   |  146 ++
 .../ec2/options/RunInstancesOptionsTest.java    |  247 ++++
 .../ec2/parse/DescribeSubnetsResponseTest.java  |   71 +
 .../ec2/parse/DescribeTagsResponseTest.java     |   74 +
 .../ec2/parse/GetPasswordDataResponseTest.java  |   55 +
 .../ec2/predicates/VolumeDetachedTest.java      |  112 ++
 .../DescribeAvailabilityZonesInRegionTest.java  |  124 ++
 .../org/jclouds/ec2/util/IpPermissionsTest.java |  106 ++
 .../java/org/jclouds/ec2/util/TagsTest.java     |   55 +
 .../xml/AllocateAddressResponseHandlerTest.java |   44 +
 .../jclouds/ec2/xml/AttachmentHandlerTest.java  |   53 +
 .../org/jclouds/ec2/xml/BaseEC2HandlerTest.java |   86 ++
 .../ec2/xml/BlockDeviceMappingHandlerTest.java  |   57 +
 .../jclouds/ec2/xml/BundleTaskHandlerTest.java  |   68 +
 .../xml/CreateVolumeResponseHandlerTest.java    |   60 +
 .../DescribeAddressesResponseHandlerTest.java   |   57 +
 ...ibeAvailabilityZonesResponseHandlerTest.java |   85 ++
 .../DescribeBundleTasksResponseHandlerTest.java |   56 +
 .../xml/DescribeImagesResponseHandlerTest.java  |  151 ++
 .../ec2/xml/DescribeInstanceAttributeTest.java  |   80 ++
 .../DescribeInstancesResponseHandlerTest.java   |  173 +++
 .../DescribeKeyPairsResponseHandlerTest.java    |   53 +
 .../xml/DescribeRegionsResponseHandlerTest.java |  136 ++
 ...scribeSecurityGroupsResponseHandlerTest.java |   89 ++
 .../DescribeSnapshotsResponseHandlerTest.java   |   59 +
 .../xml/DescribeVolumesResponseHandlerTest.java |   67 +
 .../GetConsoleOutputResponseHandlerTest.java    |   55 +
 .../ec2/xml/InstanceStateChangeHandlerTest.java |   93 ++
 .../ec2/xml/KeyPairResponseHandlerTest.java     |   80 ++
 .../jclouds/ec2/xml/PermissionHandlerTest.java  |   48 +
 .../xml/RunInstancesResponseHandlerTest.java    |  110 ++
 .../jclouds/ec2/xml/SnapshotHandlerTest.java    |   53 +
 .../src/test/resources/allocate_address.xml     |    3 +
 .../src/test/resources/amzn_images.xml          |  113 ++
 .../1.7.1-stratos/src/test/resources/attach.xml |    7 +
 ...authorize_securitygroup_ingress_response.xml |    4 +
 .../availabilityZones-ap-northeast-1.xml        |   17 +
 .../availabilityZones-ap-southeast-1.xml        |   17 +
 .../resources/availabilityZones-eu-west-1.xml   |   23 +
 .../resources/availabilityZones-sa-east-1.xml   |   17 +
 .../resources/availabilityZones-us-east-1.xml   |   35 +
 .../resources/availabilityZones-us-west-1.xml   |   23 +
 .../resources/availabilityZones-us-west-2.xml   |   23 +
 .../src/test/resources/availabilityZones.xml    |   35 +
 .../src/test/resources/bundle_instance.xml      |   18 +
 .../src/test/resources/cancel_bundle_task.xml   |   16 +
 .../src/test/resources/create_keypair.xml       |   28 +
 .../test/resources/created_securitygroup.xml    |    6 +
 .../src/test/resources/created_snapshot.xml     |   10 +
 .../src/test/resources/created_volume.xml       |    9 +
 .../src/test/resources/delete_securitygroup.xml |    4 +
 .../src/test/resources/describe_addresses.xml   |   11 +
 .../resources/describe_addresses_single.xml     |    8 +
 .../test/resources/describe_bundle_tasks.xml    |   18 +
 ...cribe_image_attribute_blockDeviceMapping.xml |   24 +
 ...escribe_image_attribute_launchPermission.xml |   11 +
 .../src/test/resources/describe_images.xml      |   23 +
 .../src/test/resources/describe_images_ebs.xml  |   40 +
 .../describe_images_imageextension0.xml         |   24 +
 .../describe_images_imageextension1.xml         |   24 +
 .../describe_images_imageextension2.xml         |   24 +
 .../src/test/resources/describe_images_nova.xml |   21 +
 .../src/test/resources/describe_images_tags.xml |   33 +
 .../test/resources/describe_images_windows.xml  |   22 +
 .../src/test/resources/describe_instances.xml   |   85 ++
 .../test/resources/describe_instances_ebs.xml   |   63 +
 .../resources/describe_instances_multiple.xml   |  130 ++
 .../resources/describe_instances_running-1.xml  |   74 +
 .../describe_instances_running-named.xml        |   74 +
 .../resources/describe_instances_running.xml    |   45 +
 ...escribe_instances_running_securitygroups.xml |   74 +
 .../src/test/resources/describe_keypairs.xml    |    8 +
 .../test/resources/describe_securitygroups.xml  |   39 +
 .../resources/describe_securitygroups_empty.xml |   41 +
 .../describe_securitygroups_extension_cidr.xml  |   24 +
 .../describe_securitygroups_extension_group.xml |   26 +
 .../describe_securitygroups_extension_new.xml   |   27 +
 ...describe_securitygroups_extension_single.xml |   12 +
 .../src/test/resources/describe_snapshots.xml   |   20 +
 .../src/test/resources/describe_subnets.xml     |   33 +
 .../src/test/resources/describe_tags.xml        |   29 +
 .../src/test/resources/describe_volumes.xml     |   32 +
 .../test/resources/describe_volumes_single.xml  |   15 +
 .../test/resources/disableApiTermination.xml    |    8 +
 .../resources/get_console_output_response.xml   |   13 +
 .../src/test/resources/get_passworddata.xml     |    6 +
 .../instanceInitiatedShutdownBehavior.xml       |    7 +
 .../src/test/resources/instanceType.xml         |    9 +
 .../1.7.1-stratos/src/test/resources/log4j.xml  |  166 +++
 .../src/test/resources/new_instance.xml         |   56 +
 .../src/test/resources/new_securitygroup.xml    |   14 +
 .../src/test/resources/ramdisk.xml              |    8 +
 .../resources/regionEndpoints-additional.xml    |   22 +
 .../src/test/resources/regionEndpoints-all.xml  |   34 +
 .../src/test/resources/regionEndpoints.xml      |   18 +
 .../src/test/resources/run_instances.xml        |   74 +
 .../resources/run_instances_cloudbridge.xml     |   68 +
 .../src/test/resources/start_instances.xml      |   15 +
 .../src/test/resources/stop_instances.xml       |   15 +
 .../src/test/resources/terminate_instances.xml  |   15 +
 .../src/test/resources/userData.xml             |    8 +
 .../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 +++
 .../provider/aws-ec2/1.7.1-stratos/README.txt   |    8 +
 .../provider/aws-ec2/1.7.1-stratos/pom.xml      |  154 ++
 .../src/main/clojure/org/jclouds/aws/ec2.clj    |   62 +
 .../java/org/jclouds/aws/ec2/AWSEC2Api.java     |  119 ++
 .../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java  |   83 ++
 .../jclouds/aws/ec2/AWSEC2ProviderMetadata.java |  103 ++
 .../BindLaunchSpecificationToFormParams.java    |  101 ++
 ...otInstanceRequestIdsToIndexedFormParams.java |   37 +
 .../BindTagFiltersToIndexedFormParams.java      |   37 +
 .../binders/BindTagsToIndexedFormParams.java    |   37 +
 .../aws/ec2/compute/AWSEC2ComputeService.java   |  160 +++
 .../compute/AWSEC2ComputeServiceContext.java    |   31 +
 .../ec2/compute/AWSEC2TemplateBuilderImpl.java  |   51 +
 .../aws/ec2/compute/AWSEC2TemplateOptions.java  |  824 +++++++++++
 .../AWSEC2BindComputeSuppliersByClass.java      |   34 +
 .../AWSEC2ComputeServiceContextModule.java      |  182 +++
 .../AWSEC2ComputeServiceDependenciesModule.java |  179 +++
 .../aws/ec2/compute/config/ClusterCompute.java  |   37 +
 .../aws/ec2/compute/config/ImageQuery.java      |   37 +
 .../AWSEC2SecurityGroupExtension.java           |  220 +++
 .../AWSEC2SecurityGroupToSecurityGroup.java     |   50 +
 .../AWSRunningInstanceToNodeMetadata.java       |   81 ++
 .../PresentSpotRequestsAndInstances.java        |   95 ++
 .../AWSEC2ComputeServiceContextImpl.java        |   48 +
 .../AWSEC2CreateSecurityGroupIfNeeded.java      |  140 ++
 .../AWSEC2CreateNodesInGroupThenAddToSet.java   |  115 ++
 .../strategy/AWSEC2DestroyNodeStrategy.java     |   75 +
 .../strategy/AWSEC2GetNodeMetadataStrategy.java |   65 +
 .../strategy/AWSEC2ListNodesStrategy.java       |  107 ++
 .../strategy/AWSEC2ReviseParsedImage.java       |  119 ++
 ...curityGroupsAsNeededAndReturnRunOptions.java |  200 +++
 .../suppliers/AWSEC2HardwareSupplier.java       |  109 ++
 .../compute/suppliers/AWSEC2ImageSupplier.java  |  162 +++
 .../ec2/compute/suppliers/CallForImages.java    |   94 ++
 .../aws/ec2/config/AWSEC2HttpApiModule.java     |   82 ++
 .../aws/ec2/domain/AWSRunningInstance.java      |  346 +++++
 .../aws/ec2/domain/LaunchSpecification.java     |  570 ++++++++
 .../jclouds/aws/ec2/domain/MonitoringState.java |   50 +
 .../jclouds/aws/ec2/domain/PlacementGroup.java  |  157 ++
 .../domain/RegionNameAndPublicKeyMaterial.java  |   40 +
 .../java/org/jclouds/aws/ec2/domain/Spot.java   |  199 +++
 .../aws/ec2/domain/SpotInstanceRequest.java     |  474 +++++++
 .../org/jclouds/aws/ec2/features/AWSAMIApi.java |  126 ++
 .../aws/ec2/features/AWSInstanceApi.java        |   94 ++
 .../jclouds/aws/ec2/features/AWSKeyPairApi.java |   88 ++
 .../aws/ec2/features/AWSSecurityGroupApi.java   |  147 ++
 .../jclouds/aws/ec2/features/MonitoringApi.java |   97 ++
 .../aws/ec2/features/PlacementGroupApi.java     |  162 +++
 .../aws/ec2/features/SpotInstanceApi.java       |  247 ++++
 .../functions/CreatePlacementGroupIfNeeded.java |   81 ++
 .../ImportOrReturnExistingKeypair.java          |   90 ++
 ...SpotInstanceRequestToAWSRunningInstance.java |   63 +
 .../ec2/options/AWSDescribeImagesOptions.java   |  152 ++
 .../aws/ec2/options/AWSRunInstancesOptions.java |  310 ++++
 .../ec2/options/CreateSecurityGroupOptions.java |   63 +
 .../DescribeSpotPriceHistoryOptions.java        |  115 ++
 .../options/RequestSpotInstancesOptions.java    |  139 ++
 .../ec2/predicates/PlacementGroupAvailable.java |   69 +
 .../ec2/predicates/PlacementGroupDeleted.java   |   66 +
 .../predicates/SpotInstanceRequestActive.java   |   75 +
 .../aws/ec2/reference/AWSEC2Constants.java      |   39 +
 .../AWSDescribeInstancesResponseHandler.java    |  110 ++
 ...C2DescribeSecurityGroupsResponseHandler.java |  125 ++
 .../aws/ec2/xml/AWSEC2IpPermissionHandler.java  |   94 ++
 .../aws/ec2/xml/AWSEC2SecurityGroupHandler.java |  142 ++
 .../ec2/xml/AWSRunInstancesResponseHandler.java |   51 +
 .../aws/ec2/xml/BaseAWSReservationHandler.java  |  251 ++++
 .../xml/CreateSecurityGroupResponseHandler.java |   44 +
 .../DescribePlacementGroupsResponseHandler.java |   75 +
 ...eservedInstancesOfferingResponseHandler.java |   74 +
 ...DescribeSpotPriceHistoryResponseHandler.java |   76 +
 .../aws/ec2/xml/LaunchSpecificationHandler.java |  151 ++
 .../aws/ec2/xml/MonitoringStateHandler.java     |   58 +
 .../aws/ec2/xml/PlacementGroupHandler.java      |   70 +
 .../aws/ec2/xml/ProductCodesHandler.java        |   51 +
 .../xml/ReservedInstancesOfferingHandler.java   |   90 ++
 .../org/jclouds/aws/ec2/xml/SpotHandler.java    |   77 +
 .../aws/ec2/xml/SpotInstanceHandler.java        |  152 ++
 .../aws/ec2/xml/SpotInstancesHandler.java       |   81 ++
 .../org.jclouds.providers.ProviderMetadata      |    1 +
 .../test/clojure/org/jclouds/aws/ec2_test.clj   |   32 +
 .../aws/ec2/AWSEC2ContextBuilderTest.java       |   79 ++
 .../org/jclouds/aws/ec2/AWSEC2ProviderTest.java |   33 +
 ...BindLaunchSpecificationToFormParamsTest.java |   98 ++
 .../BindTagsToIndexedFormParamsTest.java        |   63 +
 .../compute/AWSEC2ComputeServiceExpectTest.java |  280 ++++
 .../compute/AWSEC2ComputeServiceLiveTest.java   |  196 +++
 .../compute/AWSEC2TemplateBuilderLiveTest.java  |  367 +++++
 .../AWSEC2ComputeServiceContextModuleTest.java  |   65 +
 .../AWSEC2ImageExtensionLiveTest.java           |   62 +
 .../AWSEC2SecurityGroupExtensionExpectTest.java |  364 +++++
 .../AWSEC2SecurityGroupExtensionLiveTest.java   |   36 +
 .../AWSEC2SecurityGroupToSecurityGroupTest.java |   83 ++
 .../AWSRunningInstanceToNodeMetadataTest.java   |  220 +++
 .../PresentSpotRequestsAndInstancesTest.java    |  100 ++
 .../BaseAWSEC2ComputeServiceExpectTest.java     |  153 ++
 .../AWSEC2CreateSecurityGroupIfNeededTest.java  |  103 ++
 .../options/AWSEC2TemplateOptionsTest.java      |  418 ++++++
 .../compute/strategy/AWSEC2ImageParserTest.java |  242 ++++
 .../strategy/AWSEC2ReviseParsedImageTest.java   |  111 ++
 ...tyGroupsAsNeededAndReturnRunOptionsTest.java |  958 +++++++++++++
 .../aws/ec2/features/AWSAMIApiLiveTest.java     |   58 +
 .../jclouds/aws/ec2/features/AWSAMIApiTest.java |  497 +++++++
 .../ec2/features/AWSInstanceApiLiveTest.java    |   60 +
 .../aws/ec2/features/AWSInstanceApiTest.java    |  539 +++++++
 .../aws/ec2/features/AWSKeyPairApiLiveTest.java |  208 +++
 .../aws/ec2/features/AWSKeyPairApiTest.java     |  134 ++
 .../features/AWSSecurityGroupApiLiveTest.java   |  123 ++
 .../ec2/features/AWSSecurityGroupApiTest.java   |  207 +++
 .../aws/ec2/features/AWSSubnetApiLiveTest.java  |   31 +
 .../aws/ec2/features/BaseAWSEC2ApiTest.java     |  135 ++
 .../aws/ec2/features/MonitoringApiLiveTest.java |   65 +
 .../aws/ec2/features/MonitoringApiTest.java     |   73 +
 .../features/PlacementGroupApiExpectTest.java   |   78 +
 .../ec2/features/PlacementGroupApiLiveTest.java |  221 +++
 .../aws/ec2/features/PlacementGroupApiTest.java |  136 ++
 .../ec2/features/SpotInstanceApiExpectTest.java |   78 +
 .../ec2/features/SpotInstanceApiLiveTest.java   |  215 +++
 .../aws/ec2/features/SpotInstanceApiTest.java   |  100 ++
 .../ec2/features/TagSecurityGroupLiveTest.java  |   56 +
 .../ImportOrReturnExistingKeypairTest.java      |  115 ++
 ...InstanceRequestToAWSRunningInstanceTest.java |   91 ++
 .../options/AWSDescribeImagesOptionsTest.java   |  177 +++
 .../ec2/options/AWSRunInstancesOptionsTest.java |  370 +++++
 .../DescribeSpotPriceHistoryOptionsTest.java    |  119 ++
 .../RequestSpotInstancesOptionsTest.java        |  143 ++
 .../parse/DescribeInstancesResponseTest.java    |  112 ++
 .../DescribeSecurityGroupsResponseTest.java     |   77 +
 ...AWSDescribeInstancesResponseHandlerTest.java |  167 +++
 .../xml/AWSRunInstancesResponseHandlerTest.java |  114 ++
 ...cribePlacementGroupsResponseHandlerTest.java |   53 +
 ...vedInstancesOfferingResponseHandlerTest.java |   55 +
 ...ribeSpotPriceHistoryResponseHandlerTest.java |   72 +
 .../aws/ec2/xml/MonitoringStateHandlerTest.java |   50 +
 .../aws/ec2/xml/ProductCodesHandlerTest.java    |   49 +
 .../aws/ec2/xml/SpotInstanceHandlerTest.java    |  138 ++
 .../aws/ec2/xml/SpotInstancesHandlerTest.java   |  117 ++
 .../src/test/resources/alestic_canonical.xml    |  119 ++
 .../src/test/resources/amzn_images.xml          |   86 ++
 .../describe_image_attribute_productCodes.xml   |    9 +
 .../src/test/resources/describe_images_cc.xml   |   31 +
 .../src/test/resources/describe_instances_1.xml |   55 +
 .../src/test/resources/describe_instances_2.xml |  986 +++++++++++++
 .../src/test/resources/describe_instances_3.xml |    5 +
 .../resources/describe_instances_latest.xml     |  132 ++
 .../resources/describe_instances_pending.xml    |   82 ++
 .../resources/describe_placement_groups.xml     |   10 +
 .../describe_reserved_instances_offerings.xml   |   15 +
 .../resources/describe_security_groups_vpc.xml  |   35 +
 .../test/resources/describe_spot_instance.xml   |   45 +
 .../describe_spot_instance_requests.xml         |  425 ++++++
 .../resources/describe_spot_instance_tags.xml   |  115 ++
 .../resources/describe_spot_instances_1.xml     |  207 +++
 .../resources/describe_spot_price_history.xml   |   27 +
 .../src/test/resources/monitoring.xml           |   16 +
 .../resources/request_spot_instances-ebs.xml    |   52 +
 .../test/resources/request_spot_instances.xml   |   93 ++
 .../src/test/resources/rightscale_images.xml    |   94 ++
 .../src/test/resources/run_instances_1.xml      |   54 +
 .../1.7.1-stratos/src/test/resources/vostok.xml |   19 +
 .../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                            |    5 +-
 .../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    |   28 +-
 .../streamdefinitions/stream-manager-config.xml |   22 +
 .../pom.xml                                     |   19 +-
 .../main/resources/conf/cloud-controller.xml    |    4 +-
 .../resources/conf/scripts/sh/customization     |    4 +
 .../src/main/resources/p2.inf                   |    1 +
 .../resources/p2.inf                            |   15 +-
 .../src/main/resources/p2.inf                   |   15 +-
 .../src/main/resources/p2.inf                   |   17 +
 pom.xml                                         |   76 +-
 products/autoscaler/INSTALL.txt                 |   75 -
 products/autoscaler/LICENSE                     |  613 --------
 products/autoscaler/NOTICE                      |    5 -
 products/autoscaler/README.txt                  |  220 ---
 .../distribution/lib/home/images/bottom.gif     |  Bin 523 -> 0 bytes
 .../distribution/lib/home/images/content-bg.gif |  Bin 233 -> 0 bytes
 .../distribution/lib/home/images/favicon.ico    |  Bin 17542 -> 0 bytes
 .../lib/home/images/feature-01-icon.gif         |  Bin 2063 -> 0 bytes
 .../lib/home/images/feature-02-icon.gif         |  Bin 2141 -> 0 bytes
 .../lib/home/images/feature-03-icon.gif         |  Bin 2649 -> 0 bytes
 .../distribution/lib/home/images/intro-bg.gif   |  Bin 3964 -> 0 bytes
 .../distribution/lib/home/images/logo.gif       |  Bin 3931 -> 0 bytes
 .../lib/home/images/powered-logo.gif            |  Bin 1280 -> 0 bytes
 .../distribution/lib/home/images/register.gif   |  Bin 6859 -> 0 bytes
 .../distribution/lib/home/images/sign-in.gif    |  Bin 3256 -> 0 bytes
 .../distribution/lib/home/images/title-bg.gif   |  Bin 1182 -> 0 bytes
 .../distribution/lib/home/images/top.gif        |  Bin 16149 -> 0 bytes
 .../modules/distribution/lib/home/index.html    |   90 --
 .../modules/distribution/lib/home/style.css     |   67 -
 .../autoscaler/modules/distribution/pom.xml     |  152 --
 .../distribution/src/main/assembly/bin.xml      |  380 -----
 .../src/main/assembly/filter.properties         |   23 -
 .../main/autoscale-policies/economyPolicy.xml   |   28 -
 .../distribution/src/main/conf/autoscaler.xml   |   45 -
 .../distribution/src/main/conf/jndi.properties  |    3 -
 .../distribution/src/main/conf/log4j.properties |  171 ---
 .../distribution/src/main/conf/mincheck.drl     |   79 --
 .../distribution/src/main/conf/scaling.drl      |  182 ---
 .../distribution/src/main/conf/terminateall.drl |   44 -
 .../deployment-policies/economy-deployment.xml  |   25 -
 .../distribution/src/main/license/LICENSE       |  930 ------------
 .../modules/distribution/src/main/notice/NOTICE |  114 --
 .../src/main/partitions/partitions.xml          |   39 -
 .../distribution/src/main/resources/launch.ini  |  249 ----
 .../distribution/src/main/resources/stratos.bat |  274 ----
 .../distribution/src/main/resources/stratos.sh  |  304 ----
 products/autoscaler/modules/integration/pom.xml |  225 ---
 .../autoscaler/integration/TopicPublisher.java  |  101 --
 .../tests/AutoscalerTestServerManager.java      |  111 --
 .../AutoscalingPolicyDeploymentTestCase.java    |   82 --
 .../DeploymentPolicyDeploymentTestCase.java     |   60 -
 .../integration/tests/LoginLogoutTestCase.java  |   49 -
 .../tests/PartitionDeploymentTestCase.java      |   70 -
 .../tests/SecurityVerificationTestCase.java     |   27 -
 .../tests/TopologyEventsPublisherTestCase.java  |  122 --
 .../resources/CloudControllerService_1.0.0.aar  |  Bin 313389 -> 0 bytes
 .../src/test/resources/automation.properties    |  116 --
 .../src/test/resources/autoscaler.xml           |   34 -
 .../src/test/resources/jndi.properties          |    5 -
 .../src/test/resources/keys/wso2carbon.jks      |  Bin 33260 -> 0 bytes
 .../integration/src/test/resources/testng.xml   |   35 -
 products/autoscaler/modules/p2-profile/pom.xml  |  265 ----
 .../src/main/resources/META-INF/product.xml     |   28 -
 .../src/main/resources/web/product/about.html   |  132 --
 .../src/main/resources/web/styles/css/main.css  |  176 ---
 .../main/resources/web/styles/images/1px.gif    |  Bin 43 -> 0 bytes
 .../web/styles/images/leftRightSlider-dark.png  |  Bin 1103 -> 0 bytes
 .../resources/web/styles/images/menu_header.png |  Bin 227 -> 0 bytes
 .../web/styles/images/right-links-bg.gif        |  Bin 1070 -> 0 bytes
 .../web/styles/images/right-logo-bg.gif         |  Bin 3445 -> 0 bytes
 .../resources/web/styles/images/scc-back.png    |  Bin 20094 -> 0 bytes
 .../web/styles/images/scc-header-repeat.png     |  Bin 178 -> 0 bytes
 .../resources/web/styles/images/scclogo.png     |  Bin 5808 -> 0 bytes
 products/autoscaler/pom.xml                     |  107 --
 .../distribution/src/main/assembly/bin.xml      |    8 -
 .../distribution/src/main/bin/stratos.sh        |    6 +-
 .../distribution/src/main/conf/agent-flow.conf  |   14 -
 .../modules/scripts/ec2/clean.sh                |   20 +
 products/cloud-controller/INSTALL.txt           |   75 -
 products/cloud-controller/LICENSE               |  613 --------
 products/cloud-controller/NOTICE                |    5 -
 products/cloud-controller/README.txt            |  220 ---
 .../distribution/lib/home/images/bottom.gif     |  Bin 523 -> 0 bytes
 .../distribution/lib/home/images/content-bg.gif |  Bin 233 -> 0 bytes
 .../distribution/lib/home/images/favicon.ico    |  Bin 17542 -> 0 bytes
 .../lib/home/images/feature-01-icon.gif         |  Bin 2063 -> 0 bytes
 .../lib/home/images/feature-02-icon.gif         |  Bin 2141 -> 0 bytes
 .../lib/home/images/feature-03-icon.gif         |  Bin 2649 -> 0 bytes
 .../distribution/lib/home/images/intro-bg.gif   |  Bin 3964 -> 0 bytes
 .../distribution/lib/home/images/logo.gif       |  Bin 3931 -> 0 bytes
 .../lib/home/images/powered-logo.gif            |  Bin 1280 -> 0 bytes
 .../distribution/lib/home/images/register.gif   |  Bin 6859 -> 0 bytes
 .../distribution/lib/home/images/sign-in.gif    |  Bin 3256 -> 0 bytes
 .../distribution/lib/home/images/title-bg.gif   |  Bin 1182 -> 0 bytes
 .../distribution/lib/home/images/top.gif        |  Bin 16149 -> 0 bytes
 .../modules/distribution/lib/home/index.html    |   90 --
 .../modules/distribution/lib/home/style.css     |   67 -
 .../modules/distribution/pom.xml                |  167 ---
 .../distribution/src/main/assembly/bin.xml      |  408 ------
 .../src/main/assembly/filter.properties         |   23 -
 .../distribution/src/main/cartridges/README.txt |    1 -
 .../distribution/src/main/conf/axis2.xml        |  703 ---------
 .../src/main/conf/cipher-text.properties        |   29 -
 .../src/main/conf/cipher-tool.properties        |   36 -
 .../src/main/conf/datasources.properties        |   58 -
 .../src/main/conf/embedded-ldap.xml             |  165 ---
 .../distribution/src/main/conf/event-broker.xml |   66 -
 .../distribution/src/main/conf/jaas.conf        |   30 -
 .../distribution/src/main/conf/jndi.properties  |    3 -
 .../distribution/src/main/conf/log4j.properties |  193 ---
 .../src/main/conf/rule-component.conf           |   21 -
 .../conf/synapse-configs/default/registry.xml   |   26 -
 .../default/sequences/errorHandler.xml          |   31 -
 .../synapse-configs/default/sequences/fault.xml |   76 -
 .../synapse-configs/default/sequences/main.xml  |  110 --
 .../conf/synapse-configs/default/synapse.xml    |   25 -
 .../src/main/conf/synapse.properties            |   38 -
 .../modules/distribution/src/main/conf/zoo.cfg  |    3 -
 .../distribution/src/main/license/LICENSE       |  930 ------------
 .../modules/distribution/src/main/notice/NOTICE |  114 --
 .../distribution/src/main/resources/launch.ini  |  268 ----
 .../distribution/src/main/resources/stratos.bat |  274 ----
 .../distribution/src/main/resources/stratos.sh  |  304 ----
 .../distribution/src/main/services/README.txt   |    1 -
 .../cloud-controller/modules/p2-profile/pom.xml |  415 ------
 .../src/main/resources/META-INF/product.xml     |   28 -
 .../src/main/resources/web/product/about.html   |  132 --
 .../src/main/resources/web/styles/css/main.css  |  176 ---
 .../main/resources/web/styles/images/1px.gif    |  Bin 43 -> 0 bytes
 .../web/styles/images/leftRightSlider-dark.png  |  Bin 1103 -> 0 bytes
 .../resources/web/styles/images/menu_header.png |  Bin 227 -> 0 bytes
 .../web/styles/images/right-links-bg.gif        |  Bin 1070 -> 0 bytes
 .../web/styles/images/right-logo-bg.gif         |  Bin 3445 -> 0 bytes
 .../resources/web/styles/images/scc-back.png    |  Bin 20094 -> 0 bytes
 .../web/styles/images/scc-header-repeat.png     |  Bin 178 -> 0 bytes
 .../resources/web/styles/images/scclogo.png     |  Bin 5808 -> 0 bytes
 .../src/main/resources/META-INF/product.xml     |   27 -
 .../service/src/main/resources/web/favicon.ico  |  Bin 17542 -> 0 bytes
 .../src/main/resources/web/styles/css/main.css  |  261 ----
 .../resources/web/styles/images/def-body-bg.gif |  Bin 419 -> 0 bytes
 .../web/styles/images/def-header-bg.gif         |  Bin 17875 -> 0 bytes
 .../web/styles/images/def-header-region-bg.gif  |  Bin 22784 -> 0 bytes
 .../main/resources/web/styles/images/logo.gif   |  Bin 1815 -> 0 bytes
 .../resources/web/styles/images/powered.gif     |  Bin 1773 -> 0 bytes
 .../resources/web/styles/images/right-logo.gif  |  Bin 6102 -> 0 bytes
 .../web/styles/images/t-right-logo.gif          |  Bin 3629 -> 0 bytes
 products/cloud-controller/pom.xml               |  105 --
 .../synapse-configs/default/sequences/main.xml  |    8 +-
 products/pom.xml                                |    8 +-
 .../distribution/src/main/bin/version.txt       |    1 -
 products/stratos-manager/conf/README-STRATOS    |   90 --
 .../conf/application-authenticators.xml         |   23 -
 products/stratos-manager/conf/axis2.xml         |  526 -------
 products/stratos-manager/conf/bam.xml           |   45 -
 .../stratos-manager/conf/billing-config.xml     |   68 -
 .../stratos-manager/conf/cipher-text.properties |   26 -
 .../conf/cloud-services-desc.xml                |  195 ---
 .../stratos-manager/conf/datasources.properties |   58 -
 .../conf/email-bill-generated.xml               |   39 -
 .../conf/email-billing-notifications.xml        |   50 -
 .../conf/email-new-tenant-activation.xml        |   47 -
 .../conf/email-new-tenant-registration.xml      |   47 -
 .../conf/email-password-reset.xml               |   43 -
 .../conf/email-payment-received-customer.xml    |   39 -
 .../conf/email-payment-received-wso2.xml        |   39 -
 .../conf/email-registration-complete.xml        |   38 -
 .../conf/email-registration-moderation.xml      |   47 -
 ...l-registration-payment-received-customer.xml |   39 -
 .../stratos-manager/conf/email-registration.xml |   46 -
 products/stratos-manager/conf/email-update.xml  |   39 -
 products/stratos-manager/conf/embedded-ldap.xml |  165 ---
 products/stratos-manager/conf/event-broker.xml  |   63 -
 .../stratos-manager/conf/features-dashboard.xml |   93 --
 products/stratos-manager/conf/identity.xml      |  108 --
 products/stratos-manager/conf/jaas.conf         |   30 -
 products/stratos-manager/conf/jndi.properties   |    3 -
 products/stratos-manager/conf/loadbalancer.conf |   49 -
 products/stratos-manager/conf/log4j.properties  |  169 ---
 .../conf/metering-config-non-manager.xml        |  104 --
 .../conf/multitenancy-billing-rules.drl         |   53 -
 products/stratos-manager/conf/nhttp.properties  |   42 -
 .../conf/passthru-http.properties               |   34 -
 .../stratos-manager/conf/rule-component.conf    |   22 -
 products/stratos-manager/conf/samples-desc.xml  |   33 -
 .../stratos-manager/conf/sso-idp-config.xml     |   38 -
 .../conf/status-monitor-config.xml              |   53 -
 .../conf/stratos-datasources.xml                |   69 -
 .../conf/synapse-configs/default/registry.xml   |   26 -
 .../default/sequences/errorHandler.xml          |   31 -
 .../synapse-configs/default/sequences/fault.xml |   76 -
 .../synapse-configs/default/sequences/main.xml  |  110 --
 .../conf/synapse-configs/default/synapse.xml    |   25 -
 .../stratos-manager/conf/synapse.properties     |   38 -
 .../conf/temp-artifacts/carbon/module.xml       |   47 -
 .../carbon/scripts/registry/artifacts.js        |  574 --------
 .../carbon/scripts/registry/registry-osgi.js    |  445 ------
 .../carbon/scripts/registry/registry-ws.js      |   56 -
 .../carbon/scripts/registry/registry.js         |   24 -
 .../carbon/scripts/server/config.js             |   32 -
 .../carbon/scripts/server/osgi.js               |   10 -
 .../carbon/scripts/server/server.js             |   90 --
 .../carbon/scripts/server/tenant.js             |   49 -
 .../carbon/scripts/user/registry-space.js       |   39 -
 .../temp-artifacts/carbon/scripts/user/space.js |   10 -
 .../carbon/scripts/user/user-manager.js         |  158 ---
 .../temp-artifacts/carbon/scripts/user/user.js  |   78 -
 ...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar |  Bin 11856 -> 0 bytes
 .../org.wso2.store.sso.common_1.0.0.jar         |  Bin 13957 -> 0 bytes
 ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar |  Bin 12276 -> 0 bytes
 .../conf/temp-artifacts/sso/module.xml          |    6 -
 .../temp-artifacts/sso/scripts/sso.client.js    |  172 ---
 .../stratos-manager/conf/tenant-reg-agent.xml   |   25 -
 .../stratos-manager/conf/throttling-rules.drl   |  270 ----
 products/stratos-manager/conf/user-mgt.xml      |  241 ----
 products/stratos-manager/conf/zoo.cfg           |   24 -
 .../stratos-manager/dbscripts/billing-h2.sql    |  128 --
 .../stratos-manager/dbscripts/billing-mysql.sql |  139 --
 .../stratos-manager/dbscripts/metering_h2.sql   |  133 --
 .../dbscripts/metering_mysql.sql                |  168 ---
 .../stratos-manager/dbscripts/migration.sql     |   26 -
 products/stratos-manager/dbscripts/s2_h2.sql    |  115 --
 .../stratos-manager/dbscripts/stratos_mysql.sql |  159 ---
 products/stratos-manager/dbscripts/wso2_rss.sql |   99 --
 .../modules/cloud-service-mgt/pom.xml           |   98 --
 .../services/mgt/beans/CloudService.java        |   85 --
 .../CloudServiceMgtServiceComponent.java        |   74 -
 .../mgt/services/CloudManagerService.java       |  122 --
 .../manager/services/mgt/util/Constants.java    |   29 -
 .../stratos/manager/services/mgt/util/Util.java |  264 ----
 .../src/main/resources/META-INF/component.xml   |   32 -
 .../src/main/resources/META-INF/services.xml    |   43 -
 .../stratos-manager/modules/dashboard/pom.xml   |  144 --
 .../ui/clients/CloudManagerServiceClient.java   |  125 --
 .../manager/dashboard/ui/utils/Util.java        |   48 -
 .../src/main/resources/CloudManagerService.wsdl |  331 -----
 .../src/main/resources/META-INF/component.xml   |   36 -
 .../dashboard/ui/i18n/JSResources.properties    |   24 -
 .../dashboard/ui/i18n/Resources.properties      |   24 -
 .../cloud_services_configuration.jsp            |  204 ---
 .../cloud_services_save_ajaxprocessor.jsp       |   35 -
 .../web/tenant-dashboard/css/dashboard.css      |  252 ----
 .../tenant-dashboard/docs/images/dashboard.png  |  Bin 139674 -> 0 bytes
 .../tenant-dashboard/docs/userguide-old.html    |  101 --
 .../web/tenant-dashboard/docs/userguide.html    |   37 -
 .../images/WSO2-Cloud-Gateway-logo.gif          |  Bin 2506 -> 0 bytes
 .../images/WSO2-Storage-Server-logo.gif         |  Bin 2490 -> 0 bytes
 .../WSO2-Stratos-Application-Server-logo.gif    |  Bin 1473 -> 0 bytes
 ...2-Stratos-Business-Activity-Monitor-logo.gif |  Bin 1690 -> 0 bytes
 ...SO2-Stratos-Business-Process-Server-logo.gif |  Bin 1606 -> 0 bytes
 .../WSO2-Stratos-Business-Rules-Server-logo.gif |  Bin 1596 -> 0 bytes
 ...WSO2-Stratos-Cloud-Services-Gateway-logo.gif |  Bin 2030 -> 0 bytes
 ...tos-Complex-Event-Processing-Server-logo.gif |  Bin 1998 -> 0 bytes
 .../WSO2-Stratos-Data-Services-Server-logo.gif  |  Bin 1528 -> 0 bytes
 ...WSO2-Stratos-Enterprise-Service-Bus-logo.gif |  Bin 1598 -> 0 bytes
 .../images/WSO2-Stratos-Gadget-Server-logo.gif  |  Bin 1368 -> 0 bytes
 .../images/WSO2-Stratos-Governance-logo.gif     |  Bin 1525 -> 0 bytes
 .../images/WSO2-Stratos-Identity-logo.gif       |  Bin 1398 -> 0 bytes
 .../images/WSO2-Stratos-Mashup-Server-logo.gif  |  Bin 1440 -> 0 bytes
 .../images/WSO2-Stratos-Message-Broker-logo.gif |  Bin 1603 -> 0 bytes
 .../images/WSO2-Tasks-Server-logo.gif           |  Bin 2350 -> 0 bytes
 .../web/tenant-dashboard/images/aas-top.gif     |  Bin 4659 -> 0 bytes
 .../tenant-dashboard/images/activate-button.gif |  Bin 2601 -> 0 bytes
 .../tenant-dashboard/images/appserver-logo.gif  |  Bin 1473 -> 0 bytes
 .../web/tenant-dashboard/images/bam-logo.gif    |  Bin 1690 -> 0 bytes
 .../web/tenant-dashboard/images/bps-logo.gif    |  Bin 1606 -> 0 bytes
 .../web/tenant-dashboard/images/brs-logo.gif    |  Bin 1596 -> 0 bytes
 .../web/tenant-dashboard/images/cep_logo.gif    |  Bin 1998 -> 0 bytes
 .../web/tenant-dashboard/images/csg-logo.gif    |  Bin 2030 -> 0 bytes
 .../images/deactivate-button.gif                |  Bin 2448 -> 0 bytes
 .../web/tenant-dashboard/images/ds-logo.gif     |  Bin 1528 -> 0 bytes
 .../web/tenant-dashboard/images/esb-logo.gif    |  Bin 1598 -> 0 bytes
 .../web/tenant-dashboard/images/gadget-logo.gif |  Bin 1368 -> 0 bytes
 .../web/tenant-dashboard/images/go-button.gif   |  Bin 2165 -> 0 bytes
 .../tenant-dashboard/images/governance-logo.gif |  Bin 1525 -> 0 bytes
 .../tenant-dashboard/images/identity-logo.gif   |  Bin 1398 -> 0 bytes
 .../images/inactive-go-button.gif               |  Bin 2135 -> 0 bytes
 .../web/tenant-dashboard/images/mashup-logo.gif |  Bin 1440 -> 0 bytes
 .../web/tenant-dashboard/images/mb_logo.gif     |  Bin 1603 -> 0 bytes
 .../images/service-configuration.gif            |  Bin 389 -> 0 bytes
 .../resources/web/tenant-dashboard/index.jsp    |  243 ----
 .../web/tenant-dashboard/js/configurations.js   |  402 ------
 .../web/tenant-dashboard/js/dashboard.js        |   33 -
 .../modules/distribution/INSTALL.txt            |   61 -
 .../modules/distribution/LICENSE.txt            |  488 -------
 .../modules/distribution/README.txt             |   42 -
 .../modules/distribution/lib/home/faq.html      |  413 ------
 .../distribution/lib/home/images/bottom.gif     |  Bin 523 -> 0 bytes
 .../distribution/lib/home/images/bullet-01.gif  |  Bin 159 -> 0 bytes
 .../distribution/lib/home/images/content-bg.gif |  Bin 233 -> 0 bytes
 .../distribution/lib/home/images/favicon.ico    |  Bin 17542 -> 0 bytes
 .../lib/home/images/feature-01-icon.gif         |  Bin 2825 -> 0 bytes
 .../lib/home/images/feature-02-icon.gif         |  Bin 3361 -> 0 bytes
 .../lib/home/images/feature-03-icon.gif         |  Bin 3285 -> 0 bytes
 .../lib/home/images/feature-middle-bg.gif       |  Bin 1139 -> 0 bytes
 .../distribution/lib/home/images/intro-bg.gif   |  Bin 3964 -> 0 bytes
 .../distribution/lib/home/images/intro-text.gif |  Bin 4082 -> 0 bytes
 .../distribution/lib/home/images/left-bg.gif    |  Bin 1135 -> 0 bytes
 .../distribution/lib/home/images/logo.gif       |  Bin 11127 -> 0 bytes
 .../lib/home/images/powered-logo.gif            |  Bin 1280 -> 0 bytes
 .../distribution/lib/home/images/register.gif   |  Bin 6946 -> 0 bytes
 .../distribution/lib/home/images/sign-in.gif    |  Bin 3150 -> 0 bytes
 .../lib/home/images/stratos-products-new.jpg    |  Bin 25720 -> 0 bytes
 .../distribution/lib/home/images/title-bg.gif   |  Bin 1182 -> 0 bytes
 .../distribution/lib/home/images/top.gif        |  Bin 16149 -> 0 bytes
 .../distribution/lib/home/images/webinar.png    |  Bin 12318 -> 0 bytes
 .../lib/home/images/white-paper.png             |  Bin 15148 -> 0 bytes
 .../modules/distribution/lib/home/index.html    |  140 --
 .../lib/home/js/jquery-1.5.1.min.js             |   16 -
 .../lib/home/js/jquery.orbit-1.2.3.min.js       |   17 -
 .../distribution/lib/home/js/orbit-1.2.3.css    |  223 ---
 .../lib/home/js/orbit/left-arrow.png            |  Bin 860 -> 0 bytes
 .../distribution/lib/home/js/orbit/loading.gif  |  Bin 2608 -> 0 bytes
 .../lib/home/js/orbit/mask-black.png            |  Bin 705 -> 0 bytes
 .../lib/home/js/orbit/right-arrow.png           |  Bin 825 -> 0 bytes
 .../lib/home/js/orbit/rotator-black.png         |  Bin 733 -> 0 bytes
 .../lib/home/js/orbit/timer-black.png           |  Bin 705 -> 0 bytes
 .../modules/distribution/lib/home/style.css     |  181 ---
 .../modules/distribution/pom.xml                |  683 ---------
 .../distribution/qpid-resources/etc/config.xml  |  101 --
 .../qpid-resources/etc/jmxremote.access         |   23 -
 .../qpid-resources/etc/virtualhosts.xml         |   62 -
 .../distribution/qpid-resources/qpid.xml        |   25 -
 .../modules/distribution/release-notes.html     |  134 --
 .../modules/distribution/src/assembly/bin.xml   |  706 ---------
 .../distribution/src/assembly/filter.properties |   26 -
 .../distribution/src/bin/add_entry_zone_file.sh |   70 -
 .../src/bin/git-folder-structure.sh             |   67 -
 .../distribution/src/bin/manage-git-repo.sh     |  138 --
 .../src/bin/remove_entry_zone_file.sh           |   75 -
 .../distribution/src/bin/set-mysql-password.sh  |   65 -
 .../modules/distribution/src/bin/stratos.bat    |  170 ---
 .../modules/distribution/src/bin/stratos.sh     |  304 ----
 .../distribution/src/bin/update-instance.sh     |   54 -
 .../distribution/src/main/conf/axis2.xml        |  702 ---------
 .../src/main/conf/cartridge-config.properties   |   27 -
 .../distribution/src/main/license/LICENSE       | 1152 ---------------
 .../modules/distribution/src/main/notice/NOTICE |  702 ---------
 .../WebContent/META-INF/MANIFEST.MF             |    3 -
 .../WebContent/WEB-INF/web.xml                  |   28 -
 .../WebContent/dashboards/as.html               |   90 --
 .../WebContent/dashboards/bam.html              |  109 --
 .../WebContent/dashboards/bps.html              |   72 -
 .../WebContent/dashboards/brs.html              |   43 -
 .../WebContent/dashboards/cep.html              |  103 --
 .../WebContent/dashboards/csg.html              |   32 -
 .../dashboards/css/features-dashboard.css       |   76 -
 .../WebContent/dashboards/dss.html              |   96 --
 .../WebContent/dashboards/esb.html              |   91 --
 .../WebContent/dashboards/greg.html             |  115 --
 .../WebContent/dashboards/gs.html               |  111 --
 .../WebContent/dashboards/images/black.png      |  Bin 7338 -> 0 bytes
 .../dashboards/images/configure_db.png          |  Bin 43279 -> 0 bytes
 .../dashboards/images/tenant_isolation.png      |  Bin 67219 -> 0 bytes
 .../images/usage_metering_and_throttling.jpg    |  Bin 44100 -> 0 bytes
 .../WebContent/dashboards/is.html               |  119 --
 .../WebContent/dashboards/manager.html          |   89 --
 .../WebContent/dashboards/mb.html               |  102 --
 .../WebContent/dashboards/ms.html               |  102 --
 .../WebContent/dashboards/server.jsp            |  152 --
 .../css/features-dashboard-new.css              |  176 ---
 .../WebContent/tenant-dashboard/css/ie7.css     |   29 -
 .../tenant-dashboard/images/arrow-blue.png      |  Bin 815 -> 0 bytes
 .../tenant-dashboard/images/arrow-white.png     |  Bin 846 -> 0 bytes
 .../WebContent/tenant-dashboard/images/back.jpg |  Bin 1496 -> 0 bytes
 .../tenant-dashboard/images/boxes.png           |  Bin 645 -> 0 bytes
 .../images/dashboard-back-repeat.png            |  Bin 696 -> 0 bytes
 .../tenant-dashboard/images/workAreaBack.png    |  Bin 760 -> 0 bytes
 .../WebContent/tenant-dashboard/index.html      |  194 ---
 .../WebContent/tenant-dashboard/index.jsp       |  205 ---
 .../tenant-dashboard/js/jquery-1.7.1.min.js     |    4 -
 .../tenant-dashboard/js/jquery.masonry.min.js   |   10 -
 .../js/jquery/jquery-1.5.1.min.js               |   16 -
 .../js/jquery/jquery.ui.core.js                 |    1 -
 .../js/jquery/jquery.ui.core.min.js             |   17 -
 .../js/jquery/jquery.ui.tabs.min.js             |   35 -
 .../js/jquery/jquery.ui.widget.min.js           |   15 -
 .../js/jquery/jquery.validate.js                | 1166 ---------------
 .../ui-bg_diagonals-thick_18_b81900_40x40.png   |  Bin 260 -> 0 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png   |  Bin 251 -> 0 bytes
 .../images/ui-bg_flat_10_000000_40x100.png      |  Bin 178 -> 0 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png     |  Bin 104 -> 0 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png     |  Bin 125 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png      |  Bin 105 -> 0 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png      |  Bin 3762 -> 0 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png   |  Bin 90 -> 0 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png    |  Bin 129 -> 0 bytes
 .../images/ui-icons_222222_256x240.png          |  Bin 4369 -> 0 bytes
 .../images/ui-icons_228ef1_256x240.png          |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ef8c08_256x240.png          |  Bin 5355 -> 0 bytes
 .../images/ui-icons_ffd27a_256x240.png          |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffffff_256x240.png          |  Bin 4369 -> 0 bytes
 .../ui-lightness/jquery-ui-1.8.14.custom.css    |  568 --------
 .../themes/ui-lightness/jquery.ui.accordion.css |   19 -
 .../themes/ui-lightness/jquery.ui.all.css       |   11 -
 .../ui-lightness/jquery.ui.autocomplete.css     |   53 -
 .../themes/ui-lightness/jquery.ui.base.css      |   11 -
 .../themes/ui-lightness/jquery.ui.button.css    |   38 -
 .../themes/ui-lightness/jquery.ui.core.css      |   41 -
 .../ui-lightness/jquery.ui.datepicker.css       |   68 -
 .../themes/ui-lightness/jquery.ui.dialog.css    |   21 -
 .../ui-lightness/jquery.ui.progressbar.css      |   11 -
 .../themes/ui-lightness/jquery.ui.resizable.css |   20 -
 .../ui-lightness/jquery.ui.selectable.css       |   10 -
 .../themes/ui-lightness/jquery.ui.slider.css    |   24 -
 .../themes/ui-lightness/jquery.ui.tabs.css      |   18 -
 .../themes/ui-lightness/jquery.ui.theme.css     |  249 ----
 .../features-dashboard/features-dashboard.xml   |  783 ----------
 .../modules/features-dashboard/pom.xml          |  132 --
 .../manager/feature/dashbord/ui/beans/Data.java |   61 -
 .../manager/feature/dashbord/ui/beans/Link.java |   41 -
 .../feature/dashbord/ui/beans/Service.java      |   72 -
 .../feature/dashbord/ui/beans/Story.java        |   62 -
 .../feature/dashbord/ui/utils/Utils.java        |  177 ---
 .../stratos-manager/modules/features/pom.xml    |   40 -
 .../features/service/etc/feature.properties     |  245 ----
 .../service/org.apache.stratos.feature/pom.xml  |   85 --
 .../org.apache.stratos.server.feature/pom.xml   |  236 ---
 .../org.apache.stratos.ui.feature/pom.xml       |  207 ---
 .../modules/features/service/pom.xml            |   50 -
 .../stratos-manager/modules/integration/pom.xml |  163 ---
 .../integration/tests/LoginLogoutTestCase.java  |   49 -
 .../tests/SecurityVerificationTestCase.java     |   27 -
 .../tests/StratosManagerTestServerManager.java  |   54 -
 .../integration/tests/TenantMgtTestCase.java    |   92 --
 .../src/test/resources/instrumentation.txt      |    2 -
 .../src/test/resources/keys/wso2carbon.jks      |  Bin 33260 -> 0 bytes
 .../integration/src/test/resources/testng.xml   |   39 -
 products/stratos-manager/modules/login/pom.xml  |  131 --
 .../src/main/resources/META-INF/component.xml   |   21 -
 .../login/src/main/resources/TenantService.wsdl |  577 --------
 .../web/tenant-login/css/loginpage.css          |  289 ----
 .../resources/web/tenant-login/css/tenant.css   |   83 --
 .../docs/images/sign-in-no-domain.png           |  Bin 10682 -> 0 bytes
 .../docs/images/sign-in-with-domain.png         |  Bin 8233 -> 0 bytes
 .../web/tenant-login/docs/userguide.html        |  114 --
 .../domain_rename_checker_ajaxprocessor.jsp     |   47 -
 .../web/tenant-login/images/body-bg.gif         |  Bin 923 -> 0 bytes
 .../web/tenant-login/images/feature-01-icon.gif |  Bin 2825 -> 0 bytes
 .../web/tenant-login/images/feature-02-icon.gif |  Bin 3361 -> 0 bytes
 .../web/tenant-login/images/feature-03-icon.gif |  Bin 3285 -> 0 bytes
 .../tenant-login/images/google-apps-login.gif   |  Bin 4189 -> 0 bytes
 .../web/tenant-login/images/link-icon.gif       |  Bin 118 -> 0 bytes
 .../web/tenant-login/images/login-bg.gif        |  Bin 56670 -> 0 bytes
 .../resources/web/tenant-login/images/logo.gif  |  Bin 17603 -> 0 bytes
 .../tenant-login/images/paas-login-1pix-1.gif   |  Bin 43 -> 0 bytes
 .../web/tenant-login/images/paas-login-1pix.gif |  Bin 43 -> 0 bytes
 .../web/tenant-login/images/powered.gif         |  Bin 1280 -> 0 bytes
 .../tenant-login/images/reg-button-hover.gif    |  Bin 3824 -> 0 bytes
 .../web/tenant-login/images/reg-button.gif      |  Bin 3852 -> 0 bytes
 .../web/tenant-login/images/register.gif        |  Bin 4099 -> 0 bytes
 .../tenant-login/images/st-login-body-bg.gif    |  Bin 2215 -> 0 bytes
 .../tenant-login/images/st-login-content-bg.gif |  Bin 1060 -> 0 bytes
 .../tenant-login/images/st-login-footer-bg.gif  |  Bin 749 -> 0 bytes
 .../tenant-login/images/st-login-header-bg.gif  |  Bin 64503 -> 0 bytes
 .../web/tenant-login/images/t-right-logo.gif    |  Bin 2445 -> 0 bytes
 .../main/resources/web/tenant-login/js/login.js |   48 -
 .../web/tenant-login/login_ajaxprocessor.jsp    |  331 -----
 .../web/tenant-login/terms/policy.html          |   72 -
 .../web/tenant-login/terms/support.html         |   39 -
 .../resources/web/tenant-login/terms/terms.html |   74 -
 .../modules/p2-profile-gen/pom.xml              |  517 -------
 products/stratos-manager/modules/styles/pom.xml |  130 --
 .../src/main/resources/META-INF/product.xml     |   27 -
 .../styles/src/main/resources/web/favicon.ico   |  Bin 17542 -> 0 bytes
 .../src/main/resources/web/styles/css/main.css  |  261 ----
 .../resources/web/styles/images/def-body-bg.gif |  Bin 419 -> 0 bytes
 .../web/styles/images/def-header-bg.gif         |  Bin 17875 -> 0 bytes
 .../web/styles/images/def-header-region-bg.gif  |  Bin 22784 -> 0 bytes
 .../main/resources/web/styles/images/logo.gif   |  Bin 3476 -> 0 bytes
 .../resources/web/styles/images/powered.gif     |  Bin 1773 -> 0 bytes
 .../resources/web/styles/images/right-logo.gif  |  Bin 6102 -> 0 bytes
 .../web/styles/images/t-right-logo.gif          |  Bin 3629 -> 0 bytes
 .../payload/user-data/ssl-cert-snakeoil.key     |   16 -
 .../payload/user-data/ssl-cert-snakeoil.pem     |   14 -
 products/stratos-manager/pom.xml                |  342 -----
 .../resources/allthemes/Dark/admin/logo.gif     |  Bin 3476 -> 0 bytes
 .../resources/allthemes/Dark/admin/main.css     |  253 ----
 .../allthemes/Dark/admin/powered-stratos.gif    |  Bin 1515 -> 0 bytes
 .../allthemes/Dark/admin/right-logo.gif         |  Bin 2325 -> 0 bytes
 .../allthemes/Dark/admin/theme-header-bg.gif    |  Bin 4245 -> 0 bytes
 .../Dark/admin/theme-header-region-bg.gif       |  Bin 793 -> 0 bytes
 .../allthemes/Dark/admin/theme-menu-header.gif  |  Bin 261 -> 0 bytes
 .../Dark/admin/theme-menu-panel-l-bg.gif        |  Bin 312 -> 0 bytes
 .../Dark/admin/theme-menu-table-bg.gif          |  Bin 5671 -> 0 bytes
 .../Dark/admin/theme-right-links-bg.gif         |  Bin 1005 -> 0 bytes
 .../resources/allthemes/Dark/thumb.png          |  Bin 19546 -> 0 bytes
 .../allthemes/Default/admin/def-body-bg.gif     |  Bin 419 -> 0 bytes
 .../allthemes/Default/admin/def-header-bg.gif   |  Bin 17875 -> 0 bytes
 .../Default/admin/def-header-region-bg.gif      |  Bin 22784 -> 0 bytes
 .../resources/allthemes/Default/admin/logo.gif  |  Bin 3476 -> 0 bytes
 .../resources/allthemes/Default/admin/main.css  |  250 ----
 .../allthemes/Default/admin/powered-stratos.gif |  Bin 1515 -> 0 bytes
 .../allthemes/Default/admin/right-logo.gif      |  Bin 3629 -> 0 bytes
 .../resources/allthemes/Default/thumb.png       |  Bin 24432 -> 0 bytes
 .../resources/allthemes/Light/admin/logo.gif    |  Bin 3476 -> 0 bytes
 .../resources/allthemes/Light/admin/main.css    |  250 ----
 .../allthemes/Light/admin/menu_header.gif       |  Bin 243 -> 0 bytes
 .../allthemes/Light/admin/powered-stratos.gif   |  Bin 1515 -> 0 bytes
 .../allthemes/Light/admin/right-links-bg.gif    |  Bin 1191 -> 0 bytes
 .../allthemes/Light/admin/right-logo.gif        |  Bin 2325 -> 0 bytes
 .../allthemes/Light/admin/theme-header-bg.gif   |  Bin 3792 -> 0 bytes
 .../Light/admin/theme-header-region-b-bg.gif    |  Bin 121 -> 0 bytes
 .../Light/admin/theme-header-region-bg.gif      |  Bin 534 -> 0 bytes
 .../Light/admin/theme-menu-panel-l-bg.gif       |  Bin 772 -> 0 bytes
 .../Light/admin/theme-menu-table-bg.gif         |  Bin 5991 -> 0 bytes
 .../resources/allthemes/Light/thumb.png         |  Bin 18102 -> 0 bytes
 .../cloud-services-icons/appserver.gif          |  Bin 2086 -> 0 bytes
 .../resources/cloud-services-icons/bam.gif      |  Bin 1773 -> 0 bytes
 .../resources/cloud-services-icons/bps.gif      |  Bin 1531 -> 0 bytes
 .../resources/cloud-services-icons/brs-old.gif  |  Bin 1772 -> 0 bytes
 .../resources/cloud-services-icons/brs.gif      |  Bin 2170 -> 0 bytes
 .../resources/cloud-services-icons/cep.png      |  Bin 3218 -> 0 bytes
 .../resources/cloud-services-icons/cg.gif       |  Bin 2385 -> 0 bytes
 .../cloud-services-icons/csg-inactive.gif       |  Bin 3188 -> 0 bytes
 .../resources/cloud-services-icons/csg.gif      |  Bin 3176 -> 0 bytes
 .../resources/cloud-services-icons/ds.gif       |  Bin 2012 -> 0 bytes
 .../resources/cloud-services-icons/esb.gif      |  Bin 1787 -> 0 bytes
 .../resources/cloud-services-icons/gadget.gif   |  Bin 2242 -> 0 bytes
 .../cloud-services-icons/governance.gif         |  Bin 1977 -> 0 bytes
 .../resources/cloud-services-icons/identity.gif |  Bin 1936 -> 0 bytes
 .../cloud-services-icons/inactive-appserver.gif |  Bin 1957 -> 0 bytes
 .../cloud-services-icons/inactive-bam.gif       |  Bin 1647 -> 0 bytes
 .../cloud-services-icons/inactive-brs.gif       |  Bin 1874 -> 0 bytes
 .../cloud-services-icons/inactive-cep.png       |  Bin 2959 -> 0 bytes
 .../cloud-services-icons/inactive-esb.gif       |  Bin 1656 -> 0 bytes
 .../cloud-services-icons/inactive-gadget.gif    |  Bin 2087 -> 0 bytes
 .../inactive-governance.gif                     |  Bin 1850 -> 0 bytes
 .../cloud-services-icons/inactive-identity.gif  |  Bin 1794 -> 0 bytes
 .../cloud-services-icons/inactive-mashup.gif    |  Bin 1772 -> 0 bytes
 .../cloud-services-icons/inactive-mb.png        |  Bin 2746 -> 0 bytes
 .../resources/cloud-services-icons/mashup.gif   |  Bin 1850 -> 0 bytes
 .../resources/cloud-services-icons/mb.png       |  Bin 3139 -> 0 bytes
 .../resources/cloud-services-icons/pom.xml      |   58 -
 .../resources/cloud-services-icons/ss.gif       |  Bin 2432 -> 0 bytes
 .../resources/cloud-services-icons/ts.gif       |  Bin 2475 -> 0 bytes
 .../powerded-by-logos/appserver-logo.gif        |  Bin 1473 -> 0 bytes
 .../resources/powerded-by-logos/bam-logo.gif    |  Bin 1690 -> 0 bytes
 .../resources/powerded-by-logos/bps-logo.gif    |  Bin 1606 -> 0 bytes
 .../resources/powerded-by-logos/brs-logo.gif    |  Bin 1596 -> 0 bytes
 .../resources/powerded-by-logos/csg-logo.gif    |  Bin 2030 -> 0 bytes
 .../resources/powerded-by-logos/ds-logo.gif     |  Bin 1528 -> 0 bytes
 .../resources/powerded-by-logos/esb-logo.gif    |  Bin 1598 -> 0 bytes
 .../resources/powerded-by-logos/gadget-logo.gif |  Bin 1368 -> 0 bytes
 .../powerded-by-logos/governance-logo.gif       |  Bin 1525 -> 0 bytes
 .../powerded-by-logos/identity-logo.gif         |  Bin 1398 -> 0 bytes
 .../resources/powerded-by-logos/mashup-logo.gif |  Bin 1440 -> 0 bytes
 .../stratos/conf/application-authenticators.xml |   23 +
 products/stratos/conf/axis2.xml                 |  526 +++++++
 products/stratos/conf/bam.xml                   |   45 +
 products/stratos/conf/billing-config.xml        |   68 +
 products/stratos/conf/cipher-text.properties    |   26 +
 products/stratos/conf/cloud-services-desc.xml   |  195 +++
 .../conf/data-bridge/data-bridge-config.xml     |   71 +
 .../conf/data-bridge/thrift-agent-config.xml    |   44 +
 products/stratos/conf/datasources.properties    |   58 +
 products/stratos/conf/email-bill-generated.xml  |   39 +
 .../conf/email-billing-notifications.xml        |   50 +
 .../conf/email-new-tenant-activation.xml        |   47 +
 .../conf/email-new-tenant-registration.xml      |   47 +
 products/stratos/conf/email-password-reset.xml  |   43 +
 .../conf/email-payment-received-customer.xml    |   39 +
 .../conf/email-payment-received-wso2.xml        |   39 +
 .../conf/email-registration-complete.xml        |   38 +
 .../conf/email-registration-moderation.xml      |   47 +
 ...l-registration-payment-received-customer.xml |   39 +
 products/stratos/conf/email-registration.xml    |   46 +
 products/stratos/conf/email-update.xml          |   39 +
 products/stratos/conf/embedded-ldap.xml         |  165 +++
 products/stratos/conf/event-broker.xml          |   63 +
 products/stratos/conf/features-dashboard.xml    |   93 ++
 products/stratos/conf/identity.xml              |  108 ++
 products/stratos/conf/jaas.conf                 |   30 +
 products/stratos/conf/jndi.properties           |   21 +
 .../conf/metering-config-non-manager.xml        |  104 ++
 .../stratos/conf/multitenancy-billing-rules.drl |   53 +
 products/stratos/conf/nhttp.properties          |   42 +
 products/stratos/conf/passthru-http.properties  |   34 +
 products/stratos/conf/rule-component.conf       |   22 +
 products/stratos/conf/samples-desc.xml          |   33 +
 products/stratos/conf/sso-idp-config.xml        |   38 +
 products/stratos/conf/status-monitor-config.xml |   53 +
 products/stratos/conf/stratos-datasources.xml   |   69 +
 .../conf/synapse-configs/default/registry.xml   |   26 +
 .../default/sequences/errorHandler.xml          |   31 +
 .../synapse-configs/default/sequences/fault.xml |   76 +
 .../synapse-configs/default/sequences/main.xml  |  110 ++
 .../conf/synapse-configs/default/synapse.xml    |   25 +
 products/stratos/conf/synapse.properties        |   38 +
 .../conf/temp-artifacts/carbon/module.xml       |   69 +
 .../carbon/scripts/registry/artifacts.js        |  595 ++++++++
 .../carbon/scripts/registry/registry-osgi.js    |  466 ++++++
 .../carbon/scripts/registry/registry-ws.js      |   77 +
 .../carbon/scripts/registry/registry.js         |   45 +
 .../carbon/scripts/server/config.js             |   53 +
 .../carbon/scripts/server/osgi.js               |   31 +
 .../carbon/scripts/server/server.js             |  111 ++
 .../carbon/scripts/server/tenant.js             |   70 +
 .../carbon/scripts/user/registry-space.js       |   60 +
 .../temp-artifacts/carbon/scripts/user/space.js |   31 +
 .../carbon/scripts/user/user-manager.js         |  179 +++
 .../temp-artifacts/carbon/scripts/user/user.js  |   99 ++
 ...ryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar |  Bin 0 -> 11856 bytes
 .../org.wso2.store.sso.common_1.0.0.jar         |  Bin 0 -> 13957 bytes
 ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar |  Bin 0 -> 12276 bytes
 .../stratos/conf/temp-artifacts/sso/module.xml  |   28 +
 .../temp-artifacts/sso/scripts/sso.client.js    |  193 +++
 products/stratos/conf/tenant-reg-agent.xml      |   25 +
 products/stratos/conf/throttling-rules.drl      |  270 ++++
 products/stratos/conf/user-mgt.xml              |  241 ++++
 products/stratos/conf/zoo.cfg                   |   24 +
 products/stratos/dbscripts/billing-h2.sql       |  128 ++
 products/stratos/dbscripts/billing-mysql.sql    |  139 ++
 products/stratos/dbscripts/metering_h2.sql      |  133 ++
 products/stratos/dbscripts/metering_mysql.sql   |  168 +++
 products/stratos/dbscripts/migration.sql        |   26 +
 products/stratos/dbscripts/s2_h2.sql            |  115 ++
 products/stratos/dbscripts/stratos_mysql.sql    |  159 +++
 products/stratos/dbscripts/wso2_rss.sql         |   99 ++
 .../stratos/modules/distribution/INSTALL.txt    |   61 +
 .../stratos/modules/distribution/LICENSE.txt    |  488 +++++++
 .../stratos/modules/distribution/README.txt     |   42 +
 .../modules/distribution/lib/home/faq.html      |  413 ++++++
 .../distribution/lib/home/images/bottom.gif     |  Bin 0 -> 523 bytes
 .../distribution/lib/home/images/bullet-01.gif  |  Bin 0 -> 159 bytes
 .../distribution/lib/home/images/content-bg.gif |  Bin 0 -> 233 bytes
 .../distribution/lib/home/images/favicon.ico    |  Bin 0 -> 17542 bytes
 .../lib/home/images/feature-01-icon.gif         |  Bin 0 -> 2825 bytes
 .../lib/home/images/feature-02-icon.gif         |  Bin 0 -> 3361 bytes
 .../lib/home/images/feature-03-icon.gif         |  Bin 0 -> 3285 bytes
 .../lib/home/images/feature-middle-bg.gif       |  Bin 0 -> 1139 bytes
 .../distribution/lib/home/images/intro-bg.gif   |  Bin 0 -> 3964 bytes
 .../distribution/lib/home/images/intro-text.gif |  Bin 0 -> 4082 bytes
 .../distribution/lib/home/images/left-bg.gif    |  Bin 0 -> 1135 bytes
 .../distribution/lib/home/images/logo.gif       |  Bin 0 -> 11127 bytes
 .../lib/home/images/powered-logo.gif            |  Bin 0 -> 1280 bytes
 .../distribution/lib/home/images/register.gif   |  Bin 0 -> 6946 bytes
 .../distribution/lib/home/images/sign-in.gif    |  Bin 0 -> 3150 bytes
 .../lib/home/images/stratos-products-new.jpg    |  Bin 0 -> 25720 bytes
 .../distribution/lib/home/images/title-bg.gif   |  Bin 0 -> 1182 bytes
 .../distribution/lib/home/images/top.gif        |  Bin 0 -> 16149 bytes
 .../distribution/lib/home/images/webinar.png    |  Bin 0 -> 12318 bytes
 .../lib/home/images/white-paper.png             |  Bin 0 -> 15148 bytes
 .../modules/distribution/lib/home/index.html    |  140 ++
 .../lib/home/js/jquery-1.5.1.min.js             |   16 +
 .../lib/home/js/jquery.orbit-1.2.3.min.js       |   17 +
 .../distribution/lib/home/js/orbit-1.2.3.css    |  223 +++
 .../lib/home/js/orbit/left-arrow.png            |  Bin 0 -> 860 bytes
 .../distribution/lib/home/js/orbit/loading.gif  |  Bin 0 -> 2608 bytes
 .../lib/home/js/orbit/mask-black.png            |  Bin 0 -> 705 bytes
 .../lib/home/js/orbit/right-arrow.png           |  Bin 0 -> 825 bytes
 .../lib/home/js/orbit/rotator-black.png         |  Bin 0 -> 733 bytes
 .../lib/home/js/orbit/timer-black.png           |  Bin 0 -> 705 bytes
 .../modules/distribution/lib/home/style.css     |  181 +++
 products/stratos/modules/distribution/pom.xml   |  703 +++++++++
 .../distribution/qpid-resources/etc/config.xml  |  101 ++
 .../qpid-resources/etc/jmxremote.access         |   23 +
 .../qpid-resources/etc/virtualhosts.xml         |   62 +
 .../distribution/qpid-resources/qpid.xml        |   25 +
 .../modules/distribution/release-notes.html     |  134 ++
 .../modules/distribution/src/assembly/bin.xml   |  860 +++++++++++
 .../distribution/src/assembly/filter.properties |   26 +
 .../distribution/src/bin/add_entry_zone_file.sh |   70 +
 .../src/bin/git-folder-structure.sh             |   67 +
 .../distribution/src/bin/manage-git-repo.sh     |  138 ++
 .../src/bin/remove_entry_zone_file.sh           |   75 +
 .../distribution/src/bin/set-mysql-password.sh  |   65 +
 .../modules/distribution/src/bin/stratos.bat    |  170 +++
 .../modules/distribution/src/bin/stratos.sh     |  305 ++++
 .../distribution/src/bin/update-instance.sh     |   54 +
 .../distribution/src/main/conf/autoscaler.xml   |   45 +
 .../distribution/src/main/conf/axis2.xml        |  702 +++++++++
 .../src/main/conf/cartridge-config.properties   |   27 +
 .../src/main/conf/cipher-text.properties        |   29 +
 .../src/main/conf/cipher-tool.properties        |   57 +
 .../DefaultWSO2EventInputAdaptor.xml            |   30 +
 .../DefaultWSO2EventOutputAdaptor.xml           |   29 +
 .../distribution/src/main/conf/jndi.properties  |   24 +
 .../distribution/src/main/conf/log4j.properties |  194 +++
 .../distribution/src/main/conf/mincheck.drl     |   79 ++
 .../distribution/src/main/conf/scaling.drl      |  182 +++
 .../src/main/conf/siddhi/siddhi.extension       |    3 +
 .../distribution/src/main/conf/terminateall.drl |   44 +
 .../distribution/src/main/license/LICENSE       | 1152 +++++++++++++++
 .../modules/distribution/src/main/notice/NOTICE |  702 +++++++++
 .../src/main/partitions/partitions.xml          |   39 +
 .../distribution/src/main/resources/launch.ini  |  269 ++++
 products/stratos/modules/integration/pom.xml    |  163 +++
 .../integration/tests/LoginLogoutTestCase.java  |   49 +
 .../tests/SecurityVerificationTestCase.java     |   27 +
 .../tests/StratosManagerTestServerManager.java  |   54 +
 .../integration/tests/TenantMgtTestCase.java    |   92 ++
 .../src/test/resources/instrumentation.txt      |    2 +
 .../src/test/resources/keys/wso2carbon.jks      |  Bin 0 -> 33260 bytes
 .../integration/src/test/resources/testng.xml   |   39 +
 .../modules/p2-profile-gen/carbon.product       |   54 +
 products/stratos/modules/p2-profile-gen/pom.xml |  836 +++++++++++
 .../payload/user-data/ssl-cert-snakeoil.key     |   16 +
 .../payload/user-data/ssl-cert-snakeoil.pem     |   14 +
 products/stratos/pom.xml                        |  335 +++++
 .../resources/allthemes/Dark/admin/logo.gif     |  Bin 0 -> 3476 bytes
 .../resources/allthemes/Dark/admin/main.css     |  253 ++++
 .../allthemes/Dark/admin/powered-stratos.gif    |  Bin 0 -> 1515 bytes
 .../allthemes/Dark/admin/right-logo.gif         |  Bin 0 -> 2325 bytes
 .../allthemes/Dark/admin/theme-header-bg.gif    |  Bin 0 -> 4245 bytes
 .../Dark/admin/theme-header-region-bg.gif       |  Bin 0 -> 793 bytes
 .../allthemes/Dark/admin/theme-menu-header.gif  |  Bin 0 -> 261 bytes
 .../Dark/admin/theme-menu-panel-l-bg.gif        |  Bin 0 -> 312 bytes
 .../Dark/admin/theme-menu-table-bg.gif          |  Bin 0 -> 5671 bytes
 .../Dark/admin/theme-right-links-bg.gif         |  Bin 0 -> 1005 bytes
 .../stratos/resources/allthemes/Dark/thumb.png  |  Bin 0 -> 19546 bytes
 .../allthemes/Default/admin/def-body-bg.gif     |  Bin 0 -> 419 bytes
 .../allthemes/Default/admin/def-header-bg.gif   |  Bin 0 -> 17875 bytes
 .../Default/admin/def-header-region-bg.gif      |  Bin 0 -> 22784 bytes
 .../resources/allthemes/Default/admin/logo.gif  |  Bin 0 -> 3476 bytes
 .../resources/allthemes/Default/admin/main.css  |  250 ++++
 .../allthemes/Default/admin/powered-stratos.gif |  Bin 0 -> 1515 bytes
 .../allthemes/Default/admin/right-logo.gif      |  Bin 0 -> 3629 bytes
 .../resources/allthemes/Default/thumb.png       |  Bin 0 -> 24432 bytes
 .../resources/allthemes/Light/admin/logo.gif    |  Bin 0 -> 3476 bytes
 .../resources/allthemes/Light/admin/main.css    |  250 ++++
 .../allthemes/Light/admin/menu_header.gif       |  Bin 0 -> 243 bytes
 .../allthemes/Light/admin/powered-stratos.gif   |  Bin 0 -> 1515 bytes
 .../allthemes/Light/admin/right-links-bg.gif    |  Bin 0 -> 1191 bytes
 .../allthemes/Light/admin/right-logo.gif        |  Bin 0 -> 2325 bytes
 .../allthemes/Light/admin/theme-header-bg.gif   |  Bin 0 -> 3792 bytes
 .../Light/admin/theme-header-region-b-bg.gif    |  Bin 0 -> 121 bytes
 .../Light/admin/theme-header-region-bg.gif      |  Bin 0 -> 534 bytes
 .../Light/admin/theme-menu-panel-l-bg.gif       |  Bin 0 -> 772 bytes
 .../Light/admin/theme-menu-table-bg.gif         |  Bin 0 -> 5991 bytes
 .../stratos/resources/allthemes/Light/thumb.png |  Bin 0 -> 18102 bytes
 .../cloud-services-icons/appserver.gif          |  Bin 0 -> 2086 bytes
 .../resources/cloud-services-icons/bam.gif      |  Bin 0 -> 1773 bytes
 .../resources/cloud-services-icons/bps.gif      |  Bin 0 -> 1531 bytes
 .../resources/cloud-services-icons/brs-old.gif  |  Bin 0 -> 1772 bytes
 .../resources/cloud-services-icons/brs.gif      |  Bin 0 -> 2170 bytes
 .../resources/cloud-services-icons/cep.png      |  Bin 0 -> 3218 bytes
 .../resources/cloud-services-icons/cg.gif       |  Bin 0 -> 2385 bytes
 .../cloud-services-icons/csg-inactive.gif       |  Bin 0 -> 3188 bytes
 .../resources/cloud-services-icons/csg.gif      |  Bin 0 -> 3176 bytes
 .../resources/cloud-services-icons/ds.gif       |  Bin 0 -> 2012 bytes
 .../resources/cloud-services-icons/esb.gif      |  Bin 0 -> 1787 bytes
 .../resources/cloud-services-icons/gadget.gif   |  Bin 0 -> 2242 bytes
 .../cloud-services-icons/governance.gif         |  Bin 0 -> 1977 bytes
 .../resources/cloud-services-icons/identity.gif |  Bin 0 -> 1936 bytes
 .../cloud-services-icons/inactive-appserver.gif |  Bin 0 -> 1957 bytes
 .../cloud-services-icons/inactive-bam.gif       |  Bin 0 -> 1647 bytes
 .../cloud-services-icons/inactive-brs.gif       |  Bin 0 -> 1874 bytes
 .../cloud-services-icons/inactive-cep.png       |  Bin 0 -> 2959 bytes
 .../cloud-services-icons/inactive-esb.gif       |  Bin 0 -> 1656 bytes
 .../cloud-services-icons/inactive-gadget.gif    |  Bin 0 -> 2087 bytes
 .../inactive-governance.gif                     |  Bin 0 -> 1850 bytes
 .../cloud-services-icons/inactive-identity.gif  |  Bin 0 -> 1794 bytes
 .../cloud-services-icons/inactive-mashup.gif    |  Bin 0 -> 1772 bytes
 .../cloud-services-icons/inactive-mb.png        |  Bin 0 -> 2746 bytes
 .../resources/cloud-services-icons/mashup.gif   |  Bin 0 -> 1850 bytes
 .../resources/cloud-services-icons/mb.png       |  Bin 0 -> 3139 bytes
 .../resources/cloud-services-icons/pom.xml      |   58 +
 .../resources/cloud-services-icons/ss.gif       |  Bin 0 -> 2432 bytes
 .../resources/cloud-services-icons/ts.gif       |  Bin 0 -> 2475 bytes
 .../powerded-by-logos/appserver-logo.gif        |  Bin 0 -> 1473 bytes
 .../resources/powerded-by-logos/bam-logo.gif    |  Bin 0 -> 1690 bytes
 .../resources/powerded-by-logos/bps-logo.gif    |  Bin 0 -> 1606 bytes
 .../resources/powerded-by-logos/brs-logo.gif    |  Bin 0 -> 1596 bytes
 .../resources/powerded-by-logos/csg-logo.gif    |  Bin 0 -> 2030 bytes
 .../resources/powerded-by-logos/ds-logo.gif     |  Bin 0 -> 1528 bytes
 .../resources/powerded-by-logos/esb-logo.gif    |  Bin 0 -> 1598 bytes
 .../resources/powerded-by-logos/gadget-logo.gif |  Bin 0 -> 1368 bytes
 .../powerded-by-logos/governance-logo.gif       |  Bin 0 -> 1525 bytes
 .../powerded-by-logos/identity-logo.gif         |  Bin 0 -> 1398 bytes
 .../resources/powerded-by-logos/mashup-logo.gif |  Bin 0 -> 1440 bytes
 .../pom.xml                                     |    2 +-
 .../src/main/resources/AutoScalerService.wsdl   |  139 +-
 .../pom.xml                                     |   12 +-
 .../main/resources/CloudControllerService.wsdl  |  854 +++++------
 .../InstanceCleanupNotificationService.wsdl     |   24 +-
 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/puppet/agent/etc/rc.local                 |   26 -
 tools/puppet/agent/root/bin/ec2_init.sh         |  149 --
 tools/puppet/agent/ruby/stratos_sendinfo.rb     |   30 -
 .../puppet/etc/puppet/files/cartridge-agent.sh  |  117 --
 tools/puppet/etc/puppet/files/environment       |   22 -
 .../etc/puppet/files/get-launch-params.rb       |   54 -
 tools/puppet/etc/puppet/fileserver.conf         |   35 -
 tools/puppet/manifests/classes/apt.pp           |   43 -
 tools/puppet/manifests/classes/hosts.pp         |   29 -
 tools/puppet/manifests/classes/java.pp          |   65 -
 tools/puppet/manifests/classes/lb_cartridge.pp  |  139 --
 tools/puppet/manifests/classes/mcollective.pp   |   84 --
 tools/puppet/manifests/classes/mysql.pp         |  122 --
 tools/puppet/manifests/classes/php_cartridge.pp |  148 --
 tools/puppet/manifests/classes/ssh.pp           |   61 -
 tools/puppet/manifests/classes/stratos.pp       |   93 --
 tools/puppet/manifests/classes/system_config.pp |   77 -
 tools/puppet/manifests/nodes.pp                 |  135 --
 tools/puppet/manifests/site.pp                  |   23 -
 tools/puppet/modules/apt/files/90forceyes       |   23 -
 .../modules/commons/files/bin/puppet_init.sh    |   53 -
 .../modules/commons/files/bin/sign_jars.sh      |   39 -
 .../configs/bin/native/wrapper-linux-x86-32     |  Bin 111027 -> 0 bytes
 .../commons/files/configs/lib/home/favicon.ico  |  Bin 1150 -> 0 bytes
 tools/puppet/modules/commons/files/environment  |   23 -
 .../java/files/jars/copy_java_patches_here      |   22 -
 .../java/files/jdk-7u7-linux-x64.tar.gz.file    |   22 -
 tools/puppet/templates/load-balancer/.erb       |    0
 .../php_cartridge/etc/apache2/apache2.conf.erb  |  256 ----
 .../etc/apache2/sites-available/default-ssl.erb |  195 ---
 .../etc/apache2/sites-available/default.erb     |   64 -
 tools/puppet3-agent/config.sh                   |   14 +-
 tools/puppet3-agent/init-vcloud.sh              |   80 ++
 tools/puppet3-agent/puppetinstall/puppetinstall |   38 +-
 tools/puppet3-agent/stratos_sendinfo.rb         |   21 +-
 tools/puppet3/auth.conf                         |   17 +
 tools/puppet3/autosign.conf                     |   16 +
 tools/puppet3/fileserver.conf                   |   17 +
 tools/puppet3/manifests/nodes.pp                |  110 +-
 tools/puppet3/manifests/site.pp                 |   17 +
 tools/puppet3/modules/agent/files/README.txt    |   12 +
 tools/puppet3/modules/agent/manifests/init.pp   |   17 +
 .../modules/agent/manifests/initialize.pp       |   45 +-
 .../modules/agent/manifests/push_templates.pp   |   33 +-
 tools/puppet3/modules/agent/manifests/start.pp  |   33 +-
 .../modules/agent/templates/bin/stratos.sh.erb  |    8 +-
 .../conf/templates/jndi.properties.template.erb |   15 +-
 .../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/files/README.txt       |   12 +
 tools/puppet3/modules/lb/manifests/clean.pp     |   33 +-
 tools/puppet3/modules/lb/manifests/deploy.pp    |   33 +-
 tools/puppet3/modules/lb/manifests/init.pp      |   34 +-
 .../puppet3/modules/lb/manifests/initialize.pp  |   43 +-
 tools/puppet3/modules/lb/manifests/params.pp    |   33 +-
 .../modules/lb/manifests/push_templates.pp      |   33 +-
 tools/puppet3/modules/lb/manifests/start.pp     |   33 +-
 .../lb/templates/conf/axis2/axis2.xml.erb       |    4 +-
 .../conf/templates/jndi.properties.template.erb |   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   |   43 +
 .../modules/mysql/templates/000-default.erb     |   58 +
 .../puppet3/modules/mysql/templates/my.cnf.erb  |  144 ++
 .../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  |   63 +-
 .../modules/tomcat/templates/server.xml.erb     |  145 ++
 .../puppet3/modules/tomcat/templates/tomcat.erb |  Bin 0 -> 1364 bytes
 .../puppet3/modules/wordpress/manifests/init.pp |   17 +
 .../wordpress/templates/httpd/httpd.conf.erb    |   17 +
 tools/puppet3/puppet.conf                       |   17 +
 tools/stratos-installer/clean.sh                |   39 +-
 tools/stratos-installer/conf/setup.conf         |   98 +-
 .../repository/conf/activemq/jndi.properties    |   28 +
 .../config/all/repository/conf/autoscaler.xml   |   39 +
 .../repository/conf/cartridge-config.properties |   28 +
 .../all/repository/conf/cloud-controller.xml    |   89 ++
 .../conf/datasources/master-datasources.xml     |  129 ++
 .../conf/datasources/stratos-datasources.xml    |   51 +
 .../config/all/repository/conf/jndi.properties  |   32 +
 .../config/as/repository/conf/jndi.properties   |   21 +
 .../cc/repository/conf/cloud-controller.xml     |   13 +-
 .../config/cc/repository/conf/jndi.properties   |   21 +
 .../repository/conf/activemq/jndi.properties    |   28 +
 .../config/sm/repository/conf/carbon.xml        |    2 +-
 .../config/sm/repository/conf/jndi.properties   |   21 +
 tools/stratos-installer/demo.sh                 |  145 ++
 tools/stratos-installer/ec2.sh                  |   43 +-
 tools/stratos-installer/openstack.sh            |   31 +-
 .../resources/add_entry_zone_file.sh            |   70 -
 .../resources/billing-mysql.sql                 |  143 --
 .../stratos-installer/resources/db.stratos.com  |   15 -
 tools/stratos-installer/resources/git           |   74 -
 .../resources/gitolite-suexec-wrapper.sh        |   30 -
 .../resources/metering_mysql.sql                |  172 ---
 tools/stratos-installer/resources/notify.php    |   62 -
 tools/stratos-installer/resources/registry.sql  |  407 ------
 .../resources/remove_entry_zone_file.sh         |   75 -
 .../resources/stratos_foundation.sql            |  159 ---
 tools/stratos-installer/resources/userstore.sql |  481 -------
 tools/stratos-installer/setup.sh                |  822 +++++------
 tools/stratos-installer/start-servers.sh        |  107 +-
 tools/stratos-installer/vcloud.sh               |   52 +
 tools/templates/json/autoscale-policy.json      |   28 -
 tools/templates/json/cartridge.json             |   49 -
 tools/templates/json/deployment-policy.json     |   16 -
 .../templates/json/load-balancer-cartridge.json |   67 -
 tools/templates/json/partition.json             |   14 -
 tools/templates/json/subscribe.json             |   12 -
 2911 files changed, 159171 insertions(+), 101537 deletions(-)
----------------------------------------------------------------------