You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/21 09:10:04 UTC
[51/52] [abbrv] [partial] stratos git commit: Merging jclouds GCE fix
with upstream - resolving conflicts
Merging jclouds GCE fix with upstream - resolving conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/897edde8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/897edde8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/897edde8
Branch: refs/heads/master
Commit: 897edde8515db5d008a05a23d7b14f51ad189124
Parents: 0478f14
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Aug 21 09:11:41 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Aug 21 09:11:41 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller/pom.xml | 44 +-
.../CloudStackPartitionValidator.java | 6 +-
.../iaases/ec2/EC2PartitionValidator.java | 10 +-
.../cloud/controller/iaases/gce/GCEIaas.java | 202 +-
.../iaases/gce/GCEPartitionValidator.java | 70 +-
.../openstack/OpenstackPartitionValidator.java | 10 +-
.../controller/iaases/vcloud/VCloudIaas.java | 392 ----
.../iaases/vcloud/VCloudPartitionValidator.java | 56 -
.../stratos/cloud/controller/util/Scope.java | 26 +
.../messaging/domain/topology/Scope.java | 26 -
.../jclouds/apis/gce/1.8.1-stratos/README.txt | 77 -
.../jclouds/apis/gce/1.8.1-stratos/pom.xml | 144 --
.../GoogleComputeEngineApi.java | 185 --
.../GoogleComputeEngineApiMetadata.java | 103 -
.../GoogleComputeEngineConstants.java | 81 -
.../compute/GoogleComputeEngineService.java | 200 --
.../GoogleComputeEngineServiceAdapter.java | 439 -----
...GoogleComputeEngineServiceContextModule.java | 283 ---
...ogleComputeEngineSecurityGroupExtension.java | 342 ----
.../functions/BuildInstanceMetadata.java | 46 -
.../functions/FirewallTagNamingConvention.java | 62 -
.../functions/FirewallToIpPermission.java | 87 -
.../GoogleComputeEngineImageToImage.java | 80 -
.../functions/InstanceInZoneToNodeMetadata.java | 150 --
.../functions/MachineTypeInZoneToHardware.java | 95 -
.../functions/NetworkToSecurityGroup.java | 82 -
.../functions/OrphanedGroupsFromDeadNodes.java | 57 -
.../compute/functions/RegionToLocation.java | 45 -
.../compute/functions/ZoneToLocation.java | 45 -
.../compute/loaders/FindNetworkOrCreate.java | 62 -
.../GoogleComputeEngineTemplateOptions.java | 382 ----
.../predicates/AllNodesInGroupTerminated.java | 48 -
...desWithGroupEncodedIntoNameThenAddToSet.java | 183 --
...DefaultLoginCredentialsForImageStrategy.java | 69 -
...eNodeCredentialsButOverrideFromTemplate.java | 57 -
.../GoogleComputeEngineHttpApiModule.java | 177 --
.../config/GoogleComputeEngineParserModule.java | 413 ----
.../config/OAuthModuleWithoutTypeAdapters.java | 53 -
.../googlecomputeengine/config/UserProject.java | 33 -
.../domain/AbstractDisk.java | 121 --
.../googlecomputeengine/domain/Address.java | 177 --
.../googlecomputeengine/domain/Deprecated.java | 195 --
.../googlecomputeengine/domain/Disk.java | 123 --
.../googlecomputeengine/domain/Firewall.java | 379 ----
.../googlecomputeengine/domain/Image.java | 286 ---
.../googlecomputeengine/domain/Instance.java | 1187 ------------
.../domain/InstanceInZone.java | 52 -
.../domain/InstanceTemplate.java | 445 -----
.../googlecomputeengine/domain/ListPage.java | 179 --
.../googlecomputeengine/domain/MachineType.java | 348 ----
.../domain/MachineTypeInZone.java | 52 -
.../googlecomputeengine/domain/Metadata.java | 139 --
.../googlecomputeengine/domain/Network.java | 133 --
.../googlecomputeengine/domain/Operation.java | 556 ------
.../googlecomputeengine/domain/Project.java | 162 --
.../googlecomputeengine/domain/Quota.java | 152 --
.../googlecomputeengine/domain/Region.java | 175 --
.../googlecomputeengine/domain/Resource.java | 283 ---
.../googlecomputeengine/domain/Route.java | 433 -----
.../domain/SlashEncodedIds.java | 83 -
.../googlecomputeengine/domain/Snapshot.java | 135 --
.../googlecomputeengine/domain/Zone.java | 334 ----
.../domain/internal/NetworkAndAddressRange.java | 91 -
.../features/AddressApi.java | 187 --
.../googlecomputeengine/features/DiskApi.java | 255 ---
.../features/FirewallApi.java | 227 ---
.../features/GlobalOperationApi.java | 158 --
.../googlecomputeengine/features/ImageApi.java | 167 --
.../features/InstanceApi.java | 381 ----
.../features/MachineTypeApi.java | 143 --
.../features/NetworkApi.java | 204 --
.../features/ProjectApi.java | 96 -
.../googlecomputeengine/features/RegionApi.java | 135 --
.../features/RegionOperationApi.java | 163 --
.../googlecomputeengine/features/RouteApi.java | 184 --
.../features/SnapshotApi.java | 160 --
.../googlecomputeengine/features/ZoneApi.java | 135 --
.../features/ZoneOperationApi.java | 163 --
.../functions/CreateNetworkIfNeeded.java | 100 -
.../functions/internal/BaseToPagedIterable.java | 66 -
.../internal/BaseWithRegionToPagedIterable.java | 72 -
.../internal/BaseWithZoneToPagedIterable.java | 72 -
.../functions/internal/PATCH.java | 35 -
.../functions/internal/ParseAddresses.java | 67 -
.../functions/internal/ParseDisks.java | 67 -
.../functions/internal/ParseFirewalls.java | 63 -
.../internal/ParseGlobalOperations.java | 63 -
.../functions/internal/ParseImages.java | 63 -
.../functions/internal/ParseInstances.java | 65 -
.../functions/internal/ParseMachineTypes.java | 64 -
.../functions/internal/ParseNetworks.java | 63 -
.../internal/ParseRegionOperations.java | 65 -
.../functions/internal/ParseRegions.java | 63 -
.../functions/internal/ParseRoutes.java | 63 -
.../functions/internal/ParseSnapshots.java | 66 -
.../functions/internal/ParseZoneOperations.java | 65 -
.../functions/internal/ParseZones.java | 63 -
.../handlers/FirewallBinder.java | 56 -
.../GoogleComputeEngineErrorHandler.java | 62 -
.../handlers/InstanceBinder.java | 65 -
.../handlers/MetadataBinder.java | 60 -
.../handlers/RouteBinder.java | 56 -
.../options/AttachDiskOptions.java | 128 --
.../options/DeprecateOptions.java | 126 --
.../options/FirewallOptions.java | 166 --
.../options/ListOptions.java | 91 -
.../options/RouteOptions.java | 202 --
.../GlobalOperationDonePredicate.java | 59 -
.../predicates/InstancePredicates.java | 33 -
.../predicates/NetworkFirewallPredicates.java | 121 --
.../RegionOperationDonePredicate.java | 69 -
.../predicates/ZoneOperationDonePredicate.java | 68 -
.../java/org/jclouds/oauth/v2/OAuthApi.java | 61 -
.../org/jclouds/oauth/v2/OAuthApiMetadata.java | 80 -
.../org/jclouds/oauth/v2/OAuthConstants.java | 78 -
.../jclouds/oauth/v2/config/Authentication.java | 35 -
.../jclouds/oauth/v2/config/CredentialType.java | 42 -
.../v2/config/OAuthAuthenticationModule.java | 52 -
.../oauth/v2/config/OAuthHttpApiModule.java | 45 -
.../jclouds/oauth/v2/config/OAuthModule.java | 119 --
.../oauth/v2/config/OAuthProperties.java | 51 -
.../jclouds/oauth/v2/config/OAuthScopes.java | 40 -
.../org/jclouds/oauth/v2/domain/ClaimSet.java | 191 --
.../org/jclouds/oauth/v2/domain/Header.java | 128 --
.../oauth/v2/domain/OAuthCredentials.java | 129 --
.../java/org/jclouds/oauth/v2/domain/Token.java | 149 --
.../jclouds/oauth/v2/domain/TokenRequest.java | 131 --
.../oauth/v2/domain/TokenRequestFormat.java | 45 -
.../v2/filters/BearerTokenAuthenticator.java | 41 -
.../v2/filters/OAuthAuthenticationFilter.java | 27 -
.../oauth/v2/filters/OAuthAuthenticator.java | 62 -
.../oauth/v2/functions/BuildTokenRequest.java | 135 --
.../jclouds/oauth/v2/functions/FetchToken.java | 41 -
.../v2/functions/OAuthCredentialsSupplier.java | 125 --
.../v2/functions/SignOrProduceMacForToken.java | 119 --
.../oauth/v2/handlers/OAuthErrorHandler.java | 64 -
.../oauth/v2/handlers/OAuthTokenBinder.java | 45 -
.../oauth/v2/json/ClaimSetTypeAdapter.java | 59 -
.../oauth/v2/json/HeaderTypeAdapter.java | 52 -
.../oauth/v2/json/JWTTokenRequestFormat.java | 96 -
.../services/org.jclouds.apis.ApiMetadata | 19 -
.../GoogleComputeEngineApiMetadataTest.java | 38 -
...eEngineAuthenticatedRestContextLiveTest.java | 33 -
.../PageSystemExpectTest.java | 114 --
.../GoogleComputeEngineServiceExpectTest.java | 574 ------
.../GoogleComputeEngineServiceLiveTest.java | 133 --
...uteEngineSecurityGroupExtensionLiveTest.java | 28 -
.../functions/FirewallToIpPermissionTest.java | 93 -
.../GoogleComputeEngineImageToImageTest.java | 64 -
.../InstanceInZoneToNodeMetadataTest.java | 285 ---
.../functions/NetworkToSecurityGroupTest.java | 94 -
.../OrphanedGroupsFromDeadNodesTest.java | 136 --
.../loaders/FindNetworkOrCreateTest.java | 141 --
.../features/AddressApiExpectTest.java | 163 --
.../features/AddressApiLiveTest.java | 71 -
.../features/DiskApiExpectTest.java | 226 ---
.../features/DiskApiLiveTest.java | 85 -
.../features/FirewallApiExpectTest.java | 301 ---
.../features/FirewallApiLiveTest.java | 164 --
.../features/GlobalOperationApiExpectTest.java | 158 --
.../features/GlobalOperationApiLiveTest.java | 91 -
.../features/ImageApiExpectTest.java | 159 --
.../features/ImageApiLiveTest.java | 74 -
.../features/InstanceApiExpectTest.java | 410 ----
.../features/InstanceApiLiveTest.java | 241 ---
.../features/MachineTypeApiExpectTest.java | 113 --
.../features/MachineTypeApiLiveTest.java | 73 -
.../features/NetworkApiExpectTest.java | 164 --
.../features/NetworkApiLiveTest.java | 84 -
.../features/ProjectApiExpectTest.java | 96 -
.../features/ProjectApiLiveTest.java | 123 --
.../features/RegionApiExpectTest.java | 94 -
.../features/RegionApiLiveTest.java | 74 -
.../features/RegionOperationApiExpectTest.java | 195 --
.../features/RegionOperationApiLiveTest.java | 91 -
.../features/RouteApiExpectTest.java | 175 --
.../features/RouteApiLiveTest.java | 97 -
.../features/SnapshotApiExpectTest.java | 94 -
.../features/SnapshotApiLiveTest.java | 92 -
.../features/ZoneApiExpectTest.java | 97 -
.../features/ZoneApiLiveTest.java | 74 -
.../features/ZoneOperationApiExpectTest.java | 193 --
.../features/ZoneOperationApiLiveTest.java | 90 -
.../functions/CreateNetworkIfNeededTest.java | 132 --
.../GoogleComputeEngineErrorHandlerTest.java | 92 -
.../BaseGoogleComputeEngineApiExpectTest.java | 31 -
.../BaseGoogleComputeEngineApiLiveTest.java | 160 --
.../BaseGoogleComputeEngineExpectTest.java | 195 --
.../BaseGoogleComputeEngineParseTest.java | 33 -
...leComputeEngineServiceContextExpectTest.java | 49 -
...aseGoogleComputeEngineServiceExpectTest.java | 28 -
.../parse/ParseAddressListTest.java | 61 -
.../parse/ParseAddressTest.java | 51 -
.../parse/ParseDiskListTest.java | 61 -
.../parse/ParseDiskTest.java | 50 -
.../parse/ParseFirewallListTest.java | 68 -
.../parse/ParseFirewallTest.java | 60 -
.../parse/ParseImageListTest.java | 71 -
.../parse/ParseImageTest.java | 55 -
.../parse/ParseInstanceListTest.java | 48 -
.../parse/ParseInstanceSerialOutputTest.java | 38 -
.../parse/ParseInstanceTest.java | 81 -
.../parse/ParseMachineTypeListTest.java | 91 -
.../parse/ParseMachineTypeTest.java | 56 -
.../parse/ParseMetadataTest.java | 45 -
.../parse/ParseNetworkListTest.java | 49 -
.../parse/ParseNetworkTest.java | 48 -
.../parse/ParseOperationListTest.java | 46 -
.../parse/ParseOperationTest.java | 58 -
.../parse/ParseProjectTest.java | 67 -
.../parse/ParseQuotaTest.java | 39 -
.../parse/ParseRegionListTest.java | 72 -
.../parse/ParseRegionTest.java | 62 -
.../parse/ParseRouteListTest.java | 62 -
.../parse/ParseRouteTest.java | 56 -
.../parse/ParseSnapshotListTest.java | 64 -
.../parse/ParseSnapshotTest.java | 52 -
.../parse/ParseZoneListTest.java | 70 -
.../parse/ParseZoneTest.java | 55 -
.../NetworkFirewallPredicatesTest.java | 162 --
.../jclouds/oauth/v2/OAuthApiMetadataTest.java | 38 -
.../org/jclouds/oauth/v2/OAuthTestUtils.java | 91 -
.../oauth/v2/features/OAuthApiExpectTest.java | 99 -
.../oauth/v2/features/OAuthApiLiveTest.java | 80 -
.../functions/OAuthCredentialsFromPKTest.java | 61 -
.../functions/OAuthCredentialsSupplierTest.java | 55 -
.../oauth/v2/functions/SignerFunctionTest.java | 61 -
.../v2/handlers/OAuthErrorHandlerTest.java | 92 -
.../oauth/v2/internal/Base64UrlSafeTest.java | 40 -
.../v2/internal/BaseOAuthApiExpectTest.java | 23 -
.../oauth/v2/internal/BaseOAuthApiLiveTest.java | 56 -
.../BaseOAuthAuthenticatedApiLiveTest.java | 110 --
.../oauth/v2/internal/BaseOAuthExpectTest.java | 26 -
.../v2/json/JWTTokenRequestFormatTest.java | 69 -
.../jclouds/oauth/v2/parse/ParseTokenTest.java | 40 -
.../firewall_list.json | 37 -
.../network_get.json | 10 -
.../src/test/resources/address_get.json | 12 -
.../src/test/resources/address_insert.json | 1 -
.../src/test/resources/address_list.json | 31 -
.../test/resources/disk_create_snapshot.json | 1 -
.../src/test/resources/disk_get.json | 10 -
.../src/test/resources/disk_insert.json | 1 -
.../src/test/resources/disk_list.json | 17 -
.../src/test/resources/firewall_get.json | 30 -
.../src/test/resources/firewall_insert.json | 1 -
.../src/test/resources/firewall_list.json | 58 -
.../src/test/resources/global_operation.json | 15 -
.../test/resources/global_operation_list.json | 22 -
.../src/test/resources/image_get.json | 13 -
.../src/test/resources/image_insert.json | 4 -
.../src/test/resources/image_list.json | 24 -
.../src/test/resources/image_list_centos.json | 183 --
.../src/test/resources/image_list_debian.json | 400 ----
.../src/test/resources/image_list_empty.json | 6 -
.../resources/image_list_multiple_page_1.json | 55 -
.../resources/image_list_multiple_page_2.json | 47 -
.../test/resources/image_list_single_page.json | 50 -
.../resources/instance_add_access_config.json | 11 -
.../test/resources/instance_attach_disk.json | 6 -
.../src/test/resources/instance_get.json | 62 -
.../src/test/resources/instance_insert.json | 1 -
.../test/resources/instance_insert_simple.json | 1 -
.../src/test/resources/instance_list.json | 69 -
.../instance_list_central1b_empty.json | 6 -
.../test/resources/instance_serial_port.json | 4 -
.../test/resources/instance_set_metadata.json | 10 -
.../src/test/resources/logback.xml | 83 -
.../src/test/resources/machinetype.json | 21 -
.../src/test/resources/machinetype_list.json | 54 -
.../resources/machinetype_list_central1b.json | 41 -
.../machinetype_list_central1b_empty.json | 6 -
.../src/test/resources/metadata.json | 1 -
.../src/test/resources/network_get.json | 10 -
.../src/test/resources/network_insert.json | 1 -
.../src/test/resources/network_list.json | 18 -
.../src/test/resources/operation.json | 17 -
.../src/test/resources/operation_error.json | 26 -
.../src/test/resources/operation_list.json | 24 -
.../src/test/resources/project.json | 69 -
.../1.8.1-stratos/src/test/resources/quota.json | 5 -
.../src/test/resources/region_get.json | 60 -
.../src/test/resources/region_list.json | 126 --
.../src/test/resources/region_operation.json | 16 -
.../test/resources/region_operation_list.json | 23 -
.../src/test/resources/route_get.json | 14 -
.../src/test/resources/route_insert.json | 1 -
.../src/test/resources/route_list.json | 34 -
.../src/test/resources/snapshot_get.json | 13 -
.../src/test/resources/snapshot_list.json | 33 -
.../src/test/resources/tag_insert.json | 1 -
.../1.8.1-stratos/src/test/resources/testpk.pem | 15 -
.../src/test/resources/tokenResponse.json | 5 -
.../src/test/resources/zone_get.json | 17 -
.../src/test/resources/zone_list.json | 41 -
.../src/test/resources/zone_list_short.json | 24 -
.../src/test/resources/zone_operation.json | 16 -
.../test/resources/zone_operation_error.json | 25 -
.../src/test/resources/zone_operation_list.json | 23 -
dependencies/jclouds/apis/gce/README.md | 87 -
.../openstack-neutron/1.8.1-stratos/README.md | 7 -
.../openstack-neutron/1.8.1-stratos/pom.xml | 161 --
.../openstack/neutron/v2/NeutronApi.java | 116 --
.../neutron/v2/NeutronApiMetadata.java | 100 -
.../neutron/v2/config/NeutronHttpApiModule.java | 91 -
.../neutron/v2/domain/AddressPair.java | 176 --
.../neutron/v2/domain/AllocationPool.java | 138 --
.../neutron/v2/domain/ExternalGatewayInfo.java | 137 --
.../neutron/v2/domain/ExtraDhcpOption.java | 165 --
.../openstack/neutron/v2/domain/FloatingIP.java | 315 ---
.../neutron/v2/domain/FloatingIPs.java | 36 -
.../openstack/neutron/v2/domain/HostRoute.java | 123 --
.../jclouds/openstack/neutron/v2/domain/IP.java | 135 --
.../neutron/v2/domain/IPv6DHCPMode.java | 57 -
.../openstack/neutron/v2/domain/Network.java | 646 -------
.../neutron/v2/domain/NetworkSegment.java | 167 --
.../neutron/v2/domain/NetworkStatus.java | 60 -
.../neutron/v2/domain/NetworkType.java | 81 -
.../openstack/neutron/v2/domain/Networks.java | 36 -
.../openstack/neutron/v2/domain/Port.java | 763 --------
.../openstack/neutron/v2/domain/Ports.java | 36 -
.../openstack/neutron/v2/domain/Router.java | 285 ---
.../neutron/v2/domain/RouterInterface.java | 139 --
.../openstack/neutron/v2/domain/Routers.java | 36 -
.../openstack/neutron/v2/domain/Rule.java | 376 ----
.../neutron/v2/domain/RuleDirection.java | 61 -
.../neutron/v2/domain/RuleEthertype.java | 61 -
.../neutron/v2/domain/RuleProtocol.java | 65 -
.../openstack/neutron/v2/domain/Rules.java | 35 -
.../neutron/v2/domain/SecurityGroup.java | 218 ---
.../neutron/v2/domain/SecurityGroups.java | 36 -
.../openstack/neutron/v2/domain/Subnet.java | 466 -----
.../openstack/neutron/v2/domain/Subnets.java | 36 -
.../openstack/neutron/v2/domain/VIFType.java | 62 -
.../openstack/neutron/v2/domain/VNICType.java | 56 -
.../v2/domain/lbaas/v1/HealthMonitor.java | 450 -----
.../v2/domain/lbaas/v1/HealthMonitorStatus.java | 100 -
.../v2/domain/lbaas/v1/HealthMonitors.java | 37 -
.../neutron/v2/domain/lbaas/v1/HttpMethod.java | 75 -
.../neutron/v2/domain/lbaas/v1/LBaaSStatus.java | 78 -
.../neutron/v2/domain/lbaas/v1/Member.java | 367 ----
.../neutron/v2/domain/lbaas/v1/Members.java | 36 -
.../neutron/v2/domain/lbaas/v1/Pool.java | 481 -----
.../neutron/v2/domain/lbaas/v1/PoolStatus.java | 100 -
.../neutron/v2/domain/lbaas/v1/Pools.java | 36 -
.../neutron/v2/domain/lbaas/v1/ProbeType.java | 70 -
.../neutron/v2/domain/lbaas/v1/Protocol.java | 67 -
.../v2/domain/lbaas/v1/SessionPersistence.java | 182 --
.../neutron/v2/domain/lbaas/v1/VIP.java | 492 -----
.../neutron/v2/domain/lbaas/v1/VIPs.java | 36 -
.../v2/extensions/ExtensionNamespaces.java | 39 -
.../neutron/v2/extensions/FloatingIPApi.java | 138 --
.../neutron/v2/extensions/RouterApi.java | 198 --
.../neutron/v2/extensions/SecurityGroupApi.java | 186 --
.../v2/extensions/lbaas/v1/LBaaSApi.java | 426 -----
.../v2/fallbacks/EmptyFloatingIPsFallback.java | 38 -
.../v2/fallbacks/EmptyNetworksFallback.java | 38 -
.../v2/fallbacks/EmptyPortsFallback.java | 38 -
.../v2/fallbacks/EmptyRoutersFallback.java | 38 -
.../v2/fallbacks/EmptyRulesFallback.java | 38 -
.../fallbacks/EmptySecurityGroupsFallback.java | 38 -
.../v2/fallbacks/EmptySubnetsFallback.java | 38 -
.../lbaas/v1/EmptyHealthMonitorsFallback.java | 38 -
.../lbaas/v1/EmptyMembersFallback.java | 38 -
.../fallbacks/lbaas/v1/EmptyPoolsFallback.java | 38 -
.../fallbacks/lbaas/v1/EmptyVIPsFallback.java | 38 -
.../neutron/v2/features/NetworkApi.java | 151 --
.../openstack/neutron/v2/features/PortApi.java | 148 --
.../neutron/v2/features/SubnetApi.java | 144 --
.../functions/FloatingIPsToPagedIterable.java | 64 -
.../v2/functions/NetworksToPagedIterable.java | 64 -
.../neutron/v2/functions/ParseFloatingIPs.java | 37 -
.../neutron/v2/functions/ParseNetworks.java | 38 -
.../neutron/v2/functions/ParsePorts.java | 37 -
.../neutron/v2/functions/ParseRouters.java | 37 -
.../neutron/v2/functions/ParseRules.java | 38 -
.../v2/functions/ParseSecurityGroups.java | 38 -
.../neutron/v2/functions/ParseSubnets.java | 37 -
.../v2/functions/PortsToPagedIterable.java | 64 -
.../v2/functions/RouterToPagedIterable.java | 65 -
.../v2/functions/RulesToPagedIterable.java | 66 -
.../SecurityGroupsToPagedIterable.java | 66 -
.../v2/functions/SubnetsToPagedIterable.java | 64 -
.../lbaas/v1/HealthMonitorsToPagedIterable.java | 66 -
.../lbaas/v1/MembersToPagedIterable.java | 65 -
.../functions/lbaas/v1/ParseHealthMonitors.java | 38 -
.../v2/functions/lbaas/v1/ParseMembers.java | 38 -
.../v2/functions/lbaas/v1/ParsePools.java | 38 -
.../v2/functions/lbaas/v1/ParseVIPs.java | 38 -
.../lbaas/v1/PoolsToPagedIterable.java | 65 -
.../functions/lbaas/v1/VIPsToPagedIterable.java | 65 -
.../v2/handlers/NeutronErrorHandler.java | 62 -
.../neutron/v2/options/EmptyOptions.java | 45 -
.../openstack/neutron/v2_0/NeutronApi.java | 134 --
.../neutron/v2_0/NeutronApiMetadata.java | 101 -
.../v2_0/config/NeutronHttpApiModule.java | 82 -
.../neutron/v2_0/domain/AllocationPool.java | 125 --
.../neutron/v2_0/domain/BulkNetwork.java | 208 --
.../openstack/neutron/v2_0/domain/BulkPort.java | 230 ---
.../neutron/v2_0/domain/BulkSubnet.java | 273 ---
.../v2_0/domain/ExternalGatewayInfo.java | 102 -
.../neutron/v2_0/domain/HostRoute.java | 126 --
.../openstack/neutron/v2_0/domain/IP.java | 120 --
.../openstack/neutron/v2_0/domain/Network.java | 255 ---
.../neutron/v2_0/domain/NetworkType.java | 39 -
.../openstack/neutron/v2_0/domain/Port.java | 234 ---
.../neutron/v2_0/domain/Reference.java | 127 --
.../neutron/v2_0/domain/ReferenceWithName.java | 109 --
.../openstack/neutron/v2_0/domain/Router.java | 149 --
.../neutron/v2_0/domain/RouterInterface.java | 125 --
.../openstack/neutron/v2_0/domain/State.java | 27 -
.../openstack/neutron/v2_0/domain/Subnet.java | 264 ---
.../neutron/v2_0/extensions/RouterApi.java | 215 ---
.../neutron/v2_0/features/NetworkApi.java | 178 --
.../neutron/v2_0/features/PortApi.java | 182 --
.../neutron/v2_0/features/SubnetApi.java | 181 --
.../v2_0/functions/ParseNetworkDetails.java | 93 -
.../neutron/v2_0/functions/ParseNetworks.java | 93 -
.../v2_0/functions/ParsePortDetails.java | 94 -
.../neutron/v2_0/functions/ParsePorts.java | 93 -
.../v2_0/functions/ParseRouterDetails.java | 93 -
.../neutron/v2_0/functions/ParseRouters.java | 93 -
.../v2_0/functions/ParseSubnetDetails.java | 93 -
.../neutron/v2_0/functions/ParseSubnets.java | 93 -
.../v2_0/handlers/NeutronErrorHandler.java | 59 -
.../v2_0/options/CreateNetworkBulkOptions.java | 138 --
.../v2_0/options/CreateNetworkOptions.java | 240 ---
.../v2_0/options/CreatePortBulkOptions.java | 133 --
.../neutron/v2_0/options/CreatePortOptions.java | 241 ---
.../v2_0/options/CreateRouterOptions.java | 164 --
.../v2_0/options/CreateSubnetBulkOptions.java | 139 --
.../v2_0/options/CreateSubnetOptions.java | 256 ---
.../neutron/v2_0/options/EmptyOptions.java | 45 -
.../v2_0/options/UpdateNetworkOptions.java | 128 --
.../neutron/v2_0/options/UpdatePortOptions.java | 215 ---
.../v2_0/options/UpdateRouterOptions.java | 164 --
.../v2_0/options/UpdateSubnetOptions.java | 215 ---
.../services/org.jclouds.apis.ApiMetadata | 19 -
.../neutron/v2/NeutronApiMetadataTest.java | 33 -
.../v2/extensions/FloatingIPApiLiveTest.java | 92 -
.../v2/extensions/FloatingIPApiMockTest.java | 436 -----
.../v2/extensions/RouterApiLiveTest.java | 173 --
.../v2/extensions/RouterApiMockTest.java | 631 -------
.../v2/extensions/SecurityGroupApiLiveTest.java | 99 -
.../v2/extensions/SecurityGroupApiMockTest.java | 659 -------
.../extensions/lbaas/v1/LBaaSApiLiveTest.java | 637 -------
.../extensions/lbaas/v1/LBaaSApiMockTest.java | 1787 ------------------
.../v2/features/ExtensionApiLiveTest.java | 83 -
.../v2/features/ExtensionApiMockTest.java | 152 --
.../neutron/v2/features/NetworkApiLiveTest.java | 100 -
.../neutron/v2/features/NetworkApiMockTest.java | 464 -----
.../neutron/v2/features/PortApiLiveTest.java | 149 --
.../neutron/v2/features/PortApiMockTest.java | 492 -----
.../neutron/v2/features/SubnetApiLiveTest.java | 118 --
.../neutron/v2/features/SubnetApiMockTest.java | 472 -----
.../v2/internal/BaseNeutronApiLiveTest.java | 44 -
.../v2/internal/BaseNeutronApiMockTest.java | 41 -
.../openstack/neutron/v2/util/ClassUtil.java | 39 -
.../neutron/v2/util/PredicateUtil.java | 47 -
.../neutron/v2_0/NeutronApiMetadataTest.java | 31 -
.../v2_0/extensions/RouterApiExpectTest.java | 295 ---
.../v2_0/extensions/RouterApiLiveTest.java | 190 --
.../v2_0/features/NetworkApiExpectTest.java | 245 ---
.../v2_0/features/NetworkApiLiveTest.java | 121 --
.../v2_0/features/PortApiExpectTest.java | 245 ---
.../neutron/v2_0/features/PortApiLiveTest.java | 157 --
.../v2_0/features/SubnetApiExpectTest.java | 252 ---
.../v2_0/features/SubnetApiLiveTest.java | 139 --
.../v2_0/internal/BaseNeutronApiExpectTest.java | 66 -
.../v2_0/internal/BaseNeutronApiLiveTest.java | 44 -
.../v2_0/internal/BaseNeutronExpectTest.java | 64 -
.../neutron/v2_0/parse/ParseNetworkTest.java | 50 -
.../neutron/v2_0/parse/ParsePortTest.java | 49 -
.../neutron/v2_0/parse/ParseRouterTest.java | 51 -
.../neutron/v2_0/parse/ParseSubnetTest.java | 49 -
.../openstack/neutron/v2_0/util/ClassUtil.java | 39 -
.../neutron/v2_0/util/PredicateUtil.java | 47 -
.../src/test/resources/access.json | 228 ---
.../src/test/resources/extension_details.json | 10 -
.../src/test/resources/extension_list.json | 140 --
.../extension_list_with_lbaas_v1_response.json | 140 --
...xtension_list_without_lbaas_v1_response.json | 132 --
.../resources/floatingip_create_request.json | 6 -
.../resources/floatingip_create_response.json | 11 -
.../test/resources/floatingip_get_response.json | 11 -
.../resources/floatingip_list_response.json | 22 -
.../floatingip_list_response_paged1.json | 32 -
.../floatingip_list_response_paged2.json | 28 -
.../floatingip_update_dissociate_request.json | 5 -
.../floatingip_update_dissociate_response.json | 11 -
.../resources/floatingip_update_request.json | 5 -
.../resources/floatingip_update_response.json | 11 -
.../lbaas/v1/health_monitor_create_request.json | 8 -
.../v1/health_monitor_create_response.json | 16 -
.../lbaas/v1/health_monitor_get_response.json | 16 -
.../v1/health_monitor_list_response_paged1.json | 20 -
.../v1/health_monitor_list_response_paged2.json | 23 -
.../lbaas/v1/health_monitor_update_request.json | 11 -
.../v1/health_monitor_update_response.json | 16 -
.../lbaas/v1/member_create_request.json | 6 -
.../lbaas/v1/member_create_response.json | 12 -
.../resources/lbaas/v1/member_get_response.json | 12 -
.../lbaas/v1/member_list_response_paged1.json | 20 -
.../lbaas/v1/member_list_response_paged2.json | 20 -
.../lbaas/v1/member_update_request.json | 7 -
.../lbaas/v1/member_update_response.json | 12 -
.../pool_associate_health_monitor_request.json | 5 -
.../pool_associate_health_monitor_response.json | 4 -
.../resources/lbaas/v1/pool_create_request.json | 8 -
.../lbaas/v1/pool_create_response.json | 18 -
.../resources/lbaas/v1/pool_get_response.json | 35 -
.../lbaas/v1/pool_list_response_paged1.json | 46 -
.../lbaas/v1/pool_list_response_paged2.json | 42 -
.../resources/lbaas/v1/pool_update_request.json | 11 -
.../lbaas/v1/pool_update_response.json | 29 -
.../resources/lbaas/v1/vip_create_request.json | 9 -
.../resources/lbaas/v1/vip_create_response.json | 17 -
.../resources/lbaas/v1/vip_get_response.json | 21 -
.../lbaas/v1/vip_list_response_paged1.json | 29 -
.../lbaas/v1/vip_list_response_paged2.json | 29 -
.../resources/lbaas/v1/vip_update_request.json | 13 -
.../resources/lbaas/v1/vip_update_response.json | 21 -
.../src/test/resources/list_networks.json | 62 -
.../src/test/resources/list_ports.json | 86 -
.../src/test/resources/list_routers.json | 74 -
.../src/test/resources/list_subnets.json | 98 -
.../src/test/resources/logback.xml | 69 -
.../src/test/resources/network.json | 7 -
.../resources/network_bulk_create_request.json | 12 -
.../resources/network_bulk_create_response.json | 18 -
.../test/resources/network_create_request.json | 4 -
.../test/resources/network_create_response.json | 7 -
.../test/resources/network_get_response.json | 7 -
.../test/resources/network_list_response.json | 62 -
.../resources/network_list_response_paged1.json | 40 -
.../resources/network_list_response_paged2.json | 36 -
.../test/resources/network_update_request.json | 4 -
.../test/resources/network_update_response.json | 11 -
.../1.8.1-stratos/src/test/resources/port.json | 7 -
.../resources/port_create_bulk_request.json | 22 -
.../resources/port_create_bulk_response.json | 47 -
.../src/test/resources/port_create_request.json | 14 -
.../test/resources/port_create_response.json | 29 -
.../src/test/resources/port_get_response.json | 10 -
.../src/test/resources/port_list_response.json | 86 -
.../resources/port_list_response_paged1.json | 48 -
.../resources/port_list_response_paged2.json | 44 -
.../src/test/resources/port_update_request.json | 8 -
.../test/resources/port_update_response.json | 23 -
.../src/test/resources/router.json | 9 -
.../router_add_interface_port_request.json | 3 -
.../resources/router_add_interface_request.json | 3 -
.../router_add_interface_response.json | 4 -
.../test/resources/router_create_request.json | 9 -
.../test/resources/router_create_response.json | 12 -
.../src/test/resources/router_get_response.json | 12 -
.../test/resources/router_list_response.json | 74 -
.../resources/router_list_response_paged1.json | 34 -
.../resources/router_list_response_paged2.json | 30 -
.../router_remove_interface_port_request.json | 3 -
.../router_remove_interface_subnet_request.json | 3 -
.../test/resources/router_update_request.json | 7 -
.../test/resources/router_update_response.json | 12 -
.../security_group_create_request.json | 6 -
.../security_group_create_response.json | 34 -
.../resources/security_group_get_response.json | 58 -
.../resources/security_group_list_response.json | 116 --
.../security_group_list_response_paged1.json | 126 --
.../security_group_list_response_paged2.json | 122 --
.../security_group_rule_create_request.json | 11 -
.../security_group_rule_create_response.json | 15 -
.../security_group_rule_get_response.json | 14 -
.../security_group_rule_list_response.json | 52 -
...ecurity_group_rule_list_response_paged1.json | 62 -
...ecurity_group_rule_list_response_paged2.json | 58 -
.../src/test/resources/subnet.json | 8 -
.../resources/subnet_bulk_create_request.json | 14 -
.../resources/subnet_bulk_create_response.json | 48 -
.../test/resources/subnet_create_request.json | 6 -
.../test/resources/subnet_create_response.json | 8 -
.../src/test/resources/subnet_get_response.json | 9 -
.../test/resources/subnet_list_response.json | 98 -
.../resources/subnet_list_response_pages1.json | 30 -
.../resources/subnet_list_response_pages2.json | 26 -
.../test/resources/subnet_update_request.json | 6 -
.../test/resources/subnet_update_response.json | 18 -
.../jclouds/apis/openstack-neutron/README.md | 23 -
.../apis/vcloud/1.8.1-stratos/README.txt | 6 -
.../jclouds/apis/vcloud/1.8.1-stratos/pom.xml | 129 --
.../vcloud/TaskInErrorStateException.java | 34 -
.../vcloud/TaskStillRunningException.java | 34 -
.../main/java/org/jclouds/vcloud/VCloudApi.java | 90 -
.../org/jclouds/vcloud/VCloudApiMetadata.java | 101 -
.../org/jclouds/vcloud/VCloudMediaType.java | 226 ---
.../jclouds/vcloud/VCloudResponseException.java | 66 -
.../java/org/jclouds/vcloud/VCloudToken.java | 34 -
.../org/jclouds/vcloud/VCloudVersionsApi.java | 38 -
.../binders/BindCPUCountToXmlPayload.java | 74 -
.../BindCaptureVAppParamsToXmlPayload.java | 119 --
.../binders/BindCatalogItemToXmlPayload.java | 121 --
.../binders/BindCloneParamsToXmlPayload.java | 128 --
.../BindCloneVAppParamsToXmlPayload.java | 60 -
...BindCloneVAppTemplateParamsToXmlPayload.java | 55 -
.../BindDeployVAppParamsToXmlPayload.java | 37 -
...indDiskAttachOrDetachParamsToXmlPayload.java | 100 -
...ndGuestCustomizationSectionToXmlPayload.java | 107 --
...stantiateVAppTemplateParamsToXmlPayload.java | 216 ---
.../vcloud/binders/BindMemoryToXmlPayload.java | 75 -
...indNetworkConnectionSectionToXmlPayload.java | 101 -
.../vcloud/binders/BindParamsToXmlPayload.java | 76 -
.../BindUndeployVAppParamsToXmlPayload.java | 37 -
.../BindVCloudNetworkAdapterToXmlPayload.java | 141 --
.../OrgNameAndCatalogNameToEndpoint.java | 75 -
.../binders/OrgNameAndVDCNameToEndpoint.java | 74 -
.../OrgNameCatalogNameItemNameToEndpoint.java | 73 -
...meCatalogNameVAppTemplateNameToEndpoint.java | 86 -
.../OrgNameVDCNameNetworkNameToEndpoint.java | 50 -
...NameVDCNameResourceEntityNameToEndpoint.java | 50 -
.../OrgNameVDCNameResourceNameToEndpoint.java | 77 -
.../VCloudComputeServiceContextModule.java | 37 -
.../VCloudComputeServiceDependenciesModule.java | 150 --
.../functions/FindLocationForResource.java | 66 -
.../compute/functions/HardwareForVApp.java | 68 -
.../functions/HardwareForVAppTemplate.java | 81 -
.../compute/functions/ImageForVAppTemplate.java | 79 -
.../compute/functions/VAppToNodeMetadata.java | 111 --
...dHardwareBuilderFromResourceAllocations.java | 40 -
...EnvelopeOrThrowIllegalArgumentException.java | 71 -
.../internal/VCloudTemplateBuilderImpl.java | 45 -
.../compute/options/VCloudTemplateOptions.java | 349 ----
...edIntoNameThenCustomizeDeployAndPowerOn.java | 497 -----
...etworkConfigurationForNetworkAndOptions.java | 76 -
.../strategy/VCloudComputeServiceAdapter.java | 262 ---
.../vcloud/compute/util/VCloudComputeUtils.java | 112 --
.../vcloud/config/DefaultCatalogForOrg.java | 59 -
.../vcloud/config/DefaultNetworkForVDC.java | 61 -
.../vcloud/config/DefaultOrgForUser.java | 54 -
.../vcloud/config/DefaultTasksListForOrg.java | 49 -
.../config/DefaultVCloudReferencesModule.java | 161 --
.../jclouds/vcloud/config/DefaultVDCForOrg.java | 59 -
.../vcloud/config/VCloudHttpApiModule.java | 536 ------
.../jclouds/vcloud/domain/AllocationModel.java | 70 -
.../org/jclouds/vcloud/domain/Capacity.java | 106 --
.../java/org/jclouds/vcloud/domain/Catalog.java | 66 -
.../org/jclouds/vcloud/domain/CatalogItem.java | 34 -
.../vcloud/domain/DiskAttachOrDetachParams.java | 173 --
.../domain/GuestCustomizationSection.java | 440 -----
.../domain/InstantiateVAppTemplateParams.java | 96 -
.../vcloud/domain/NetworkConnection.java | 231 ---
.../vcloud/domain/NetworkConnectionSection.java | 218 ---
.../java/org/jclouds/vcloud/domain/Org.java | 84 -
.../jclouds/vcloud/domain/ReferenceType.java | 52 -
.../java/org/jclouds/vcloud/domain/Status.java | 244 ---
.../java/org/jclouds/vcloud/domain/Task.java | 72 -
.../org/jclouds/vcloud/domain/TaskStatus.java | 68 -
.../org/jclouds/vcloud/domain/TasksList.java | 34 -
.../java/org/jclouds/vcloud/domain/VApp.java | 85 -
.../org/jclouds/vcloud/domain/VAppTemplate.java | 95 -
.../org/jclouds/vcloud/domain/VCloudError.java | 118 --
.../jclouds/vcloud/domain/VCloudSession.java | 25 -
.../java/org/jclouds/vcloud/domain/VDC.java | 144 --
.../org/jclouds/vcloud/domain/VDCStatus.java | 57 -
.../main/java/org/jclouds/vcloud/domain/Vm.java | 106 --
.../vcloud/domain/internal/CatalogImpl.java | 189 --
.../vcloud/domain/internal/CatalogItemImpl.java | 106 --
.../vcloud/domain/internal/ErrorImpl.java | 114 --
.../jclouds/vcloud/domain/internal/OrgImpl.java | 168 --
.../domain/internal/ReferenceTypeImpl.java | 99 -
.../vcloud/domain/internal/TaskImpl.java | 160 --
.../vcloud/domain/internal/TasksListImpl.java | 78 -
.../vcloud/domain/internal/VAppImpl.java | 163 --
.../domain/internal/VAppTemplateImpl.java | 202 --
.../jclouds/vcloud/domain/internal/VDCImpl.java | 289 ---
.../jclouds/vcloud/domain/internal/VmImpl.java | 214 ---
.../vcloud/domain/network/DhcpService.java | 106 --
.../jclouds/vcloud/domain/network/Features.java | 95 -
.../vcloud/domain/network/FenceMode.java | 68 -
.../vcloud/domain/network/FirewallService.java | 86 -
.../domain/network/IpAddressAllocationMode.java | 50 -
.../jclouds/vcloud/domain/network/IpRange.java | 75 -
.../jclouds/vcloud/domain/network/IpScope.java | 169 --
.../vcloud/domain/network/NatService.java | 115 --
.../vcloud/domain/network/NetworkConfig.java | 163 --
.../vcloud/domain/network/OrgNetwork.java | 119 --
.../domain/network/firewall/FirewallPolicy.java | 53 -
.../network/firewall/FirewallProtocols.java | 71 -
.../domain/network/firewall/FirewallRule.java | 124 --
.../domain/network/internal/OrgNetworkImpl.java | 198 --
.../vcloud/domain/network/nat/NatPolicy.java | 53 -
.../vcloud/domain/network/nat/NatProtocol.java | 46 -
.../vcloud/domain/network/nat/NatRule.java | 33 -
.../vcloud/domain/network/nat/NatType.java | 59 -
.../domain/network/nat/rules/MappingMode.java | 53 -
.../network/nat/rules/OneToOneVmRule.java | 109 --
.../network/nat/rules/PortForwardingRule.java | 110 --
.../vcloud/domain/network/nat/rules/VmRule.java | 127 --
.../EditableResourceAllocationSettingData.java | 298 ---
.../vcloud/domain/ovf/VCloudHardDisk.java | 326 ----
.../vcloud/domain/ovf/VCloudNetworkAdapter.java | 328 ----
.../vcloud/domain/ovf/VCloudNetworkSection.java | 80 -
.../ovf/VCloudOperatingSystemSection.java | 118 --
.../ovf/VCloudVirtualHardwareSection.java | 179 --
.../org/jclouds/vcloud/endpoints/Catalog.java | 34 -
.../org/jclouds/vcloud/endpoints/Network.java | 34 -
.../java/org/jclouds/vcloud/endpoints/Org.java | 34 -
.../org/jclouds/vcloud/endpoints/OrgList.java | 34 -
.../org/jclouds/vcloud/endpoints/TasksList.java | 34 -
.../jclouds/vcloud/endpoints/VCloudLogin.java | 36 -
.../java/org/jclouds/vcloud/endpoints/VDC.java | 34 -
.../org/jclouds/vcloud/features/CatalogApi.java | 143 --
.../org/jclouds/vcloud/features/NetworkApi.java | 60 -
.../org/jclouds/vcloud/features/OrgApi.java | 84 -
.../org/jclouds/vcloud/features/TaskApi.java | 80 -
.../org/jclouds/vcloud/features/VAppApi.java | 260 ---
.../vcloud/features/VAppTemplateApi.java | 179 --
.../org/jclouds/vcloud/features/VDCApi.java | 71 -
.../java/org/jclouds/vcloud/features/VmApi.java | 326 ----
...ddVCloudAuthorizationAndCookieToRequest.java | 60 -
.../vcloud/functions/CatalogItemsInCatalog.java | 61 -
.../vcloud/functions/CatalogItemsInOrg.java | 54 -
.../jclouds/vcloud/functions/CatalogsInOrg.java | 69 -
.../functions/DefaultNetworkNameInTemplate.java | 47 -
.../jclouds/vcloud/functions/NetworksInOrg.java | 54 -
.../vcloud/functions/OrgNameToEndpoint.java | 53 -
.../functions/OrgNameToTasksListEndpoint.java | 58 -
.../vcloud/functions/OrgsForLocations.java | 70 -
.../jclouds/vcloud/functions/OrgsForNames.java | 53 -
.../ParseLoginResponseFromHeaders.java | 103 -
.../functions/VAppTemplatesForCatalogItems.java | 63 -
.../vcloud/functions/VAppTemplatesInOrg.java | 62 -
.../org/jclouds/vcloud/functions/VDCsInOrg.java | 54 -
.../ParseVCloudErrorFromHttpResponse.java | 118 --
.../http/filters/VCloudBasicAuthentication.java | 58 -
.../http/filters/VCloudSupportedVersions.java | 35 -
.../jclouds/vcloud/internal/VCloudLoginApi.java | 45 -
.../org/jclouds/vcloud/loaders/OVFLoader.java | 47 -
.../vcloud/loaders/VAppTemplateLoader.java | 47 -
.../org/jclouds/vcloud/location/DefaultVDC.java | 74 -
.../location/OrgAndVDCToLocationSupplier.java | 90 -
.../vcloud/options/CaptureVAppOptions.java | 46 -
.../vcloud/options/CatalogItemOptions.java | 72 -
.../jclouds/vcloud/options/CloneOptions.java | 48 -
.../vcloud/options/CloneVAppOptions.java | 83 -
.../options/CloneVAppTemplateOptions.java | 37 -
.../options/InstantiateVAppTemplateOptions.java | 173 --
.../jclouds/vcloud/predicates/TaskSuccess.java | 63 -
.../vcloud/reference/VCloudConstants.java | 52 -
.../jclouds/vcloud/reference/package-info.java | 20 -
...thNameMatchingConfigurationKeyOrDefault.java | 95 -
.../vcloud/suppliers/VAppTemplatesSupplier.java | 83 -
.../java/org/jclouds/vcloud/util/Utils.java | 67 -
.../org/jclouds/vcloud/util/VCloudUtils.java | 65 -
.../org/jclouds/vcloud/xml/CatalogHandler.java | 101 -
.../jclouds/vcloud/xml/CatalogItemHandler.java | 78 -
.../org/jclouds/vcloud/xml/ErrorHandler.java | 42 -
.../xml/GuestCustomizationSectionHandler.java | 134 --
.../vcloud/xml/NetworkConnectionHandler.java | 84 -
.../xml/NetworkConnectionSectionHandler.java | 100 -
.../java/org/jclouds/vcloud/xml/OrgHandler.java | 109 --
.../org/jclouds/vcloud/xml/OrgListHandler.java | 51 -
.../jclouds/vcloud/xml/OrgNetworkHandler.java | 322 ----
.../vcloud/xml/SupportedVersionsHandler.java | 57 -
.../org/jclouds/vcloud/xml/TaskHandler.java | 125 --
.../jclouds/vcloud/xml/TasksListHandler.java | 71 -
.../org/jclouds/vcloud/xml/VAppHandler.java | 148 --
.../jclouds/vcloud/xml/VAppTemplateHandler.java | 149 --
.../xml/VCloudVirtualHardwareHandler.java | 69 -
.../java/org/jclouds/vcloud/xml/VDCHandler.java | 164 --
.../java/org/jclouds/vcloud/xml/VmHandler.java | 175 --
.../xml/ovf/VCloudNetworkSectionHandler.java | 66 -
.../xml/ovf/VCloudOperatingSystemHandler.java | 78 -
...oudResourceAllocationSettingDataHandler.java | 86 -
.../services/org.jclouds.apis.ApiMetadata | 1 -
.../jclouds/vcloud/VCloudApiMetadataTest.java | 28 -
.../java/org/jclouds/vcloud/VCloudApiTest.java | 62 -
.../vcloud/VCloudSessionRefreshLiveTest.java | 39 -
.../jclouds/vcloud/VCloudVersionsApiTest.java | 68 -
.../BindCatalogItemToXmlPayloadTest.java | 51 -
.../BindCloneVAppParamsToXmlPayloadTest.java | 79 -
...CloneVAppTemplateParamsToXmlPayloadTest.java | 87 -
.../BindDeployVAppParamsToXmlPayloadTest.java | 59 -
...tiateVAppTemplateParamsToXmlPayloadTest.java | 177 --
...etworkConnectionSectionToXmlPayloadTest.java | 66 -
.../BindUndeployVAppParamsToXmlPayloadTest.java | 59 -
.../BaseVCloudComputeServiceExpectTest.java | 158 --
.../compute/VCloudComputeServiceLiveTest.java | 49 -
.../functions/FindLocationForResourceTest.java | 62 -
.../functions/ListImagesInVCloudExpectTest.java | 85 -
.../functions/VAppToNodeMetadataTest.java | 226 ---
.../options/VCloudTemplateOptionsTest.java | 195 --
...ThenCustomizeDeployAndPowerOnExpectTest.java | 169 --
.../VCloudComputeServiceAdapterTest.java | 89 -
.../vcloud/features/CatalogApiLiveTest.java | 50 -
.../jclouds/vcloud/features/CatalogApiTest.java | 129 --
.../vcloud/features/NetworkApiLiveTest.java | 26 -
.../jclouds/vcloud/features/NetworkApiTest.java | 73 -
.../jclouds/vcloud/features/OrgApiLiveTest.java | 39 -
.../org/jclouds/vcloud/features/OrgApiTest.java | 89 -
.../vcloud/features/TaskApiLiveTest.java | 26 -
.../jclouds/vcloud/features/TaskApiTest.java | 106 --
.../vcloud/features/VAppApiLiveTest.java | 49 -
.../jclouds/vcloud/features/VAppApiTest.java | 313 ---
.../features/VAppTemplateApiLiveTest.java | 164 --
.../vcloud/features/VAppTemplateApiTest.java | 236 ---
.../jclouds/vcloud/features/VDCApiLiveTest.java | 26 -
.../org/jclouds/vcloud/features/VDCApiTest.java | 100 -
.../jclouds/vcloud/features/VmApiLiveTest.java | 161 --
.../org/jclouds/vcloud/features/VmApiTest.java | 318 ----
...loudAuthorizationAndCookieToRequestTest.java | 51 -
.../ParseLoginResponseFromHeadersTest.java | 145 --
.../ParseVCloudErrorFromHttpResponseTest.java | 92 -
.../vcloud/internal/BasePayloadTest.java | 51 -
.../vcloud/internal/BaseVCloudApiLiveTest.java | 55 -
.../vcloud/internal/BaseVCloudApiTest.java | 270 ---
.../vcloud/internal/VCloudLoginApiTest.java | 95 -
.../InstantiateVAppTemplateOptionsTest.java | 72 -
...meMatchingConfigurationKeyOrDefaultTest.java | 113 --
.../org/jclouds/vcloud/utils/TestUtils.java | 30 -
.../jclouds/vcloud/xml/CatalogHandlerTest.java | 133 --
.../vcloud/xml/CatalogItemHandlerTest.java | 84 -
.../GuestCustomizationSectionHandlerTest.java | 73 -
.../xml/NetworkConnectionHandlerTest.java | 55 -
.../NetworkConnectionSectionHandlerTest.java | 61 -
.../org/jclouds/vcloud/xml/OrgHandlerTest.java | 122 --
.../jclouds/vcloud/xml/OrgListHandlerTest.java | 55 -
.../vcloud/xml/OrgNetworkHandlerTest.java | 102 -
.../xml/SupportedVersionsHandlerTest.java | 51 -
.../org/jclouds/vcloud/xml/TaskHandlerTest.java | 133 --
.../vcloud/xml/TasksListHandlerTest.java | 80 -
.../org/jclouds/vcloud/xml/VAppHandlerTest.java | 75 -
.../vcloud/xml/VAppTemplateHandlerTest.java | 162 --
.../org/jclouds/vcloud/xml/VDCHandlerTest.java | 134 --
.../org/jclouds/vcloud/xml/VmHandlerTest.java | 77 -
...VCloudOperatingSystemSectionHandlerTest.java | 59 -
...VCloudVirtualHardwareSectionHandlerTest.java | 151 --
.../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.8.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.8.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.8.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.8.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.8.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/jclouds/apis/vcloud/Readme.md | 636 -------
.../provider/aws-ec2/1.8.1-stratos/README.txt | 8 -
.../provider/aws-ec2/1.8.1-stratos/pom.xml | 154 --
.../src/main/clojure/org/jclouds/aws/ec2.clj | 62 -
.../java/org/jclouds/aws/ec2/AWSEC2Api.java | 117 --
.../org/jclouds/aws/ec2/AWSEC2ApiMetadata.java | 83 -
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 101 -
.../BindLaunchSpecificationToFormParams.java | 97 -
...otInstanceRequestIdsToIndexedFormParams.java | 35 -
.../BindTagFiltersToIndexedFormParams.java | 34 -
.../binders/BindTagsToIndexedFormParams.java | 34 -
.../aws/ec2/compute/AWSEC2ComputeService.java | 157 --
.../compute/AWSEC2ComputeServiceContext.java | 28 -
.../ec2/compute/AWSEC2TemplateBuilderImpl.java | 50 -
.../aws/ec2/compute/AWSEC2TemplateOptions.java | 819 --------
.../AWSEC2BindComputeSuppliersByClass.java | 31 -
.../AWSEC2ComputeServiceContextModule.java | 178 --
.../AWSEC2ComputeServiceDependenciesModule.java | 175 --
.../aws/ec2/compute/config/ClusterCompute.java | 34 -
.../aws/ec2/compute/config/ImageQuery.java | 34 -
.../AWSEC2SecurityGroupExtension.java | 216 ---
.../AWSEC2SecurityGroupToSecurityGroup.java | 48 -
.../AWSRunningInstanceToNodeMetadata.java | 78 -
.../PresentSpotRequestsAndInstances.java | 93 -
.../AWSEC2ComputeServiceContextImpl.java | 45 -
.../AWSEC2CreateSecurityGroupIfNeeded.java | 135 --
.../AWSEC2CreateNodesInGroupThenAddToSet.java | 113 --
.../strategy/AWSEC2DestroyNodeStrategy.java | 71 -
.../strategy/AWSEC2GetNodeMetadataStrategy.java | 61 -
.../strategy/AWSEC2ListNodesStrategy.java | 103 -
.../strategy/AWSEC2ReviseParsedImage.java | 116 --
...curityGroupsAsNeededAndReturnRunOptions.java | 197 --
.../suppliers/AWSEC2HardwareSupplier.java | 107 --
.../compute/suppliers/AWSEC2ImageSupplier.java | 158 --
.../ec2/compute/suppliers/CallForImages.java | 90 -
.../aws/ec2/config/AWSEC2HttpApiModule.java | 80 -
.../aws/ec2/domain/AWSRunningInstance.java | 343 ----
.../aws/ec2/domain/LaunchSpecification.java | 580 ------
.../jclouds/aws/ec2/domain/MonitoringState.java | 49 -
.../jclouds/aws/ec2/domain/PlacementGroup.java | 156 --
.../domain/RegionNameAndPublicKeyMaterial.java | 36 -
.../java/org/jclouds/aws/ec2/domain/Spot.java | 198 --
.../aws/ec2/domain/SpotInstanceRequest.java | 470 -----
.../org/jclouds/aws/ec2/features/AWSAMIApi.java | 124 --
.../aws/ec2/features/AWSInstanceApi.java | 92 -
.../jclouds/aws/ec2/features/AWSKeyPairApi.java | 85 -
.../aws/ec2/features/AWSSecurityGroupApi.java | 145 --
.../jclouds/aws/ec2/features/MonitoringApi.java | 95 -
.../aws/ec2/features/PlacementGroupApi.java | 160 --
.../aws/ec2/features/SpotInstanceApi.java | 245 ---
.../functions/CreatePlacementGroupIfNeeded.java | 77 -
.../ImportOrReturnExistingKeypair.java | 86 -
...SpotInstanceRequestToAWSRunningInstance.java | 60 -
.../ec2/options/AWSDescribeImagesOptions.java | 151 --
.../aws/ec2/options/AWSRunInstancesOptions.java | 307 ---
.../ec2/options/CreateSecurityGroupOptions.java | 62 -
.../DescribeSpotPriceHistoryOptions.java | 114 --
.../options/RequestSpotInstancesOptions.java | 138 --
.../ec2/predicates/PlacementGroupAvailable.java | 64 -
.../ec2/predicates/PlacementGroupDeleted.java | 61 -
.../predicates/SpotInstanceRequestActive.java | 70 -
.../aws/ec2/reference/AWSEC2Constants.java | 40 -
.../AWSDescribeInstancesResponseHandler.java | 109 --
...C2DescribeSecurityGroupsResponseHandler.java | 124 --
.../aws/ec2/xml/AWSEC2IpPermissionHandler.java | 90 -
.../aws/ec2/xml/AWSEC2SecurityGroupHandler.java | 139 --
.../ec2/xml/AWSRunInstancesResponseHandler.java | 50 -
.../aws/ec2/xml/BaseAWSReservationHandler.java | 247 ---
.../xml/CreateSecurityGroupResponseHandler.java | 40 -
.../DescribePlacementGroupsResponseHandler.java | 72 -
...eservedInstancesOfferingResponseHandler.java | 71 -
...DescribeSpotPriceHistoryResponseHandler.java | 73 -
.../aws/ec2/xml/LaunchSpecificationHandler.java | 147 --
.../aws/ec2/xml/MonitoringStateHandler.java | 54 -
.../aws/ec2/xml/PlacementGroupHandler.java | 66 -
.../aws/ec2/xml/ProductCodesHandler.java | 50 -
.../xml/ReservedInstancesOfferingHandler.java | 89 -
.../org/jclouds/aws/ec2/xml/SpotHandler.java | 73 -
.../aws/ec2/xml/SpotInstanceHandler.java | 148 --
.../aws/ec2/xml/SpotInstancesHandler.java | 78 -
.../org.jclouds.providers.ProviderMetadata | 1 -
.../test/clojure/org/jclouds/aws/ec2_test.clj | 32 -
.../aws/ec2/AWSEC2ContextBuilderTest.java | 76 -
.../org/jclouds/aws/ec2/AWSEC2ProviderTest.java | 31 -
...BindLaunchSpecificationToFormParamsTest.java | 95 -
.../BindTagsToIndexedFormParamsTest.java | 61 -
.../compute/AWSEC2ComputeServiceExpectTest.java | 278 ---
.../compute/AWSEC2ComputeServiceLiveTest.java | 192 --
.../compute/AWSEC2TemplateBuilderLiveTest.java | 363 ----
.../AWSEC2ComputeServiceContextModuleTest.java | 62 -
.../AWSEC2ImageExtensionLiveTest.java | 59 -
.../AWSEC2SecurityGroupExtensionExpectTest.java | 414 ----
.../AWSEC2SecurityGroupExtensionLiveTest.java | 33 -
.../AWSEC2SecurityGroupToSecurityGroupTest.java | 80 -
.../AWSRunningInstanceToNodeMetadataTest.java | 217 ---
.../PresentSpotRequestsAndInstancesTest.java | 97 -
.../BaseAWSEC2ComputeServiceExpectTest.java | 151 --
.../AWSEC2CreateSecurityGroupIfNeededTest.java | 99 -
.../options/AWSEC2TemplateOptionsTest.java | 416 ----
.../compute/strategy/AWSEC2ImageParserTest.java | 239 ---
.../strategy/AWSEC2ReviseParsedImageTest.java | 111 --
...tyGroupsAsNeededAndReturnRunOptionsTest.java | 954 ----------
.../aws/ec2/features/AWSAMIApiLiveTest.java | 129 --
.../jclouds/aws/ec2/features/AWSAMIApiTest.java | 496 -----
.../AWSElasticBlockStoreApiLiveTest.java | 68 -
.../ec2/features/AWSInstanceApiLiveTest.java | 58 -
.../aws/ec2/features/AWSInstanceApiTest.java | 537 ------
.../aws/ec2/features/AWSKeyPairApiLiveTest.java | 206 --
.../aws/ec2/features/AWSKeyPairApiTest.java | 132 --
.../features/AWSSecurityGroupApiLiveTest.java | 119 --
.../ec2/features/AWSSecurityGroupApiTest.java | 205 --
.../aws/ec2/features/AWSSubnetApiLiveTest.java | 27 -
.../aws/ec2/features/BaseAWSEC2ApiTest.java | 132 --
.../aws/ec2/features/MonitoringApiLiveTest.java | 63 -
.../aws/ec2/features/MonitoringApiTest.java | 71 -
.../features/PlacementGroupApiExpectTest.java | 75 -
.../ec2/features/PlacementGroupApiLiveTest.java | 219 ---
.../aws/ec2/features/PlacementGroupApiTest.java | 134 --
.../ec2/features/SpotInstanceApiExpectTest.java | 75 -
.../ec2/features/SpotInstanceApiLiveTest.java | 213 ---
.../aws/ec2/features/SpotInstanceApiTest.java | 98 -
.../ec2/features/TagSecurityGroupLiveTest.java | 52 -
.../ImportOrReturnExistingKeypairTest.java | 112 --
...InstanceRequestToAWSRunningInstanceTest.java | 89 -
.../options/AWSDescribeImagesOptionsTest.java | 175 --
.../ec2/options/AWSRunInstancesOptionsTest.java | 374 ----
.../DescribeSpotPriceHistoryOptionsTest.java | 117 --
.../RequestSpotInstancesOptionsTest.java | 141 --
.../parse/DescribeInstancesResponseTest.java | 110 --
.../DescribeSecurityGroupsResponseTest.java | 73 -
...AWSDescribeInstancesResponseHandlerTest.java | 165 --
.../xml/AWSRunInstancesResponseHandlerTest.java | 112 --
...cribePlacementGroupsResponseHandlerTest.java | 51 -
...vedInstancesOfferingResponseHandlerTest.java | 53 -
...ribeSpotPriceHistoryResponseHandlerTest.java | 70 -
.../aws/ec2/xml/MonitoringStateHandlerTest.java | 48 -
.../aws/ec2/xml/ProductCodesHandlerTest.java | 47 -
.../aws/ec2/xml/SpotInstanceHandlerTest.java | 136 --
.../aws/ec2/xml/SpotInstancesHandlerTest.java | 115 --
.../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.8.1-stratos/src/test/resources/vostok.xml | 19 -
dependencies/jclouds/provider/aws-ec2/Readme.md | 684 -------
dependencies/org.wso2.carbon.ui/pom.xml | 1 +
dependencies/pom.xml | 14 +-
.../pom.xml | 348 +---
pom.xml | 6 +-
products/stratos/modules/distribution/pom.xml | 46 +-
.../modules/distribution/src/assembly/bin.xml | 1 +
1074 files changed, 328 insertions(+), 113318 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index bef0799..02ef8f9 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -19,7 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
@@ -38,7 +37,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -61,10 +59,15 @@
org.apache.commons.logging,
org.apache.commons.io.*,
org.wso2.carbon.utils.*,
- org.apache.stratos.kubernetes.client,
- org.apache.stratos.kubernetes.client.exceptions,
- <!--org.jclouds.compute*;version="${jclouds.version}";resolution:=optional,
- org.jclouds*;version="${jclouds.version}",-->
+ org.apache.stratos.kubernetes.client; version="${project.version}",
+ org.apache.stratos.kubernetes.client.exceptions; version="${project.version}",
+ org.jclouds.aws.ec2.*; version=${jclouds.version},
+ org.jclouds.ec2.*; version=${jclouds.version},
+ org.jclouds.compute.*; version=${jclouds.version},
+ org.jclouds.domain.*; version=${jclouds.version},
+ org.jclouds.googlecomputeengine*; version=${jclouds.version},
+ org.jclouds.googlecloud.*; version=${jclouds.version},
+ org.jclouds*; version=${jclouds.version},
*; resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -120,22 +123,22 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>17.0</version>
+ <version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.jsch</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.core</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
- <version>0.0.7</version>
+ <version>0.0.8</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
@@ -223,7 +226,7 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>aws-ec2</artifactId>
- <version>${project.jclouds.stratos.version}</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
@@ -231,9 +234,9 @@
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
+ <groupId>org.apache.jclouds.labs</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${project.jclouds.stratos.version}</version>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
@@ -247,13 +250,8 @@
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
- <artifactId>vcloud</artifactId>
- <version>${project.jclouds.stratos.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>gce</artifactId>
- <version>${project.jclouds.stratos.version}</version>
+ <artifactId>google-compute-engine</artifactId>
+ <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>com.jamesmurty.utils.wso2</groupId>
@@ -263,7 +261,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${gson2.version}</version>
+ <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>com.google.guice.wso2</groupId>
@@ -322,9 +320,7 @@
</dependency>
</dependencies>
<properties>
- <gson2.version>2.2</gson2.version>
<com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
<sun.jersey.version>1.12</sun.jersey.version>
</properties>
-</project>
-
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
index e487f6d..579da5b 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/cloudstack/CloudStackPartitionValidator.java
@@ -28,7 +28,7 @@ import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.iaases.ec2.EC2PartitionValidator;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
-import org.apache.stratos.messaging.domain.topology.Scope;
+import org.apache.stratos.cloud.controller.util.Scope;
import java.util.Properties;
@@ -54,8 +54,8 @@ public class CloudStackPartitionValidator implements PartitionValidator {
Iaas updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
updatedIaas.setIaasProvider(updatedIaasProvider);
- if (properties.containsKey(Scope.zone.toString())) {
- String zone = properties.getProperty(Scope.zone.toString());
+ if (properties.containsKey(Scope.ZONE.toString())) {
+ String zone = properties.getProperty(Scope.ZONE.toString());
iaas.isValidZone(null, zone);
updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone);
updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
index 03f57df..e3a78b6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/ec2/EC2PartitionValidator.java
@@ -28,7 +28,7 @@ import org.apache.stratos.cloud.controller.iaases.Iaas;
import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
-import org.apache.stratos.messaging.domain.topology.Scope;
+import org.apache.stratos.cloud.controller.util.Scope;
import java.util.Properties;
@@ -46,8 +46,8 @@ public class EC2PartitionValidator implements PartitionValidator {
public IaasProvider validate(Partition partition, Properties properties) throws InvalidPartitionException {
// validate the existence of the region and zone properties.
try {
- if (properties.containsKey(Scope.region.toString())) {
- String region = properties.getProperty(Scope.region.toString());
+ if (properties.containsKey(Scope.REGION.toString())) {
+ String region = properties.getProperty(Scope.REGION.toString());
if (iaasProvider.getImage() != null && !iaasProvider.getImage().contains(region)) {
@@ -63,8 +63,8 @@ public class EC2PartitionValidator implements PartitionValidator {
Iaas updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);
updatedIaas.setIaasProvider(updatedIaasProvider);
- if (properties.containsKey(Scope.zone.toString())) {
- String zone = properties.getProperty(Scope.zone.toString());
+ if (properties.containsKey(Scope.ZONE.toString())) {
+ String zone = properties.getProperty(Scope.ZONE.toString());
iaas.isValidZone(region, zone);
updatedIaasProvider.setProperty(CloudControllerConstants.AVAILABILITY_ZONE, zone);
updatedIaas = CloudControllerServiceUtil.buildIaas(updatedIaasProvider);