Author: chathura Date: Sun Feb 10 21:57:06 2008 New Revision: 13544 Log:
Added user-role constraint to derby and mysql databases. Minor change in the userguide. Modified: branches/registry/1_0/modules/core/src/main/resources/database-scripts/derby-complete.sql branches/registry/1_0/modules/core/src/main/resources/database-scripts/mysql-complete.sql branches/registry/1_0/modules/documentation/xdocs/userguide.xml Modified: branches/registry/1_0/modules/core/src/main/resources/database-scripts/derby-complete.sql ============================================================================== --- branches/registry/1_0/modules/core/src/main/resources/database-scripts/derby-complete.sql (original) +++ branches/registry/1_0/modules/core/src/main/resources/database-scripts/derby-complete.sql Sun Feb 10 21:57:06 2008 @@ -83,4 +83,4 @@ CREATE TABLE UM_PERMISSIONS (ID VARCHAR(255), RESOURCE_ID VARCHAR(255) NOT NULL, ACTION VARCHAR(255) NOT NULL, PRIMARY KEY (ID)); CREATE TABLE UM_ROLE_PERMISSIONS (ID VARCHAR(255), PERMISSION_ID VARCHAR(255), ROLE_ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); CREATE TABLE UM_USER_PERMISSIONS (ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, PERMISSION_ID VARCHAR(255), USER_ID VARCHAR(255), FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); -CREATE TABLE UM_USER_ROLES (ID VARCHAR(255), ROLE_ID VARCHAR(255), USER_ID VARCHAR(255), FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); +CREATE TABLE UM_USER_ROLES (ID VARCHAR(255), ROLE_ID VARCHAR(255), USER_ID VARCHAR(255), UNIQUE (USER_ID, ROLE_ID), FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); Modified: branches/registry/1_0/modules/core/src/main/resources/database-scripts/mysql-complete.sql ============================================================================== --- branches/registry/1_0/modules/core/src/main/resources/database-scripts/mysql-complete.sql (original) +++ branches/registry/1_0/modules/core/src/main/resources/database-scripts/mysql-complete.sql Sun Feb 10 21:57:06 2008 @@ -82,4 +82,4 @@ CREATE TABLE UM_PERMISSIONS (ID VARCHAR(255), RESOURCE_ID VARCHAR(255) NOT NULL, ACTION VARCHAR(255) NOT NULL, PRIMARY KEY (ID)); CREATE TABLE UM_ROLE_PERMISSIONS (ID VARCHAR(255), PERMISSION_ID VARCHAR(255), ROLE_ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); CREATE TABLE UM_USER_PERMISSIONS (ID VARCHAR(255), IS_ALLOWED SMALLINT NOT NULL, PERMISSION_ID VARCHAR(255), USER_ID VARCHAR(255), FOREIGN KEY (PERMISSION_ID) REFERENCES UM_PERMISSIONS(ID) ON DELETE CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); -CREATE TABLE UM_USER_ROLES (ID VARCHAR(255), ROLE_ID VARCHAR(255), USER_ID VARCHAR(255), FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); +CREATE TABLE UM_USER_ROLES (ID VARCHAR(255), ROLE_ID VARCHAR(255), USER_ID VARCHAR(255), UNIQUE (USER_ID, ROLE_ID), FOREIGN KEY (ROLE_ID) REFERENCES UM_ROLES(ID) ON DELETE CASCADE, FOREIGN KEY (USER_ID) REFERENCES UM_USERS(ID) ON DELETE CASCADE, PRIMARY KEY (ID)); Modified: branches/registry/1_0/modules/documentation/xdocs/userguide.xml ============================================================================== --- branches/registry/1_0/modules/documentation/xdocs/userguide.xml (original) +++ branches/registry/1_0/modules/documentation/xdocs/userguide.xml Sun Feb 10 21:57:06 2008 @@ -87,7 +87,8 @@ <p></p> <p>Below are the steps for configuring WSO2 Registry with Apache Derby -database.</p> +database. Note that the following database commands are for linux platform. Please replace +file paths to match Windows, if you are using this in Windows platform.</p> <p></p> <ol> _______________________________________________ Registry-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
