[Hawkular-commits] [hawkular/hawkular-alerts] 1fd378: HWKALERTS-40 Tenant integration

Branch: refs/heads/wintermute Home: https://github.com/hawkular/hawkular-alerts Commit: 1fd3783e2295eea8784fecb6ded352756908f8d5 https://github.com/hawkular/hawkular-alerts/commit/1fd3783e2295eea8784fec... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-05-27 (Wed, 27 May 2015) Changed paths: M .travis.yml M README.adoc M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java M hawkular-alerts-ear/pom.xml M hawkular-alerts-engine/pom.xml M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql M hawkular-alerts-engine/src/main/resources/hawkular-alerts.properties M hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassTest.java R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsTest.java A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java M hawkular-alerts-engine/src/test/resources/hawkular-alerts.properties M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data M hawkular-alerts-rest-tests/pom.xml M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AbstractITestBase.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AlertsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ConditionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy A hawkular-alerts-rest-tests/src/test/resources/hawkular-realm-patch.json A hawkular-alerts-rest-tests/src/test/resources/log4j.properties A hawkular-alerts-rest-tests/src/test/resources/standalone.xsl M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/actions.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data M hawkular-alerts-rest/pom.xml M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/HawkularAlertsApp.java A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ResponseUtil.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java M hawkular-alerts-rest/src/main/webapp/WEB-INF/jboss-web.xml M hawkular-alerts-rest/src/main/webapp/WEB-INF/web.xml M pom.xml Log Message: ----------- HWKALERTS-40 Tenant integration Conflicts: hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java hawkular-alerts-engine/pom.xml hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data hawkular-alerts-rest-tests/pom.xml hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/actions.data hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data pom.xml Commit: 8a25b92181a97f0be34b061a4434a0eaeedd4428 https://github.com/hawkular/hawkular-alerts/commit/8a25b92181a97f0be34b06... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-05-28 (Thu, 28 May 2015) Changed paths: M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java Log Message: ----------- HWKALERTS-40 Minor fixes after review Commit: 27627d4c52d2e6209322cde8dc09e105ba5577d1 https://github.com/hawkular/hawkular-alerts/commit/27627d4c52d2e6209322cd... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2015-05-28 (Thu, 28 May 2015) Changed paths: M .travis.yml M README.adoc M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Tag.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/AlertsService.java M hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/services/DefinitionsService.java M hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java M hawkular-alerts-bus/src/main/java/org/hawkular/alerts/bus/sender/ActionSender.java M hawkular-alerts-ear/pom.xml M hawkular-alerts-engine/pom.xml M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbAlertsServiceImpl.java M hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/DbDefinitionsServiceImpl.java M hawkular-alerts-engine/src/main/resources/hawkular-alerts-schema.cql M hawkular-alerts-engine/src/main/resources/hawkular-alerts.properties M hawkular-alerts-engine/src/main/resources/hawkular-alerts/actions.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/main/resources/hawkular-alerts/triggers.data M hawkular-alerts-engine/src/main/resources/org/hawkular/alerts/engine/rules/ConditionMatch.drl A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassDefinitionsTest.java R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassTest.java R hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsServiceImplTest.java A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DbDefinitionsTest.java A hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/DefinitionsTest.java M hawkular-alerts-engine/src/test/resources/hawkular-alerts.properties M hawkular-alerts-engine/src/test/resources/hawkular-alerts/actions.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/conditions.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/dampening.data M hawkular-alerts-engine/src/test/resources/hawkular-alerts/triggers.data M hawkular-alerts-rest-tests/pom.xml M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AbstractITestBase.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ActionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/AlertsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/ConditionsITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/DampeningITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/LifecycleITest.groovy M hawkular-alerts-rest-tests/src/test/groovy/org/hawkular/alerts/rest/TriggersITest.groovy A hawkular-alerts-rest-tests/src/test/resources/hawkular-realm-patch.json A hawkular-alerts-rest-tests/src/test/resources/log4j.properties A hawkular-alerts-rest-tests/src/test/resources/standalone.xsl M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/actions.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/conditions.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/dampening.data M hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/triggers.data M hawkular-alerts-rest/pom.xml M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionPluginHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ActionsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/AlertsHandler.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/HawkularAlertsApp.java A hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/ResponseUtil.java M hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java M hawkular-alerts-rest/src/main/webapp/WEB-INF/jboss-web.xml M hawkular-alerts-rest/src/main/webapp/WEB-INF/web.xml M pom.xml Log Message: ----------- Merge pull request #50 from lucasponce/ACCOUNTS-WINTERMUTE HWKALERTS-40 Tenant integration Compare: https://github.com/hawkular/hawkular-alerts/compare/3239fcb097fb...27627d...