modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/jms-data.xml | 17 --
modules/core/dbutils/src/main/scripts/dbsetup/jms-schema.xml | 67 ----------
modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml | 9 +
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 8 +
6 files changed, 18 insertions(+), 87 deletions(-)
New commits:
commit b69893f53ed0e9f6ecce40f4c3bb319759c0fc03
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Mon Sep 24 15:31:24 2012 -0400
Remove the JMS_* tables, they are not relevant to HornetQ.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index bb561bf..afaa176 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other
utilities</description>
<properties>
- <db.schema.version>2.123</db.schema.version>
+ <db.schema.version>2.124</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
index 470fcc6..ee32017 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml
@@ -41,7 +41,7 @@ To run the default target, you must set one of the following properties
to true:
<property name="dbsetup.scripts.dir"
value="${basedir}/src/main/scripts/dbsetup" />
<property name="dbsetup.output.dir"
value="${basedir}/target/dbsetup" /> <!-- away from classes so it
doesn't go into the jar -->
<!-- define the setup creation processing order. note, removals are done in the
reverse order -->
- <property name="dbsetup.subsystems"
value="config,cluster,auth,inventory,authz,search,dashboard,operation,event,alert,sysconfig,scheduler,amps,measurement,content,resource-request,jms,obsolete"/>
+ <property name="dbsetup.subsystems"
value="config,cluster,auth,inventory,authz,search,dashboard,operation,event,alert,sysconfig,scheduler,amps,measurement,content,resource-request,obsolete"/>
<property name="dbsetup.combined.schema"
value="${dbsetup.output.dir}/all-schema.xml" />
<property name="dbsetup.combined.data"
value="${dbsetup.output.dir}/all-data.xml" />
<property name="dbsetup.tstamp.file"
value="${dbsetup.output.dir}/dbsetup-combine.tstamp" />
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/jms-data.xml
b/modules/core/dbutils/src/main/scripts/dbsetup/jms-data.xml
deleted file mode 100644
index 51c369e..0000000
--- a/modules/core/dbutils/src/main/scripts/dbsetup/jms-data.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem
-->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-<!-- the data must match that which is expected in conf/login-config.xml -->
-
-<dbsetup name="jms-data.xml">
-
- <table name="JMS_USERS">
- <data USERID="guest" PASSWD="guest" />
- </table>
-
- <table name="JMS_ROLES">
- <data ROLEID="guest" USERID="guest" />
- </table>
-
-</dbsetup>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/jms-schema.xml
b/modules/core/dbutils/src/main/scripts/dbsetup/jms-schema.xml
deleted file mode 100644
index e84bc00..0000000
--- a/modules/core/dbutils/src/main/scripts/dbsetup/jms-schema.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- the schema matches that which would be automatically created by the JMS subsystem
-->
-<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
-
-<dbsetup name="jms-schema.xml">
-
- <table name="JMS_MESSAGES">
- <column name="MESSAGEID" required="true"
type="INTEGER" />
- <column name="DESTINATION" required="true"
type="VARCHAR2" size="255" />
- <column name="TXID" required="false"
type="INTEGER" />
- <column name="TXOP" required="false"
type="CHAR" size="1" />
- <column name="MESSAGEBLOB" required="false"
type="BLOB" />
-
- <constraint name="JMS_MESSAGES_PKEY">
- <primaryKey>
- <field ref="MESSAGEID"/>
- <field ref="DESTINATION"/>
- </primaryKey>
- </constraint>
-
- <index name="JMS_MESSAGES_TXOP_TXID">
- <field ref="TXOP"/>
- <field ref="TXID"/>
- </index>
- <index name="JMS_MESSAGES_DESTINATION">
- <field ref="DESTINATION"/>
- </index>
- </table>
-
- <table name="JMS_TRANSACTIONS">
- <column name="TXID" required="true"
type="INTEGER" primarykey="true" />
- </table>
-
- <table name="JMS_USERS">
- <column name="USERID" required="true"
type="VARCHAR2" size="32" primarykey="true" />
- <column name="PASSWD" required="true"
type="VARCHAR2" size="32" />
- <column name="CLIENTID" required="false"
type="VARCHAR2" size="128" />
- </table>
-
- <table name="JMS_ROLES">
- <column name="ROLEID" required="true"
type="VARCHAR2" size="32" />
- <column name="USERID" required="true"
type="VARCHAR2" size="32" />
-
- <constraint name="JMS_ROLES_PKEY">
- <primaryKey>
- <field ref="USERID"/>
- <field ref="ROLEID"/>
- </primaryKey>
- </constraint>
- </table>
-
- <table name="JMS_SUBSCRIPTIONS">
- <column name="CLIENTID" required="true"
type="VARCHAR2" size="128" />
- <column name="SUBNAME" required="true"
type="VARCHAR2" size="128" />
- <column name="TOPIC" required="true"
type="VARCHAR2" size="255" />
- <column name="SELECTOR" required="false"
type="VARCHAR2" size="255" />
-
- <constraint name="JMS_SUBSCRIPTIONS_PKEY">
- <primaryKey>
- <field ref="CLIENTID"/>
- <field ref="SUBNAME"/>
- </primaryKey>
- </constraint>
- </table>
-
-</dbsetup>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml
b/modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml
index 7562b7a..90d2e7e 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml
@@ -6,7 +6,14 @@
<!-- NOTE: The tables will be dropped in the *** REVERSE ORDER *** as listed in
this file! -->
<!-- NOTE: So, put the table you want dropped first at the bottom, and so on...
-->
-
+ <!-- !!! JMS tables removed when moving to HornetQ -->
+
+ <table obsolete="true">JMS_SUBSCRIPTIONS</table>
+ <table obsolete="true">JMS_ROLES</table>
+ <table obsolete="true">JMS_USERS</table>
+ <table obsolete="true">JMS_TRANSACTIONS</table>
+ <table obsolete="true">JMS_MESSAGES</table>
+
<!-- !!! REMOVED FROM CONTENT-SCHEMA !!!! -->
<table name="RHQ_DRIFT_TEMPLATE_MAP" obsolete="true">
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 1443b80..0864fde 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4035,6 +4035,14 @@
<schema-addColumn table="RHQ_CONFIG_PROP_DEF"
column="MAX_ENTRIES" columnType="INTEGER"/>
</schemaSpec>
+ <schemaSpec version="2.124">
+ <schema-dropTable table="JMS_MESSAGES"
ignoreError="true" />
+ <schema-dropTable table="JMS_TRANSACTIONS"
ignoreError="true" />
+ <schema-dropTable table="JMS_USERS"
ignoreError="true" />
+ <schema-dropTable table="JMS_ROLES"
ignoreError="true" />
+ <schema-dropTable table="JMS_SUBSCRIPTIONS"
ignoreError="true" />
+ </schemaSpec>
+
</dbupgrade>
</target>
</project>