Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 414a2a69691055be0466b18962dbdec698f57d05 https://github.com/rhq-project/rhq/commit/414a2a69691055be0466b18962dbdec698... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)

Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd M modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/server/ear/pom.xml A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.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/PluginManagerLocal.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml

Log Message: ----------- [BZ 1076126] - RFE: Canned dynaGroup expressions provided by plugin

Added concept of 'additional descriptor' (optional zml file living in plugin's META-INF folder side-by-side to plugin descriptor). This file is parsed only by server when plugin is discovered. Within this xml file, we currently store predefined expressions for read dynaGroup definitions. Such expressions can install dynaGroup definitions automatically. This commit contains also logic which takes care about dynaGroupDefs created using such expressions. When plugin updates such expression, dynaGroup is updated (same for delete). GroupDefinition table has now "weak" reference to expression (Plugin:ExprId)

Predefined dynaGroup expressions hardcoded in SingleGroupDefinitionView.java have been replaced by cannedExpressions provided by plugins. From user perspective, almost nothing changed, except cannedExpressions contain more than just expression string, so when user selects template/expression fields like name,description,recursive,recalcInterval are pre-populated as well.

Added 3 expressions. First groups managed servers by server-group name (deploys DG) 2nd groups managed servers by hostname (aka domain) (deploys DG) 3rd groups enabled deployments per server-groups

For expressions with 'createByDefault=true': dynagroups being created are attached to plugin (having non-null cannedExpression). Whenever this dynagroup is changed (via API or UI) it get's detached from plugin (setting cannedExpression to null). Also on plugin upgrade or first install, if we find a detached dynagroup having same name as we are about to create, we just log INFO message - this happens when DG got previously detached.

Commit: a4629adaa5b38cbc8537881a210aa0a50f934b43 https://github.com/rhq-project/rhq/commit/a4629adaa5b38cbc8537881a210aa0a50f... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)

Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties

Log Message: ----------- [BZ 1076126] Update Group Definitions UI to show DGs from plugins

When listing dynaGroups we now show additional first column having an icon of user - in case of regular dyna group or plugin - in case definition comes from plugin. When user edits plugin-based definition we also warn him once he attemts to save such expression. Within this commit i18n messages for old template names has been removed.

Commit: 061e29f6f4479f93f2de1a43f9f45a7b80496035 https://github.com/rhq-project/rhq/commit/061e29f6f4479f93f2de1a43f9f45a7b80... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-04-22 (Tue, 22 Apr 2014)

Changed paths: M modules/core/dbutils/pom.xml

Log Message: ----------- bump dbversion

Commit: 5ac07def1618f0c7aac5d6f882add38ac0452496 https://github.com/rhq-project/rhq/commit/5ac07def1618f0c7aac5d6f882add38ac0... Author: Heiko W. Rupp hwr@pilhuhn.de Date: 2014-04-22 (Tue, 22 Apr 2014)

Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java A modules/core/client-api/src/main/resources/rhq-canned-groups.xsd 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/criteria/ResourceGroupDefinitionCriteria.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupAddition.java A modules/core/domain/src/main/java/org/rhq/core/domain/plugin/CannedGroupExpression.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/PluginGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/PluginGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/server/ear/pom.xml A modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginAdditionsReader.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.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/PluginManagerLocal.java A modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/jboss-as/src/main/resources/META-INF/rhq-group-expressions.xml A modules/plugins/platform/src/main/resources/META-INF/rhq-group-expressions.xml

Log Message: ----------- Merge pull request #11 from lzoubek/feature/canned-expressions

Bug 1076126 - RFE: Canned dynaGroup expressions provided by plugin

Compare: https://github.com/rhq-project/rhq/compare/4edaa3b2de25...5ac07def1618