Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 9874b8e4816dee35833b90dc3f0a8218ee44557b https://github.com/rhq-project/rhq/commit/9874b8e4816dee35833b90dc3f0a8218ee... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- [BZ 1069545] Add Subsystems and Server Configuration subcategories.
Commit: 5be9d35a859366f0da72329610d20b78d9e2bffb https://github.com/rhq-project/rhq/commit/5be9d35a859366f0da72329610d20b78d9... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java
Log Message: ----------- [BZ 1069545] Add a ManyToMany relationship between resource type and proper subcategories. Also, add new table, upgrade schema, and upgrade tasks to move to the new model.
Commit: 1535aaf8bf5094893573a4f1aa3e92c2c66c52c7 https://github.com/rhq-project/rhq/commit/1535aaf8bf5094893573a4f1aa3e92c2c6... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
Log Message: ----------- [BZ 1069545] Clean the subcategory class as well the persisting layers.
Commit: 25d37b1e1197bc3c4503a2138d13f3a443768f48 https://github.com/rhq-project/rhq/commit/25d37b1e1197bc3c4503a2138d13f3a443... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
Log Message: ----------- [BZ 1069545] Add code that indepdently persists the subcategories.
Commit: 302326a1c2e8890f9e367e200d00b54a482e28f5 https://github.com/rhq-project/rhq/commit/302326a1c2e8890f9e367e200d00b54a48... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/SubCategoriesMetadataParserTest.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDescriptorProcessor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
Log Message: ----------- [BZ 1069545] First cut at removing the predefined subcategories concept. This version has some functionality removed but will be added in later revisions.
Commit: 7e32c7fdd5d02fa5c0d30618c590ee01a52d385f https://github.com/rhq-project/rhq/commit/7e32c7fdd5d02fa5c0d30618c590ee01a5... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M etc/eclipse-tools/hibernate.cfg.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
Log Message: ----------- [BZ 1069545] Gui changes for the subcategory generation. The subcategories are now driven by attributes on the child resource type.
Commit: 62021ed04882b2d0da8d4e2dd562d3ddd99fc1b2 https://github.com/rhq-project/rhq/commit/62021ed04882b2d0da8d4e2dd562d3ddd9... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
Log Message: ----------- [BZ 1069545] Fix queries related to subcategories.
Commit: 386e726eceb5c346c6e75c17fa0619b71b5f2c0c https://github.com/rhq-project/rhq/commit/386e726eceb5c346c6e75c17fa0619b71b... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
Log Message: ----------- [BZ 1069545] More subcategory cleanup, removing unused code and fixing joined queries.
Commit: fe5bb64ca90c10c29658646f398a4f4479599617 https://github.com/rhq-project/rhq/commit/fe5bb64ca90c10c29658646f398a4f4479... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
Log Message: ----------- [BZ 1069545] Removing more undeeded code for fetching subcategories. Subcategories are now just a proper field on the resource type.
Commit: 7915a1c0d1f94206cd4a0fd41fd1ea2b5cb59342 https://github.com/rhq-project/rhq/commit/7915a1c0d1f94206cd4a0fd41fd1ea2b5c... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- [BZ 1069545] Updates to the tree build structure.
Commit: f20731b47a3c3a30903a0f08c73b8a4fa7860167 https://github.com/rhq-project/rhq/commit/f20731b47a3c3a30903a0f08c73b8a4fa7... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
Log Message: ----------- [BZ 1069545] More updates to the tree build structure.
Commit: 39bb847b8118bc46ceeeac43cfb4d8db0f6fef41 https://github.com/rhq-project/rhq/commit/39bb847b8118bc46ceeeac43cfb4d8db0f... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java
Log Message: ----------- [BZ 1069545] More updates to the tree build structure for the resource view.
Commit: 6863de9642a0c4470cd871d4f2cb807fd245cce5 https://github.com/rhq-project/rhq/commit/6863de9642a0c4470cd871d4f2cb807fd2... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- [BZ 1069545] The resource tree view now renders subcategories as well as nested subcategories with the identical names properly.
Commit: 3b2550b2b8fab19a96e14a42ad9404de8a8a324b https://github.com/rhq-project/rhq/commit/3b2550b2b8fab19a96e14a42ad9404de8a... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
Log Message: ----------- [BZ 1069545] First round for addressing API differences due to this change.
Commit: 198f9331180ca6c9757216c55a1fde62a223d05c https://github.com/rhq-project/rhq/commit/198f9331180ca6c9757216c55a1fde62a2... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml
Log Message: ----------- [BZ 1069545] Updates to the API change.
Commit: cabbc1165ff95ba3406fc745026c5d3b40370562 https://github.com/rhq-project/rhq/commit/cabbc1165ff95ba3406fc745026c5d3b40... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
Log Message: ----------- [BZ 1069545] Fix type merging to support updates to subcategories.
Commit: 3ee07efc34418b75eeb2432841dd704bfa2d03aa https://github.com/rhq-project/rhq/commit/3ee07efc34418b75eeb2432841dd704bfa... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml
Log Message: ----------- [BZ 1069545] Reorder api check exceptions.
Commit: 880d1abae7d10d98f33f45aded50ab0604550ce8 https://github.com/rhq-project/rhq/commit/880d1abae7d10d98f33f45aded50ab0604... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Log Message: ----------- [BZ 1069545] Database upgrade task for subcategories.
Commit: 3cd47a544572fc3d3ea326f97d6d51a222b1b15d https://github.com/rhq-project/rhq/commit/3cd47a544572fc3d3ea326f97d6d51a222... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- [BZ 1069545] Remove subcategories from all the plugins and fix subcategory nesting where needed.
Commit: c0431c9fb84f248427bad7395448f970cfb11035 https://github.com/rhq-project/rhq/commit/c0431c9fb84f248427bad7395448f970cf... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java R modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/old-subcat.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
Log Message: ----------- [BZ 1069545] Update remaining unit and integration tests. The tests are heavily simplified because there is entity to handle subcategories. Subcategories are now just a field on the resource type so there is not much to test anymore.
Commit: 7acf5a029ea1aba3dd4155e30c5a5f5e6df0528c https://github.com/rhq-project/rhq/commit/7acf5a029ea1aba3dd4155e30c5a5f5e6d... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/enterprise/server/appserver/src/main/scripts/storage_setup.groovy
Log Message: ----------- [BZ 1069545] Update serialization version to touched domain objects. Removed unused queries for domain objects. Deprecate more code. Remove inadvertently introduced groovy script. Increase string size for subcategory.
Commit: 8e092dbd6847caf6c97d629580d4077ba860094e https://github.com/rhq-project/rhq/commit/8e092dbd6847caf6c97d629580d4077ba8... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java
Log Message: ----------- [BZ 1069545] Add deprecation documentation to all the code modified for this feature.
Commit: 006f3cfe765ea23ad6f4a76484069f47be7e262d https://github.com/rhq-project/rhq/commit/006f3cfe765ea23ad6f4a76484069f47be... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
Log Message: ----------- [1093822] RFE: Allow automatic uninventory of dead / missing / removed resources Changing "DEAD" to "MISSING" in response to terminology feedback.
(cherry picked from commit 78df7de3618ac64f5e7595d54fa1ad30121e4f36)
Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
Commit: 298a65c5154dc4106ac42e5e3c7d4a2fbbe78549 https://github.com/rhq-project/rhq/commit/298a65c5154dc4106ac42e5e3c7d4a2fbb... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- [BZ 1069545] Align subsystems subcategories with EAP admin console.
Commit: 277a70d72de1840c2c10b6d03b7ec0de942c9e24 https://github.com/rhq-project/rhq/commit/277a70d72de1840c2c10b6d03b7ec0de94... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/intentional-api-changes-since-4.11.0.xml
Log Message: ----------- [BZ 1069545] Fix API changes files since RHQ 4.11 has been released.
Commit: 41c24733c5bcc6865e8903a5d8e231bd7be65518 https://github.com/rhq-project/rhq/commit/41c24733c5bcc6865e8903a5d8e231bd7b... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/domain/intentional-api-changes-since-4.11.0.xml
Log Message: ----------- [BZ 1069545] Fix API changes files since RHQ 4.11 has been released.
Commit: 389e03bfe37b0e6822e050bc8c7a50067aaafebd https://github.com/rhq-project/rhq/commit/389e03bfe37b0e6822e050bc8c7a50067a... Author: Stefan Negrea snegrea@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
Log Message: ----------- [BZ 1069545] Increment database version number.
Commit: 6bd9be98054f8a9a67293cc137b6c8e3fc41e10b https://github.com/rhq-project/rhq/commit/6bd9be98054f8a9a67293cc137b6c8e3fc... Author: jshaughn jshaughn@redhat.com Date: 2014-05-15 (Thu, 15 May 2014)
Changed paths: M etc/eclipse-tools/hibernate.cfg.xml M etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/SubCategoriesMetadataParser.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/NestedSubCategoriesMetadataParserTest.java M modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/SubCategoriesMetadataParserTest.java M modules/core/dbutils/pom.xml A modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/SubcategoryUpgradeTask.java M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/intentional-api-changes-since-4.10.0.xml M modules/core/domain/intentional-api-changes-since-4.11.0.xml M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java M modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDescriptorProcessor.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/ResourceTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/type/ResourceTypeRepository.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java M modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java R modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml M modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml A modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/old-subcat.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml R modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java M modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml M modules/plugins/rhq-storage/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- Merge pull request #22 from rhq-project/BZ1069545
Put EAP subsystems into JON subcategories - BZ1069545
Compare: https://github.com/rhq-project/rhq/compare/5a3382f71e34...6bd9be98054f