Index: lams_build/conf/unix/jboss/service/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/jboss/service/mysql-ds.xml,v
diff -u -r1.2 -r1.3
--- lams_build/conf/unix/jboss/service/mysql-ds.xml	3 Jun 2005 07:52:42 -0000	1.2
+++ lams_build/conf/unix/jboss/service/mysql-ds.xml	13 Mar 2006 05:49:02 -0000	1.3
@@ -45,4 +45,21 @@
     <!-- Connections not used after 5 minutes will be closed and removed -->
     <idle-timeout-minutes>5</idle-timeout-minutes>
   </local-tx-datasource>
+  
+  <!-- quartz-ds datasource for use by Quartz -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/quartz-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+    
 </datasources>
Index: lams_build/conf/windows/jboss/service/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/jboss/service/mysql-ds.xml,v
diff -u -r1.2 -r1.3
--- lams_build/conf/windows/jboss/service/mysql-ds.xml	25 Aug 2005 04:52:07 -0000	1.2
+++ lams_build/conf/windows/jboss/service/mysql-ds.xml	13 Mar 2006 05:49:02 -0000	1.3
@@ -45,4 +45,20 @@
     <!-- Connections not used after 5 minutes will be closed and removed -->
     <idle-timeout-minutes>5</idle-timeout-minutes>
   </local-tx-datasource>
+  
+  <!-- quartz-ds datasource for use by Quartz -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/quartz-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
 </datasources>
Index: lams_build/lib/quartz/quartz.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/Attic/quartz.jar,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_build/lib/quartz/dbTables/readme.txt
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/readme.txt,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_build/lib/quartz/dbTables/readme.txt	13 Mar 2006 05:49:02 -0000	1.1
@@ -0,0 +1 @@
+Quartz 1.5.2 persist table for various database. So far, LAMS 1.1 just use mysql database. Please change relative table definition in lams_common/db/create_lams_11_table if adopting different database in the future.
\ No newline at end of file
Index: lams_build/lib/quartz/dbTables/tables_cloudscape.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_cloudscape.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_db2.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_db2.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_db2_v72.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_db2_v72.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_db2_v8.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_db2_v8.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_derby.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_derby.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_firebird.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_firebird.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_hsqldb.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_hsqldb.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_hsqldb_old.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_hsqldb_old.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_informix.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_informix.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_mysql.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_mysql.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_mysql_innodb.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_mysql_innodb.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_oracle.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_oracle.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_pointbase.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_pointbase.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_postgres.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_postgres.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_postgres7.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_postgres7.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_sapdb.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_sapdb.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_sqlServer.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_sqlServer.sql,v
diff -u
Binary files differ
Index: lams_build/lib/quartz/dbTables/tables_sybase.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/quartz/dbTables/Attic/tables_sybase.sql,v
diff -u
Binary files differ
Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.39 -r1.40
--- lams_common/build.xml	14 Feb 2006 02:59:53 -0000	1.39
+++ lams_common/build.xml	13 Mar 2006 05:51:10 -0000	1.40
@@ -268,6 +268,20 @@
 			<transaction src="${db.scripts}/insert_types_data.sql"/>
 			<transaction src="${db.scripts}/insert_users.sql"/>
 		</sql>
+		<!-- Create Quartz table --> 
+	    <sql
+	        driver="${db.driver}"
+	        url="${db.url}"
+	        userid="${db.username}"
+	        password="${db.password}">
+	
+	        <classpath>
+	            <pathelement location="${db.driver.jar}"/>
+	        </classpath>
+	    	<transaction src="${db.scripts}/create_quartz_table.sql"/>
+	    </sql>
+		
+		
 		<delete dir="${contentrepository.directory}"/>
 	</target>
 
Index: lams_common/db/sql/create_quartz_table.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/create_quartz_table.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/db/sql/create_quartz_table.sql	13 Mar 2006 05:51:10 -0000	1.1
@@ -0,0 +1,169 @@
+# LAMS1.1: quartz 1.5.2 table definition
+#
+# Quartz seems to work best with the driver mm.mysql-2.0.7-bin.jar
+#
+# In your Quartz properties file, you'll need to set 
+# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+#
+
+set foreign_key_checks = 0;
+
+DROP TABLE IF EXISTS lams_quartz_JOB_LISTENERS;
+DROP TABLE IF EXISTS lams_quartz_TRIGGER_LISTENERS;
+DROP TABLE IF EXISTS lams_quartz_FIRED_TRIGGERS;
+DROP TABLE IF EXISTS lams_quartz_PAUSED_TRIGGER_GRPS;
+DROP TABLE IF EXISTS lams_quartz_SCHEDULER_STATE;
+DROP TABLE IF EXISTS lams_quartz_LOCKS;
+DROP TABLE IF EXISTS lams_quartz_SIMPLE_TRIGGERS;
+DROP TABLE IF EXISTS lams_quartz_CRON_TRIGGERS;
+DROP TABLE IF EXISTS lams_quartz_BLOB_TRIGGERS;
+DROP TABLE IF EXISTS lams_quartz_TRIGGERS;
+DROP TABLE IF EXISTS lams_quartz_JOB_DETAILS;
+DROP TABLE IF EXISTS lams_quartz_CALENDARS;
+
+
+CREATE TABLE lams_quartz_JOB_DETAILS
+  (
+    JOB_NAME  VARCHAR(80) NOT NULL,
+    JOB_GROUP VARCHAR(80) NOT NULL,
+    DESCRIPTION VARCHAR(120) NULL,
+    JOB_CLASS_NAME   VARCHAR(128) NOT NULL,
+    IS_DURABLE VARCHAR(1) NOT NULL,
+    IS_VOLATILE VARCHAR(1) NOT NULL,
+    IS_STATEFUL VARCHAR(1) NOT NULL,
+    REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
+    JOB_DATA BLOB NULL,
+    PRIMARY KEY (JOB_NAME,JOB_GROUP)
+);
+
+CREATE TABLE lams_quartz_JOB_LISTENERS
+  (
+    JOB_NAME  VARCHAR(80) NOT NULL,
+    JOB_GROUP VARCHAR(80) NOT NULL,
+    JOB_LISTENER VARCHAR(80) NOT NULL,
+    PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER),
+    FOREIGN KEY (JOB_NAME,JOB_GROUP)
+        REFERENCES lams_quartz_JOB_DETAILS(JOB_NAME,JOB_GROUP)
+);
+
+CREATE TABLE lams_quartz_TRIGGERS
+  (
+    TRIGGER_NAME VARCHAR(80) NOT NULL,
+    TRIGGER_GROUP VARCHAR(80) NOT NULL,
+    JOB_NAME  VARCHAR(80) NOT NULL,
+    JOB_GROUP VARCHAR(80) NOT NULL,
+    IS_VOLATILE VARCHAR(1) NOT NULL,
+    DESCRIPTION VARCHAR(120) NULL,
+    NEXT_FIRE_TIME BIGINT(13) NULL,
+    PREV_FIRE_TIME BIGINT(13) NULL,
+    TRIGGER_STATE VARCHAR(16) NOT NULL,
+    TRIGGER_TYPE VARCHAR(8) NOT NULL,
+    START_TIME BIGINT(13) NOT NULL,
+    END_TIME BIGINT(13) NULL,
+    CALENDAR_NAME VARCHAR(80) NULL,
+    MISFIRE_INSTR SMALLINT(2) NULL,
+    JOB_DATA BLOB NULL,
+    PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (JOB_NAME,JOB_GROUP)
+        REFERENCES lams_quartz_JOB_DETAILS(JOB_NAME,JOB_GROUP)
+);
+
+CREATE TABLE lams_quartz_SIMPLE_TRIGGERS
+  (
+    TRIGGER_NAME VARCHAR(80) NOT NULL,
+    TRIGGER_GROUP VARCHAR(80) NOT NULL,
+    REPEAT_COUNT BIGINT(7) NOT NULL,
+    REPEAT_INTERVAL BIGINT(12) NOT NULL,
+    TIMES_TRIGGERED BIGINT(7) NOT NULL,
+    PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE lams_quartz_CRON_TRIGGERS
+  (
+    TRIGGER_NAME VARCHAR(80) NOT NULL,
+    TRIGGER_GROUP VARCHAR(80) NOT NULL,
+    CRON_EXPRESSION VARCHAR(80) NOT NULL,
+    TIME_ZONE_ID VARCHAR(80),
+    PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE lams_quartz_BLOB_TRIGGERS
+  (
+    TRIGGER_NAME VARCHAR(80) NOT NULL,
+    TRIGGER_GROUP VARCHAR(80) NOT NULL,
+    BLOB_DATA BLOB NULL,
+    PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE lams_quartz_TRIGGER_LISTENERS
+  (
+    TRIGGER_NAME  VARCHAR(80) NOT NULL,
+    TRIGGER_GROUP VARCHAR(80) NOT NULL,
+    TRIGGER_LISTENER VARCHAR(80) NOT NULL,
+    PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER),
+    FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+        REFERENCES lams_quartz_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+
+CREATE TABLE lams_quartz_CALENDARS
+  (
+    CALENDAR_NAME  VARCHAR(80) NOT NULL,
+    CALENDAR BLOB NOT NULL,
+    PRIMARY KEY (CALENDAR_NAME)
+);
+
+
+
+CREATE TABLE lams_quartz_PAUSED_TRIGGER_GRPS
+  (
+    TRIGGER_GROUP  VARCHAR(80) NOT NULL, 
+    PRIMARY KEY (TRIGGER_GROUP)
+);
+
+CREATE TABLE lams_quartz_FIRED_TRIGGERS
+  (
+    ENTRY_ID VARCHAR(95) NOT NULL,
+    TRIGGER_NAME VARCHAR(80) NOT NULL,
+    TRIGGER_GROUP VARCHAR(80) NOT NULL,
+    IS_VOLATILE VARCHAR(1) NOT NULL,
+    INSTANCE_NAME VARCHAR(80) NOT NULL,
+    FIRED_TIME BIGINT(13) NOT NULL,
+    STATE VARCHAR(16) NOT NULL,
+    JOB_NAME VARCHAR(80) NULL,
+    JOB_GROUP VARCHAR(80) NULL,
+    IS_STATEFUL VARCHAR(1) NULL,
+    REQUESTS_RECOVERY VARCHAR(1) NULL,
+    PRIMARY KEY (ENTRY_ID)
+);
+
+CREATE TABLE lams_quartz_SCHEDULER_STATE
+  (
+    INSTANCE_NAME VARCHAR(80) NOT NULL,
+    LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
+    CHECKIN_INTERVAL BIGINT(13) NOT NULL,
+    RECOVERER VARCHAR(80) NULL,
+    PRIMARY KEY (INSTANCE_NAME)
+);
+
+CREATE TABLE lams_quartz_LOCKS
+  (
+    LOCK_NAME  VARCHAR(40) NOT NULL, 
+    PRIMARY KEY (LOCK_NAME)
+);
+
+
+INSERT INTO lams_quartz_LOCKS values('TRIGGER_ACCESS');
+INSERT INTO lams_quartz_LOCKS values('JOB_ACCESS');
+INSERT INTO lams_quartz_LOCKS values('CALENDAR_ACCESS');
+INSERT INTO lams_quartz_LOCKS values('STATE_ACCESS');
+INSERT INTO lams_quartz_LOCKS values('MISFIRE_ACCESS');
+
+
+set foreign_key_checks = 1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	21 Dec 2005 05:27:08 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	13 Mar 2006 05:51:10 -0000	1.6
@@ -39,6 +39,10 @@
 	<bean id="toolDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
 		<property name="jndiName"><value>java:jdbc/tool-ds</value></property>
 	</bean>
+	
+	<bean id="quartzDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+		<property name="jndiName"><value>java:jdbc/quartz-ds</value></property>
+	</bean>
 
 	<!--  Transaction manager for all transactions involving the core classes or the content repository. -->