Branch: refs/heads/BZ1069545 Home: https://github.com/rhq-project/rhq Commit: 9a610ded207d1a6252ba329531347078ab4d6de3 https://github.com/rhq-project/rhq/commit/9a610ded207d1a6252ba32953134707... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: d28528b4b11fa051ec500791db606d9bbff3be9e https://github.com/rhq-project/rhq/commit/d28528b4b11fa051ec500791db606d9... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: b301111897d7b235d9041ec0069a490a786ff445 https://github.com/rhq-project/rhq/commit/b301111897d7b235d9041ec0069a490... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: a0b2fc43e05c8845a1c1b16ac6d9b12737da3227 https://github.com/rhq-project/rhq/commit/a0b2fc43e05c8845a1c1b16ac6d9b12... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: c9e9e5e3ac9e3751bad0028e17369b1032fc2b98 https://github.com/rhq-project/rhq/commit/c9e9e5e3ac9e3751bad0028e17369b1... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: a87590557af4512b1ff43a0ff6007494b09817c5 https://github.com/rhq-project/rhq/commit/a87590557af4512b1ff43a0ff600749... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 2014) Changed paths: M etc/eclipse-tools/hibernate.cfg.xml M modules/core/dbutils/pom.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: a24ecfc665dd734e9a54c5ed7fc6f1c72351c95e https://github.com/rhq-project/rhq/commit/a24ecfc665dd734e9a54c5ed7fc6f1c... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 2014) Changed paths: M modules/core/dbutils/pom.xml 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: faec6f2d75f2d8eb5f4a0a186bb152b18c12a504 https://github.com/rhq-project/rhq/commit/faec6f2d75f2d8eb5f4a0a186bb152b... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: 916d0f3acc49409b2eb547603f51b369f7e2ee9c https://github.com/rhq-project/rhq/commit/916d0f3acc49409b2eb547603f51b36... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: 79eab8edc5ebe91bc3633ac0ecdf063fe9f64f78 https://github.com/rhq-project/rhq/commit/79eab8edc5ebe91bc3633ac0ecdf063... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: 2de0c497707cf414629eeb5d60b80bba5d1c6415 https://github.com/rhq-project/rhq/commit/2de0c497707cf414629eeb5d60b80bb... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: c8e4be31e8077fb6fb3afb835331c259c2c3a039 https://github.com/rhq-project/rhq/commit/c8e4be31e8077fb6fb3afb835331c25... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: 1af6f9b8eb84dfee60bb2a30aa5afe41d97e16c4 https://github.com/rhq-project/rhq/commit/1af6f9b8eb84dfee60bb2a30aa5afe4... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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: e414181dbf34ceddaa38cff9758a5215dbea5838 https://github.com/rhq-project/rhq/commit/e414181dbf34ceddaa38cff9758a521... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2014-04-30 (Wed, 30 Apr 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. Compare: https://github.com/rhq-project/rhq/compare/43a744fb3268...e414181dbf34