You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/06/26 15:00:59 UTC

[17/17] jclouds-labs-google git commit: Remove the graduated GCE provided and updated Maven coordinates

Remove the graduated GCE provided and updated Maven coordinates


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/cf9af834
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/cf9af834
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/cf9af834

Branch: refs/heads/master
Commit: cf9af834481c3c649136a275a0634ff4e0ab36d5
Parents: 413b03b
Author: Ignasi Barrera <na...@apache.org>
Authored: Fri Jun 26 14:51:07 2015 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri Jun 26 14:51:07 2015 +0200

----------------------------------------------------------------------
 CONTRIBUTING.md                                 |   2 +
 README.md                                       |   4 +-
 google-cloud-storage/pom.xml                    |   4 +-
 google-compute-engine/README.md                 |  70 ---
 google-compute-engine/pom.xml                   | 170 -------
 .../GoogleComputeEngineApi.java                 | 163 ------
 .../GoogleComputeEngineApiMetadata.java         | 101 ----
 .../GoogleComputeEngineFallbacks.java           |  36 --
 .../GoogleComputeEngineProviderMetadata.java    |  72 ---
 .../binders/DiskCreationBinder.java             |  58 ---
 .../binders/FirewallBinder.java                 |  47 --
 .../binders/ForwardingRuleCreationBinder.java   |  73 ---
 .../binders/HttpHealthCheckCreationBinder.java  |  78 ---
 .../binders/RouteBinder.java                    |  47 --
 .../TargetPoolChangeHealthChecksBinder.java     |  28 --
 .../TargetPoolChangeInstancesBinder.java        |  28 --
 .../TargetPoolMapofListofMapGenericBinder.java  |  66 ---
 .../compute/GoogleComputeEngineService.java     | 183 -------
 .../GoogleComputeEngineServiceAdapter.java      | 318 ------------
 ...GoogleComputeEngineServiceContextModule.java | 221 --------
 .../functions/FirewallTagNamingConvention.java  |  59 ---
 .../GoogleComputeEngineImageToImage.java        |  59 ---
 .../functions/ImageNameToOperatingSystem.java   |  65 ---
 .../functions/InstanceToNodeMetadata.java       | 114 -----
 .../functions/MachineTypeToHardware.java        |  83 ---
 .../functions/OrphanedGroupsFromDeadNodes.java  |  51 --
 .../compute/functions/Resources.java            |  94 ----
 .../compute/loaders/DiskURIToImage.java         |  57 ---
 .../GoogleComputeEngineTemplateOptions.java     | 283 -----------
 .../predicates/AtomicInstanceVisible.java       |  44 --
 .../compute/predicates/AtomicOperationDone.java |  53 --
 .../compute/predicates/GroupIsEmpty.java        |  42 --
 ...desWithGroupEncodedIntoNameThenAddToSet.java | 233 ---------
 .../GoogleComputeEngineHttpApiModule.java       | 143 ------
 .../config/GoogleComputeEngineParserModule.java | 137 -----
 .../config/GoogleComputeEngineProperties.java   |  39 --
 .../googlecomputeengine/domain/Address.java     |  69 ---
 .../googlecomputeengine/domain/AttachDisk.java  | 132 -----
 .../domain/BackendService.java                  | 103 ----
 .../googlecomputeengine/domain/Deprecated.java  |  64 ---
 .../googlecomputeengine/domain/Disk.java        |  77 ---
 .../googlecomputeengine/domain/DiskType.java    |  56 ---
 .../googlecomputeengine/domain/Firewall.java    | 109 ----
 .../domain/ForwardingRule.java                  |  88 ----
 .../domain/HealthStatus.java                    |  56 ---
 .../domain/HttpHealthCheck.java                 |  75 ---
 .../googlecomputeengine/domain/Image.java       | 106 ----
 .../googlecomputeengine/domain/Instance.java    | 262 ----------
 .../domain/KeyValuePair.java                    |  37 --
 .../googlecomputeengine/domain/License.java     |  40 --
 .../googlecomputeengine/domain/MachineType.java |  87 ----
 .../googlecomputeengine/domain/Metadata.java    | 118 -----
 .../googlecomputeengine/domain/Network.java     |  63 ---
 .../googlecomputeengine/domain/NewInstance.java | 180 -------
 .../domain/NewTargetInstance.java               |  72 ---
 .../googlecomputeengine/domain/Operation.java   | 148 ------
 .../googlecomputeengine/domain/Project.java     |  80 ---
 .../googlecomputeengine/domain/Quota.java       |  41 --
 .../googlecomputeengine/domain/Region.java      |  62 ---
 .../googlecomputeengine/domain/Route.java       |  88 ----
 .../googlecomputeengine/domain/Snapshot.java    |  75 ---
 .../googlecomputeengine/domain/Tags.java        |  55 --
 .../domain/TargetHttpProxy.java                 |  47 --
 .../domain/TargetInstance.java                  |  49 --
 .../googlecomputeengine/domain/TargetPool.java  | 100 ----
 .../googlecomputeengine/domain/UrlMap.java      | 125 -----
 .../domain/UrlMapValidateResult.java            |  84 ----
 .../googlecomputeengine/domain/Warning.java     |  40 --
 .../googlecomputeengine/domain/Zone.java        |  97 ----
 .../features/AddressApi.java                    | 138 -----
 .../features/AggregatedListApi.java             | 501 -------------------
 .../features/BackendServiceApi.java             | 197 --------
 .../googlecomputeengine/features/DiskApi.java   | 175 -------
 .../features/DiskTypeApi.java                   | 101 ----
 .../features/FirewallApi.java                   | 168 -------
 .../features/ForwardingRuleApi.java             | 158 ------
 .../features/HttpHealthCheckApi.java            | 180 -------
 .../googlecomputeengine/features/ImageApi.java  | 226 ---------
 .../features/InstanceApi.java                   | 323 ------------
 .../features/LicenseApi.java                    |  48 --
 .../features/MachineTypeApi.java                | 101 ----
 .../features/NetworkApi.java                    | 145 ------
 .../features/OperationApi.java                  | 219 --------
 .../features/ProjectApi.java                    |  80 ---
 .../googlecomputeengine/features/RegionApi.java | 100 ----
 .../googlecomputeengine/features/RouteApi.java  | 134 -----
 .../features/SnapshotApi.java                   | 111 ----
 .../features/TargetHttpProxyApi.java            | 175 -------
 .../features/TargetInstanceApi.java             | 129 -----
 .../features/TargetPoolApi.java                 | 250 ---------
 .../googlecomputeengine/features/UrlMapApi.java | 216 --------
 .../googlecomputeengine/features/ZoneApi.java   | 100 ----
 .../GoogleComputeEngineErrorHandler.java        |  59 ---
 .../internal/BaseArg0ToIteratorOfListPage.java  |  23 -
 .../BaseCallerArg0ToIteratorOfListPage.java     |  23 -
 .../internal/BaseToIteratorOfListPage.java      |  23 -
 .../options/AddressCreationOptions.java         |  62 ---
 .../options/BackendServiceOptions.java          | 155 ------
 .../options/DeprecateOptions.java               | 113 -----
 .../options/DiskCreationOptions.java            |  94 ----
 .../options/FirewallOptions.java                | 182 -------
 .../options/ForwardingRuleCreationOptions.java  | 109 ----
 .../options/HttpHealthCheckCreationOptions.java | 169 -------
 .../options/ImageCreationOptions.java           |  87 ----
 .../options/ListOptions.java                    |  89 ----
 .../options/NetworkCreationOptions.java         |  85 ----
 .../options/RouteOptions.java                   | 218 --------
 .../options/TargetHttpProxyOptions.java         |  67 ---
 .../options/TargetPoolCreationOptions.java      | 142 ------
 .../options/UrlMapOptions.java                  | 145 ------
 ...GoogleComputeEngineProviderMetadataTest.java |  34 --
 .../binders/DiskCreationBinderTest.java         |  53 --
 .../ForwardingRuleCreationBinderTest.java       |  72 ---
 .../HttpHealthCheckCreationBinderTest.java      |  72 ---
 .../TargetPoolAddInstanceBinderTest.java        |  59 ---
 .../GoogleComputeEngineServiceLiveTest.java     | 149 ------
 .../GoogleComputeEngineServiceMockTest.java     | 270 ----------
 ...gleComputeEngineTemplateBuilderLiveTest.java |  79 ---
 .../GoogleComputeEngineImageToImageTest.java    | 106 ----
 .../ImageNameToOperatingSystemTest.java         |  52 --
 .../functions/InstanceToNodeMetadataTest.java   | 202 --------
 .../OrphanedGroupsFromDeadNodesTest.java        | 172 -------
 .../compute/functions/ResourcesMockTest.java    | 162 ------
 .../UseApiToResolveProjectNameMockTest.java     |  76 ---
 .../features/AddressApiLiveTest.java            |  60 ---
 .../features/AddressApiMockTest.java            | 100 ----
 .../features/AggregatedListApiLiveTest.java     | 168 -------
 .../features/AggregatedListApiMockTest.java     | 207 --------
 .../features/BackendServiceApiLiveTest.java     | 131 -----
 .../features/BackendServiceApiMockTest.java     | 152 ------
 .../features/DiskApiLiveTest.java               | 103 ----
 .../features/DiskApiMockTest.java               | 142 ------
 .../features/DiskTypeApiLiveTest.java           |  66 ---
 .../features/DiskTypeApiMockTest.java           |  63 ---
 .../features/FirewallApiLiveTest.java           | 124 -----
 .../features/FirewallApiMockTest.java           | 140 ------
 .../features/ForwardingRuleApiLiveTest.java     | 125 -----
 .../features/ForwardingRuleApiMockTest.java     | 114 -----
 .../GlobalForwardingRuleApiLiveTest.java        | 138 -----
 .../GlobalForwardingRuleApiMockTest.java        | 106 ----
 .../features/HttpHealthCheckApiLiveTest.java    | 120 -----
 .../features/HttpHealthCheckApiMockTest.java    | 121 -----
 .../features/ImageApiLiveTest.java              | 128 -----
 .../features/ImageApiMockTest.java              | 154 ------
 .../features/InstanceApiLiveTest.java           | 358 -------------
 .../features/InstanceApiMockTest.java           | 293 -----------
 .../features/LicenseApiLiveTest.java            |  47 --
 .../features/LicenseApiMockTest.java            |  46 --
 .../features/MachineTypeApiLiveTest.java        |  62 ---
 .../features/MachineTypeApiMockTest.java        |  63 ---
 .../features/NetworkApiLiveTest.java            |  73 ---
 .../features/NetworkApiMockTest.java            |  87 ----
 .../features/OperationApiLiveTest.java          |  98 ----
 .../features/OperationApiMockTest.java          | 166 ------
 .../features/ProjectApiLiveTest.java            |  82 ---
 .../features/ProjectApiMockTest.java            |  72 ---
 .../features/RegionApiLiveTest.java             |  62 ---
 .../features/RegionApiMockTest.java             |  63 ---
 .../features/RouteApiLiveTest.java              |  90 ----
 .../features/RouteApiMockTest.java              |  98 ----
 .../features/SnapshotApiLiveTest.java           |  85 ----
 .../features/SnapshotApiMockTest.java           |  79 ---
 .../features/TargetHttpProxyApiLiveTest.java    | 114 -----
 .../features/TargetHttpProxyApiMockTest.java    | 114 -----
 .../features/TargetInstanceApiLiveTest.java     |  77 ---
 .../features/TargetInstanceApiMockTest.java     | 101 ----
 .../features/TargetPoolApiLiveTest.java         | 274 ----------
 .../features/TargetPoolApiMockTest.java         | 178 -------
 .../features/UrlMapApiLiveTest.java             | 214 --------
 .../features/UrlMapApiMockTest.java             | 139 -----
 .../features/ZoneApiLiveTest.java               |  64 ---
 .../features/ZoneApiMockTest.java               |  63 ---
 .../GoogleComputeEngineErrorHandlerTest.java    |  92 ----
 .../BaseGoogleComputeEngineApiLiveTest.java     | 158 ------
 .../BaseGoogleComputeEngineApiMockTest.java     | 147 ------
 .../BaseGoogleComputeEngineExpectTest.java      | 122 -----
 .../BaseGoogleComputeEngineParseTest.java       |  41 --
 .../internal/GoogleComputeEngineTestModule.java |  94 ----
 .../ToIteratorOfListPageExpectTest.java         | 184 -------
 .../parse/ParseAddressListTest.java             |  66 ---
 .../parse/ParseAddressTest.java                 |  59 ---
 .../parse/ParseBackendServiceListTest.java      |  69 ---
 .../parse/ParseBackendServiceTest.java          |  74 ---
 .../parse/ParseDiskListTest.java                |  51 --
 .../parse/ParseDiskTest.java                    |  62 ---
 .../parse/ParseDiskTypeListTest.java            |  60 ---
 .../parse/ParseDiskTypeTest.java                |  51 --
 .../parse/ParseFirewallListTest.java            |  66 ---
 .../parse/ParseFirewallTest.java                |  63 ---
 .../parse/ParseForwardingRuleListTest.java      |  51 --
 .../parse/ParseForwardingRuleTest.java          |  57 ---
 .../ParseGlobalForwardingRuleListTest.java      |  46 --
 .../parse/ParseGlobalForwardingRuleTest.java    |  51 --
 .../parse/ParseGlobalOperationListTest.java     |  51 --
 .../parse/ParseGlobalOperationTest.java         |  69 ---
 .../parse/ParseHealthStatusTest.java            |  58 ---
 .../parse/ParseHttpHealthCheckListTest.java     |  84 ----
 .../parse/ParseHttpHealthCheckTest.java         |  59 ---
 .../parse/ParseImageListTest.java               |  50 --
 .../parse/ParseImageTest.java                   |  74 ---
 .../parse/ParseInstanceListTest.java            |  51 --
 .../parse/ParseInstanceSerialOutputTest.java    |  48 --
 .../parse/ParseInstanceTest.java                |  94 ----
 .../parse/ParseLicenseTest.java                 |  46 --
 .../parse/ParseMachineTypeListTest.java         |  98 ----
 .../parse/ParseMachineTypeTest.java             |  63 ---
 .../parse/ParseMetadataTest.java                |  39 --
 .../parse/ParseNetworkListTest.java             |  51 --
 .../parse/ParseNetworkTest.java                 |  54 --
 .../parse/ParseOperationTest.java               |  79 ---
 .../parse/ParseProjectTest.java                 |  71 ---
 .../parse/ParseQuotaTest.java                   |  39 --
 .../parse/ParseRegionListTest.java              |  74 ---
 .../parse/ParseRegionOperationTest.java         |  69 ---
 .../parse/ParseRegionTest.java                  |  69 ---
 .../parse/ParseRouteListTest.java               |  70 ---
 .../parse/ParseRouteTest.java                   |  67 ---
 .../parse/ParseSnapshotListTest.java            |  69 ---
 .../parse/ParseSnapshotTest.java                |  59 ---
 .../parse/ParseTargetHttpProxyListTest.java     |  60 ---
 .../parse/ParseTargetHttpProxyTest.java         |  51 --
 .../parse/ParseTargetInstanceListTest.java      |  62 ---
 .../parse/ParseTargetInstanceTest.java          |  53 --
 .../parse/ParseTargetPoolListTest.java          |  51 --
 .../parse/ParseTargetPoolTest.java              |  58 ---
 .../parse/ParseUrlMapListTest.java              |  63 ---
 .../parse/ParseUrlMapTest.java                  |  81 ---
 .../parse/ParseUrlMapValidateTest.java          |  56 ---
 .../parse/ParseZoneListTest.java                |  72 ---
 .../parse/ParseZoneOperationTest.java           |  69 ---
 .../parse/ParseZoneTest.java                    |  65 ---
 .../parse/SimpleParsingTests.java               |  82 ---
 .../src/test/resources/address_get.json         |  14 -
 .../src/test/resources/address_insert.json      |   1 -
 .../src/test/resources/address_list.json        |  32 --
 .../test/resources/aggregated_address_list.json | 131 -----
 .../aggregated_address_list_empty.json          | 115 -----
 .../test/resources/aggregated_disk_list.json    | 118 -----
 .../resources/aggregated_disk_list_empty.json   | 115 -----
 .../resources/aggregated_disktype_list.json     | 127 -----
 .../aggregated_disktype_list_empty.json         | 115 -----
 .../aggregated_forwarding_rule_list.json        |  60 ---
 .../aggregated_forwarding_rule_list_empty.json  |  55 --
 .../aggregated_global_operation_list.json       |  99 ----
 .../aggregated_global_operation_list_empty.json | 115 -----
 .../resources/aggregated_instance_list.json     | 174 -------
 .../aggregated_instance_list_empty.json         | 115 -----
 .../resources/aggregated_machinetype_list.json  |  58 ---
 .../aggregated_target_instance_list.json        | 128 -----
 .../aggregated_target_instance_list_empty.json  |  55 --
 .../resources/aggregated_target_pool_list.json  |  46 --
 .../aggregated_target_pool_list_empty.json      |  43 --
 .../src/test/resources/backend_service_get.json |  24 -
 .../backend_service_get_health_request.json     |   1 -
 .../test/resources/backend_service_insert.json  |   9 -
 .../test/resources/backend_service_list.json    |  45 --
 .../test/resources/disk_create_snapshot.json    |   1 -
 .../src/test/resources/disk_get.json            |  11 -
 .../resources/disk_get_with_source_image.json   |  12 -
 .../src/test/resources/disk_insert.json         |   1 -
 .../src/test/resources/disk_insert_ssd.json     |   1 -
 .../src/test/resources/disk_list.json           |  18 -
 .../src/test/resources/disktype.json            |  11 -
 .../src/test/resources/disktype_list.json       |  27 -
 .../test/resources/disktype_list_central1b.json |  17 -
 .../src/test/resources/disktype_ssd.json        |  11 -
 .../src/test/resources/firewall_get.json        |  30 --
 .../src/test/resources/firewall_insert.json     |  22 -
 .../src/test/resources/firewall_insert_2.json   |  28 --
 .../src/test/resources/firewall_list.json       |  58 ---
 .../test/resources/firewall_list_compute.json   |  36 --
 .../src/test/resources/forwardingrule_get.json  |  12 -
 .../test/resources/forwardingrule_insert.json   |   4 -
 .../src/test/resources/forwardingrule_list.json |  19 -
 .../resources/forwardingrule_set_target.json    |   1 -
 .../resources/global_forwarding_rule_get.json   |  12 -
 .../global_forwarding_rule_insert.json          |   1 -
 .../resources/global_forwarding_rule_list.json  |  19 -
 .../global_forwarding_rule_setTarget.json       |   3 -
 .../src/test/resources/global_operation.json    |  16 -
 .../test/resources/global_operation_list.json   |  23 -
 .../resources/health_status_get_health.json     |  10 -
 .../src/test/resources/httphealthcheck_get.json |  14 -
 .../test/resources/httphealthcheck_insert.json  |   1 -
 .../test/resources/httphealthcheck_list.json    |  39 --
 .../test/resources/httphealthcheck_patch.json   |   1 -
 .../src/test/resources/image_deprecate.json     |   7 -
 .../src/test/resources/image_get.json           |  25 -
 .../resources/image_get_for_source_image.json   |  25 -
 .../src/test/resources/image_insert.json        |   4 -
 .../test/resources/image_insert_from_pd.json    |   1 -
 .../src/test/resources/image_list.json          |  32 --
 .../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  |  71 ---
 .../resources/instance_add_access_config.json   |  11 -
 .../test/resources/instance_attach_disk.json    |  18 -
 .../src/test/resources/instance_get.json        |  74 ---
 .../src/test/resources/instance_insert.json     |  34 --
 .../src/test/resources/instance_insert_2.json   |  39 --
 .../test/resources/instance_insert_full.json    |  47 --
 .../test/resources/instance_insert_simple.json  |  30 --
 .../src/test/resources/instance_insert_ssd.json |  40 --
 .../src/test/resources/instance_list.json       |  81 ---
 .../instance_list_central1b_empty.json          |   6 -
 .../test/resources/instance_serial_port.json    |   5 -
 .../test/resources/instance_set_metadata.json   |   1 -
 .../src/test/resources/instance_set_tags.json   |   4 -
 .../src/test/resources/license_get.json         |   6 -
 .../src/test/resources/list_empty.json          |   5 -
 .../src/test/resources/logback.xml              |  83 ---
 .../src/test/resources/machinetype.json         |  21 -
 .../src/test/resources/machinetype_list.json    |  54 --
 .../src/test/resources/metadata.json            |   1 -
 .../src/test/resources/network_get.json         |  10 -
 .../src/test/resources/network_get_default.json |  10 -
 .../src/test/resources/network_insert.json      |   1 -
 .../src/test/resources/network_list.json        |  18 -
 .../src/test/resources/operation.json           |  40 --
 .../src/test/resources/operation_error.json     |  26 -
 .../src/test/resources/operation_list.json      |  24 -
 .../src/test/resources/project.json             |  73 ---
 .../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    |  17 -
 .../test/resources/region_operation_list.json   |  24 -
 .../src/test/resources/route_get.json           |  28 --
 .../src/test/resources/route_insert.json        |   1 -
 .../src/test/resources/route_list.json          |  47 --
 .../src/test/resources/snapshot_get.json        |  13 -
 .../src/test/resources/snapshot_list.json       |  33 --
 .../src/test/resources/tag_insert.json          |   1 -
 .../test/resources/target_http_proxy_get.json   |   8 -
 .../resources/target_http_proxy_insert.json     |   4 -
 .../test/resources/target_http_proxy_list.json  |  24 -
 .../target_http_proxy_set_url_map.json          |   1 -
 .../src/test/resources/target_instance_get.json |  11 -
 .../test/resources/target_instance_insert.json  |   6 -
 .../test/resources/target_instance_list.json    |  30 --
 .../test/resources/targetpool_addinstance.json  |   1 -
 .../resources/targetpool_changehealthcheck.json |   1 -
 .../src/test/resources/targetpool_get.json      |   9 -
 .../src/test/resources/targetpool_insert.json   |   3 -
 .../src/test/resources/targetpool_list.json     |  17 -
 .../test/resources/targetpool_setbackup.json    |   1 -
 google-compute-engine/src/test/resources/test   |  27 -
 .../src/test/resources/url_map_get.json         |  39 --
 .../src/test/resources/url_map_insert.json      |   1 -
 .../src/test/resources/url_map_list.json        |  56 ---
 .../src/test/resources/url_map_validate.json    |  17 -
 .../resources/url_map_validate_request.json     |   1 -
 .../src/test/resources/zone_get.json            |  18 -
 .../src/test/resources/zone_list.json           |  43 --
 .../src/test/resources/zone_list_short.json     |  25 -
 .../src/test/resources/zone_operation.json      |  17 -
 .../test/resources/zone_operation_error.json    |  25 -
 .../src/test/resources/zone_operation_list.json |  24 -
 googlecloud/pom.xml                             |  62 ---
 .../googlecloud/GoogleCredentialsFromJson.java  |  63 ---
 .../googlecloud/config/CurrentProject.java      |  50 --
 .../config/GoogleCloudProperties.java           |  40 --
 .../config/ListPageAdapterFactory.java          | 109 ----
 .../googlecloud/domain/ForwardingListPage.java  |  51 --
 .../jclouds/googlecloud/domain/ListPage.java    |  28 --
 .../googlecloud/internal/AdvancingIterator.java |  48 --
 .../internal/BaseArg0ToIteratorOfListPage.java  |  58 ---
 .../BaseCallerArg0ToIteratorOfListPage.java     |  58 ---
 .../internal/BaseToIteratorOfListPage.java      |  49 --
 .../jclouds/googlecloud/internal/ListPages.java |  57 ---
 .../googlecloud/internal/NullSafeCopies.java    |  39 --
 .../googlecloud/options/ListOptions.java        |  30 --
 .../googlecloud/internal/TestProperties.java    | 108 ----
 pom.xml                                         |   2 -
 377 files changed, 7 insertions(+), 28935 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9e4d772..4da3fc3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,5 @@
+If you are looking for the google-compute-engine provider, go to the main jclouds reposityy
+
 Please review the [How to Contribute](https://cwiki.apache.org/confluence/display/JCLOUDS/Contribute) page for information on how to submit your patch and how the review process works.
 
 Also make sure all the changes are aligned with the [Coding Standards](https://cwiki.apache.org/confluence/display/JCLOUDS/Writing+jclouds+Code) of the project.

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 64ca8ef..79c2e80 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 jclouds Labs Google
 ======================
 
-Repository for developing [Google Cloud Platform](https://cloud.google.com/) providers and [APIs](https://cloud.google.com/storage/docs/json_api/v1/)
+Repository for developing experimental [Google Cloud Platform](https://cloud.google.com/) providers and [APIs](https://cloud.google.com/storage/docs/json_api/v1/)
+
+The Google Compute Engine provider has already been graduated to the main jclouds repo.
 
 License
 -------

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-cloud-storage/pom.xml
----------------------------------------------------------------------
diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml
index 203bb39..1b08640 100644
--- a/google-cloud-storage/pom.xml
+++ b/google-cloud-storage/pom.xml
@@ -49,13 +49,13 @@
             <version>${jclouds.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.common</groupId>
             <artifactId>googlecloud</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
+            <groupId>org.apache.jclouds.common</groupId>
             <artifactId>googlecloud</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/README.md
----------------------------------------------------------------------
diff --git a/google-compute-engine/README.md b/google-compute-engine/README.md
deleted file mode 100644
index aa88a7c..0000000
--- a/google-compute-engine/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-jclouds Google Compute Engine Provider
-======
-
-
-Authenticating into the instances:
---------
-
-User:
-If no user is specified in the template options when launching instances, the default one will be used: "jclouds" for all instances, "core" for CoreOS images, and "Administrator" for Windows images.
-
-Credential:
-
-GCE uses exclusively ssh keys to login into instances.
-In order for an instance to be sshable a public key must be installed. Public keys are installed if they are present in the project or instance's metatada.
-
-For an instance to be ssable one of the following must happen:
-1 - the project's metadata has an adequately built "sshKeys" entry and a corresponding private key is provided in GoogleComputeEngineTemplateOptions when createNodesInGroup is called.
-2 - an instance of GoogleComputeEngineTemplateOptions with an adequate public and private key is provided.
-
-NOTE: if methods 2 is chosen the global project keys will not be installed in the instance.
-
-Please refer to Google's documentation on how to form valid project wide ssh keys metadata entries.
-
-FAQ:
---------
-
-* Q. What is the identity for GCE?
-
-A. the identity is the developer email which can be obtained from the admin GUI. Its usually something in the form: [PROJECT_ID](https://cloud.google.com/compute/docs/overview#projectids)@developer.gserviceaccount.com
-
-* Q. What is the credential for GCE
-
-A. the credential is a private key, in pem format. It can be extracted from the p12 keystore that is obtained when creating a "Service Account" (in the GUI: Google apis console > Api Access > Create another client ID > "Service Account"
-
-* Q. How to convert a p12 keystore into a pem format jclouds Google Compute Engine can handle:
-
-A.
-
-1. Convert the p12 file into pem format (it will ask for the keystore password, which is usually "notasecret"):
- openssl pkcs12 -in <my_keystore>.p12 -out <my_keystore>.pem -nodes
-
-2. Extract only the pk and remove passphrase
- openssl rsa -in <my_keystore>.pem -out <my_key>.pem
-
-The last file (<my_key>.pem) should contain the pk that needs to be passed to `ContextBuilder.credential()` for the provider `google-compute-engine`.
-
-
-Running the live tests:
---------
-
-1. Place the following in your ~/.m2/settings.xml in a profile enabled when live:
-```
-    <test.google-compute-engine.identity>PROJECT_ID@developer.gserviceaccount.com</test.google-compute-engine.identity>
-    <test.google-compute-engine.credential>-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQRRbRqVDtJLN1MO/xJoKqZuphDeBh5jIKueW3aNIiWs1XFcct+h
--- this text is literally from your <my_key>.pem
-aH7xmpHSTbbXmQkuuv+z8EKijigprd/FoJpTX1f5/R+4wQ==
------END RSA PRIVATE KEY-----</test.google-compute-engine.credential>
-  </properties>
-```
-Or, if using an existing OAuth Bearer Token for authentication.
-```
-    <test.google-compute-engine.identity>PROJECT_ID@developer.gserviceaccount.com</test.google-compute-engine.identity>
-    <test.google-compute-engine.credential>EXISTING_BEARER_TOKEN</test.google-compute-engine.credential>
-    <test.jclouds.oauth.credential-type>bearerTokenCredentials</test.jclouds.oauth.credential-type>
-  </properties>
-```
-
-2. mvn clean install -Plive 
-

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/pom.xml
----------------------------------------------------------------------
diff --git a/google-compute-engine/pom.xml b/google-compute-engine/pom.xml
deleted file mode 100644
index 2cf38fb..0000000
--- a/google-compute-engine/pom.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.jclouds.labs</groupId>
-        <artifactId>jclouds-labs-google</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
-
-    <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-    <groupId>org.apache.jclouds.labs</groupId>
-    <artifactId>google-compute-engine</artifactId>
-    <name>jclouds Google Compute Engine provider</name>
-    <description>jclouds components to access GoogleCompute</description>
-
-    <properties>
-        <test.google-compute-engine.identity>client_email which usually looks like project_id@developer.gserviceaccount.com</test.google-compute-engine.identity>
-        <test.google-compute-engine.credential>Private key (PEM encoded PKCS12 file or literal) associated with the client_email</test.google-compute-engine.credential>
-        <!-- Add this property to use a different project, or avoid looking up the project for each test. -->
-        <test.jclouds.googlecloud.project-name></test.jclouds.googlecloud.project-name>
-        <test.jclouds.oauth.credential-type>p12PrivateKeyCredentials</test.jclouds.oauth.credential-type>
-        <test.google-compute-engine.api-version>v1</test.google-compute-engine.api-version>
-        <test.google-compute-engine.build-version/>
-        <test.google-compute-engine.template>imageNameMatches=debian-7-wheezy-v[0-9]*,locationId=us-central1-a,minRam=2048</test.google-compute-engine.template>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
-            <artifactId>googlecloud</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds.labs</groupId>
-            <artifactId>googlecloud</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds</groupId>
-            <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.auto.service</groupId>
-            <artifactId>auto-service</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.auto.value</groupId>
-            <artifactId>auto-value</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds</groupId>
-            <artifactId>jclouds-compute</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds.driver</groupId>
-            <artifactId>jclouds-slf4j</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds.driver</groupId>
-            <artifactId>jclouds-sshj</artifactId>
-            <version>${jclouds.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jclouds.driver</groupId>
-            <artifactId>jclouds-okhttp</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.squareup.okhttp</groupId>
-          <artifactId>mockwebserver</artifactId>
-          <scope>test</scope>
-          <exclusions>
-            <!-- Already provided by jclouds-sshj -->
-            <exclusion>
-              <groupId>org.bouncycastle</groupId>
-              <artifactId>bcprov-jdk15on</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-test</id>
-                                <configuration>
-                                    <skipTests>true</skipTests>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>integration</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <threadCount>1</threadCount>
-                                    <systemPropertyVariables>
-                                        <test.google-compute-engine.identity>${test.google-compute-engine.identity}</test.google-compute-engine.identity>
-                                        <test.google-compute-engine.credential>${test.google-compute-engine.credential}</test.google-compute-engine.credential>
-                                        <test.jclouds.googlecloud.project-name>${test.jclouds.googlecloud.project-name}</test.jclouds.googlecloud.project-name>
-                                        <test.jclouds.oauth.credential-type>${test.jclouds.oauth.credential-type}</test.jclouds.oauth.credential-type>
-                                        <test.google-compute-engine.api-version>${test.google-compute-engine.api-version}</test.google-compute-engine.api-version>
-                                        <test.google-compute-engine.build-version>${test.google-compute-engine.build-version}</test.google-compute-engine.build-version>
-                                        <test.google-compute-engine.template>${test.google-compute-engine.template}</test.google-compute-engine.template>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java
deleted file mode 100644
index 21c0764..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine;
-
-import java.io.Closeable;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.jclouds.googlecloud.config.CurrentProject;
-import org.jclouds.googlecomputeengine.features.AddressApi;
-import org.jclouds.googlecomputeengine.features.AggregatedListApi;
-import org.jclouds.googlecomputeengine.features.BackendServiceApi;
-import org.jclouds.googlecomputeengine.features.DiskApi;
-import org.jclouds.googlecomputeengine.features.DiskTypeApi;
-import org.jclouds.googlecomputeengine.features.FirewallApi;
-import org.jclouds.googlecomputeengine.features.ForwardingRuleApi;
-import org.jclouds.googlecomputeengine.features.HttpHealthCheckApi;
-import org.jclouds.googlecomputeengine.features.ImageApi;
-import org.jclouds.googlecomputeengine.features.InstanceApi;
-import org.jclouds.googlecomputeengine.features.LicenseApi;
-import org.jclouds.googlecomputeengine.features.MachineTypeApi;
-import org.jclouds.googlecomputeengine.features.NetworkApi;
-import org.jclouds.googlecomputeengine.features.OperationApi;
-import org.jclouds.googlecomputeengine.features.ProjectApi;
-import org.jclouds.googlecomputeengine.features.RegionApi;
-import org.jclouds.googlecomputeengine.features.RouteApi;
-import org.jclouds.googlecomputeengine.features.SnapshotApi;
-import org.jclouds.googlecomputeengine.features.TargetInstanceApi;
-import org.jclouds.googlecomputeengine.features.TargetPoolApi;
-import org.jclouds.googlecomputeengine.features.TargetHttpProxyApi;
-import org.jclouds.googlecomputeengine.features.UrlMapApi;
-import org.jclouds.googlecomputeengine.features.ZoneApi;
-import org.jclouds.rest.annotations.Delegate;
-import org.jclouds.rest.annotations.Endpoint;
-
-public interface GoogleComputeEngineApi extends Closeable {
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/regions/{region}")
-   AddressApi addressesInRegion(@PathParam("region") String region);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   AggregatedListApi aggregatedList();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global/backendServices")
-   BackendServiceApi backendServices();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/zones/{zone}")
-   DiskApi disksInZone(@PathParam("zone") String zone);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/zones/{zone}")
-   DiskTypeApi diskTypesInZone(@PathParam("zone") String zone);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global")
-   FirewallApi firewalls();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/regions/{region}")
-   ForwardingRuleApi forwardingRulesInRegion(@PathParam("region") String region);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global")
-   ForwardingRuleApi globalForwardingRules();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global")
-   HttpHealthCheckApi httpHeathChecks();
-
-   @Delegate
-   ImageApi images();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/zones/{zone}")
-   InstanceApi instancesInZone(@PathParam("zone") String zone);
-
-   @Delegate
-   @Path("/projects/{project}/global")
-   LicenseApi licensesInProject(@PathParam("project") String project);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/zones/{zone}")
-   MachineTypeApi machineTypesInZone(@PathParam("zone") String zone);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global")
-   NetworkApi networks();
-
-   @Delegate
-   OperationApi operations();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   ProjectApi project();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   RegionApi regions();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global")
-   RouteApi routes();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global")
-   SnapshotApi snapshots();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   TargetHttpProxyApi targetHttpProxies();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/zones/{zone}")
-   TargetInstanceApi targetInstancesInZone(@PathParam("zone") String zone);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/regions/{region}")
-   TargetPoolApi targetPoolsInRegion(@PathParam("region") String region);
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   ZoneApi zones();
-
-   @Delegate
-   @Endpoint(CurrentProject.class)
-   @Path("/global/urlMaps")
-   UrlMapApi urlMaps();
-
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java
deleted file mode 100644
index c2e632a..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine;
-
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
-import static org.jclouds.googlecloud.config.GoogleCloudProperties.PROJECT_NAME;
-import static org.jclouds.googlecomputeengine.config.GoogleComputeEngineProperties.IMAGE_PROJECTS;
-import static org.jclouds.googlecomputeengine.config.GoogleComputeEngineProperties.OPERATION_COMPLETE_INTERVAL;
-import static org.jclouds.googlecomputeengine.config.GoogleComputeEngineProperties.OPERATION_COMPLETE_TIMEOUT;
-import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
-import static org.jclouds.oauth.v2.config.OAuthProperties.JWS_ALG;
-import static org.jclouds.reflect.Reflection2.typeToken;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.googlecloud.config.CurrentProject;
-import org.jclouds.googlecomputeengine.compute.config.GoogleComputeEngineServiceContextModule;
-import org.jclouds.googlecomputeengine.config.GoogleComputeEngineHttpApiModule;
-import org.jclouds.googlecomputeengine.config.GoogleComputeEngineParserModule;
-import org.jclouds.oauth.v2.config.OAuthModule;
-import org.jclouds.rest.internal.BaseHttpApiMetadata;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
-
-public class GoogleComputeEngineApiMetadata extends BaseHttpApiMetadata<GoogleComputeEngineApi> {
-   @Override
-   public Builder toBuilder() {
-      return new Builder().fromApiMetadata(this);
-   }
-
-   public GoogleComputeEngineApiMetadata() {
-      this(new Builder());
-   }
-
-   protected GoogleComputeEngineApiMetadata(Builder builder) {
-      super(builder);
-   }
-
-   public static Properties defaultProperties() {
-      Properties properties = BaseHttpApiMetadata.defaultProperties();
-      properties.put("oauth.endpoint", "https://accounts.google.com/o/oauth2/token");
-      properties.put(AUDIENCE, "https://accounts.google.com/o/oauth2/token");
-      properties.put(JWS_ALG, "RS256");
-      properties.put(PROPERTY_SESSION_INTERVAL, 3600);
-      properties.put(OPERATION_COMPLETE_INTERVAL, 500);
-      properties.put(OPERATION_COMPLETE_TIMEOUT, 600000);
-      properties.put(TEMPLATE, "osFamily=DEBIAN,osVersionMatches=7\\..*,locationId=us-central1-a");
-      properties.put(PROJECT_NAME, ""); // Defaulting to empty helps avoid temptation for optional inject!
-      properties.put(IMAGE_PROJECTS, "centos-cloud,debian-cloud,rhel-cloud,suse-cloud,opensuse-cloud,gce-nvme,coreos-cloud,ubuntu-os-cloud,windows-cloud");
-      return properties;
-   }
-
-   public static class Builder extends BaseHttpApiMetadata.Builder<GoogleComputeEngineApi, Builder> {
-
-      protected Builder() {
-         id("google-compute-engine")
-           .name("Google Compute Engine Api")
-           .identityName(CurrentProject.ClientEmail.DESCRIPTION)
-           .credentialName("PEM encoded P12 private key associated with client_email")
-           .documentation(URI.create("https://developers.google.com/compute/docs"))
-           .version("v1")
-           .defaultEndpoint("https://www.googleapis.com/compute/v1")
-           .defaultProperties(GoogleComputeEngineApiMetadata.defaultProperties())
-           .view(typeToken(ComputeServiceContext.class))
-           .defaultModules(ImmutableSet.<Class<? extends Module>>builder()
-                   .add(GoogleComputeEngineHttpApiModule.class)
-                   .add(GoogleComputeEngineParserModule.class)
-                   .add(OAuthModule.class)
-                   .add(GoogleComputeEngineServiceContextModule.class)
-                   .build());
-      }
-
-      @Override
-      public GoogleComputeEngineApiMetadata build() {
-         return new GoogleComputeEngineApiMetadata(this);
-      }
-
-      @Override
-      protected Builder self() {
-         return this;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java
deleted file mode 100644
index 105da4d..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineFallbacks.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.in;
-import static com.google.common.base.Throwables.propagate;
-import static com.google.common.primitives.Ints.asList;
-import static org.jclouds.http.HttpUtils.returnValueOnCodeOrNull;
-
-import org.jclouds.Fallback;
-
-public final class GoogleComputeEngineFallbacks {
-   public static class NullOn400or404 implements Fallback<Object> {
-      @Override public Object createOrPropagate(Throwable t) throws Exception {
-         Boolean returnVal = returnValueOnCodeOrNull(checkNotNull(t, "throwable"), false, in(asList(400, 404)));
-         if (returnVal != null)
-            return null;
-         throw propagate(t);
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineProviderMetadata.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineProviderMetadata.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineProviderMetadata.java
deleted file mode 100644
index 43c8855..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineProviderMetadata.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine;
-
-import java.net.URI;
-import java.util.Properties;
-
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-import com.google.auto.service.AutoService;
-
-/** Note: This does not set iso3166Codes as Google intentionally does not document them. */
-@AutoService(ProviderMetadata.class)
-public final class GoogleComputeEngineProviderMetadata extends BaseProviderMetadata {
-
-   public static Builder builder() {
-      return new Builder();
-   }
-
-   @Override
-   public Builder toBuilder() {
-      return builder().fromProviderMetadata(this);
-   }
-
-   public GoogleComputeEngineProviderMetadata() {
-      super(builder());
-   }
-
-   public GoogleComputeEngineProviderMetadata(Builder builder) {
-      super(builder);
-   }
-
-   public static Properties defaultProperties() {
-      return new Properties(); // currently all are set in the api metadata class.
-   }
-
-   public static final class Builder extends BaseProviderMetadata.Builder {
-
-      private Builder() {
-         id("google-compute-engine") //
-         .name("Google Compute Engine") //
-         .apiMetadata(new GoogleComputeEngineApiMetadata()) //
-         .homepage(URI.create("https://cloud.google.com/compute")) //
-         .console(URI.create("https://console.developers.google.com/project")) //
-         .defaultProperties(GoogleComputeEngineProviderMetadata.defaultProperties());
-      }
-
-      @Override public GoogleComputeEngineProviderMetadata build() {
-         return new GoogleComputeEngineProviderMetadata(this);
-      }
-
-      @Override public Builder fromProviderMetadata(ProviderMetadata in) {
-         super.fromProviderMetadata(in);
-         return this;
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/DiskCreationBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/DiskCreationBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/DiskCreationBinder.java
deleted file mode 100644
index b91671d..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/DiskCreationBinder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Map;
-
-import org.jclouds.googlecomputeengine.options.DiskCreationOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-
-import com.google.gson.stream.JsonWriter;
-
-public final class DiskCreationBinder implements MapBinder {
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-      DiskCreationOptions options = (DiskCreationOptions) postParams.get("options");
-      Writer out = new StringWriter();
-      JsonWriter json = new JsonWriter(out);
-      json.setSerializeNulls(false);
-      try {
-         json.beginObject();
-         json.name("name").value(postParams.get("name").toString());
-         json.name("sizeGb").value(options.sizeGb());
-         json.name("type").value(options.type() != null ? options.type().toString() : null);
-         json.name("sourceSnapshot")
-               .value(options.sourceSnapshot() != null ? options.sourceSnapshot().toString() : null);
-         json.name("description").value(options.description());
-         json.endObject();
-         json.close();
-      } catch (IOException e) {
-         throw new AssertionError(e); // should be impossible as we are writing a string!
-      }
-      request.setPayload(out.toString());
-      request.getPayload().getContentMetadata().setContentType("application/json");
-      return request;
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      throw new UnsupportedOperationException();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java
deleted file mode 100644
index 43f7c48..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/FirewallBinder.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jclouds.googlecomputeengine.options.FirewallOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-public class FirewallBinder implements MapBinder {
-
-   private final BindToJsonPayload jsonBinder;
-
-   @Inject FirewallBinder(BindToJsonPayload jsonBinder){
-      this.jsonBinder = jsonBinder;
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-      FirewallOptions options = (FirewallOptions) postParams.get("options");
-      options.name(postParams.get("name").toString());
-      options.network((URI) postParams.get("network"));
-      return bindToRequest(request, options);
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return jsonBinder.bindToRequest(request, input);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java
deleted file mode 100644
index df0e6fc..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jclouds.googlecomputeengine.domain.ForwardingRule;
-import org.jclouds.googlecomputeengine.options.ForwardingRuleCreationOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.json.Json;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-
-public class ForwardingRuleCreationBinder extends BindToJsonPayload {
-
-   @Inject ForwardingRuleCreationBinder(Json jsonBinder) {
-      super(jsonBinder);
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-      ForwardingRuleCreationOptions options = (ForwardingRuleCreationOptions) postParams.get("options");
-      String name = postParams.get("name").toString();
-      ForwardingRuleCreationBinderHelper forwardingRuleCreationBinderHelper = new ForwardingRuleCreationBinderHelper(name, options);
-      return super.bindToRequest(request, forwardingRuleCreationBinderHelper);
-   }
-
-   private class ForwardingRuleCreationBinderHelper{
-
-      /**
-       * Values used to bind ForwardingRuleOptions to json request.
-       * Note: Two break convention of starting with lower case letters due to
-       *       attributes on GCE starting with upper case letters.
-       */
-      @SuppressWarnings("unused")
-      private String name;
-      @SuppressWarnings("unused")
-      private String description;
-      @SuppressWarnings("unused")
-      private String IPAddress;
-      @SuppressWarnings("unused")
-      private ForwardingRule.IPProtocol IPProtocol;
-      @SuppressWarnings("unused")
-      private String portRange;
-      @SuppressWarnings("unused")
-      private URI target;
-
-      private ForwardingRuleCreationBinderHelper(String name, ForwardingRuleCreationOptions forwardingRuleCreationOptions){
-         this.name = name;
-         this.description = forwardingRuleCreationOptions.description();
-         this.IPAddress = forwardingRuleCreationOptions.ipAddress();
-         this.IPProtocol = forwardingRuleCreationOptions.ipProtocol();
-         this.portRange = forwardingRuleCreationOptions.portRange();
-         this.target = forwardingRuleCreationOptions.target();
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java
deleted file mode 100644
index 636cced..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/HttpHealthCheckCreationBinder.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jclouds.googlecomputeengine.options.HttpHealthCheckCreationOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.json.Json;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-
-public class HttpHealthCheckCreationBinder extends BindToJsonPayload {
-
-   @Inject HttpHealthCheckCreationBinder(Json jsonBinder) {
-      super(jsonBinder);
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-      HttpHealthCheckCreationOptions options = (HttpHealthCheckCreationOptions) postParams.get("options");
-      String name = postParams.get("name").toString();
-      HttpHealthCheckBinderHelper helper = new HttpHealthCheckBinderHelper(name, options);
-      return super.bindToRequest(request, helper);
-   }
-
-   private class HttpHealthCheckBinderHelper{
-
-      /**
-       * Values used to bind HttpHealthCheckCreationOptions to json request.
-       */
-      @SuppressWarnings("unused")
-      private String name;
-      @SuppressWarnings("unused")
-      private String host;
-      @SuppressWarnings("unused")
-      private String requestPath;
-      @SuppressWarnings("unused")
-      private Integer port;
-      @SuppressWarnings("unused")
-      private Integer checkIntervalSec;
-      @SuppressWarnings("unused")
-      private Integer timeoutSec;
-      @SuppressWarnings("unused")
-      private Integer unhealthyThreshold;
-      @SuppressWarnings("unused")
-      private Integer healthyThreshold;
-      @SuppressWarnings("unused")
-      private String description;
-
-      private HttpHealthCheckBinderHelper(String name, HttpHealthCheckCreationOptions httpHealthCheckCreationOptions){
-         this.name = name;
-         this.host = httpHealthCheckCreationOptions.host();
-         this.requestPath = httpHealthCheckCreationOptions.requestPath();
-         this.port = httpHealthCheckCreationOptions.port();
-         this.checkIntervalSec = httpHealthCheckCreationOptions.checkIntervalSec();
-         this.timeoutSec = httpHealthCheckCreationOptions.timeoutSec();
-         this.unhealthyThreshold = httpHealthCheckCreationOptions.unhealthyThreshold();
-         this.healthyThreshold = httpHealthCheckCreationOptions.healthyThreshold();
-         this.description = httpHealthCheckCreationOptions.description();
-      }
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java
deleted file mode 100644
index 6b454bf..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/RouteBinder.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import java.net.URI;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.jclouds.googlecomputeengine.options.RouteOptions;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-import org.jclouds.rest.binders.BindToJsonPayload;
-
-public class RouteBinder implements MapBinder {
-
-   private final BindToJsonPayload jsonBinder;
-
-   @Inject RouteBinder(BindToJsonPayload jsonBinder){
-      this.jsonBinder = jsonBinder;
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-      RouteOptions options = (RouteOptions) postParams.get("options");
-      options.name(postParams.get("name").toString());
-      options.network((URI) postParams.get("network"));
-      return bindToRequest(request, options);
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      return jsonBinder.bindToRequest(request, input);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java
deleted file mode 100644
index 6c0e0e2..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeHealthChecksBinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import javax.inject.Inject;
-
-/**
- * Binder used for adding and deleting healthChecks from a target pool.
- */
-public final class TargetPoolChangeHealthChecksBinder extends TargetPoolMapofListofMapGenericBinder {
-   @Inject TargetPoolChangeHealthChecksBinder() {
-      super("healthChecks", "healthCheck");
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java
deleted file mode 100644
index 4572505..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolChangeInstancesBinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import javax.inject.Inject;
-
-/**
- * Binder used for adding and deleting instances from a target pool.
- */
-public final class TargetPoolChangeInstancesBinder extends TargetPoolMapofListofMapGenericBinder {
-   @Inject TargetPoolChangeInstancesBinder() {
-      super("instances", "instance");
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolMapofListofMapGenericBinder.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolMapofListofMapGenericBinder.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolMapofListofMapGenericBinder.java
deleted file mode 100644
index fa611f1..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/TargetPoolMapofListofMapGenericBinder.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.binders;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.rest.MapBinder;
-
-import com.google.gson.stream.JsonWriter;
-
-class TargetPoolMapofListofMapGenericBinder implements MapBinder {
-   private final String outterString;
-   private final String innerString;
-
-   TargetPoolMapofListofMapGenericBinder(String outterString, String innerString) {
-      this.outterString = outterString;
-      this.innerString = innerString;
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
-      Writer out = new StringWriter();
-      JsonWriter json = new JsonWriter(out);
-      try {
-         json.beginObject();
-         json.name(outterString);
-         json.beginArray();
-         for (URI uri : (List<URI>) postParams.get(outterString)) {
-            json.beginObject();
-            json.name(innerString).value(uri.toString());
-            json.endObject();
-         }
-         json.endArray();
-         json.endObject();
-         json.close();
-      } catch (IOException e) {
-         throw new AssertionError(e); // should be impossible as we are writing a string!
-      }
-      request.setPayload(out.toString());
-      request.getPayload().getContentMetadata().setContentType("application/json");
-      return request;
-   }
-
-   @Override public <R extends HttpRequest> R bindToRequest(R request, Object input) {
-      throw new UnsupportedOperationException();
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/cf9af834/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
deleted file mode 100644
index 74c7c57..0000000
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.googlecomputeengine.compute;
-
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Sets.newHashSet;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_SUSPENDED;
-import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
-import static org.jclouds.compute.predicates.NodePredicates.all;
-import static org.jclouds.googlecloud.internal.ListPages.concat;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-
-import org.jclouds.Constants;
-import org.jclouds.collect.Memoized;
-import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.compute.callables.RunScriptOnNode;
-import org.jclouds.compute.domain.Hardware;
-import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.compute.extensions.ImageExtension;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.compute.functions.GroupNamingConvention;
-import org.jclouds.compute.internal.BaseComputeService;
-import org.jclouds.compute.internal.PersistNodeCredentials;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet;
-import org.jclouds.compute.strategy.DestroyNodeStrategy;
-import org.jclouds.compute.strategy.GetImageStrategy;
-import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
-import org.jclouds.compute.strategy.InitializeRunScriptOnNodeOrPlaceInBadMap;
-import org.jclouds.compute.strategy.ListNodesStrategy;
-import org.jclouds.compute.strategy.RebootNodeStrategy;
-import org.jclouds.compute.strategy.ResumeNodeStrategy;
-import org.jclouds.compute.strategy.SuspendNodeStrategy;
-import org.jclouds.domain.Credentials;
-import org.jclouds.domain.Location;
-import org.jclouds.googlecomputeengine.GoogleComputeEngineApi;
-import org.jclouds.googlecomputeengine.compute.options.GoogleComputeEngineTemplateOptions;
-import org.jclouds.googlecomputeengine.domain.Firewall;
-import org.jclouds.googlecomputeengine.domain.Operation;
-import org.jclouds.googlecomputeengine.features.FirewallApi;
-import org.jclouds.scriptbuilder.functions.InitAdminAccess;
-
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.Atomics;
-import com.google.common.util.concurrent.ListeningExecutorService;
-
-public final class GoogleComputeEngineService extends BaseComputeService {
-
-   private final Function<Set<? extends NodeMetadata>, Set<String>> findOrphanedGroups;
-   private final GroupNamingConvention.Factory namingConvention;
-   private final GoogleComputeEngineApi api;
-   private final Predicate<AtomicReference<Operation>> operationDone;
-
-   @Inject GoogleComputeEngineService(ComputeServiceContext context,
-                                        Map<String, Credentials> credentialStore,
-                                        @Memoized Supplier<Set<? extends Image>> images,
-                                        @Memoized Supplier<Set<? extends Hardware>> hardwareProfiles,
-                                        @Memoized Supplier<Set<? extends Location>> locations,
-                                        ListNodesStrategy listNodesStrategy,
-                                        GetImageStrategy getImageStrategy,
-                                        GetNodeMetadataStrategy getNodeMetadataStrategy,
-                                        CreateNodesInGroupThenAddToSet runNodesAndAddToSetStrategy,
-                                        RebootNodeStrategy rebootNodeStrategy,
-                                        DestroyNodeStrategy destroyNodeStrategy,
-                                        ResumeNodeStrategy resumeNodeStrategy,
-                                        SuspendNodeStrategy suspendNodeStrategy,
-                                        Provider<TemplateBuilder> templateBuilderProvider,
-                                        @Named("DEFAULT") Provider<TemplateOptions> templateOptionsProvider,
-                                        @Named(TIMEOUT_NODE_RUNNING) Predicate<AtomicReference<NodeMetadata>>
-                                                nodeRunning,
-                                        @Named(TIMEOUT_NODE_TERMINATED) Predicate<AtomicReference<NodeMetadata>>
-                                                nodeTerminated,
-                                        @Named(TIMEOUT_NODE_SUSPENDED)
-                                        Predicate<AtomicReference<NodeMetadata>> nodeSuspended,
-                                        InitializeRunScriptOnNodeOrPlaceInBadMap.Factory initScriptRunnerFactory,
-                                        InitAdminAccess initAdminAccess,
-                                        RunScriptOnNode.Factory runScriptOnNodeFactory,
-                                        PersistNodeCredentials persistNodeCredentials,
-                                        ComputeServiceConstants.Timeouts timeouts,
-                                        @Named(Constants.PROPERTY_USER_THREADS) ListeningExecutorService userExecutor,
-                                        Optional<ImageExtension> imageExtension,
-                                        Optional<SecurityGroupExtension> securityGroupExtension,
-                                        Function<Set<? extends NodeMetadata>, Set<String>> findOrphanedGroups,
-                                        GroupNamingConvention.Factory namingConvention,
-                                        GoogleComputeEngineApi api,
-                                        Predicate<AtomicReference<Operation>> operationDone) {
-      super(context, credentialStore, images, hardwareProfiles, locations, listNodesStrategy, getImageStrategy,
-              getNodeMetadataStrategy, runNodesAndAddToSetStrategy, rebootNodeStrategy, destroyNodeStrategy,
-              resumeNodeStrategy, suspendNodeStrategy, templateBuilderProvider, templateOptionsProvider, nodeRunning,
-              nodeTerminated, nodeSuspended, initScriptRunnerFactory, initAdminAccess, runScriptOnNodeFactory,
-              persistNodeCredentials, timeouts, userExecutor, imageExtension, securityGroupExtension);
-      this.findOrphanedGroups = findOrphanedGroups;
-      this.namingConvention = namingConvention;
-      this.api = api;
-      this.operationDone = operationDone;
-   }
-   
-   @Override
-   public void destroyNode(String id) {
-      // GCE does not return TERMINATED nodes, so in practice no node will never reach the TERMINATED
-      // state, and the deleted nodes will never be returned.
-      // In order to be able to clean up the resources associated to the deleted nodes, we have to retrieve
-      // the details of the nodes before deleting them.
-      NodeMetadata node = getNodeMetadata(id);
-      super.destroyNode(id);
-      cleanUpIncidentalResourcesOfDeadNodes(ImmutableSet.of(node));
-   }
-
-   @Override
-   public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<NodeMetadata> filter) {
-      // GCE does not return TERMINATED nodes, so in practice no node will never reach the TERMINATED
-      // state, and the deleted nodes will never be returned.
-      // In order to be able to clean up the resources associated to the deleted nodes, we have to retrieve
-      // the details of the nodes before deleting them.
-      Set<? extends NodeMetadata> nodes = newHashSet(filter(listNodesDetailsMatching(all()), filter));
-      super.destroyNodesMatching(filter); // This returns an empty list (a list of null elements) in GCE, as the api does not return deleted nodes
-      cleanUpIncidentalResourcesOfDeadNodes(nodes);
-      return nodes;
-   }
-
-
-
-   @Override
-   protected synchronized void cleanUpIncidentalResourcesOfDeadNodes(Set<? extends NodeMetadata> deadNodes) {
-      Set<String> orphanedGroups = findOrphanedGroups.apply(deadNodes);
-      for (String orphanedGroup : orphanedGroups) {
-         cleanUpFirewallsForGroup(orphanedGroup);
-      }
-   }
-
-   private void cleanUpFirewallsForGroup(final String groupName) {
-      GroupNamingConvention namingScheme = namingConvention.create();
-      FirewallApi firewallApi = api.firewalls();
-
-      for (Firewall firewall : concat(firewallApi.list())) {
-         String foundGroup = namingScheme.groupInUniqueNameOrNull(firewall.name());
-         if ((foundGroup != null) && foundGroup.equals(groupName)){
-            AtomicReference<Operation> operation = Atomics.newReference(firewallApi.delete(firewall.name()));
-            operationDone.apply(operation);
-
-            if (operation.get().httpErrorStatusCode() != null) {
-               logger.warn("delete orphaned firewall %s failed. Http Error Code: %d HttpError: %s",
-                     operation.get().targetId(), operation.get().httpErrorStatusCode(),
-                     operation.get().httpErrorMessage());
-            }
-         }
-      }
-   }
-
-   @Override
-   public GoogleComputeEngineTemplateOptions templateOptions() {
-      return GoogleComputeEngineTemplateOptions.class.cast(super.templateOptions());
-   }
-}