issue #1165 promote route53 out of labs

jclouds · Jan 31, 2013 · 7525fed · 7525fed
1 parent 40a2e71
commit 7525fed
Show file tree

Hide file tree

Showing 77 changed files with 11 additions and 6 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -65,6 +65,11 @@
             <artifactId>aws-sts</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>aws-route53</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jclouds-allloadbalancer</artifactId>

diff --git a/apis/pom.xml b/apis/pom.xml
@@ -57,5 +57,6 @@
        <module>rackspace-cloudidentity</module>
        <module>rackspace-cloudloadbalancers</module>
        <module>sts</module>
+       <module>route53</module>
     </modules>
 </project>
diff --git a/labs/route53/pom.xml → apis/route53/pom.xml b/labs/route53/pom.xml → apis/route53/pom.xml
@@ -27,7 +27,7 @@
     <version>1.5.6-SNAPSHOT</version>
     <relativePath>../../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.jclouds.api</groupId>
   <artifactId>route53</artifactId>
   <name>jcloud route53 api</name>
   <description>jclouds components to access an implementation of Route 53</description>

diff --git a/.../route53/InvalidChangeBatchException.java → .../route53/InvalidChangeBatchException.java b/.../route53/InvalidChangeBatchException.java → .../route53/InvalidChangeBatchException.java
diff --git a/.../java/org/jclouds/route53/Route53Api.java → .../java/org/jclouds/route53/Route53Api.java b/.../java/org/jclouds/route53/Route53Api.java → .../java/org/jclouds/route53/Route53Api.java
diff --git a/...g/jclouds/route53/Route53ApiMetadata.java → ...g/jclouds/route53/Route53ApiMetadata.java b/...g/jclouds/route53/Route53ApiMetadata.java → ...g/jclouds/route53/Route53ApiMetadata.java
diff --git a/.../org/jclouds/route53/Route53AsyncApi.java → .../org/jclouds/route53/Route53AsyncApi.java b/.../org/jclouds/route53/Route53AsyncApi.java → .../org/jclouds/route53/Route53AsyncApi.java
diff --git a/...ouds/route53/binders/BindChangeBatch.java → ...ouds/route53/binders/BindChangeBatch.java b/...ouds/route53/binders/BindChangeBatch.java → ...ouds/route53/binders/BindChangeBatch.java
diff --git a/...louds/route53/binders/BindNextRecord.java → ...louds/route53/binders/BindNextRecord.java b/...louds/route53/binders/BindNextRecord.java → ...louds/route53/binders/BindNextRecord.java
diff --git a/...ute53/config/Route53RestClientModule.java → ...ute53/config/Route53RestClientModule.java b/...ute53/config/Route53RestClientModule.java → ...ute53/config/Route53RestClientModule.java
diff --git a/...va/org/jclouds/route53/domain/Change.java → ...va/org/jclouds/route53/domain/Change.java b/...va/org/jclouds/route53/domain/Change.java → ...va/org/jclouds/route53/domain/Change.java
diff --git a/...g/jclouds/route53/domain/ChangeBatch.java → ...g/jclouds/route53/domain/ChangeBatch.java b/...g/jclouds/route53/domain/ChangeBatch.java → ...g/jclouds/route53/domain/ChangeBatch.java
diff --git a/...a/org/jclouds/route53/domain/NewZone.java → ...a/org/jclouds/route53/domain/NewZone.java b/...a/org/jclouds/route53/domain/NewZone.java → ...a/org/jclouds/route53/domain/NewZone.java
diff --git a/...org/jclouds/route53/domain/RecordSet.java → ...org/jclouds/route53/domain/RecordSet.java b/...org/jclouds/route53/domain/RecordSet.java → ...org/jclouds/route53/domain/RecordSet.java
diff --git a/...uds/route53/domain/RecordSetIterable.java → ...uds/route53/domain/RecordSetIterable.java b/...uds/route53/domain/RecordSetIterable.java → ...uds/route53/domain/RecordSetIterable.java
diff --git a/...java/org/jclouds/route53/domain/Zone.java → ...java/org/jclouds/route53/domain/Zone.java b/...java/org/jclouds/route53/domain/Zone.java → ...java/org/jclouds/route53/domain/Zone.java
diff --git a/...ds/route53/domain/ZoneAndNameServers.java → ...ds/route53/domain/ZoneAndNameServers.java b/...ds/route53/domain/ZoneAndNameServers.java → ...ds/route53/domain/ZoneAndNameServers.java
diff --git a/...clouds/route53/features/RecordSetApi.java → ...clouds/route53/features/RecordSetApi.java b/...clouds/route53/features/RecordSetApi.java → ...clouds/route53/features/RecordSetApi.java
diff --git a/...s/route53/features/RecordSetAsyncApi.java → ...s/route53/features/RecordSetAsyncApi.java b/...s/route53/features/RecordSetAsyncApi.java → ...s/route53/features/RecordSetAsyncApi.java
diff --git a/...org/jclouds/route53/features/ZoneApi.java → ...org/jclouds/route53/features/ZoneApi.java b/...org/jclouds/route53/features/ZoneApi.java → ...org/jclouds/route53/features/ZoneApi.java
diff --git a/...clouds/route53/features/ZoneAsyncApi.java → ...clouds/route53/features/ZoneAsyncApi.java b/...clouds/route53/features/ZoneAsyncApi.java → ...clouds/route53/features/ZoneAsyncApi.java
diff --git a/...s/route53/filters/RestAuthentication.java → ...s/route53/filters/RestAuthentication.java b/...s/route53/filters/RestAuthentication.java → ...s/route53/filters/RestAuthentication.java
diff --git a/...ons/RecordSetIterableToPagedIterable.java → ...ons/RecordSetIterableToPagedIterable.java b/...ons/RecordSetIterableToPagedIterable.java → ...ons/RecordSetIterableToPagedIterable.java
diff --git a/...louds/route53/functions/SerializeRRS.java → ...louds/route53/functions/SerializeRRS.java b/...louds/route53/functions/SerializeRRS.java → ...louds/route53/functions/SerializeRRS.java
diff --git a/...ute53/functions/ZonesToPagedIterable.java → ...ute53/functions/ZonesToPagedIterable.java b/...ute53/functions/ZonesToPagedIterable.java → ...ute53/functions/ZonesToPagedIterable.java
diff --git a/...route53/handlers/Route53ErrorHandler.java → ...route53/handlers/Route53ErrorHandler.java b/...route53/handlers/Route53ErrorHandler.java → ...route53/handlers/Route53ErrorHandler.java
diff --git a/...ute53/predicates/RecordSetPredicates.java → ...ute53/predicates/RecordSetPredicates.java b/...ute53/predicates/RecordSetPredicates.java → ...ute53/predicates/RecordSetPredicates.java
diff --git a/...ds/route53/predicates/ZonePredicates.java → ...ds/route53/predicates/ZonePredicates.java b/...ds/route53/predicates/ZonePredicates.java → ...ds/route53/predicates/ZonePredicates.java
diff --git a/...rg/jclouds/route53/xml/ChangeHandler.java → ...rg/jclouds/route53/xml/ChangeHandler.java b/...rg/jclouds/route53/xml/ChangeHandler.java → ...rg/jclouds/route53/xml/ChangeHandler.java
diff --git a/.../xml/CreateHostedZoneResponseHandler.java → .../xml/CreateHostedZoneResponseHandler.java b/.../xml/CreateHostedZoneResponseHandler.java → .../xml/CreateHostedZoneResponseHandler.java
diff --git a/...e53/xml/GetHostedZoneResponseHandler.java → ...e53/xml/GetHostedZoneResponseHandler.java b/...e53/xml/GetHostedZoneResponseHandler.java → ...e53/xml/GetHostedZoneResponseHandler.java
diff --git a/...oute53/xml/InvalidChangeBatchHandler.java → ...oute53/xml/InvalidChangeBatchHandler.java b/...oute53/xml/InvalidChangeBatchHandler.java → ...oute53/xml/InvalidChangeBatchHandler.java
diff --git a/...3/xml/ListHostedZonesResponseHandler.java → ...3/xml/ListHostedZonesResponseHandler.java b/...3/xml/ListHostedZonesResponseHandler.java → ...3/xml/ListHostedZonesResponseHandler.java
diff --git a/...istResourceRecordSetsResponseHandler.java → ...istResourceRecordSetsResponseHandler.java b/...istResourceRecordSetsResponseHandler.java → ...istResourceRecordSetsResponseHandler.java
diff --git a/...route53/xml/ResourceRecordSetHandler.java → ...route53/xml/ResourceRecordSetHandler.java b/...route53/xml/ResourceRecordSetHandler.java → ...route53/xml/ResourceRecordSetHandler.java
diff --git a/.../org/jclouds/route53/xml/ZoneHandler.java → .../org/jclouds/route53/xml/ZoneHandler.java b/.../org/jclouds/route53/xml/ZoneHandler.java → .../org/jclouds/route53/xml/ZoneHandler.java
diff --git a/...INF/services/org.jclouds.apis.ApiMetadata → ...INF/services/org.jclouds.apis.ApiMetadata b/...INF/services/org.jclouds.apis.ApiMetadata → ...INF/services/org.jclouds.apis.ApiMetadata
diff --git a/...jclouds/route53/Route53ApiExpectTest.java → ...jclouds/route53/Route53ApiExpectTest.java b/...jclouds/route53/Route53ApiExpectTest.java → ...jclouds/route53/Route53ApiExpectTest.java
diff --git a/...g/jclouds/route53/Route53ApiLiveTest.java → ...g/jclouds/route53/Route53ApiLiveTest.java b/...g/jclouds/route53/Route53ApiLiveTest.java → ...g/jclouds/route53/Route53ApiLiveTest.java
diff --git a/...louds/route53/Route53ApiMetadataTest.java → ...louds/route53/Route53ApiMetadataTest.java b/...louds/route53/Route53ApiMetadataTest.java → ...louds/route53/Route53ApiMetadataTest.java
diff --git a/...te53/features/RecordSetApiExpectTest.java → ...te53/features/RecordSetApiExpectTest.java b/...te53/features/RecordSetApiExpectTest.java → ...te53/features/RecordSetApiExpectTest.java
diff --git a/...oute53/features/RecordSetApiLiveTest.java → ...oute53/features/RecordSetApiLiveTest.java b/...oute53/features/RecordSetApiLiveTest.java → ...oute53/features/RecordSetApiLiveTest.java
diff --git a/...s/route53/features/ZoneApiExpectTest.java → ...s/route53/features/ZoneApiExpectTest.java b/...s/route53/features/ZoneApiExpectTest.java → ...s/route53/features/ZoneApiExpectTest.java
diff --git a/...uds/route53/features/ZoneApiLiveTest.java → ...uds/route53/features/ZoneApiLiveTest.java b/...uds/route53/features/ZoneApiLiveTest.java → ...uds/route53/features/ZoneApiLiveTest.java
diff --git a/...ute53/filters/RestAuthenticationTest.java → ...ute53/filters/RestAuthenticationTest.java b/...ute53/filters/RestAuthenticationTest.java → ...ute53/filters/RestAuthenticationTest.java
diff --git a/...e53/handlers/Route53ErrorHandlerTest.java → ...e53/handlers/Route53ErrorHandlerTest.java b/...e53/handlers/Route53ErrorHandlerTest.java → ...e53/handlers/Route53ErrorHandlerTest.java
diff --git a/...53/internal/BaseRoute53ApiExpectTest.java → ...53/internal/BaseRoute53ApiExpectTest.java b/...53/internal/BaseRoute53ApiExpectTest.java → ...53/internal/BaseRoute53ApiExpectTest.java
diff --git a/...te53/internal/BaseRoute53ApiLiveTest.java → ...te53/internal/BaseRoute53ApiLiveTest.java b/...te53/internal/BaseRoute53ApiLiveTest.java → ...te53/internal/BaseRoute53ApiLiveTest.java
diff --git a/...ute53/internal/BaseRoute53ExpectTest.java → ...ute53/internal/BaseRoute53ExpectTest.java b/...ute53/internal/BaseRoute53ExpectTest.java → ...ute53/internal/BaseRoute53ExpectTest.java
diff --git a/...3/parse/CreateHostedZoneResponseTest.java → ...3/parse/CreateHostedZoneResponseTest.java b/...3/parse/CreateHostedZoneResponseTest.java → ...3/parse/CreateHostedZoneResponseTest.java
diff --git a/.../route53/parse/GetChangeResponseTest.java → .../route53/parse/GetChangeResponseTest.java b/.../route53/parse/GetChangeResponseTest.java → .../route53/parse/GetChangeResponseTest.java
diff --git a/...te53/parse/GetHostedZoneResponseTest.java → ...te53/parse/GetHostedZoneResponseTest.java b/...te53/parse/GetHostedZoneResponseTest.java → ...te53/parse/GetHostedZoneResponseTest.java
diff --git a/...parse/InvalidChangeBatchResponseTest.java → ...parse/InvalidChangeBatchResponseTest.java b/...parse/InvalidChangeBatchResponseTest.java → ...parse/InvalidChangeBatchResponseTest.java
diff --git a/...53/parse/ListHostedZonesResponseTest.java → ...53/parse/ListHostedZonesResponseTest.java b/...53/parse/ListHostedZonesResponseTest.java → ...53/parse/ListHostedZonesResponseTest.java
diff --git a/...e/ListResourceRecordSetsResponseTest.java → ...e/ListResourceRecordSetsResponseTest.java b/...e/ListResourceRecordSetsResponseTest.java → ...e/ListResourceRecordSetsResponseTest.java
diff --git a/...3/predicates/RecordSetPredicatesTest.java → ...3/predicates/RecordSetPredicatesTest.java b/...3/predicates/RecordSetPredicatesTest.java → ...3/predicates/RecordSetPredicatesTest.java
diff --git a/...oute53/predicates/ZonePredicatesTest.java → ...oute53/predicates/ZonePredicatesTest.java b/...oute53/predicates/ZonePredicatesTest.java → ...oute53/predicates/ZonePredicatesTest.java
diff --git a/.../src/test/resources/batch_rrs_request.xml → .../src/test/resources/batch_rrs_request.xml b/.../src/test/resources/batch_rrs_request.xml → .../src/test/resources/batch_rrs_request.xml
diff --git a/labs/route53/src/test/resources/change.xml → apis/route53/src/test/resources/change.xml b/labs/route53/src/test/resources/change.xml → apis/route53/src/test/resources/change.xml
diff --git a/...src/test/resources/create_hosted_zone.xml → ...src/test/resources/create_hosted_zone.xml b/...src/test/resources/create_hosted_zone.xml → ...src/test/resources/create_hosted_zone.xml
diff --git a/...src/test/resources/create_rrs_request.xml → ...src/test/resources/create_rrs_request.xml b/...src/test/resources/create_rrs_request.xml → ...src/test/resources/create_rrs_request.xml
diff --git a/...src/test/resources/delete_rrs_request.xml → ...src/test/resources/delete_rrs_request.xml b/...src/test/resources/delete_rrs_request.xml → ...src/test/resources/delete_rrs_request.xml
diff --git a/...oute53/src/test/resources/hosted_zone.xml → ...oute53/src/test/resources/hosted_zone.xml b/...oute53/src/test/resources/hosted_zone.xml → ...oute53/src/test/resources/hosted_zone.xml
diff --git a/...ute53/src/test/resources/hosted_zones.xml → ...ute53/src/test/resources/hosted_zones.xml b/...ute53/src/test/resources/hosted_zones.xml → ...ute53/src/test/resources/hosted_zones.xml
diff --git a/...c/test/resources/invalid_change_batch.xml → ...c/test/resources/invalid_change_batch.xml b/...c/test/resources/invalid_change_batch.xml → ...c/test/resources/invalid_change_batch.xml
diff --git a/labs/route53/src/test/resources/logback.xml → apis/route53/src/test/resources/logback.xml b/labs/route53/src/test/resources/logback.xml → apis/route53/src/test/resources/logback.xml
diff --git a/labs/route53/src/test/resources/new_zone.xml → apis/route53/src/test/resources/new_zone.xml b/labs/route53/src/test/resources/new_zone.xml → apis/route53/src/test/resources/new_zone.xml
diff --git a/labs/route53/src/test/resources/rrsets.xml → apis/route53/src/test/resources/rrsets.xml b/labs/route53/src/test/resources/rrsets.xml → apis/route53/src/test/resources/rrsets.xml
diff --git a/labs/pom.xml b/labs/pom.xml
@@ -61,9 +61,7 @@
        <module>abiquo</module>
        <module>openstack-quantum</module>
        <module>openstack-glance</module>
-       <module>route53</module>
        <module>dynect</module>
-       <module>aws-route53</module>
        <module>ultradns-ws</module>
   </modules>
 </project>
diff --git a/labs/aws-route53/pom.xml → providers/aws-route53/pom.xml b/labs/aws-route53/pom.xml → providers/aws-route53/pom.xml
@@ -27,7 +27,7 @@
         <version>1.5.6-SNAPSHOT</version>
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
-    <groupId>org.jclouds.labs</groupId>
+    <groupId>org.jclouds.provider</groupId>
     <artifactId>aws-route53</artifactId>
     <name>jclouds Amazon Route 53 provider</name>
     <description>Route 53 targeted to Amazon Web Services</description>
@@ -46,13 +46,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.jclouds.api</groupId>
             <artifactId>route53</artifactId>
             <version>${project.version}</version>
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.jclouds.labs</groupId>
+            <groupId>org.jclouds.api</groupId>
             <artifactId>route53</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>

diff --git a/...s/route53/AWSRoute53ProviderMetadata.java → ...s/route53/AWSRoute53ProviderMetadata.java b/...s/route53/AWSRoute53ProviderMetadata.java → ...s/route53/AWSRoute53ProviderMetadata.java
diff --git a/...es/org.jclouds.providers.ProviderMetadata → ...es/org.jclouds.providers.ProviderMetadata b/...es/org.jclouds.providers.ProviderMetadata → ...es/org.jclouds.providers.ProviderMetadata
diff --git a/...ds/aws/route53/AWSRoute53ApiLiveTest.java → ...ds/aws/route53/AWSRoute53ApiLiveTest.java b/...ds/aws/route53/AWSRoute53ApiLiveTest.java → ...ds/aws/route53/AWSRoute53ApiLiveTest.java
diff --git a/...s/aws/route53/AWSRoute53ProviderTest.java → ...s/aws/route53/AWSRoute53ProviderTest.java b/...s/aws/route53/AWSRoute53ProviderTest.java → ...s/aws/route53/AWSRoute53ProviderTest.java
diff --git a/...e53/features/AWSRecordSetApiLiveTest.java → ...e53/features/AWSRecordSetApiLiveTest.java b/...e53/features/AWSRecordSetApiLiveTest.java → ...e53/features/AWSRecordSetApiLiveTest.java
diff --git a/.../route53/features/AWSZoneApiLiveTest.java → .../route53/features/AWSZoneApiLiveTest.java b/.../route53/features/AWSZoneApiLiveTest.java → .../route53/features/AWSZoneApiLiveTest.java
diff --git a/providers/pom.xml b/providers/pom.xml
@@ -78,5 +78,6 @@
         <module>rackspace-cloudblockstorage-uk</module>
         <module>glesys</module>
         <module>aws-sts</module>
+        <module>aws-route53</module>
     </modules>
 </project>