From 26638192daeadaa02ce35227ac463962dee7b50d Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 31 Jan 2011 10:45:00 -0800 Subject: [PATCH] promoted byon --- README.txt | 2 +- allcompute/pom.xml | 5 +++++ {sandbox-apis => apis}/byon/README.txt | 0 {sandbox-apis => apis}/byon/pom.xml | 0 .../org/jclouds/byon/BYONComputeServiceContextBuilder.java | 0 .../main/java/org/jclouds/byon/BYONPropertiesBuilder.java | 0 .../byon/src/main/java/org/jclouds/byon/Node.java | 0 .../jclouds/byon/config/BYONComputeServiceContextModule.java | 0 .../java/org/jclouds/byon/functions/NodeToNodeMetadata.java | 0 .../main/java/org/jclouds/byon/functions/NodesFromYaml.java | 0 .../org/jclouds/byon/internal/BYONComputeServiceAdapter.java | 0 .../org/jclouds/byon/suppliers/NodesParsedFromSupplier.java | 0 .../byon/suppliers/SupplyFromProviderURIOrNodesProperty.java | 0 .../java/org/jclouds/byon/BYONComputeServiceLiveTest.java | 0 .../test/java/org/jclouds/byon/BYONComputeServiceTest.java | 0 .../org/jclouds/byon/functions/NodeToNodeMetadataTest.java | 0 .../java/org/jclouds/byon/functions/NodesFromYamlTest.java | 0 .../jclouds/byon/suppliers/NodesParsedFromSupplierTest.java | 0 .../suppliers/SupplyFromProviderURIOrNodesPropertyTest.java | 0 {sandbox-apis => apis}/byon/src/test/resources/log4j.xml | 0 {sandbox-apis => apis}/byon/src/test/resources/test1.yaml | 0 .../byon/src/test/resources/test_with_url.yaml | 0 {sandbox-apis => apis}/byon/src/test/resources/testkey.txt | 0 apis/pom.xml | 1 + compute/src/main/clojure/org/jclouds/compute.clj | 2 +- 25 files changed, 8 insertions(+), 2 deletions(-) rename {sandbox-apis => apis}/byon/README.txt (100%) rename {sandbox-apis => apis}/byon/pom.xml (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/BYONComputeServiceContextBuilder.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/BYONPropertiesBuilder.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/Node.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java (100%) rename {sandbox-apis => apis}/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java (100%) rename {sandbox-apis => apis}/byon/src/test/java/org/jclouds/byon/BYONComputeServiceLiveTest.java (100%) rename {sandbox-apis => apis}/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java (100%) rename {sandbox-apis => apis}/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java (100%) rename {sandbox-apis => apis}/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java (100%) rename {sandbox-apis => apis}/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java (100%) rename {sandbox-apis => apis}/byon/src/test/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesPropertyTest.java (100%) rename {sandbox-apis => apis}/byon/src/test/resources/log4j.xml (100%) rename {sandbox-apis => apis}/byon/src/test/resources/test1.yaml (100%) rename {sandbox-apis => apis}/byon/src/test/resources/test_with_url.yaml (100%) rename {sandbox-apis => apis}/byon/src/test/resources/testkey.txt (100%) diff --git a/README.txt b/README.txt index 2c9bc278a8..d8ab8e9d21 100644 --- a/README.txt +++ b/README.txt @@ -30,7 +30,7 @@ our current version is 1.0-beta-8 our dev version is 1.0-SNAPSHOT our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers-us, - cloudservers-uk, vcloud (generic), ec2 (generic), + cloudservers-uk, vcloud (generic), ec2 (generic), byon, trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic), cloudsigma-zrh, elasticstack(generic), bluelock-vclouddirector, slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1), diff --git a/allcompute/pom.xml b/allcompute/pom.xml index c66adca6ca..9e145f8790 100644 --- a/allcompute/pom.xml +++ b/allcompute/pom.xml @@ -39,6 +39,11 @@ aws-ec2 ${project.version} + + org.jclouds.api + byon + ${project.version} + org.jclouds.api ec2 diff --git a/sandbox-apis/byon/README.txt b/apis/byon/README.txt similarity index 100% rename from sandbox-apis/byon/README.txt rename to apis/byon/README.txt diff --git a/sandbox-apis/byon/pom.xml b/apis/byon/pom.xml similarity index 100% rename from sandbox-apis/byon/pom.xml rename to apis/byon/pom.xml diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/BYONComputeServiceContextBuilder.java b/apis/byon/src/main/java/org/jclouds/byon/BYONComputeServiceContextBuilder.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/BYONComputeServiceContextBuilder.java rename to apis/byon/src/main/java/org/jclouds/byon/BYONComputeServiceContextBuilder.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/BYONPropertiesBuilder.java b/apis/byon/src/main/java/org/jclouds/byon/BYONPropertiesBuilder.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/BYONPropertiesBuilder.java rename to apis/byon/src/main/java/org/jclouds/byon/BYONPropertiesBuilder.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/Node.java b/apis/byon/src/main/java/org/jclouds/byon/Node.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/Node.java rename to apis/byon/src/main/java/org/jclouds/byon/Node.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java b/apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java rename to apis/byon/src/main/java/org/jclouds/byon/config/BYONComputeServiceContextModule.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java rename to apis/byon/src/main/java/org/jclouds/byon/functions/NodeToNodeMetadata.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java b/apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java rename to apis/byon/src/main/java/org/jclouds/byon/functions/NodesFromYaml.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java b/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java rename to apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java b/apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java rename to apis/byon/src/main/java/org/jclouds/byon/suppliers/NodesParsedFromSupplier.java diff --git a/sandbox-apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java b/apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java similarity index 100% rename from sandbox-apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java rename to apis/byon/src/main/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesProperty.java diff --git a/sandbox-apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceLiveTest.java b/apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceLiveTest.java similarity index 100% rename from sandbox-apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceLiveTest.java rename to apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceLiveTest.java diff --git a/sandbox-apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java b/apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java similarity index 100% rename from sandbox-apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java rename to apis/byon/src/test/java/org/jclouds/byon/BYONComputeServiceTest.java diff --git a/sandbox-apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java b/apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java similarity index 100% rename from sandbox-apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java rename to apis/byon/src/test/java/org/jclouds/byon/functions/NodeToNodeMetadataTest.java diff --git a/sandbox-apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java b/apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java similarity index 100% rename from sandbox-apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java rename to apis/byon/src/test/java/org/jclouds/byon/functions/NodesFromYamlTest.java diff --git a/sandbox-apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java b/apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java similarity index 100% rename from sandbox-apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java rename to apis/byon/src/test/java/org/jclouds/byon/suppliers/NodesParsedFromSupplierTest.java diff --git a/sandbox-apis/byon/src/test/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesPropertyTest.java b/apis/byon/src/test/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesPropertyTest.java similarity index 100% rename from sandbox-apis/byon/src/test/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesPropertyTest.java rename to apis/byon/src/test/java/org/jclouds/byon/suppliers/SupplyFromProviderURIOrNodesPropertyTest.java diff --git a/sandbox-apis/byon/src/test/resources/log4j.xml b/apis/byon/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/byon/src/test/resources/log4j.xml rename to apis/byon/src/test/resources/log4j.xml diff --git a/sandbox-apis/byon/src/test/resources/test1.yaml b/apis/byon/src/test/resources/test1.yaml similarity index 100% rename from sandbox-apis/byon/src/test/resources/test1.yaml rename to apis/byon/src/test/resources/test1.yaml diff --git a/sandbox-apis/byon/src/test/resources/test_with_url.yaml b/apis/byon/src/test/resources/test_with_url.yaml similarity index 100% rename from sandbox-apis/byon/src/test/resources/test_with_url.yaml rename to apis/byon/src/test/resources/test_with_url.yaml diff --git a/sandbox-apis/byon/src/test/resources/testkey.txt b/apis/byon/src/test/resources/testkey.txt similarity index 100% rename from sandbox-apis/byon/src/test/resources/testkey.txt rename to apis/byon/src/test/resources/testkey.txt diff --git a/apis/pom.xml b/apis/pom.xml index 2b0319f2f8..8f525fd211 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -34,6 +34,7 @@ jclouds apis project filesystem + byon s3 ec2 elb diff --git a/compute/src/main/clojure/org/jclouds/compute.clj b/compute/src/main/clojure/org/jclouds/compute.clj index 4ab29ef6ee..a19c17890e 100644 --- a/compute/src/main/clojure/org/jclouds/compute.clj +++ b/compute/src/main/clojure/org/jclouds/compute.clj @@ -22,7 +22,7 @@ Current supported providers are: [ec2, aws-ec2, eucualyptus-partnercloud-ec2, cloudservers, - cloudservers-uk, cloudservers-us, + cloudservers-uk, cloudservers-us, byon, trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus, slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts, openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,