summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.server
diff options
context:
space:
mode:
authorShireesh Anjal <shireesh@gluster.com>2011-05-30 18:28:16 +0530
committerShireesh Anjal <shireesh@gluster.com>2011-05-30 18:35:21 +0530
commitd59ea1a86faa85a0495387aa6d18a7fef94d2e34 (patch)
tree73bdba3fecc5e32d32091346b8d8cf1d3d71cea2 /src/com.gluster.storage.management.server
parent139b3092943c150ebcb22ed27ae22ef12678f0f9 (diff)
Design changes - introducing cluster-server mapping on gateway
Diffstat (limited to 'src/com.gluster.storage.management.server')
-rw-r--r--src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
index 18bece88..53618610 100644
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ClustersResource.java
@@ -31,6 +31,7 @@ import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -80,6 +81,7 @@ public class ClustersResource {
return new StringListResponse(clusterList);
}
+ @SuppressWarnings("unchecked")
@POST
@Produces(MediaType.TEXT_XML)
public Status createCluster(@FormParam(FORM_PARAM_CLUSTER_NAME) String clusterName) {
@@ -98,6 +100,10 @@ public class ClustersResource {
}
}
+
+ @SuppressWarnings("unchecked")
+ @PUT
+ @Produces(MediaType.TEXT_XML)
public Status registerCluster(@FormParam(FORM_PARAM_CLUSTER_NAME) String clusterName,
@FormParam(FORM_PARAM_SERVER_NAME) String knownServer) {
EntityTransaction txn = clusterDao.startTransaction();
@@ -118,6 +124,7 @@ public class ClustersResource {
clusterDao.save(cluster);
return Status.STATUS_SUCCESS;
} catch(Exception e) {
+ txn.rollback();
return new Status(e);
}
}