You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/10/18 02:50:11 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf JetspeedSecurity.properties Torque.properties
taylor 2002/10/17 17:50:11
Modified: build/torque build.properties dbpsml.properties
build/torque/schema dbpsml-schema.xml security-schema.xml
turbine-schema.xml
src/sql/external populate-mysql.sql populate-oracle.sql
turbine-mysql.sql turbine-oracle.sql
webapp/WEB-INF/conf JetspeedSecurity.properties
Torque.properties
Log:
- tested Oracle support with Torque latest version
- updated Oracle scripts
- tested unit tests against Oracle
Revision Changes Path
1.8 +2 -2 jakarta-jetspeed/build/torque/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties 17 Oct 2002 21:11:00 -0000 1.7
+++ build.properties 18 Oct 2002 00:50:10 -0000 1.8
@@ -46,8 +46,8 @@
# -------------------------------------------------------------------
torque.database=hypersonic
-#torque.database=mysql
-#database=oracle
+### torque.database=mysql
+### database=oracle
# -------------------------------------------------------------------
#
1.6 +2 -2 jakarta-jetspeed/build/torque/dbpsml.properties
Index: dbpsml.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/dbpsml.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbpsml.properties 17 Oct 2002 21:11:00 -0000 1.5
+++ dbpsml.properties 18 Oct 2002 00:50:10 -0000 1.6
@@ -46,8 +46,8 @@
# -------------------------------------------------------------------
torque.database=hypersonic
-#torque.database=mysql
-#database=oracle
+### torque.database=mysql
+### torque.database=oracle
# -------------------------------------------------------------------
#
1.5 +7 -7 jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml
Index: dbpsml-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbpsml-schema.xml 28 Jun 2002 05:37:28 -0000 1.4
+++ dbpsml-schema.xml 18 Oct 2002 00:50:10 -0000 1.5
@@ -18,7 +18,7 @@
<database>
- <table name="JETSPEED_USER_PROFILE" idMethod="idbroker" >
+ <table name="JETSPEED_USER_PROFILE" idMethod="native" >
<column name="PSML_ID" required="true" primaryKey="true"
autoIncrement="true" type="INTEGER"/>
@@ -27,7 +27,7 @@
<column name="LANGUAGE" size="2" type="VARCHAR"/>
<column name="COUNTRY" size="2" type="VARCHAR"/>
<column name="PAGE" size="99" type="VARCHAR"/>
- <column name="PROFILE" type="VARBINARY"/>
+ <column name="PROFILE" type="BINARY"/>
<unique name="JETSPEED_USER_PROFILE_UNIQUE">
<unique-column name="USER_NAME" />
@@ -39,7 +39,7 @@
</table>
- <table name="JETSPEED_GROUP_PROFILE" idMethod="idbroker" >
+ <table name="JETSPEED_GROUP_PROFILE" idMethod="native" >
<column name="PSML_ID" required="true" primaryKey="true"
autoIncrement="true" type="INTEGER"/>
@@ -48,7 +48,7 @@
<column name="LANGUAGE" size="2" type="VARCHAR"/>
<column name="COUNTRY" size="2" type="VARCHAR"/>
<column name="PAGE" size="99" type="VARCHAR"/>
- <column name="PROFILE" type="VARBINARY"/>
+ <column name="PROFILE" type="BINARY"/>
<unique name="JETSPEED_GROUP_PROFILE_UNIQUE">
<unique-column name="GROUP_NAME" />
@@ -60,7 +60,7 @@
</table>
- <table name="JETSPEED_ROLE_PROFILE" idMethod="idbroker" >
+ <table name="JETSPEED_ROLE_PROFILE" idMethod="native" >
<column name="PSML_ID" required="true" primaryKey="true"
autoIncrement="true" type="INTEGER"/>
@@ -69,7 +69,7 @@
<column name="LANGUAGE" size="2" type="VARCHAR"/>
<column name="COUNTRY" size="2" type="VARCHAR"/>
<column name="PAGE" size="99" type="VARCHAR"/>
- <column name="PROFILE" type="VARBINARY"/>
+ <column name="PROFILE" type="BINARY"/>
<unique name="JETSPEED_ROLE_PROFILE_UNIQUE">
<unique-column name="ROLE_NAME" />
1.4 +11 -11 jakarta-jetspeed/build/torque/schema/security-schema.xml
Index: security-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/security-schema.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- security-schema.xml 13 Sep 2002 18:44:05 -0000 1.3
+++ security-schema.xml 18 Oct 2002 00:50:10 -0000 1.4
@@ -18,7 +18,7 @@
<database>
- <table name="TURBINE_USER" idMethod="idbroker">
+ <table name="TURBINE_USER" idMethod="native">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="LOGIN_NAME" required="true" size="32" type="VARCHAR"/>
<column name="PASSWORD_VALUE" required="true" size="32" type="VARCHAR"/>
@@ -30,7 +30,7 @@
<column name="CREATED" type="TIMESTAMP"/>
<column name="LAST_LOGIN" type="TIMESTAMP"/>
<column name="DISABLED" size="1" type="CHAR"/>
- <column name="OBJECTDATA" type="VARBINARY"/>
+ <column name="OBJECTDATA" type="BINARY"/>
<column name="PASSWORD_CHANGED" type="TIMESTAMP"/>
<unique>
@@ -39,10 +39,10 @@
</table>
- <table name="TURBINE_ROLE" idMethod="idbroker" >
+ <table name="TURBINE_ROLE" idMethod="native" >
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="ROLE_NAME" required="true" size="99" type="VARCHAR"/>
- <column name="OBJECTDATA" type="VARBINARY"/>
+ <column name="OBJECTDATA" type="BINARY"/>
<unique>
<unique-column name="ROLE_NAME"/>
@@ -50,10 +50,10 @@
</table>
- <table name="TURBINE_GROUP" idMethod="idbroker" >
+ <table name="TURBINE_GROUP" idMethod="native" >
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="99"/>
- <column name="OBJECTDATA" type="VARBINARY"/>
+ <column name="OBJECTDATA" type="BINARY"/>
<unique>
<unique-column name="GROUP_NAME"/>
@@ -61,10 +61,10 @@
</table>
- <table name="TURBINE_PERMISSION" idMethod="idbroker" >
+ <table name="TURBINE_PERMISSION" idMethod="native" >
<column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="PERMISSION_NAME" required="true" size="99" type="VARCHAR"/>
- <column name="OBJECTDATA" type="VARBINARY"/>
+ <column name="OBJECTDATA" type="BINARY"/>
<unique>
<unique-column name="PERMISSION_NAME"/>
@@ -72,7 +72,7 @@
</table>
- <table name="TURBINE_ROLE_PERMISSION" idMethod="idbroker">
+ <table name="TURBINE_ROLE_PERMISSION" idMethod="none">
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
@@ -85,7 +85,7 @@
</foreign-key>
</table>
- <table name="TURBINE_USER_GROUP_ROLE" idMethod="idbroker">
+ <table name="TURBINE_USER_GROUP_ROLE" idMethod="none">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
1.5 +3 -3 jakarta-jetspeed/build/torque/schema/turbine-schema.xml
Index: turbine-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/turbine-schema.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- turbine-schema.xml 17 Oct 2002 21:11:00 -0000 1.4
+++ turbine-schema.xml 18 Oct 2002 00:50:10 -0000 1.5
@@ -18,7 +18,7 @@
<database>
- <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker">
+ <table name="TURBINE_SCHEDULED_JOB" idMethod="native">
<column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="SECOND" default="-1" required="true" type="INTEGER"/>
<column name="MINUTE" default="-1" required="true" type="INTEGER"/>
@@ -27,7 +27,7 @@
<column name="DAY_OF_MONTH" default="-1" required="true" type="INTEGER"/>
<column name="TASK" required="true" size="99" type="VARCHAR"/>
<column name="EMAIL" size="99" type="VARCHAR"/>
- <column name="PROPERTY" type="VARBINARY"/>
+ <column name="PROPERTY" type="BINARY"/>
</table>
<table name="ID_TABLE" idMethod="idbroker">
1.11 +0 -12 jakarta-jetspeed/src/sql/external/populate-mysql.sql
Index: populate-mysql.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/populate-mysql.sql,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- populate-mysql.sql 17 Oct 2002 21:11:01 -0000 1.10
+++ populate-mysql.sql 18 Oct 2002 00:50:11 -0000 1.11
@@ -33,18 +33,6 @@
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(1,1,1);
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(1,1,2);
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(3,1,3);
-INSERT INTO ID_TABLE VALUES(1,'TURBINE_PERMISSION',100,10);
-INSERT INTO ID_TABLE VALUES(2,'TURBINE_ROLE',120,10);
-INSERT INTO ID_TABLE VALUES(3,'TURBINE_GROUP',100,10);
-INSERT INTO ID_TABLE VALUES(4,'TURBINE_USER',120,10);
-INSERT INTO ID_TABLE VALUES(5,'TURBINE_SCHEDULED_JOB',100,10);
-INSERT INTO ID_TABLE VALUES(6,'TURBINE_ROLE_PERMISSION',100,10);
-INSERT INTO ID_TABLE VALUES(7,'TURBINE_USER_GROUP_ROLE',100,10);
-INSERT INTO ID_TABLE VALUES(8,'JETSPEED_USER_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(9,'JETSPEED_GROUP_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(10,'JETSPEED_ROLE_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(11,'JETSPEED_ANON_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(12,'COFFEES',100,10);
INSERT INTO COFFEES VALUES('ColombianGrade',5,7.99,1,2);
INSERT INTO COFFEES VALUES('KonaGrade',6,7.99,1,2);
INSERT INTO COFFEES VALUES('FrenchRoastGrade',7,7.99,1,2);
1.7 +82 -46 jakarta-jetspeed/src/sql/external/populate-oracle.sql
Index: populate-oracle.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/populate-oracle.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- populate-oracle.sql 3 Jul 2002 17:10:20 -0000 1.6
+++ populate-oracle.sql 18 Oct 2002 00:50:11 -0000 1.7
@@ -1,48 +1,84 @@
-INSERT INTO TURBINE_PERMISSION VALUES(1,'view',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(2,'customize',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(3,'maximize',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(4,'minimize',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(5,'personalize',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(6,'info',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(7,'close',NULL);
-INSERT INTO TURBINE_PERMISSION VALUES(8,'detach',NULL);
-INSERT INTO TURBINE_ROLE VALUES(1,'user',NULL);
-INSERT INTO TURBINE_ROLE VALUES(2,'admin',NULL);
-INSERT INTO TURBINE_ROLE VALUES(3,'guest',NULL);
-INSERT INTO TURBINE_GROUP VALUES(1,'Jetspeed',NULL);
-INSERT INTO TURBINE_GROUP VALUES(2,'apache',NULL);
-INSERT INTO TURBINE_USER VALUES(0,'turbine','turbine','David','Turbine','taylor@apache.org','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000007478');
-INSERT INTO TURBINE_USER VALUES(1,'admin','jetspeed','Raphael','Admin','raphael@apache.org','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a778');
-INSERT INTO TURBINE_USER VALUES(2,'anon','anon','Anonymous','User','david@bluesunrise.com','CONFIRMED',NULL,NULL,SYSDATE,'F',NULL);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,1);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,2);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,3);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,4);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,5);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,6);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,1);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,2);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,3);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,4);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,5);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,6);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(2,7);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(3,1);
-INSERT INTO TURBINE_ROLE_PERMISSION VALUES(3,6);
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(0,1,1);
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(1,1,1);
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(1,1,2);
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(2,1,3);
-INSERT INTO ID_TABLE VALUES(1,'TURBINE_PERMISSION',100,10);
-INSERT INTO ID_TABLE VALUES(2,'TURBINE_ROLE',120,10);
-INSERT INTO ID_TABLE VALUES(3,'TURBINE_GROUP',100,10);
-INSERT INTO ID_TABLE VALUES(4,'TURBINE_USER',120,10);
-INSERT INTO ID_TABLE VALUES(5,'TURBINE_SCHEDULED_JOB',100,10);
-INSERT INTO ID_TABLE VALUES(6,'TURBINE_ROLE_PERMISSION',100,10);
-INSERT INTO ID_TABLE VALUES(7,'TURBINE_USER_GROUP_ROLE',100,10);
-INSERT INTO ID_TABLE VALUES(8,'JETSPEED_USER_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(9,'JETSPEED_GROUP_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(10,'JETSPEED_ROLE_PROFILE',120,10);
-INSERT INTO ID_TABLE VALUES(11,'JETSPEED_ANON_PROFILE',120,10);
+CREATE or REPLACE FUNCTION getPermissionId(p_name in varchar2)
+ return integer
+ is
+ l_id integer;
+begin
+ select PERMISSION_ID into l_id from TURBINE_PERMISSION where PERMISSION_NAME = p_name;
+ return (l_id);
+end;
+/
+CREATE or REPLACE FUNCTION getRoleId(p_name in varchar2)
+ return integer
+ is
+ l_id integer;
+begin
+ select ROLE_ID into l_id from TURBINE_ROLE where ROLE_NAME = p_name;
+ return (l_id);
+end;
+/
+CREATE or REPLACE FUNCTION getGroupId(p_name in varchar2)
+ return integer
+ is
+ l_id integer;
+begin
+ select GROUP_ID into l_id from TURBINE_GROUP where GROUP_NAME = p_name;
+ return (l_id);
+end;
+/
+CREATE or REPLACE FUNCTION getUserId(p_name in varchar2)
+ return integer
+ is
+ l_id integer;
+begin
+ select USER_ID into l_id from TURBINE_USER where LOGIN_NAME = p_name;
+ return (l_id);
+end;
+/
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'view',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'customize',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'maximize',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'minimize',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'personalize',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'info',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'close',NULL);
+INSERT INTO TURBINE_PERMISSION VALUES(turbine_permission_seq.nextval,'detach',NULL);
+INSERT INTO TURBINE_ROLE VALUES(turbine_role_seq.nextval,'user',NULL);
+INSERT INTO TURBINE_ROLE VALUES(turbine_role_seq.nextval,'admin',NULL);
+INSERT INTO TURBINE_ROLE VALUES(turbine_role_seq.nextval,'guest',NULL);
+INSERT INTO TURBINE_GROUP VALUES(turbine_group_seq.nextval,'Jetspeed',NULL);
+INSERT INTO TURBINE_GROUP VALUES(turbine_group_seq.nextval,'apache',NULL);
+INSERT INTO TURBINE_USER VALUES(turbine_user_seq.nextval,'admin','jetspeed','Jetspeed','Admin','admin@jakarta-jetspeed.com','CONFIRMED',NULL,NULL,SYSDATE,'F',NULL, NULL);
+INSERT INTO TURBINE_USER VALUES(turbine_user_seq.nextval,'turbine','turbine','Tommy','Turbine','tommy@jakarta-jetspeed.com','CONFIRMED',NULL,NULL,SYSDATE,'F',NULL, NULL);
+INSERT INTO TURBINE_USER VALUES(turbine_user_seq.nextval,'anon','anon','Anonymous','User','anon@jakarta-jetspeed.com','CONFIRMED',NULL,NULL,SYSDATE,'F',NULL, NULL);
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('user'),getPermissionId('view'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('user'),getPermissionId('customize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('user'),getPermissionId('maximize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('user'),getPermissionId('minimize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('user'),getPermissionId('personalize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('user'),getPermissionId('info'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('view'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('customize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('maximize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('minimize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('personalize'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('info'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('admin'),getPermissionId('close'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('guest'),getPermissionId('view'));
+INSERT INTO TURBINE_ROLE_PERMISSION VALUES(getRoleId('guest'),getPermissionId('info'));
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(getUserId('turbine'),getGroupId('Jetspeed'),getRoleId('user'));
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(getUserId('admin'),getGroupId('Jetspeed'),getRoleId('user'));
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(getUserId('admin'),getGroupId('Jetspeed'),getRoleId('admin'));
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(getUserId('anon'),getGroupId('Jetspeed'),getRoleId('guest'));
+INSERT INTO COFFEES VALUES('ColombianGrade',5,7.99,1,2);
+INSERT INTO COFFEES VALUES('KonaGrade',6,7.99,1,2);
+INSERT INTO COFFEES VALUES('FrenchRoastGrade',7,7.99,1,2);
+INSERT INTO COFFEES VALUES('HazelNutGrade',8,7.99,1,2);
+INSERT INTO COFFEES VALUES('VanillaGrade',9,7.99,1,2);
+INSERT INTO COFFEES VALUES('JavaGrade',10,7.99,1,2);
+INSERT INTO COFFEES VALUES('IndonesianGrade',11,7.99,1,2);
+INSERT INTO COFFEES VALUES('OotyGrade',1,7.99,1,2);
+INSERT INTO COFFEES VALUES('KenyanGrade',2,7.99,1,2);
+INSERT INTO COFFEES VALUES('JoeGrade',3,7.99,1,2);
+INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99,1,2);
1.7 +60 -92 jakarta-jetspeed/src/sql/external/turbine-mysql.sql
Index: turbine-mysql.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/turbine-mysql.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- turbine-mysql.sql 17 Oct 2002 21:11:01 -0000 1.6
+++ turbine-mysql.sql 18 Oct 2002 00:50:11 -0000 1.7
@@ -1,3 +1,4 @@
+
# -----------------------------------------------------------------------
# TURBINE_USER
# -----------------------------------------------------------------------
@@ -5,19 +6,19 @@
CREATE TABLE TURBINE_USER
(
- USER_ID INTEGER NOT NULL,
- LOGIN_NAME VARCHAR (32) NOT NULL,
- PASSWORD_VALUE VARCHAR (32) NOT NULL,
- FIRST_NAME VARCHAR (99) NOT NULL,
- LAST_NAME VARCHAR (99) NOT NULL,
- EMAIL VARCHAR (99),
- CONFIRM_VALUE VARCHAR (99),
- MODIFIED TIMESTAMP,
- CREATED TIMESTAMP,
- LAST_LOGIN TIMESTAMP,
- DISABLED CHAR (1),
- OBJECTDATA MEDIUMBLOB,
- PASSWORD_CHANGED TIMESTAMP,
+ USER_ID INTEGER NOT NULL AUTO_INCREMENT,
+ LOGIN_NAME VARCHAR (32) NOT NULL,
+ PASSWORD_VALUE VARCHAR (32) NOT NULL,
+ FIRST_NAME VARCHAR (99) NOT NULL,
+ LAST_NAME VARCHAR (99) NOT NULL,
+ EMAIL VARCHAR (99),
+ CONFIRM_VALUE VARCHAR (99),
+ MODIFIED TIMESTAMP,
+ CREATED TIMESTAMP,
+ LAST_LOGIN TIMESTAMP,
+ DISABLED CHAR (1),
+ OBJECTDATA BLOB,
+ PASSWORD_CHANGED TIMESTAMP,
PRIMARY KEY(USER_ID),
UNIQUE (LOGIN_NAME)
);
@@ -29,9 +30,9 @@
CREATE TABLE TURBINE_ROLE
(
- ROLE_ID INTEGER NOT NULL,
- ROLE_NAME VARCHAR (99) NOT NULL,
- OBJECTDATA MEDIUMBLOB,
+ ROLE_ID INTEGER NOT NULL AUTO_INCREMENT,
+ ROLE_NAME VARCHAR (99) NOT NULL,
+ OBJECTDATA BLOB,
PRIMARY KEY(ROLE_ID),
UNIQUE (ROLE_NAME)
);
@@ -43,9 +44,9 @@
CREATE TABLE TURBINE_GROUP
(
- GROUP_ID INTEGER NOT NULL,
- GROUP_NAME VARCHAR (99) NOT NULL,
- OBJECTDATA MEDIUMBLOB,
+ GROUP_ID INTEGER NOT NULL AUTO_INCREMENT,
+ GROUP_NAME VARCHAR (99) NOT NULL,
+ OBJECTDATA BLOB,
PRIMARY KEY(GROUP_ID),
UNIQUE (GROUP_NAME)
);
@@ -57,9 +58,9 @@
CREATE TABLE TURBINE_PERMISSION
(
- PERMISSION_ID INTEGER NOT NULL,
- PERMISSION_NAME VARCHAR (99) NOT NULL,
- OBJECTDATA MEDIUMBLOB,
+ PERMISSION_ID INTEGER NOT NULL AUTO_INCREMENT,
+ PERMISSION_NAME VARCHAR (99) NOT NULL,
+ OBJECTDATA BLOB,
PRIMARY KEY(PERMISSION_ID),
UNIQUE (PERMISSION_NAME)
);
@@ -93,55 +94,8 @@
FOREIGN KEY (GROUP_ID) REFERENCES TURBINE_GROUP (GROUP_ID),
FOREIGN KEY (ROLE_ID) REFERENCES TURBINE_ROLE (ROLE_ID)
);
-
-# -----------------------------------------------------------------------
-# TURBINE_SCHEDULED_JOB
-# -----------------------------------------------------------------------
-drop table if exists TURBINE_SCHEDULED_JOB;
-
-CREATE TABLE TURBINE_SCHEDULED_JOB
-(
- JOB_ID INTEGER NOT NULL,
- SECOND INTEGER default -1 NOT NULL,
- MINUTE INTEGER default -1 NOT NULL,
- HOUR INTEGER default -1 NOT NULL,
- WEEK_DAY INTEGER default -1 NOT NULL,
- DAY_OF_MONTH INTEGER default -1 NOT NULL,
- TASK VARCHAR (99) NOT NULL,
- EMAIL VARCHAR (99),
- PROPERTY MEDIUMBLOB,
- PRIMARY KEY(JOB_ID)
-);
-
-# -----------------------------------------------------------------------
-# ID_TABLE
-# -----------------------------------------------------------------------
-drop table if exists ID_TABLE;
-
-CREATE TABLE ID_TABLE
-(
- ID_TABLE_ID INTEGER NOT NULL AUTO_INCREMENT,
- TABLE_NAME VARCHAR (255) NOT NULL,
- NEXT_ID INTEGER,
- QUANTITY INTEGER,
- PRIMARY KEY(ID_TABLE_ID),
- UNIQUE (TABLE_NAME)
-);
-# -----------------------------------------------------------------------
-# COFFEES
-# -----------------------------------------------------------------------
-drop table if exists COFFEES;
-CREATE TABLE COFFEES
-(
- COF_NAME VARCHAR (50),
- SUP_ID INTEGER,
- PRICE FLOAT,
- SALES INTEGER,
- TOTAL INTEGER
-);
-
# -----------------------------------------------------------------------
# JETSPEED_USER_PROFILE
# -----------------------------------------------------------------------
@@ -149,13 +103,13 @@
CREATE TABLE JETSPEED_USER_PROFILE
(
- PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
- USER_NAME VARCHAR (32) NOT NULL,
- MEDIA_TYPE VARCHAR (99),
- LANGUAGE VARCHAR (2),
- COUNTRY VARCHAR (2),
- PAGE VARCHAR (99),
- PROFILE MEDIUMBLOB,
+ PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
+ USER_NAME VARCHAR (32) NOT NULL,
+ MEDIA_TYPE VARCHAR (99),
+ LANGUAGE VARCHAR (2),
+ COUNTRY VARCHAR (2),
+ PAGE VARCHAR (99),
+ PROFILE BLOB,
PRIMARY KEY(PSML_ID),
UNIQUE (USER_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
);
@@ -167,13 +121,13 @@
CREATE TABLE JETSPEED_GROUP_PROFILE
(
- PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
- GROUP_NAME VARCHAR (99) NOT NULL,
- MEDIA_TYPE VARCHAR (99),
- LANGUAGE VARCHAR (2),
- COUNTRY VARCHAR (2),
- PAGE VARCHAR (99),
- PROFILE MEDIUMBLOB,
+ PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
+ GROUP_NAME VARCHAR (99) NOT NULL,
+ MEDIA_TYPE VARCHAR (99),
+ LANGUAGE VARCHAR (2),
+ COUNTRY VARCHAR (2),
+ PAGE VARCHAR (99),
+ PROFILE BLOB,
PRIMARY KEY(PSML_ID),
UNIQUE (GROUP_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
);
@@ -185,18 +139,32 @@
CREATE TABLE JETSPEED_ROLE_PROFILE
(
- PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
- ROLE_NAME VARCHAR (99) NOT NULL,
- MEDIA_TYPE VARCHAR (99),
- LANGUAGE VARCHAR (2),
- COUNTRY VARCHAR (2),
- PAGE VARCHAR (99),
- PROFILE MEDIUMBLOB,
+ PSML_ID INTEGER NOT NULL AUTO_INCREMENT,
+ ROLE_NAME VARCHAR (99) NOT NULL,
+ MEDIA_TYPE VARCHAR (99),
+ LANGUAGE VARCHAR (2),
+ COUNTRY VARCHAR (2),
+ PAGE VARCHAR (99),
+ PROFILE BLOB,
PRIMARY KEY(PSML_ID),
UNIQUE (ROLE_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
);
-
-
+
+
+# -----------------------------------------------------------------------
+# COFFEES
+# -----------------------------------------------------------------------
+drop table if exists COFFEES;
+
+CREATE TABLE COFFEES
+(
+ COF_NAME VARCHAR (50),
+ SUP_ID INTEGER,
+ PRICE FLOAT,
+ SALES INTEGER,
+ TOTAL INTEGER
+);
+
1.7 +174 -111 jakarta-jetspeed/src/sql/external/turbine-oracle.sql
Index: turbine-oracle.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/sql/external/turbine-oracle.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- turbine-oracle.sql 25 Feb 2002 04:15:43 -0000 1.6
+++ turbine-oracle.sql 18 Oct 2002 00:50:11 -0000 1.7
@@ -1,207 +1,270 @@
-
+
-----------------------------------------------------------------------------
--- TURBINE_PERMISSION
+-- TURBINE_USER
-----------------------------------------------------------------------------
-drop table TURBINE_PERMISSION cascade constraints;
-drop sequence TURBINE_PERMISSION_SEQ;
+DROP TABLE TURBINE_USER CASCADE CONSTRAINTS;
+DROP SEQUENCE TURBINE_USER_SEQ;
-CREATE TABLE TURBINE_PERMISSION
+CREATE TABLE TURBINE_USER
(
- PERMISSION_ID INT NOT NULL,
- PERMISSION_NAME VARCHAR2 (99) NOT NULL,
+ USER_ID NUMBER NOT NULL,
+ LOGIN_NAME VARCHAR2 (32) NOT NULL,
+ PASSWORD_VALUE VARCHAR2 (32) NOT NULL,
+ FIRST_NAME VARCHAR2 (99) NOT NULL,
+ LAST_NAME VARCHAR2 (99) NOT NULL,
+ EMAIL VARCHAR2 (99),
+ CONFIRM_VALUE VARCHAR2 (99),
+ MODIFIED DATE,
+ CREATED DATE,
+ LAST_LOGIN DATE,
+ DISABLED CHAR (1),
OBJECTDATA LONG RAW,
- UNIQUE (PERMISSION_NAME)
+ PASSWORD_CHANGED DATE,
+ CONSTRAINT TURBINE_USER_U_1 UNIQUE (LOGIN_NAME)
);
-ALTER TABLE TURBINE_PERMISSION
- ADD CONSTRAINT TURBINE_PERMISSION_PK
-PRIMARY KEY (PERMISSION_ID);
-
+ALTER TABLE TURBINE_USER
+ ADD CONSTRAINT TURBINE_USER_PK
+PRIMARY KEY (USER_ID);
-CREATE SEQUENCE TURBINE_PERMISSION_SEQ;
+CREATE SEQUENCE TURBINE_USER_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-
-----------------------------------------------------------------------------
-- TURBINE_ROLE
-----------------------------------------------------------------------------
-drop table TURBINE_ROLE cascade constraints;
-drop sequence TURBINE_ROLE_SEQ;
+DROP TABLE TURBINE_ROLE CASCADE CONSTRAINTS;
+DROP SEQUENCE TURBINE_ROLE_SEQ;
CREATE TABLE TURBINE_ROLE
(
- ROLE_ID INT NOT NULL,
+ ROLE_ID NUMBER NOT NULL,
ROLE_NAME VARCHAR2 (99) NOT NULL,
OBJECTDATA LONG RAW,
- UNIQUE (ROLE_NAME)
+ CONSTRAINT TURBINE_ROLE_U_1 UNIQUE (ROLE_NAME)
);
ALTER TABLE TURBINE_ROLE
- ADD CONSTRAINT TURBINE_ROLE_PK
+ ADD CONSTRAINT TURBINE_ROLE_PK
PRIMARY KEY (ROLE_ID);
+CREATE SEQUENCE TURBINE_ROLE_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-CREATE SEQUENCE TURBINE_ROLE_SEQ;
-
-
-----------------------------------------------------------------------------
-- TURBINE_GROUP
-----------------------------------------------------------------------------
-drop table TURBINE_GROUP cascade constraints;
-drop sequence TURBINE_GROUP_SEQ;
+DROP TABLE TURBINE_GROUP CASCADE CONSTRAINTS;
+DROP SEQUENCE TURBINE_GROUP_SEQ;
CREATE TABLE TURBINE_GROUP
(
- GROUP_ID INT NOT NULL,
+ GROUP_ID NUMBER NOT NULL,
GROUP_NAME VARCHAR2 (99) NOT NULL,
OBJECTDATA LONG RAW,
- UNIQUE (GROUP_NAME)
+ CONSTRAINT TURBINE_GROUP_U_1 UNIQUE (GROUP_NAME)
);
ALTER TABLE TURBINE_GROUP
- ADD CONSTRAINT TURBINE_GROUP_PK
+ ADD CONSTRAINT TURBINE_GROUP_PK
PRIMARY KEY (GROUP_ID);
+CREATE SEQUENCE TURBINE_GROUP_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-CREATE SEQUENCE TURBINE_GROUP_SEQ;
-
-
-----------------------------------------------------------------------------
--- TURBINE_ROLE_PERMISSION
+-- TURBINE_PERMISSION
-----------------------------------------------------------------------------
-drop table TURBINE_ROLE_PERMISSION cascade constraints;
+DROP TABLE TURBINE_PERMISSION CASCADE CONSTRAINTS;
+DROP SEQUENCE TURBINE_PERMISSION_SEQ;
-CREATE TABLE TURBINE_ROLE_PERMISSION
+CREATE TABLE TURBINE_PERMISSION
(
- ROLE_ID INT NOT NULL,
- PERMISSION_ID INT NOT NULL
+ PERMISSION_ID NUMBER NOT NULL,
+ PERMISSION_NAME VARCHAR2 (99) NOT NULL,
+ OBJECTDATA LONG RAW,
+ CONSTRAINT TURBINE_PERMISSION_U_1 UNIQUE (PERMISSION_NAME)
);
-ALTER TABLE TURBINE_ROLE_PERMISSION
- ADD CONSTRAINT TURBINE_ROLE_PERMISSION_PK
-PRIMARY KEY (ROLE_ID,PERMISSION_ID);
-
-ALTER TABLE TURBINE_ROLE_PERMISSION
- ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_1 FOREIGN KEY (ROLE_ID)
- REFERENCES TURBINE_ROLE (ROLE_ID);
-
-
-ALTER TABLE TURBINE_ROLE_PERMISSION
- ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_2 FOREIGN KEY (PERMISSION_ID)
- REFERENCES TURBINE_PERMISSION (PERMISSION_ID);
-
-
+ALTER TABLE TURBINE_PERMISSION
+ ADD CONSTRAINT TURBINE_PERMISSION_PK
+PRIMARY KEY (PERMISSION_ID);
--- CREATE INDEX ROLE_PERMISSION_INDEX ON TURBINE_ROLE_PERMISSION (ROLE_ID, PERMISSION_ID);
+CREATE SEQUENCE TURBINE_PERMISSION_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-
-----------------------------------------------------------------------------
--- TURBINE_USER
+-- TURBINE_ROLE_PERMISSION
-----------------------------------------------------------------------------
-drop table TURBINE_USER cascade constraints;
-drop sequence TURBINE_USER_SEQ;
+DROP TABLE TURBINE_ROLE_PERMISSION CASCADE CONSTRAINTS;
+DROP SEQUENCE TURBINE_ROLE_PERMISSION_SEQ;
-CREATE TABLE TURBINE_USER
+CREATE TABLE TURBINE_ROLE_PERMISSION
(
- USER_ID INT NOT NULL,
- LOGIN_NAME VARCHAR2 (32) NOT NULL,
- PASSWORD_VALUE VARCHAR2 (32) NOT NULL,
- FIRST_NAME VARCHAR2 (99) NOT NULL,
- LAST_NAME VARCHAR2 (99) NOT NULL,
- EMAIL VARCHAR2 (99),
- CONFIRM_VALUE VARCHAR2 (99),
- MODIFIED DATE,
- CREATED DATE,
- LAST_LOGIN DATE,
- DISABLED CHAR(1),
- OBJECTDATA LONG RAW,
- UNIQUE (LOGIN_NAME)
+ ROLE_ID NUMBER NOT NULL,
+ PERMISSION_ID NUMBER NOT NULL
);
-ALTER TABLE TURBINE_USER
- ADD CONSTRAINT TURBINE_USER_PK
-PRIMARY KEY (USER_ID);
-
+ALTER TABLE TURBINE_ROLE_PERMISSION
+ ADD CONSTRAINT TURBINE_ROLE_PERMISSION_PK
+PRIMARY KEY (ROLE_ID,PERMISSION_ID);
-CREATE SEQUENCE TURBINE_USER_SEQ;
+CREATE SEQUENCE TURBINE_ROLE_PERMISSION_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-
-----------------------------------------------------------------------------
-- TURBINE_USER_GROUP_ROLE
-----------------------------------------------------------------------------
-drop table TURBINE_USER_GROUP_ROLE cascade constraints;
+DROP TABLE TURBINE_USER_GROUP_ROLE CASCADE CONSTRAINTS;
+DROP SEQUENCE TURBINE_USER_GROUP_ROLE_SEQ;
CREATE TABLE TURBINE_USER_GROUP_ROLE
(
- USER_ID INT NOT NULL,
- GROUP_ID INT NOT NULL,
- ROLE_ID INT NOT NULL
+ USER_ID NUMBER NOT NULL,
+ GROUP_ID NUMBER NOT NULL,
+ ROLE_ID NUMBER NOT NULL
);
ALTER TABLE TURBINE_USER_GROUP_ROLE
- ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_PK
+ ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_PK
PRIMARY KEY (USER_ID,GROUP_ID,ROLE_ID);
+
+CREATE SEQUENCE TURBINE_USER_GROUP_ROLE_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
+
+
+
+
+
+
+
+
+ALTER TABLE TURBINE_ROLE_PERMISSION
+ ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_1 FOREIGN KEY (ROLE_ID)
+ REFERENCES TURBINE_ROLE (ROLE_ID)
+ON DELETE CASCADE
+;
+
+ALTER TABLE TURBINE_ROLE_PERMISSION
+ ADD CONSTRAINT TURBINE_ROLE_PERMISSION_FK_2 FOREIGN KEY (PERMISSION_ID)
+ REFERENCES TURBINE_PERMISSION (PERMISSION_ID)
+ON DELETE CASCADE
+;
+
+
+
ALTER TABLE TURBINE_USER_GROUP_ROLE
ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_1 FOREIGN KEY (USER_ID)
- REFERENCES TURBINE_USER (USER_ID);
+ REFERENCES TURBINE_USER (USER_ID)
+ON DELETE CASCADE
+;
ALTER TABLE TURBINE_USER_GROUP_ROLE
ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_2 FOREIGN KEY (GROUP_ID)
- REFERENCES TURBINE_GROUP (GROUP_ID);
+ REFERENCES TURBINE_GROUP (GROUP_ID)
+ON DELETE CASCADE
+;
ALTER TABLE TURBINE_USER_GROUP_ROLE
ADD CONSTRAINT TURBINE_USER_GROUP_ROLE_FK_3 FOREIGN KEY (ROLE_ID)
- REFERENCES TURBINE_ROLE (ROLE_ID);
+ REFERENCES TURBINE_ROLE (ROLE_ID)
+ON DELETE CASCADE
+;
--- CREATE UNIQUE INDEX USER_GROUP_ROLE_INDEX ON TURBINE_USER_GROUP_ROLE (USER_ID, GROUP_ID, ROLE_ID);
+-----------------------------------------------------------------------------
+-- JETSPEED_USER_PROFILE
+-----------------------------------------------------------------------------
+DROP TABLE JETSPEED_USER_PROFILE CASCADE CONSTRAINTS;
+DROP SEQUENCE JETSPEED_USER_PROFILE_SEQ;
+
+CREATE TABLE JETSPEED_USER_PROFILE
+(
+ PSML_ID NUMBER NOT NULL,
+ USER_NAME VARCHAR2 (32) NOT NULL,
+ MEDIA_TYPE VARCHAR2 (99),
+ LANGUAGE VARCHAR2 (2),
+ COUNTRY VARCHAR2 (2),
+ PAGE VARCHAR2 (99),
+ PROFILE LONG RAW,
+ CONSTRAINT JETSPEED_USER_PROFILE_UNIQUE UNIQUE (USER_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
+);
+
+ALTER TABLE JETSPEED_USER_PROFILE
+ ADD CONSTRAINT JETSPEED_USER_PROFILE_PK
+PRIMARY KEY (PSML_ID);
+
+
+CREATE SEQUENCE JETSPEED_USER_PROFILE_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-
-----------------------------------------------------------------------------
--- TURBINE_SCHEDULED_JOB
+-- JETSPEED_GROUP_PROFILE
-----------------------------------------------------------------------------
-drop table TURBINE_SCHEDULED_JOB cascade constraints;
+DROP TABLE JETSPEED_GROUP_PROFILE CASCADE CONSTRAINTS;
+DROP SEQUENCE JETSPEED_GROUP_PROFILE_SEQ;
-CREATE TABLE TURBINE_SCHEDULED_JOB
+CREATE TABLE JETSPEED_GROUP_PROFILE
(
- JOB_ID INT NOT NULL,
- SECOND INT default -1 NOT NULL,
- MINUTE INT default -1 NOT NULL,
- HOUR INT default -1 NOT NULL,
- WEEK_DAY INT default -1 NOT NULL,
- DAY_OF_MONTH INT default -1 NOT NULL,
- TASK VARCHAR2 (99) NOT NULL,
- EMAIL VARCHAR2 (99),
- PROPERTY LONG RAW
+ PSML_ID NUMBER NOT NULL,
+ GROUP_NAME VARCHAR2 (99) NOT NULL,
+ MEDIA_TYPE VARCHAR2 (99),
+ LANGUAGE VARCHAR2 (2),
+ COUNTRY VARCHAR2 (2),
+ PAGE VARCHAR2 (99),
+ PROFILE LONG RAW,
+ CONSTRAINT JETSPEED_GROUP_PROFILE_UNIQUE UNIQUE (GROUP_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
);
-ALTER TABLE TURBINE_SCHEDULED_JOB
- ADD CONSTRAINT TURBINE_SCHEDULED_JOB_PK
-PRIMARY KEY (JOB_ID);
+ALTER TABLE JETSPEED_GROUP_PROFILE
+ ADD CONSTRAINT JETSPEED_GROUP_PROFILE_PK
+PRIMARY KEY (PSML_ID);
+
+
+CREATE SEQUENCE JETSPEED_GROUP_PROFILE_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-----------------------------------------------------------------------------
--- ID_TABLE
+-- JETSPEED_ROLE_PROFILE
-----------------------------------------------------------------------------
+DROP TABLE JETSPEED_ROLE_PROFILE CASCADE CONSTRAINTS;
+DROP SEQUENCE JETSPEED_ROLE_PROFILE_SEQ;
-drop table ID_TABLE cascade constraints;
--- drop sequence ID_TABLE_SEQ;
+CREATE TABLE JETSPEED_ROLE_PROFILE
+(
+ PSML_ID NUMBER NOT NULL,
+ ROLE_NAME VARCHAR2 (99) NOT NULL,
+ MEDIA_TYPE VARCHAR2 (99),
+ LANGUAGE VARCHAR2 (2),
+ COUNTRY VARCHAR2 (2),
+ PAGE VARCHAR2 (99),
+ PROFILE LONG RAW,
+ CONSTRAINT JETSPEED_ROLE_PROFILE_UNIQUE UNIQUE (ROLE_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
+);
+
+ALTER TABLE JETSPEED_ROLE_PROFILE
+ ADD CONSTRAINT JETSPEED_ROLE_PROFILE_PK
+PRIMARY KEY (PSML_ID);
+
+
+CREATE SEQUENCE JETSPEED_ROLE_PROFILE_SEQ INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
+
+-----------------------------------------------------------------------------
+-- COFFEES
+-----------------------------------------------------------------------------
+DROP TABLE COFFEES CASCADE CONSTRAINTS;
-CREATE TABLE ID_TABLE
+CREATE TABLE COFFEES
(
- ID_TABLE_ID INT NOT NULL,
- TABLE_NAME VARCHAR2 (255) NOT NULL,
- NEXT_ID INT,
- QUANTITY INT,
- UNIQUE (TABLE_NAME)
+ COF_NAME VARCHAR2 (50),
+ SUP_ID NUMBER,
+ PRICE FLOAT,
+ SALES NUMBER,
+ TOTAL NUMBER
);
-ALTER TABLE ID_TABLE
- ADD CONSTRAINT ID_TABLE_PK
-PRIMARY KEY (ID_TABLE_ID);
+
+
+
+
+
1.33 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
1.4 +9 -4 jakarta-jetspeed/webapp/WEB-INF/conf/Torque.properties
Index: Torque.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Torque.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Torque.properties 17 Oct 2002 21:11:01 -0000 1.3
+++ Torque.properties 18 Oct 2002 00:50:11 -0000 1.4
@@ -44,7 +44,8 @@
torque.database.default=default
torque.database.default.adapter=hypersonic
-###torque.database.default.adapter=mysql
+### torque.database.default.adapter=mysql
+### torque.database.default.adapter=oracle
##
## Using torque's old pool
@@ -58,12 +59,16 @@
torque.dsfactory.default.pool.defaultMaxConnections=10
torque.dsfactory.default.pool.maxExpiryTime=3600
torque.dsfactory.default.pool.connectionWaitTimeout=10
-# MySQL
+### MySQL
### torque.dsfactory.default.connection.driver = org.gjt.mm.mysql.Driver
### torque.dsfactory.default.connection.url = jdbc:mysql://localhost:3306/jetspeed
### torque.dsfactory.default.connection.user = root
+### torque.dsfactory.default.connection.password =
+### Oracle
+### torque.dsfactory.default.connection.driver = oracle.jdbc.driver.OracleDriver
+### torque.dsfactory.default.connection.url = jdbc:oracle:thin:@server:1521:sid
+### torque.dsfactory.default.connection.user = jetspeed
### torque.dsfactory.default.connection.password = password
-
# The interval (in milliseconds) between which the PoolBrokerService logs
# the status of it's ConnectionPools.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>