Design changes - introducing cluster-server mapping on gateway

16 files changed, 65 insertions, 120 deletions

diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/antlr-2.7.6.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/antlr-2.7.6.jar
new file mode 100644
index 00000000..3702b645
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/antlr-2.7.6.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-collections-3.1.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-collections-3.1.jar
new file mode 100644
index 00000000..41e230fe
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/commons-collections-3.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
new file mode 100644
index 00000000..c8c4dbb9
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
new file mode 100644
index 00000000..4c9ac4e9
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate3.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate3.jar
new file mode 100644
index 00000000..c1c81141
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/hibernate3.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
new file mode 100644
index 00000000..8f692f4f
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jta-1.1.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jta-1.1.jar
new file mode 100644
index 00000000..6d225b76
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/jta-1.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/log4j-1.2.16.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/log4j-1.2.16.jar
new file mode 100644
index 00000000..3f9d8476
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/log4j-1.2.16.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
new file mode 100644
index 00000000..f1f4fdd2
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/0-version.sql b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/0-version.sql
new file mode 100644
index 00000000..4c3d81d1
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/0-version.sql
@@ -0,0 +1,2 @@
+create table version (version varchar(16) not null primary key);
+insert into version(version) values('1.0.0');
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/1-security-schema.sql b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/1-security-schema.sql
new file mode 100644
index 00000000..fdde5823
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/1-security-schema.sql
@@ -0,0 +1,26 @@
+create table users(
+	username varchar(50) not null primary key,
+    password varchar(50) not null,
+    enabled smallint not null
+    );
+
+ create table authorities (
+ 	username varchar(50) not null,
+    authority varchar(50) not null,
+    constraint fk_authorities_users foreign key(username) references users(username));
+    create unique index ix_auth_username on authorities (username,authority);
+
+create table groups (
+	id bigint generated by default as identity(start with 0) primary key, 
+	group_name varchar(50) not null);
+
+create table group_authorities (
+	group_id bigint not null, 
+	authority varchar(50) not null, 
+	constraint fk_group_authorities_group foreign key(group_id) references groups(id));
+
+create table group_members (
+	id bigint generated by default as identity(start with 0) primary key, 
+	username varchar(50) not null, 
+	group_id bigint not null, 
+	constraint fk_group_members_group foreign key(group_id) references groups(id));
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
new file mode 100644
index 00000000..35ccf965
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
@@ -0,0 +1,21 @@
+-- Create users
+insert into users(username, password, enabled) values ('gluster','gluster',1);
+insert into users(username, password, enabled) values ('guest','guest',1);
+
+-- Assign authorities to users (to be removed after implementing user group functionality)
+insert into authorities(username,authority) values ('gluster','ROLE_USER');
+insert into authorities(username,authority) values ('gluster','ROLE_ADMIN');
+insert into authorities(username,authority) values ('guest','ROLE_USER');
+
+-- Create user groups
+insert into groups(group_name) values ('Users');
+insert into groups(group_name) values ('Administrators');
+
+-- Add authorities to groups (functionality not yet implemented in code)
+insert into group_authorities(group_id, authority) select id,'ROLE_USER' from groups where group_name='Users';
+insert into group_authorities(group_id, authority) select id,'ROLE_USER' from groups where group_name='Administrators'; 
+insert into group_authorities(group_id, authority) select id,'ROLE_ADMIN' from groups where group_name='Administrators';
+
+-- Assign group members
+insert into group_members(group_id, username) select id,'guest' from groups where group_name='Users';
+insert into group_members(group_id, username) select id,'gluster' from groups where group_name='Administrators';
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/3-cluster-servers.sql b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
new file mode 100644
index 00000000..17ca62d2
--- /dev/null
+++ b/src/com.gluster.storage.management.server/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
@@ -0,0 +1,16 @@
+create table cluster_info (
+	id bigint generated by default as identity, 
+	name varchar(255), 
+	primary key (id));
+
+create unique index ix_cluster_name on cluster_info (name);
+	
+create table server_info (
+	id bigint generated by default as identity, 
+	name varchar(255),
+	cluster_id bigint,
+	primary key (id));
+
+create unique index ix_cluster_server on server_info (name, cluster_id);
+	
+alter table server_info add constraint FK_CLUSTER_ID foreign key (cluster_id) references cluster_info(id);
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Common.py b/src/com.gluster.storage.management.server/WebContent/scripts/Common.py
deleted file mode 100644
index 60f200fe..00000000
--- a/src/com.gluster.storage.management.server/WebContent/scripts/Common.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Copyright (c) 2009 Gluster, Inc. <http://www.gluster.com>

-#  This file is part of GlusterSP.

-#

-#  GlusterSP is free software; you can redistribute it and/or modify

-#  it under the terms of the GNU General Public License as published

-#  by the Free Software Foundation; either version 3 of the License,

-#  or (at your option) any later version.

-#

-#  GlusterSP is distributed in the hope that it will be useful, but

-#  WITHOUT ANY WARRANTY; without even the implied warranty of

-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-#  General Public License for more details.

-#

-#  You should have received a copy of the GNU General Public License

-#  along with this program.  If not, see

-#  <http://www.gnu.org/licenses/>.

-

-import sys

-import syslog

-

-def log(priority, message=None):

-    if type(priority) == type(""):

-        logPriority = syslog.LOG_INFO

-        logMessage = priority

-    else:

-        logPriority = priority

-        logMessage = message

-    if not logMessage:

-        return

-    #if Globals.DEBUG:

-    #    sys.stderr.write(logMessage)

-    else:

-        syslog.syslog(logPriority, logMessage)

-    return

diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py b/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py
deleted file mode 100644
index 6e68adbd..00000000
--- a/src/com.gluster.storage.management.server/WebContent/scripts/Globals.py
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTICAST_GROUP = '224.224.1.1'

-MULTICAST_PORT  = 5353

-DISCOVERED_SERVER_LIST_FILENAME = "/tmp/discovered-server-list"

diff --git a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py b/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py
deleted file mode 100755
index 6ac15fed..00000000
--- a/src/com.gluster.storage.management.server/WebContent/scripts/vmware-discover-servers.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/python
-#  Copyright (C) 2009 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
-#
-#  Gluster Storage Platform is free software; you can redistribute it
-#  and/or modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 3 of
-#  the License, or (at your option) any later version.
-#
-#  Gluster Storage Platform is distributed in the hope that it will be
-#  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-#  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see
-#  <http://www.gnu.org/licenses/>.
-
-import sys
-import socket
-import signal
-import struct
-import syslog
-import Globals
-import Common
-
-class TimeoutException(Exception):
-    pass
-
-def timeoutSignal(signum, frame):
-    raise TimeoutException, "Timed out"
-
-def serverDiscoveryRequest(multiCastGroup, port):
-    servers = []
-    # Sending request to all the servers
-    socketSend = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
-    socketSend.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
-    socketSend.sendto("ServerDiscovery", (multiCastGroup, port))
-
-    # Waiting for the response
-    socketReceive = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
-    socketReceive.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    socketReceive.bind(('', port))
-    mreq = struct.pack("4sl", socket.inet_aton(multiCastGroup), socket.INADDR_ANY)
-
-    socketReceive.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq)
-    socketSend.sendto("ServerDiscovery", (multiCastGroup, port))
-
-    try:
-        while True:
-            response = socketReceive.recvfrom(200)
-            if response and response[0].upper() != "SERVERDISCOVERY":
-                servers.append(response[0])
-            signal.signal(signal.SIGALRM, timeoutSignal)
-            signal.alarm(3)
-    except TimeoutException:
-        return servers
-    return None
-
-def main():
-    syslog.openlog("discovery server request")
-    servers = serverDiscoveryRequest(Globals.MULTICAST_GROUP, Globals.MULTICAST_PORT)
-    if not servers:
-        Common.log(syslog.LOG_ERR, "Failed to discover new servers")
-        sys.exit(-1)
-
-    servers = set(servers)
-    try:
-        #fp = open(Globals.DISCOVERED_SERVER_LIST_FILENAME, "w")
-        #fp.writelines(list(servers))
-        #fp.close()
-        for server in servers:
-            print server
-    except IOError:
-        Common.log(syslog.LOG_ERR, "Unable to open file %s" % Globals.DISCOVERED_SERVER_LIST_FILENAME)
-        sys.exit(-1)
-
-    #for serverName in servers:
-    #    print serverName
-    sys.exit(0)
-
-if __name__ == "__main__":
-    main()