From 58c237fa74d7942aef493ad0a62bb955e883f3cb Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Fri, 5 Dec 2008 16:07:40 +0000 Subject: [PATCH] SEC-1015: Removed final packages/directories for old acl code. --- .../acl/basic/jdbc/acegi-acl-derby.sql | 32 ----------------- .../acl/basic/jdbc/acegi-acl-hsql.sql | 30 ---------------- .../acl/basic/jdbc/acegi-acl-mysql.sql | 30 ---------------- .../acl/basic/jdbc/acegi-acl-postgres.sql | 34 ------------------- 4 files changed, 126 deletions(-) delete mode 100644 core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql delete mode 100644 core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql delete mode 100644 core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql delete mode 100644 core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql diff --git a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql deleted file mode 100644 index b58bae23a7..0000000000 --- a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-derby.sql +++ /dev/null @@ -1,32 +0,0 @@ -CREATE SCHEMA sa; - -CREATE TABLE acl_object_identity ( - id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY CONSTRAINT acl_object_identity_PK PRIMARY KEY, - object_identity VARCHAR(250) NOT NULL, - parent_object INTEGER, - acl_class VARCHAR(250) NOT NULL, - CONSTRAINT unique_object_identity UNIQUE(object_identity), - FOREIGN KEY (parent_object) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - -CREATE TABLE acl_permission ( - id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY CONSTRAINT acl_permission_PK PRIMARY KEY, - acl_object_identity INTEGER NOT NULL, - recipient VARCHAR(100) NOT NULL, - mask INTEGER NOT NULL, - CONSTRAINT unique_recipient UNIQUE(acl_object_identity, recipient), - FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); - ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'rod', 2); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (3, 'scott', 14); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (6, 'scott', 1); diff --git a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql deleted file mode 100644 index 2caab7b930..0000000000 --- a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-hsql.sql +++ /dev/null @@ -1,30 +0,0 @@ -CREATE TABLE acl_object_identity ( - id INTEGER GENERATED BY DEFAULT AS IDENTITY, - object_identity VARCHAR(250) NOT NULL, - parent_object INTEGER, - acl_class VARCHAR(250) NOT NULL, - CONSTRAINT unique_object_identity UNIQUE(object_identity), - FOREIGN KEY (parent_object) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - -CREATE TABLE acl_permission ( - id INTEGER GENERATED BY DEFAULT AS IDENTITY, - acl_object_identity INTEGER NOT NULL, - recipient VARCHAR(100) NOT NULL, - mask INTEGER NOT NULL, - CONSTRAINT unique_recipient UNIQUE(acl_object_identity, recipient), - FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); - ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'rod', 2); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (3, 'scott', 14); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (6, 'scott', 1); diff --git a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql deleted file mode 100644 index a9a65915a8..0000000000 --- a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-mysql.sql +++ /dev/null @@ -1,30 +0,0 @@ -CREATE TABLE acl_object_identity ( - id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY, - object_identity VARCHAR(250) NOT NULL, - parent_object INTEGER, - acl_class VARCHAR(250) NOT NULL, - CONSTRAINT unique_object_identity UNIQUE(object_identity), - FOREIGN KEY (parent_object) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - -CREATE TABLE acl_permission ( - id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY, - acl_object_identity INTEGER NOT NULL, - recipient VARCHAR(100) NOT NULL, - mask INTEGER NOT NULL, - CONSTRAINT unique_recipient UNIQUE(acl_object_identity, recipient), - FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); - ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'rod', 2); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (3, 'scott', 14); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (6, 'scott', 1); diff --git a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql b/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql deleted file mode 100644 index 1ff164db5b..0000000000 --- a/core/src/main/resources/org/springframework/security/acl/basic/jdbc/acegi-acl-postgres.sql +++ /dev/null @@ -1,34 +0,0 @@ -CREATE SEQUENCE acl_object_identity_seq; - -CREATE TABLE acl_object_identity ( - id INTEGER NOT NULL DEFAULT nextval('acl_object_identity_seq') CONSTRAINT acl_object_identity_PK PRIMARY KEY, - object_identity VARCHAR(250) NOT NULL, - parent_object INTEGER, - acl_class VARCHAR(250) NOT NULL, - CONSTRAINT unique_object_identity UNIQUE(object_identity), - FOREIGN KEY (parent_object) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - -CREATE SEQUENCE acl_permission_seq; - -CREATE TABLE acl_permission ( - id INTEGER NOT NULL DEFAULT nextval('acl_permission_seq') CONSTRAINT acl_permission_PK PRIMARY KEY, - acl_object_identity INTEGER NOT NULL, - recipient VARCHAR(100) NOT NULL, - mask INTEGER NOT NULL, - CONSTRAINT unique_recipient UNIQUE(acl_object_identity, recipient), - FOREIGN KEY (acl_object_identity) REFERENCES acl_object_identity(id) ON DELETE CASCADE -); - ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); ---INSERT INTO acl_object_identity (object_identity, parent_object, acl_class) VALUES ('org.mydomain.MyClass:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry'); - ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (1, 'ROLE_ADMIN', 1); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'ROLE_ADMIN', 0); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (2, 'rod', 2); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (3, 'scott', 14); ---INSERT INTO acl_permission (acl_object_identity, recipient, mask) VALUES (6, 'scott', 1);