[Hawkular-commits] [hawkular/hawkular-alerts] 45a0fe: Fix two issues with the jndi env resolution:

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-alerts Commit: 45a0fec79eedf4f67817c6f9b8edae5734040215 https://github.com/hawkular/hawkular-alerts/commit/45a0fec79eedf4f67817c6... Author: jshaughn <jshaughn(a)localhost.localdomain&gt; Date: 2016-09-26 (Mon, 26 Sep 2016) Changed paths: M hawkular-alerts-actions/hawkular-alerts-actions-impl/src/main/java/org/hawkular/alerts/actions/standalone/ServiceNames.java M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/deployments/hawkular-alerts-actions-aerogear-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/deployments/hawkular-alerts-actions-email-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/deployments/hawkular-alerts-actions-file-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-generic/deployments/hawkular-alerts-actions-generic-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/deployments/hawkular-alerts-actions-irc-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/deployments/hawkular-alerts-actions-pagerduty-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/deployments/hawkular-alerts-actions-sms-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/deployments/hawkular-alerts-actions-webhook-global-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/deployments/hawkular-alerts-actions-webhook-standalone/src/main/webapp/WEB-INF/web.xml Log Message: ----------- Fix two issues with the jndi env resolution: - Because 'standalone' is what we explicitly set (in the web.xml), it can't also be the default. Otherwise '-metrics' deployments get the standalone jndi names. - context-param sets info in servlet context, not as a env variable, and so the env resolution was always returning null. Instead, I think we want to use env-entry and resolve via jndi. Commit: 24320e814bb5371da53fee668e5ac9e81a9331c4 https://github.com/hawkular/hawkular-alerts/commit/24320e814bb5371da53fee... Author: Lucas Ponce <ponce.ballesteros(a)gmail.com&gt; Date: 2016-09-27 (Tue, 27 Sep 2016) Changed paths: M hawkular-alerts-actions/hawkular-alerts-actions-impl/src/main/java/org/hawkular/alerts/actions/standalone/ServiceNames.java M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/deployments/hawkular-alerts-actions-aerogear-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/deployments/hawkular-alerts-actions-email-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/deployments/hawkular-alerts-actions-file-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-generic/deployments/hawkular-alerts-actions-generic-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/deployments/hawkular-alerts-actions-irc-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/deployments/hawkular-alerts-actions-pagerduty-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/deployments/hawkular-alerts-actions-sms-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook-global/deployments/hawkular-alerts-actions-webhook-global-standalone/src/main/webapp/WEB-INF/web.xml M hawkular-alerts-actions/hawkular-alerts-actions-plugins/hawkular-alerts-actions-webhook/deployments/hawkular-alerts-actions-webhook-standalone/src/main/webapp/WEB-INF/web.xml Log Message: ----------- Merge pull request #213 from jshaughn/jndi-fix ServiceName fix Compare: https://github.com/hawkular/hawkular-alerts/compare/4bcf10138246...24320e...