cmailleux 2005/10/13 15:12:47 CEST
Modified files:
core/src/webapp/WEB-INF/etc/config quartz.properties
core/src/webapp/WEB-INF/var/db hypersonic.script jboss.script
jsqlconnect.script mysql.script
oracle.script postgresql.script
sqlserver_jtds.script
sqlserver_tds.script
Log:
Put the right jdbc delegate for quartz
Revision Changes Path
1.6 +1 -1
jahia/core/src/webapp/WEB-INF/etc/config/quartz.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/quartz.properties.diff?r1=1.5&r2=1.6&f=h
1.8 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/hypersonic.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/hypersonic.script.diff?r1=1.7&r2=1.8&f=h
1.5 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/jboss.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/jboss.script.diff?r1=1.4&r2=1.5&f=h
1.5 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/jsqlconnect.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/jsqlconnect.script.diff?r1=1.4&r2=1.5&f=h
1.10 +1 -0 jahia/core/src/webapp/WEB-INF/var/db/mysql.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/mysql.script.diff?r1=1.9&r2=1.10&f=h
1.5 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/oracle.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/oracle.script.diff?r1=1.4&r2=1.5&f=h
1.6 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/postgresql.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/postgresql.script.diff?r1=1.5&r2=1.6&f=h
1.5 +2 -1
jahia/core/src/webapp/WEB-INF/var/db/sqlserver_jtds.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sqlserver_jtds.script.diff?r1=1.4&r2=1.5&f=h
1.5 +2 -1 jahia/core/src/webapp/WEB-INF/var/db/sqlserver_tds.script
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/db/sqlserver_tds.script.diff?r1=1.4&r2=1.5&f=h
Index: quartz.properties
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/quartz.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- quartz.properties 5 Oct 2005 13:49:11 -0000 1.5
+++ quartz.properties 13 Oct 2005 13:12:46 -0000 1.6
@@ -272,7 +272,7 @@
#
org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
-org.quartz.jobStore.driverDelegateClass =
org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+org.quartz.jobStore.driverDelegateClass = @JDBCDELEGATE@
org.quartz.jobStore.useProperties = false
org.quartz.jobStore.dataSource = jahiaDS
org.quartz.jobStore.tablePrefix = JAHIA_QRTZ_
Index: hypersonic.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/hypersonic.script,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hypersonic.script 5 Oct 2005 13:49:12 -0000 1.7
+++ hypersonic.script 13 Oct 2005 13:12:46 -0000 1.8
@@ -16,4 +16,5 @@
jahia.database.ojbplatform = Hsqldb
jahia.database.hibernate.dialect = org.hibernate.dialect.HSQLDialect
jahia.nested_transaction_allowed = false
-jahia.quartz.selectWithLockSQL = SELECT * FROM {0}LOCKS WHERE LOCK_NAME = ?
\ No newline at end of file
+jahia.quartz.selectWithLockSQL = SELECT * FROM {0}LOCKS WHERE LOCK_NAME = ?
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.HSQLDBDelegate
\ No newline at end of file
Index: jboss.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/jboss.script,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jboss.script 5 Oct 2005 13:49:12 -0000 1.4
+++ jboss.script 13 Oct 2005 13:12:46 -0000 1.5
@@ -14,4 +14,5 @@
#jahia.database.datasource=
jahia.database.ojbplatform = Hsqldb
jahia.database.hibernate.dialect = org.hibernate.dialect.HSQLDialect
-jahia.nested_transaction_allowed = false
\ No newline at end of file
+jahia.nested_transaction_allowed = false
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.HSQLDBDelegate
\ No newline at end of file
Index: jsqlconnect.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/jsqlconnect.script,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jsqlconnect.script 5 Oct 2005 13:49:12 -0000 1.4
+++ jsqlconnect.script 13 Oct 2005 13:12:46 -0000 1.5
@@ -14,4 +14,5 @@
#jahia.database.datasource =
jahia.database.ojbplatform = MsSQLServer
jahia.database.hibernate.dialect = org.hibernate.dialect.SQLServerDialect
-jahia.nested_transaction_allowed = false
\ No newline at end of file
+jahia.nested_transaction_allowed = false
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.MSSQLDBDelegate
\ No newline at end of file
Index: mysql.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/mysql.script,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mysql.script 5 Oct 2005 13:49:12 -0000 1.9
+++ mysql.script 13 Oct 2005 13:12:46 -0000 1.10
@@ -16,3 +16,4 @@
jahia.database.hibernate.dialect = org.hibernate.dialect.MySQLDialect
jahia.transaction_isolation_level = ISOLATION_READ_COMMITTED
jahia.nested_transaction_allowed = true
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
Index: oracle.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/oracle.script,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oracle.script 5 Oct 2005 13:49:12 -0000 1.4
+++ oracle.script 13 Oct 2005 13:12:46 -0000 1.5
@@ -13,4 +13,5 @@
#jahia.database.datasource =
jahia.database.ojbplatform = Oracle
jahia.database.hibernate.dialect = org.hibernate.dialect.OracleDialect
-jahia.nested_transaction_allowed = false
\ No newline at end of file
+jahia.nested_transaction_allowed = false
+jahia.quartz.jdbcDelegate =
org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
\ No newline at end of file
Index: postgresql.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/postgresql.script,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- postgresql.script 5 Oct 2005 13:49:12 -0000 1.5
+++ postgresql.script 13 Oct 2005 13:12:46 -0000 1.6
@@ -13,4 +13,5 @@
#jahia.database.datasource =
jahia.database.ojbplatform = PostgreSQL
jahia.database.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
-jahia.nested_transaction_allowed = false
\ No newline at end of file
+jahia.nested_transaction_allowed = false
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
\ No newline at end of file
Index: sqlserver_jtds.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sqlserver_jtds.script,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sqlserver_jtds.script 5 Oct 2005 13:49:12 -0000 1.4
+++ sqlserver_jtds.script 13 Oct 2005 13:12:46 -0000 1.5
@@ -14,4 +14,5 @@
#jahia.database.datasource =
jahia.database.ojbplatform = MsSQLServer
jahia.database.hibernate.dialect = org.hibernate.dialect.SQLServerDialect
-jahia.nested_transaction_allowed = false
\ No newline at end of file
+jahia.nested_transaction_allowed = false
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.MSSQLDBDelegate
\ No newline at end of file
Index: sqlserver_tds.script
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/var/db/sqlserver_tds.script,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sqlserver_tds.script 5 Oct 2005 13:49:12 -0000 1.4
+++ sqlserver_tds.script 13 Oct 2005 13:12:46 -0000 1.5
@@ -14,4 +14,5 @@
#jahia.database.datasource =
jahia.database.ojbplatform = MsSQLServer
jahia.database.hibernate.dialect = org.hibernate.dialect.SQLServerDialect
-jahia.nested_transaction_allowed = false
\ No newline at end of file
+jahia.nested_transaction_allowed = false
+jahia.quartz.jdbcDelegate = org.quartz.impl.jdbcjobstore.MSSQLDBDelegate
\ No newline at end of file