Issue 419 rename cloudsigma to cloudsigma-zrh

README.txt

@@ -32,7 +32,7 @@ our dev version is 1.0-SNAPSHOT
 our compute api supports: aws-ec2, gogrid, cloudservers (generic), cloudservers-us,
                           cloudservers-uk, vcloud (generic), ec2 (generic),
                           trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic),
-                          cloudsigma, elasticstack(generic), bluelock-vclouddirector,
+                          cloudsigma-zrh, elasticstack(generic), bluelock-vclouddirector,
                           slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1), 
                           elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
                           openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,

allcompute/pom.xml

@@ -141,7 +141,7 @@
         </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
-            <artifactId>cloudsigma</artifactId>
+            <artifactId>cloudsigma-zrh</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

compute/src/main/clojure/org/jclouds/compute.clj

@@ -26,7 +26,7 @@ Current supported providers are:
     trmk-ecloud, trmk-vcloudexpress, vcloud, bluelock, eucalyptus, 
     slicehost, elastichosts-lon-p, elastichosts-sat-p, elastichosts, 
     openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,
-    elastichosts-lon-b, cloudsigma, vcloudexpress, stub]
+    elastichosts-lon-b, cloudsigma-zrh, vcloudexpress, stub]
 
 Here's an example of getting some compute configuration from rackspace:
 

core/src/main/resources/rest.properties

@@ -140,8 +140,8 @@ serverlove-z1-man.contextbuilder=org.jclouds.serverlove.ServerloveManchesterCont
 openhosting-east1.propertiesbuilder=org.jclouds.openhosting.OpenHostingEast1PropertiesBuilder
 openhosting-east1.contextbuilder=org.jclouds.openhosting.OpenHostingEast1ContextBuilder
 
-cloudsigma.propertiesbuilder=org.jclouds.cloudsigma.CloudSigmaPropertiesBuilder
-cloudsigma.contextbuilder=org.jclouds.cloudsigma.CloudSigmaContextBuilder
+cloudsigma-zrh.propertiesbuilder=org.jclouds.cloudsigma.CloudSigmaZurichPropertiesBuilder
+cloudsigma-zrh.contextbuilder=org.jclouds.cloudsigma.CloudSigmaContextBuilder
 
 ibmdev.propertiesbuilder=org.jclouds.ibmdev.IBMDeveloperCloudPropertiesBuilder
 ibmdev.contextbuilder=org.jclouds.ibmdev.IBMDeveloperCloudContextBuilder

providers/cloudsigma-zrh/pom.xml

@@ -31,17 +31,17 @@
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
     <groupId>org.jclouds.provider</groupId>
-    <artifactId>cloudsigma</artifactId>
+    <artifactId>cloudsigma-zrh</artifactId>
     <name>jclouds CloudSigma provider</name>
     <description>ComputeService binding to the CloudSigma datacenter in Zürich</description>
     
     <properties>
         <!-- when instances are hung, open a ticket and add here -->
         <jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
-        <test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
-        <test.cloudsigma.apiversion>1.0</test.cloudsigma.apiversion>
-        <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
-        <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
+        <test.cloudsigma-zrh.endpoint>https://api.cloudsigma.com</test.cloudsigma-zrh.endpoint>
+        <test.cloudsigma-zrh.apiversion>1.0</test.cloudsigma-zrh.apiversion>
+        <test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
+        <test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
     </properties>
 
     <dependencies>
@@ -108,20 +108,20 @@
                                 <configuration>
                                     <systemProperties>
                                         <property>
-                                            <name>test.cloudsigma.endpoint</name>
-                                            <value>${test.cloudsigma.endpoint}</value>
+                                            <name>test.cloudsigma-zrh.endpoint</name>
+                                            <value>${test.cloudsigma-zrh.endpoint}</value>
                                         </property>
                                         <property>
-                                            <name>test.cloudsigma.apiversion</name>
-                                            <value>${test.cloudsigma.apiversion}</value>
+                                            <name>test.cloudsigma-zrh.apiversion</name>
+                                            <value>${test.cloudsigma-zrh.apiversion}</value>
                                         </property>
                                         <property>
-                                            <name>test.cloudsigma.identity</name>
-                                            <value>${test.cloudsigma.identity}</value>
+                                            <name>test.cloudsigma-zrh.identity</name>
+                                            <value>${test.cloudsigma-zrh.identity}</value>
                                         </property>
                                         <property>
-                                            <name>test.cloudsigma.credential</name>
-                                            <value>${test.cloudsigma.credential}</value>
+                                            <name>test.cloudsigma-zrh.credential</name>
+                                            <value>${test.cloudsigma-zrh.credential}</value>
                                         </property>
                                         <property>
                                             <name>jclouds.compute.blacklist-nodes</name>

providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaPropertiesBuilder.java

@@ -21,7 +21,6 @@ package org.jclouds.cloudsigma;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.jclouds.Constants.PROPERTY_API_VERSION;
-import static org.jclouds.Constants.PROPERTY_ENDPOINT;
 import static org.jclouds.cloudsigma.reference.CloudSigmaConstants.PROPERTY_VNC_PASSWORD;
 
 import java.util.Properties;
@@ -37,7 +36,6 @@ public class CloudSigmaPropertiesBuilder extends PropertiesBuilder {
    @Override
    protected Properties defaultProperties() {
       Properties properties = super.defaultProperties();
-      properties.setProperty(PROPERTY_ENDPOINT, "https://api.cloudsigma.com");
       properties.setProperty(PROPERTY_API_VERSION, "1.0");
       properties.setProperty(PROPERTY_VNC_PASSWORD, "IL9vs34d");
       return properties;

providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichPropertiesBuilder.java

@@ -0,0 +1,43 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.cloudsigma;
+
+import static org.jclouds.Constants.PROPERTY_ENDPOINT;
+
+import java.util.Properties;
+
+/**
+ * Builds properties used in CloudSigma Clients
+ * 
+ * @author Adrian Cole
+ */
+public class CloudSigmaZurichPropertiesBuilder extends CloudSigmaPropertiesBuilder {
+   @Override
+   protected Properties defaultProperties() {
+      Properties properties = super.defaultProperties();
+      properties.setProperty(PROPERTY_ENDPOINT, "https://api.cloudsigma.com");
+      return properties;
+   }
+
+   public CloudSigmaZurichPropertiesBuilder(Properties properties) {
+      super(properties);
+   }
+
+}

providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaAsyncClientTest.java

@@ -436,6 +436,6 @@ public class CloudSigmaAsyncClientTest extends RestClientTest<CloudSigmaAsyncCli
 
    @Override
    public RestContextSpec<CloudSigmaClient, CloudSigmaAsyncClient> createContextSpec() {
-      return new RestContextFactory().createContextSpec("cloudsigma", "foo", "bar", new Properties());
+      return new RestContextFactory().createContextSpec("cloudsigma-zrh", "foo", "bar", new Properties());
    }
 }

providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java

@@ -80,7 +80,7 @@ public class CloudSigmaClientLiveTest {
    protected RestContext<CloudSigmaClient, CloudSigmaAsyncClient> context;
    protected Predicate<IPSocket> socketTester;
 
-   protected String provider = "cloudsigma";
+   protected String provider = "cloudsigma-zrh";
    protected String identity;
    protected String credential;
    protected String endpoint;

providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/ProvidersInPropertiesTest.java

@@ -19,6 +19,7 @@
 
 package org.jclouds.cloudsigma;
 
+import org.jclouds.compute.util.ComputeServiceUtils;
 import org.jclouds.rest.Providers;
 import org.testng.annotations.Test;
 
@@ -35,13 +36,13 @@ public class ProvidersInPropertiesTest {
    @Test
    public void testSupportedProviders() {
       Iterable<String> providers = Providers.getSupportedProviders();
-      assert Iterables.contains(providers, "cloudsigma") : providers;
+      assert Iterables.contains(providers, "cloudsigma-zrh") : providers;
+   }
+
+   @Test
+   public void testSupportedComputeServiceProviders() {
+      Iterable<String> providers = ComputeServiceUtils.getSupportedProviders();
+      assert Iterables.contains(providers, "cloudsigma-zrh") : providers;
    }
-//
-//   @Test
-//   public void testSupportedComputeServiceProviders() {
-//      Iterable<String> providers = ComputeServiceUtils.getSupportedProviders();
-//      assert Iterables.contains(providers, "cloudsigma") : providers;
-//   }
 
 }

providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceLiveTest.java

@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
 @Test(groups = "live")
 public class CloudSigmaComputeServiceLiveTest extends BaseComputeServiceLiveTest {
    public CloudSigmaComputeServiceLiveTest() {
-      provider = "cloudsigma";
+      provider = "cloudsigma-zrh";
    }
 
    @Override

providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderLiveTest.java

@@ -40,7 +40,7 @@ import com.google.common.base.Predicate;
 public class CloudSigmaTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
 
    public CloudSigmaTemplateBuilderLiveTest() {
-      provider = "cloudsigma";
+      provider = "cloudsigma-zrh";
    }
 
    @Override

providers/pom.xml

@@ -35,7 +35,7 @@
     <modules>
         <module>gogrid</module>
         <module>slicehost</module>
-        <module>cloudsigma</module>
+        <module>cloudsigma-zrh</module>
         <module>azureblob</module>
         <module>aws-elb</module>
         <module>aws-s3</module>