Merge branch 'master' of github.com:gluster/console

16 files changed, 15 insertions, 2 deletions

diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
index 631788ff..54872639 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
+++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
@@ -37,7 +37,7 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>gluster-resources-1.0</servlet-name>
-    <url-pattern>/1.0/*</url-pattern>
+    <url-pattern>/1.0.0/*</url-pattern>
   </servlet-mapping>
   <servlet>
     <servlet-name>JnlpDownloadServlet</servlet-name>
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
new file mode 120000
index 00000000..7d230498
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/common/Globals.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
new file mode 120000
index 00000000..7ecad84d
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/common/Protocol.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
new file mode 120000
index 00000000..df26ff44
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/common/Utils.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
new file mode 120000
index 00000000..880349a1
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
new file mode 120000
index 00000000..fec57917
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
new file mode 120000
index 00000000..03752d57
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
new file mode 120000
index 00000000..d517e46c
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
new file mode 120000
index 00000000..be9e627c
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
new file mode 120000
index 00000000..3eff03fd
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh b/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
new file mode 120000
index 00000000..13b9a40b
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
new file mode 120000
index 00000000..5e56bfbb
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
new file mode 120000
index 00000000..6288f182
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
new file mode 120000
index 00000000..e3f44800
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
new file mode 120000
index 00000000..8496fae4
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
@@ -0,0 +1 @@
+../../../com.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
index 892ebf11..508a3029 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java
@@ -30,7 +30,6 @@ import com.gluster.storage.management.core.constants.CoreConstants;
 import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.VolumeOptionInfo;
 import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
 import com.gluster.storage.management.gateway.services.ClusterService;