taylor 2002/10/17 14:11:01
Modified: build/torque build.properties dbpsml.properties
build/torque/schema turbine-schema.xml
src/java/org/apache/jetspeed/services/security
TestUserManagement.java
src/sql/external populate-mysql.sql turbine-mysql.sql
webapp/WEB-INF/conf JetspeedSecurity.properties
Torque.properties
webapp/WEB-INF/db jetspeed.properties jetspeed.script
Log:
- tested MySQL support with Torque latest version
- updated MySQL scripts
- normalized all unit tests to run against all databases
NOTE: this meant changing the hypersonic db scripts so that: admin=1, turbine=2,
anon=3
- tested unit tests against MySQL
Revision Changes Path
1.7 +7 -10 jakarta-jetspeed/build/torque/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties 15 Oct 2002 17:35:31 -0000 1.6
+++ build.properties 17 Oct 2002 21:11:00 -0000 1.7
@@ -46,6 +46,8 @@
# -------------------------------------------------------------------
torque.database=hypersonic
+#torque.database=mysql
+#database=oracle
# -------------------------------------------------------------------
#
@@ -171,15 +173,10 @@
schemaDirectory=schema
torque.schemaDirectory=schema
-torque.schema.sql.includes = security-schema.xml
-torque.schema.create-db.includes = security-schema.xml
-torque.schema.init-sql.includes = security-schema.xml
-torque.schema.om.includes = security-schema.xml
-
-## if you need the ID table and COFFEES table:
-#torque.schema.sql.includes = security-schema.xml, turbine-schema.xml,
coffees-schema.xml
-#torque.schema.create-db.includes = security-schema.xml, turbine-schema.xml,
coffees-schema.xml
-#torque.schema.init-sql.includes = security-schema.xml, turbine-schema.xml,
coffees-schema.xml
-#torque.schema.om.includes = security-schema.xml, turbine-schema.xml,
coffees-schema.xml
+
+torque.schema.sql.includes = security-schema.xml, coffees-schema.xml
+torque.schema.create-db.includes = security-schema.xml, coffees-schema.xml
+torque.schema.init-sql.includes = security-schema.xml, coffees-schema.xml
+torque.schema.om.includes = security-schema.xml, coffees-schema.xml
1.5 +1 -0 jakarta-jetspeed/build/torque/dbpsml.properties
Index: dbpsml.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/dbpsml.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dbpsml.properties 15 Oct 2002 17:35:31 -0000 1.4
+++ dbpsml.properties 17 Oct 2002 21:11:00 -0000 1.5
@@ -46,6 +46,7 @@
# -------------------------------------------------------------------
torque.database=hypersonic
+#torque.database=mysql
#database=oracle
# -------------------------------------------------------------------
1.4 +5 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- turbine-schema.xml 28 Jun 2002 05:37:28 -0000 1.3
+++ turbine-schema.xml 17 Oct 2002 21:11:00 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!-- <!DOCTYPE database SYSTEM "http://java.apache.org/turbine/dtd/database.dtd";>
-->
+<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd";>
<!-- ==================================================================== -->
<!-- -->
@@ -16,7 +16,7 @@
<!-- @version $Id$ -->
<!-- ==================================================================== -->
-<database name="@DATABASE_DEFAULT@">
+<database>
<table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker">
<column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/>
@@ -30,8 +30,8 @@
<column name="PROPERTY" type="VARBINARY"/>
</table>
- <table name="ID_TABLE">
- <column name="ID_TABLE_ID" autoIncrement="true" required="true"
primaryKey="true" type="INTEGER"/>
+ <table name="ID_TABLE" idMethod="idbroker">
+ <column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="TABLE_NAME" required="true" size="255" type="VARCHAR"/>
<column name="NEXT_ID" type="INTEGER"/>
<column name="QUANTITY" type="INTEGER"/>
1.4 +6 -7
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestUserManagement.java
Index: TestUserManagement.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/TestUserManagement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestUserManagement.java 15 Oct 2002 17:35:33 -0000 1.3
+++ TestUserManagement.java 17 Oct 2002 21:11:01 -0000 1.4
@@ -132,7 +132,6 @@
UserManagement service = getService();
JetspeedUser user = null;
-
try
{
user = JetspeedUserManagement.getUser(new UserNamePrincipal("turbine"));
@@ -142,11 +141,11 @@
fail(StringUtils.stackTrace(e));
}
- assertTrue(user.getUserId().equals("0"));
+ assertTrue(user.getUserId().equals("2"));
assertTrue(user.getUserName().equals("turbine"));
assertTrue(user.getFirstName().equals("Tommy"));
assertTrue(user.getLastName().equals("Turbine"));
- assertTrue(user.getEmail().equals("[EMAIL PROTECTED]"));
+ assertTrue(user.getEmail().equals("[EMAIL PROTECTED]"));
assertTrue(user.getConfirmed().equals("CONFIRMED"));
assertTrue(user.getDisabled() == false);
subtestTemp(user);
@@ -186,7 +185,7 @@
//System.out.println("user name = " + user.getUserName());
if (user.getUserName().equals("turbine"))
{
- assertTrue(user.getUserId().equals("0"));
+ assertTrue(user.getUserId().equals("2"));
assertTrue(user.getLastName().equals("Turbine"));
}
if (user.getUserName().equals("admin"))
@@ -303,7 +302,7 @@
user.setPassword("woof");
user.setLastName("Taylor");
user.setFirstName("Busby");
- user.setEmail("[EMAIL PROTECTED]");
+ user.setEmail("[EMAIL PROTECTED]");
user.setDisabled(false);
user.setConfirmed("NO");
user.setPerm("dogfood", "alpo");
@@ -313,7 +312,7 @@
assertTrue(user2.getUserName().equals("busby"));
assertTrue(user2.getLastName().equals("Taylor"));
assertTrue(user2.getFirstName().equals("Busby"));
- assertTrue(user2.getEmail().equals("[EMAIL PROTECTED]"));
+ assertTrue(user2.getEmail().equals("[EMAIL PROTECTED]"));
assertTrue(user2.getConfirmed().equals("NO"));
String dogfood = (String)user2.getPerm("dogfood");
assertTrue(dogfood.equals("alpo"));
1.10 +15 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- populate-mysql.sql 28 Jun 2002 05:37:36 -0000 1.9
+++ populate-mysql.sql 17 Oct 2002 21:11:01 -0000 1.10
@@ -11,9 +11,9 @@
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(1,'admin','jetspeed','Raphael','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a778');
-INSERT INTO TURBINE_USER
VALUES(2,'turbine','turbine','David','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,NULL,'F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000037708000000050000000274000a4c4153545f4c4f47494e7372000e6a6176612e7574696c2e44617465686a81014b5974190300007870770800000000000000007874000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000007478');
-INSERT INTO TURBINE_USER
VALUES(3,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2001-11-11
18:45:41.671','F',NULL);
+INSERT INTO TURBINE_USER
VALUES(1,'admin','jetspeed','Jetspeed','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL, NULL);
+INSERT INTO TURBINE_USER
VALUES(2,'turbine','turbine','Tommy','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL, NULL);
+INSERT INTO TURBINE_USER
VALUES(3,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL, 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);
@@ -44,5 +44,16 @@
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);
+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.6 +152 -86 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- turbine-mysql.sql 25 Feb 2002 04:15:43 -0000 1.5
+++ turbine-mysql.sql 17 Oct 2002 21:11:01 -0000 1.6
@@ -1,138 +1,204 @@
-
---------------------------------------------------------------------------
--- TURBINE_PERMISSION
---------------------------------------------------------------------------
-drop table if exists TURBINE_PERMISSION;
+# -----------------------------------------------------------------------
+# TURBINE_USER
+# -----------------------------------------------------------------------
+drop table if exists TURBINE_USER;
-CREATE TABLE TURBINE_PERMISSION
+CREATE TABLE TURBINE_USER
(
- PERMISSION_ID INTEGER NOT NULL AUTO_INCREMENT,
- PERMISSION_NAME VARCHAR (99) NOT NULL,
- OBJECTDATA MEDIUMBLOB,
- PRIMARY KEY(PERMISSION_ID),
- UNIQUE (PERMISSION_NAME)
+ 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,
+ PRIMARY KEY(USER_ID),
+ UNIQUE (LOGIN_NAME)
);
-
---------------------------------------------------------------------------
--- TURBINE_ROLE
---------------------------------------------------------------------------
+# -----------------------------------------------------------------------
+# TURBINE_ROLE
+# -----------------------------------------------------------------------
drop table if exists TURBINE_ROLE;
CREATE TABLE TURBINE_ROLE
(
- ROLE_ID INTEGER NOT NULL AUTO_INCREMENT,
- ROLE_NAME VARCHAR (99) NOT NULL,
- OBJECTDATA MEDIUMBLOB,
+ ROLE_ID INTEGER NOT NULL,
+ ROLE_NAME VARCHAR (99) NOT NULL,
+ OBJECTDATA MEDIUMBLOB,
PRIMARY KEY(ROLE_ID),
UNIQUE (ROLE_NAME)
);
-
---------------------------------------------------------------------------
--- TURBINE_GROUP
---------------------------------------------------------------------------
+# -----------------------------------------------------------------------
+# TURBINE_GROUP
+# -----------------------------------------------------------------------
drop table if exists TURBINE_GROUP;
CREATE TABLE TURBINE_GROUP
(
- GROUP_ID INTEGER NOT NULL AUTO_INCREMENT,
- GROUP_NAME VARCHAR (99) NOT NULL,
- OBJECTDATA MEDIUMBLOB,
+ GROUP_ID INTEGER NOT NULL,
+ GROUP_NAME VARCHAR (99) NOT NULL,
+ OBJECTDATA MEDIUMBLOB,
PRIMARY KEY(GROUP_ID),
UNIQUE (GROUP_NAME)
);
-
---------------------------------------------------------------------------
--- TURBINE_ROLE_PERMISSION
---------------------------------------------------------------------------
+# -----------------------------------------------------------------------
+# TURBINE_PERMISSION
+# -----------------------------------------------------------------------
+drop table if exists TURBINE_PERMISSION;
+
+CREATE TABLE TURBINE_PERMISSION
+(
+ PERMISSION_ID INTEGER NOT NULL,
+ PERMISSION_NAME VARCHAR (99) NOT NULL,
+ OBJECTDATA MEDIUMBLOB,
+ PRIMARY KEY(PERMISSION_ID),
+ UNIQUE (PERMISSION_NAME)
+);
+
+# -----------------------------------------------------------------------
+# TURBINE_ROLE_PERMISSION
+# -----------------------------------------------------------------------
drop table if exists TURBINE_ROLE_PERMISSION;
CREATE TABLE TURBINE_ROLE_PERMISSION
(
- ROLE_ID INTEGER NOT NULL,
- PERMISSION_ID INTEGER NOT NULL,
+ ROLE_ID INTEGER NOT NULL,
+ PERMISSION_ID INTEGER NOT NULL,
PRIMARY KEY(ROLE_ID,PERMISSION_ID),
FOREIGN KEY (ROLE_ID) REFERENCES TURBINE_ROLE (ROLE_ID),
FOREIGN KEY (PERMISSION_ID) REFERENCES TURBINE_PERMISSION (PERMISSION_ID)
);
-
---------------------------------------------------------------------------
--- TURBINE_USER
---------------------------------------------------------------------------
-drop table if exists TURBINE_USER;
-
-CREATE TABLE TURBINE_USER
-(
- 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 VARCHAR(1),
- OBJECTDATA MEDIUMBLOB,
- PRIMARY KEY(USER_ID),
- UNIQUE (LOGIN_NAME)
-);
-
-
---------------------------------------------------------------------------
--- TURBINE_USER_GROUP_ROLE
---------------------------------------------------------------------------
+# -----------------------------------------------------------------------
+# TURBINE_USER_GROUP_ROLE
+# -----------------------------------------------------------------------
drop table if exists TURBINE_USER_GROUP_ROLE;
CREATE TABLE TURBINE_USER_GROUP_ROLE
(
- USER_ID INTEGER NOT NULL,
- GROUP_ID INTEGER NOT NULL,
- ROLE_ID INTEGER NOT NULL,
+ USER_ID INTEGER NOT NULL,
+ GROUP_ID INTEGER NOT NULL,
+ ROLE_ID INTEGER NOT NULL,
PRIMARY KEY(USER_ID,GROUP_ID,ROLE_ID),
FOREIGN KEY (USER_ID) REFERENCES TURBINE_USER (USER_ID),
FOREIGN KEY (GROUP_ID) REFERENCES TURBINE_GROUP (GROUP_ID),
- FOREIGN KEY (ROLE_ID) REFERENCES TURBINE_USER_ROLE (ROLE_ID)
+ FOREIGN KEY (ROLE_ID) REFERENCES TURBINE_ROLE (ROLE_ID)
);
-
---------------------------------------------------------------------------
--- TURBINE_SCHEDULED_JOB
---------------------------------------------------------------------------
+# -----------------------------------------------------------------------
+# 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,
+ 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
------------------------------------------------------------------------------
-
+# -----------------------------------------------------------------------
+# ID_TABLE
+# -----------------------------------------------------------------------
drop table if exists ID_TABLE;
CREATE TABLE ID_TABLE
(
- ID_TABLE_ID INT NOT NULL,
- TABLE_NAME VARCHAR (255) NOT NULL,
- NEXT_ID INT,
- QUANTITY INT,
+ 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
+# -----------------------------------------------------------------------
+drop table if exists JETSPEED_USER_PROFILE;
+
+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,
+ PRIMARY KEY(PSML_ID),
+ UNIQUE (USER_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
+);
+
+# -----------------------------------------------------------------------
+# JETSPEED_GROUP_PROFILE
+# -----------------------------------------------------------------------
+drop table if exists JETSPEED_GROUP_PROFILE;
+
+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,
+ PRIMARY KEY(PSML_ID),
+ UNIQUE (GROUP_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
+);
+
+# -----------------------------------------------------------------------
+# JETSPEED_ROLE_PROFILE
+# -----------------------------------------------------------------------
+drop table if exists JETSPEED_ROLE_PROFILE;
+
+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,
+ PRIMARY KEY(PSML_ID),
+ UNIQUE (ROLE_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE)
+);
+
+
+
+
+
+
+
1.32 +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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
1.3 +6 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Torque.properties 15 Oct 2002 17:35:34 -0000 1.2
+++ Torque.properties 17 Oct 2002 21:11:01 -0000 1.3
@@ -44,6 +44,7 @@
torque.database.default=default
torque.database.default.adapter=hypersonic
+###torque.database.default.adapter=mysql
##
## Using torque's old pool
@@ -58,10 +59,10 @@
torque.dsfactory.default.pool.maxExpiryTime=3600
torque.dsfactory.default.pool.connectionWaitTimeout=10
# MySQL
-# torque.dsfactory.default.connection.driver = org.gjt.mm.mysql.Driver
-# torque.dsfactory.default.connection.url = jdbc:mysql://localhost:3306/torque
-# torque.dsfactory.default.connection.user = user
-# torque.dsfactory.default.connection.password = password
+### 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 = password
# The interval (in milliseconds) between which the PoolBrokerService logs
1.19 +1 -1 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jetspeed.properties 15 Oct 2002 17:35:34 -0000 1.18
+++ jetspeed.properties 17 Oct 2002 21:11:01 -0000 1.19
@@ -1,4 +1,4 @@
#Hypersonic SQL database
-#Tue Oct 15 10:20:49 PDT 2002
+#Thu Oct 17 13:22:20 PDT 2002
version=1.4
modified=yes
1.21 +11 -31 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script
Index: jetspeed.script
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jetspeed.script 15 Oct 2002 17:35:34 -0000 1.20
+++ jetspeed.script 17 Oct 2002 21:11:01 -0000 1.21
@@ -100,9 +100,9 @@
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','Tommy','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-06-04
16:05:25.712','F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000577080000000700000003740008756e69747465737474000074000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b020000787000000076740007555345525f49447400013078',NULL)
-INSERT INTO TURBINE_USER
VALUES(1,'admin','jetspeed','Jetspeed','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2001-11-11
18:45:41.671','F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000027708000000030000000174000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a978',NULL)
-INSERT INTO TURBINE_USER
VALUES(2,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2001-11-11
18:45:41.671','F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000027708000000030000000174000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a978',NULL)
+INSERT INTO TURBINE_USER
VALUES(1,'admin','jetspeed','Jetspeed','Admin','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL,NULL)
+INSERT INTO TURBINE_USER
VALUES(2,'turbine','turbine','Tommy','Turbine','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f4000000000000377080000000500000002740007555345525f494474000132740008756e69747465737474000078',NULL)
+INSERT INTO TURBINE_USER
VALUES(3,'anon','anon','Anonymous','User','[EMAIL PROTECTED]','CONFIRMED',NULL,NULL,'2002-10-15
18:45:41.671','F',NULL,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)
@@ -118,36 +118,15 @@
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(2,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 TURBINE_USER_GROUP_ROLE VALUES(330,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(340,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(350,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(360,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(370,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(380,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(390,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(400,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(410,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(420,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(430,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(440,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(450,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(460,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(470,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(480,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(490,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(500,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(510,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(520,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(530,1,1)
-INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(540,1,1)
-INSERT INTO ID_TABLE VALUES(1,'TURBINE_PERMISSION',420,10)
-INSERT INTO ID_TABLE VALUES(2,'TURBINE_ROLE',500,10)
-INSERT INTO ID_TABLE VALUES(3,'TURBINE_GROUP',430,10)
-INSERT INTO ID_TABLE VALUES(4,'TURBINE_USER',550,10)
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(3,1,3)
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(560,1,1)
+INSERT INTO ID_TABLE VALUES(1,'TURBINE_PERMISSION',440,10)
+INSERT INTO ID_TABLE VALUES(2,'TURBINE_ROLE',520,10)
+INSERT INTO ID_TABLE VALUES(3,'TURBINE_GROUP',450,10)
+INSERT INTO ID_TABLE VALUES(4,'TURBINE_USER',570,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)
@@ -155,6 +134,7 @@
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)
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@;jakarta.apache.org>
