Merge pull request #1299 from jclouds/issue1184-joyent

command names for joyent

labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatacenterAsyncApi.java

@@ -21,6 +21,7 @@ package org.jclouds.joyent.cloudapi.v6_5.features;
 import java.net.URI;
 import java.util.Map;
 
+import javax.inject.Named;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -48,6 +49,7 @@ public interface DatacenterAsyncApi {
    /**
     * @see DatacenterApi#getDatacenters
     */
+   @Named("ListDataCenters")
    @GET
    @Path("/my/datacenters")
    @Consumes(MediaType.APPLICATION_JSON)

labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/DatasetAsyncApi.java

@@ -2,6 +2,7 @@ package org.jclouds.joyent.cloudapi.v6_5.features;
 
 import java.util.Set;
 
+import javax.inject.Named;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -32,6 +33,7 @@ public interface DatasetAsyncApi {
    /**
     * @see DatasetApi#list
     */
+   @Named("ListDatasets")
    @GET
    @Path("/my/datasets")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -41,6 +43,7 @@ public interface DatasetAsyncApi {
    /**
     * @see DatasetApi#get
     */
+   @Named("GetDataset")
    @GET
    @Path("/my/datasets/{id}")
    @Consumes(MediaType.APPLICATION_JSON)

labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/KeyAsyncApi.java

@@ -2,6 +2,7 @@ package org.jclouds.joyent.cloudapi.v6_5.features;
 
 import java.util.Set;
 
+import javax.inject.Named;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -34,6 +35,7 @@ public interface KeyAsyncApi {
    /**
     * @see KeyApi#list
     */
+   @Named("ListKeys")
    @GET
    @Path("/my/keys")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -43,6 +45,7 @@ public interface KeyAsyncApi {
    /**
     * @see KeyApi#get
     */
+   @Named("GetKey")
    @GET
    @Path("/my/keys/{name}")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -52,6 +55,7 @@ public interface KeyAsyncApi {
    /**
     * @see KeyApi#create
     */
+   @Named("CreateKey")
    @POST
    @Path("/my/keys")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -60,6 +64,7 @@ public interface KeyAsyncApi {
    /**
     * @see KeyApi#delete
     */
+   @Named("DeleteKey")
    @DELETE
    @Consumes(MediaType.APPLICATION_JSON)
    @Path("/my/keys/{name}")

labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/MachineAsyncApi.java

@@ -20,6 +20,7 @@ package org.jclouds.joyent.cloudapi.v6_5.features;
 
 import java.util.Set;
 
+import javax.inject.Named;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -59,6 +60,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#list
     */
+   @Named("ListMachines")
    @GET
    @Path("/my/machines")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -68,6 +70,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#get
     */
+   @Named("GetMachine")
    @GET
    @Path("/my/machines/{id}")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -77,6 +80,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#createWithDataset(String)
     */
+   @Named("CreateMachine")
    @POST
    @Path("/my/machines")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -85,6 +89,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#createWithDataset(String, CreateMachineOptions)
     */
+   @Named("CreateMachine")
    @POST
    @Path("/my/machines")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -93,6 +98,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#stop
     */
+   @Named("StopMachine")
    @POST
    @Consumes(MediaType.APPLICATION_JSON)
    @Produces(MediaType.APPLICATION_FORM_URLENCODED)
@@ -103,6 +109,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#start
     */
+   @Named("StartMachine")
    @POST
    @Consumes(MediaType.APPLICATION_JSON)
    @Produces(MediaType.APPLICATION_FORM_URLENCODED)
@@ -113,6 +120,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#reboot
     */
+   @Named("RestartMachine")
    @POST
    @Consumes(MediaType.APPLICATION_JSON)
    @Produces(MediaType.APPLICATION_FORM_URLENCODED)
@@ -123,6 +131,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#resize
     */
+   @Named("ResizeMachine")
    @POST
    @Consumes(MediaType.APPLICATION_JSON)
    @Produces(MediaType.APPLICATION_FORM_URLENCODED)
@@ -133,6 +142,7 @@ public interface MachineAsyncApi {
    /**
     * @see MachineApi#delete
     */
+   @Named("DeleteMachine")
    @DELETE
    @Consumes(MediaType.APPLICATION_JSON)
    @Path("/my/machines/{id}")

labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/features/PackageAsyncApi.java

@@ -2,6 +2,7 @@ package org.jclouds.joyent.cloudapi.v6_5.features;
 
 import java.util.Set;
 
+import javax.inject.Named;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -31,6 +32,7 @@ public interface PackageAsyncApi {
    /**
     * @see PackageApi#list
     */
+   @Named("ListPackages")
    @GET
    @Path("/my/packages")
    @Consumes(MediaType.APPLICATION_JSON)
@@ -40,6 +42,7 @@ public interface PackageAsyncApi {
    /**
     * @see PackageApi#get
     */
+   @Named("GetPackage")
    @GET
    @Path("/my/packages/{name}")
    @Consumes(MediaType.APPLICATION_JSON)