[rhq] Branch 'refs/tags/RHQ_4_0_0' - 0 commits -
by John Sanda
Rebased ref, commits from common ancestor:
13 years
- 1
- 0
[rhq] Branch 'release-4.0.0' - 2 commits - modules/core
by Heiko W. Rupp
modules/core/dbutils/pom.xml | 2 -
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 19 +++++-----
2 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 36fe86c79d49b0f3cb346e60dabab74a94580329
Merge: 5b57930 a3804b1
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon May 2 15:51:46 2011 +0200
Merge branch 'release-4.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-4.0.0
commit 5b57930288f32cbaf0bb190dfed50e78390a402d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon May 2 15:49:08 2011 +0200
BZ 667218 - create operation schedule sequence on upgrade
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 50ad317..64af8e7 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -22,7 +22,7 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.106</db.schema.version>
+ <db.schema.version>2.107</db.schema.version>
</properties>
<dependencies>
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 57f82f0..b7f801f 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3204,7 +3204,7 @@
<!-- give the 'SUPER USER' and 'ALL RESOURCES' roles permission to delete/purge events (this permission
previously did not exist, and event deletion/purging could be performed by any user with authz to
view the resource/group in question).
-
+
a user with MANAGE_SECURITY must explicitly grant this permission to other roles after upgrade-->
<schema-directSQL>
<statement desc="Inserting MANAGE_EVENTS permission for 'Super User' role">
@@ -3235,7 +3235,7 @@
</statement>
</schema-directSQL>
</schemaSpec>
-
+
<schemaSpec version="2.97">
<!-- Support subject-owned groups (e.g. autogroups) -->
<schema-addColumn table="RHQ_RESOURCE_GROUP" column="SUBJECT_ID" columnType="INTEGER" />
@@ -3328,7 +3328,7 @@
REFERENCES RHQ_RESOURCE_GROUP (ID)
</statement>
</schema-directSQL>
-
+
<!-- Add category for distinguishing what kind of dashboard this is -->
<schema-addColumn table="RHQ_DASHBOARD" column="CATEGORY" columnType="VARCHAR2" precision="20"/>
<schema-directSQL>
@@ -3337,12 +3337,12 @@
SET CATEGORY = 'INVENTORY'
</statement>
</schema-directSQL>
- <schema-alterColumn table="RHQ_DASHBOARD" column="CATEGORY" nullable="FALSE" />
+ <schema-alterColumn table="RHQ_DASHBOARD" column="CATEGORY" nullable="FALSE" />
</schemaSpec>
<schemaSpec version="2.104">
<!-- package types no longer require to be coupled with a resource type. They can exist on their own. -->
- <schema-alterColumn table="RHQ_PACKAGE_TYPE" column="RESOURCE_TYPE_ID" nullable="true"/>
+ <schema-alterColumn table="RHQ_PACKAGE_TYPE" column="RESOURCE_TYPE_ID" nullable="true"/>
</schemaSpec>
<schemaSpec version="2.105">
@@ -3367,12 +3367,12 @@
REFERENCES RHQ_SUBJECT (ID)
</statement>
</schema-directSQL>
-
+
<!-- Now add modify the permissions to give all the roles with MANAGE_INVENTORY
the new MANAGE_REPOSITORIES privilege so that people's privs remain unchanged. -->
<schema-directSQL>
<statement>
- INSERT INTO RHQ_PERMISSION (role_id, operation)
+ INSERT INTO RHQ_PERMISSION (role_id, operation)
SELECT role_id, 15 FROM RHQ_PERMISSION WHERE operation = 1
</statement>
</schema-directSQL>
@@ -3381,9 +3381,12 @@
<schemaSpec version="2.106">
<!-- add pre-computed disambiguated name for Resource -->
<schema-addColumn table="RHQ_RESOURCE" column="ANCESTRY" columnType="VARCHAR2" precision="4000" />
- <schema-javaTask className="ResourceAncestryUpgradeTask" />
+ <schema-javaTask className="ResourceAncestryUpgradeTask" />
</schemaSpec>
+ <schemaSpec version="2.107">
+ <schema-createSequence name="RHQ_OPERATION_SCHEDULE_ID_SEQ" initial="10001"/>
+ </schemaSpec>
</dbupgrade>
</target>
</project>
13 years
- 1
- 0