summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-08-11 15:57:10 +0530
committerDhandapani <dhandapani@gluster.com>2011-08-11 16:24:41 +0530
commit9d59c906da655e6a5e225c85fd3e9a9152ad7504 (patch)
treeaf20b374ec59f778f31a8dadfb964aa6d6807c00 /src
parent5f434d7a3f0fb8560664361cb740067d8520f676 (diff)
File System type default parameter handled in resource
Bug 3391 - Expand FS to Filesystem on the Select FS type window
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java2
-rw-r--r--src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
index 2467735f..4b64ea96 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
@@ -56,7 +56,7 @@ public class InitializeDiskTypeSelection extends Dialog {
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("Gluster Management Console - Select FS Type");
+ newShell.setText("Gluster Management Console - Select File System Type");
addEscapeListener(newShell);
}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index f149b214..90442f4a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -56,6 +56,7 @@ import javax.ws.rs.core.Response;
import org.springframework.stereotype.Component;
import com.gluster.storage.management.core.constants.CoreConstants;
+import com.gluster.storage.management.core.constants.GlusterConstants;
import com.gluster.storage.management.core.constants.RESTConstants;
import com.gluster.storage.management.core.exceptions.ConnectionException;
import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
@@ -374,7 +375,8 @@ public class GlusterServersResource extends AbstractResource {
}
if (fsType == null || fsType.isEmpty()) {
- return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
+ fsType = GlusterConstants.FSTYPE_DEFAULT;
+ // return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
}
InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName, fsType);