[Jboss-cvs] JBoss Messaging SVN: r1222 - in trunk/src: etc/server/default/deploy etc/xmdesc main/org/jboss/jms/server/plugin main/org/jboss/messaging/core/plugin
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 10 14:51:49 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-08-10 14:51:44 -0400 (Thu, 10 Aug 2006)
New Revision: 1222
Modified:
trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/src/etc/xmdesc/JDBCChannelMapper-xmbean.xml
trunk/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
Log:
Fixed CreateTablesOnStartup propagation. http://jira.jboss.org/jira/browse/JBMESSAGING-507
Modified: trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml 2006-08-10 18:51:44 UTC (rev 1222)
@@ -31,6 +31,7 @@
<depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
<attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2006-08-10 18:51:44 UTC (rev 1222)
@@ -67,6 +67,7 @@
<depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
<attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="SqlProperties"><![CDATA[
CREATE_USER_TABLE=CREATE TABLE JMS_USER (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
CREATE_ROLE_TABLE=CREATE TABLE JMS_ROLE (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, PRIMARY KEY(USERID, ROLEID))
Modified: trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2006-08-10 18:51:44 UTC (rev 1222)
@@ -67,6 +67,7 @@
<depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
<attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="SqlProperties"><![CDATA[
CREATE_USER_TABLE=CREATE TABLE JMS_USER (USERID VARCHAR2(32) NOT NULL, PASSWD VARCHAR2(32) NOT NULL, CLIENTID VARCHAR2(128), PRIMARY KEY(USERID))
CREATE_ROLE_TABLE=CREATE TABLE JMS_ROLE (ROLEID VARCHAR2(32) NOT NULL, USERID VARCHAR2(32) NOT NULL, PRIMARY KEY(USERID, ROLEID))
Modified: trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2006-08-10 18:51:44 UTC (rev 1222)
@@ -67,6 +67,7 @@
<depends>jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
<attribute name="DataSource">java:/DefaultDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
<attribute name="SqlProperties"><![CDATA[
CREATE_USER_TABLE=CREATE TABLE JMS_USER (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USERID))
CREATE_ROLE_TABLE=CREATE TABLE JMS_ROLE (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, PRIMARY KEY(USERID, ROLEID))
Modified: trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2006-08-10 18:51:44 UTC (rev 1222)
@@ -78,8 +78,9 @@
<depends>jboss.jca:service=DataSourceBinding,name=SybaseDS</depends>
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
<attribute name="DataSource">SybaseDS</attribute>
+ <attribute name="CreateTablesOnStartup">true</attribute>
- <attribute name="SqlProperties"><![CDATA[
+ <attribute name="SqlProperties"><![CDATA[
CREATE_USER_TABLE=CREATE TABLE JMS_USER (USERID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128) NULL, PRIMARY KEY(USERID))
CREATE_ROLE_TABLE=CREATE TABLE JMS_ROLE (ROLEID VARCHAR(32) NOT NULL, USERID VARCHAR(32) NOT NULL, PRIMARY KEY(USERID, ROLEID))
SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JMS_USER WHERE USERID=?
Modified: trunk/src/etc/xmdesc/JDBCChannelMapper-xmbean.xml
===================================================================
--- trunk/src/etc/xmdesc/JDBCChannelMapper-xmbean.xml 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/etc/xmdesc/JDBCChannelMapper-xmbean.xml 2006-08-10 18:51:44 UTC (rev 1222)
@@ -33,8 +33,14 @@
<description>DML and DDL overrides</description>
<name>SqlProperties</name>
<type>java.lang.String</type>
- </attribute>
+ </attribute>
+ <attribute access="read-write" getMethod="isCreateTablesOnStartup" setMethod="setCreateTablesOnStartup">
+ <description>Should database tables be created on startup?</description>
+ <name>CreateTablesOnStartup</name>
+ <type>boolean</type>
+ </attribute>
+
<!-- Managed operations -->
<operation>
Modified: trunk/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2006-08-10 18:51:44 UTC (rev 1222)
@@ -770,6 +770,22 @@
{
return tmObjectName;
}
+
+ /**
+ * Managed attribute.
+ */
+ public boolean isCreateTablesOnStartup() throws Exception
+ {
+ return createTablesOnStartup;
+ }
+
+ /**
+ * Managed attribute.
+ */
+ public void setCreateTablesOnStartup(boolean b) throws Exception
+ {
+ createTablesOnStartup = b;
+ }
/**
* @return a Set<String>. It may return an empty Set, but never null.
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-08-10 18:50:43 UTC (rev 1221)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-08-10 18:51:44 UTC (rev 1222)
@@ -2126,6 +2126,7 @@
*/
// Public --------------------------------------------------------
+
/**
* Managed attribute.
*/
More information about the jboss-cvs-commits
mailing list