Branch: refs/heads/release/jon3.3.x Home: https://github.com/rhq-project/rhq Commit: 41a68bdf6fbac4a7270c654f878513ca4221c8d5 https://github.com/rhq-project/rhq/commit/41a68bdf6fbac4a7270c654f878513ca42... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertNotificationRest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/helper/ConfigurationHelper.java M modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationHelperTest.java M modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/AlertNotification.java
Log Message: ----------- Bug 1041393 - alert notification of type Resource operations is not correctly rendered by API
AlertNotificationRest extended with extraConfig field where we now output notification extra config (in case of Resource Operations alert sender, it's input parameters for operation)
With this commit we now also properly render alert notification config (simple property types mapped correctly to JSON/XML, not "just" string values)
This commit fixes ConfigurationHelper#configurationToMap which transforms Configuration to generic Map, now it can work without Configuration Definition - as a fall-back it maps all simple properties to string values.
(cherry picked from commit dad83f3ab84e87e67b4c58d2ce7477a2a782e485) Signed-off-by: Jirka Kremser jkremser@redhat.com
Commit: 0a3d6dc5d2f09595002c43d070da5126dfa40cfc https://github.com/rhq-project/rhq/commit/0a3d6dc5d2f09595002c43d070da5126df... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertDefinitionHandlerBean.java M modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AlertTest.java
Log Message: ----------- Bug 1127264 - Creating alert notification of type Resource Operations ignores extraConfig field
(cherry picked from commit 9916185a5097df1b25f6b246f913ec8301574674) Signed-off-by: Jirka Kremser jkremser@redhat.com
Compare: https://github.com/rhq-project/rhq/compare/c529c47bab96...0a3d6dc5d2f0