Merge branch 'master' of github.com:jclouds/jclouds

* 'master' of github.com:jclouds/jclouds:
  Issue 593:add rimu hosting to supported providers list
  revised rimu tests

README.txt

@@ -33,7 +33,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de
                           cloudservers-uk, vcloud (generic), ec2 (generic), byon, nova,
                           trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic),
                           cloudsigma-zrh, elasticstack(generic), bluelock-vcloud-vcenterprise,
-                          bluelock-vcloud-zone01, stratogen-vcloud-mycloud,
+                          bluelock-vcloud-zone01, stratogen-vcloud-mycloud, rimuhosting,
                           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
@@ -55,7 +55,7 @@ our loadbalancer api supports: cloudloadbalancers-us
   * note * the pom dependency org.jclouds/jclouds-allloadbalancer gives you access to
            to all of these providers
 
-we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, rimuhosting, openstack nova,
+we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, openstack nova,
                           azurequeue, simpledb, cloudstack as well as a async-http-client
                           driver in the sandbox
 

allcompute/pom.xml

@@ -49,6 +49,11 @@
             <artifactId>aws-ec2</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>rimuhosting</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jclouds.api</groupId>
             <artifactId>nova</artifactId>

providers/pom.xml

@@ -62,6 +62,7 @@
         <module>elastichosts-lon-p</module>
         <module>elastichosts-sat-p</module>
         <module>elastichosts-lon-b</module>
+        <module>rimuhosting</module>
         <module>openhosting-east1</module>
         <module>serverlove-z1-man</module>
         <module>skalicloud-sdg-my</module>

providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingPropertiesBuilder.java

@@ -31,6 +31,7 @@ import static org.jclouds.rimuhosting.miro.reference.RimuHostingConstants.PROPER
 import java.util.Properties;
 
 import org.jclouds.PropertiesBuilder;
+import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.concurrent.Timeout;
 
 /**
@@ -55,6 +56,7 @@ public class RimuHostingPropertiesBuilder extends PropertiesBuilder {
       long timeoutMillis = timeout.timeUnit().toMillis(timeout.duration());
       properties.setProperty(PROPERTY_SO_TIMEOUT, timeoutMillis + "");
       properties.setProperty(PROPERTY_CONNECTION_TIMEOUT, timeoutMillis + "");
+      properties.setProperty(ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_TERMINATED, 60 * 1000 + "");
       return properties;
    }
 

providers/rimuhosting/src/test/java/org/jclouds/rimuhosting/miro/compute/RimuHostingComputeServiceLiveTest.java

@@ -43,4 +43,8 @@ public class RimuHostingComputeServiceLiveTest extends BaseComputeServiceLiveTes
       return new JschSshClientModule();
    }
 
+   @Override
+   public void testOptionToNotBlock() {
+      // start call is blocking anyway.
+   }
 }