Merge pull request #74 from lucasponce/HWKALERTS-69

HWKALERTS-69 Rename hawkular-actions into hawkular-alerts-actions
hawkular · Jul 21, 2015 · d1ab0f4 · d1ab0f4
2 parents c3eee24 + 46aec6f
commit d1ab0f4
Show file tree

Hide file tree

Showing 54 changed files with 103 additions and 104 deletions.
diff --git a/hawkular-actions-api/pom.xml → hawkular-alerts-actions-api/pom.xml b/hawkular-actions-api/pom.xml → hawkular-alerts-actions-api/pom.xml
@@ -26,10 +26,10 @@
     <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hawkular-actions-api</artifactId>
+  <artifactId>hawkular-alerts-actions-api</artifactId>
   <packaging>jar</packaging>
 
-  <name>Hawkular Actions Api</name>
+  <name>Hawkular Alerts Actions Api</name>
 
   <dependencies>
 

diff --git a/...g/hawkular/actions/api/log/MsgLogger.java → ...lar/alerts/actions/api/log/MsgLogger.java b/...g/hawkular/actions/api/log/MsgLogger.java → ...lar/alerts/actions/api/log/MsgLogger.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.api.log;
+package org.hawkular.alerts.actions.api.log;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;

diff --git a/...ular/actions/api/model/ActionMessage.java → ...erts/actions/api/model/ActionMessage.java b/...ular/actions/api/model/ActionMessage.java → ...erts/actions/api/model/ActionMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.api.model;
+package org.hawkular.alerts.actions.api.model;
 
 import java.util.Map;
 

diff --git a/...ctions/api/model/ActionPluginMessage.java → ...ctions/api/model/ActionPluginMessage.java b/...ctions/api/model/ActionPluginMessage.java → ...ctions/api/model/ActionPluginMessage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.api.model;
+package org.hawkular.alerts.actions.api.model;
 
 import java.util.Map;
 import java.util.Set;

diff --git a/...plugins/hawkular-actions-aerogear/pom.xml → .../hawkular-alerts-actions-aerogear/pom.xml b/...plugins/hawkular-actions-aerogear/pom.xml → .../hawkular-alerts-actions-aerogear/pom.xml
@@ -22,14 +22,14 @@
 
   <parent>
     <groupId>org.hawkular.alerts</groupId>
-    <artifactId>hawkular-actions-plugins</artifactId>
+    <artifactId>hawkular-alerts-actions-plugins</artifactId>
     <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hawkular-actions-aerogear</artifactId>
+  <artifactId>hawkular-alerts-actions-aerogear</artifactId>
   <packaging>war</packaging>
 
-  <name>Hawkular Action Aerogear Plugin</name>
+  <name>Hawkular Alerts Action Aerogear Plugin</name>
 
   <dependencies>
     <dependency>

diff --git a/...s/aerogear/listener/AerogearListener.java → ...s/aerogear/listener/AerogearListener.java b/...s/aerogear/listener/AerogearListener.java → ...s/aerogear/listener/AerogearListener.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.aerogear.listener;
+package org.hawkular.alerts.actions.aerogear.listener;
 
 import javax.annotation.PostConstruct;
 import javax.ejb.ActivationConfigProperty;
 import javax.ejb.MessageDriven;
 import javax.jms.MessageListener;
 
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.api.model.ActionMessage;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.api.model.ActionMessage;
 import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.bus.common.consumer.BasicMessageListener;

diff --git a/...rogear/registration/RegistrationInit.java → ...rogear/registration/RegistrationInit.java b/...rogear/registration/RegistrationInit.java → ...rogear/registration/RegistrationInit.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.aerogear.registration;
+package org.hawkular.alerts.actions.aerogear.registration;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -26,8 +26,8 @@
 import javax.jms.JMSException;
 import javax.jms.QueueConnectionFactory;
 
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.api.model.ActionPluginMessage;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.api.model.ActionPluginMessage;
 import org.hawkular.bus.common.ConnectionContextFactory;
 import org.hawkular.bus.common.Endpoint;
 import org.hawkular.bus.common.MessageId;

diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...ear/src/main/webapp/WEB-INF/jboss-web.xml → ...ear/src/main/webapp/WEB-INF/jboss-web.xml b/...ear/src/main/webapp/WEB-INF/jboss-web.xml → ...ear/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...-aerogear/src/main/webapp/WEB-INF/web.xml → ...-aerogear/src/main/webapp/WEB-INF/web.xml b/...-aerogear/src/main/webapp/WEB-INF/web.xml → ...-aerogear/src/main/webapp/WEB-INF/web.xml
diff --git a/...rogear/listener/AerogearListenerTest.java → ...rogear/listener/AerogearListenerTest.java b/...rogear/listener/AerogearListenerTest.java → ...rogear/listener/AerogearListenerTest.java
@@ -14,12 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.aerogear.listener;
+package org.hawkular.alerts.actions.aerogear.listener;
 
-import static org.hawkular.actions.aerogear.listener.AerogearListener.APPLICATION_ID_PROPERTY;
-import static org.hawkular.actions.aerogear.listener.AerogearListener.MASTER_SECRET_PROPERTY;
-import static org.hawkular.actions.aerogear.listener.AerogearListener.ROOT_SERVER_URL_PROPERTY;
-import static org.hawkular.actions.aerogear.listener.UnifiedMessageMatcher.matchesUnifiedMessage;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -29,7 +25,7 @@
 
 import com.google.common.collect.ImmutableMap;
 
-import org.hawkular.actions.api.model.ActionMessage;
+import org.hawkular.alerts.actions.api.model.ActionMessage;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -46,9 +42,9 @@ public class AerogearListenerTest {
 
     @BeforeClass
     public static void configureListener() {
-        System.setProperty(ROOT_SERVER_URL_PROPERTY, "http://localhost:9191/ag-push");
-        System.setProperty(APPLICATION_ID_PROPERTY, "4d564d56qs4056-d0sq564065");
-        System.setProperty(MASTER_SECRET_PROPERTY, "sddqs--sqd-qs--d-qs000dsq0d");
+        System.setProperty(AerogearListener.ROOT_SERVER_URL_PROPERTY, "http://localhost:9191/ag-push");
+        System.setProperty(AerogearListener.APPLICATION_ID_PROPERTY, "4d564d56qs4056-d0sq564065");
+        System.setProperty(AerogearListener.MASTER_SECRET_PROPERTY, "sddqs--sqd-qs--d-qs000dsq0d");
     }
 
     private PushSender pushSender;
@@ -71,7 +67,8 @@ public void testSend() throws Exception {
         actionMessage.setMessage(expectedContent);
         aerogearListener.onBasicMessage(actionMessage);
 
-        verify(pushSender, times(1)).send(argThat(matchesUnifiedMessage(expectedAlias, expectedContent)));
+        verify(pushSender, times(1)).send(argThat(UnifiedMessageMatcher
+                .matchesUnifiedMessage(expectedAlias, expectedContent)));
     }
 
     @Test
@@ -83,6 +80,6 @@ public void testBroadcast() throws Exception {
         actionMessage.setMessage(expectedContent);
         aerogearListener.onBasicMessage(actionMessage);
 
-        verify(pushSender, times(1)).send(argThat(matchesUnifiedMessage(null, expectedContent)));
+        verify(pushSender, times(1)).send(argThat(UnifiedMessageMatcher.matchesUnifiedMessage(null, expectedContent)));
     }
 }
diff --git a/...ogear/listener/UnifiedMessageMatcher.java → ...ogear/listener/UnifiedMessageMatcher.java b/...ogear/listener/UnifiedMessageMatcher.java → ...ogear/listener/UnifiedMessageMatcher.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.aerogear.listener;
+package org.hawkular.alerts.actions.aerogear.listener;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...ns-plugins/hawkular-actions-email/pom.xml → ...ins/hawkular-alerts-actions-email/pom.xml b/...ns-plugins/hawkular-actions-email/pom.xml → ...ins/hawkular-alerts-actions-email/pom.xml
@@ -22,14 +22,22 @@
 
   <parent>
     <groupId>org.hawkular.alerts</groupId>
-    <artifactId>hawkular-actions-plugins</artifactId>
+    <artifactId>hawkular-alerts-actions-plugins</artifactId>
     <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hawkular-actions-email</artifactId>
+  <artifactId>hawkular-alerts-actions-email</artifactId>
   <packaging>war</packaging>
 
-  <name>Hawkular Action Email Plugin</name>
+  <name>Hawkular Alerts Action Email Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>${version.org.freemarker}</version>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>

diff --git a/...g/hawkular/actions/email/EmailPlugin.java → ...lar/alerts/actions/email/EmailPlugin.java b/...g/hawkular/actions/email/EmailPlugin.java → ...lar/alerts/actions/email/EmailPlugin.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.email;
+package org.hawkular.alerts.actions.email;
 
 /**
  * Main class to store common properties for email plugin.

diff --git a/...actions/email/listener/EmailListener.java → ...actions/email/listener/EmailListener.java b/...actions/email/listener/EmailListener.java → ...actions/email/listener/EmailListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.email.listener;
+package org.hawkular.alerts.actions.email.listener;
 
 import java.util.Date;
 import java.util.Map;
@@ -33,10 +33,10 @@
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.api.model.ActionMessage;
-import org.hawkular.actions.email.EmailPlugin;
-import org.hawkular.actions.email.template.EmailTemplate;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.api.model.ActionMessage;
+import org.hawkular.alerts.actions.email.EmailPlugin;
+import org.hawkular.alerts.actions.email.template.EmailTemplate;
 import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.bus.common.consumer.BasicMessageListener;

diff --git a/.../email/registration/RegistrationInit.java → .../email/registration/RegistrationInit.java b/.../email/registration/RegistrationInit.java → .../email/registration/RegistrationInit.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.email.registration;
+package org.hawkular.alerts.actions.email.registration;
 
 
 import java.io.IOException;
@@ -28,14 +28,14 @@
 import javax.jms.JMSException;
 import javax.jms.QueueConnectionFactory;
 
-import org.hawkular.actions.email.EmailPlugin;
+import org.hawkular.alerts.actions.email.EmailPlugin;
 import org.hawkular.bus.common.ConnectionContextFactory;
 import org.hawkular.bus.common.Endpoint;
 import org.hawkular.bus.common.MessageId;
 import org.hawkular.bus.common.MessageProcessor;
 import org.hawkular.bus.common.producer.ProducerConnectionContext;
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.api.model.ActionPluginMessage;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.api.model.ActionPluginMessage;
 import org.jboss.logging.Logger;
 
 /**

diff --git a/...actions/email/template/EmailTemplate.java → ...actions/email/template/EmailTemplate.java b/...actions/email/template/EmailTemplate.java → ...actions/email/template/EmailTemplate.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.email.template;
+package org.hawkular.alerts.actions.email.template;
 
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -27,8 +27,8 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.email.EmailPlugin;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.email.EmailPlugin;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;

diff --git a/...resources/template.html.default_en_US.ftl → ...resources/template.html.default_en_US.ftl b/...resources/template.html.default_en_US.ftl → ...resources/template.html.default_en_US.ftl
diff --git a/...esources/template.plain.default_en_US.ftl → ...esources/template.plain.default_en_US.ftl b/...esources/template.plain.default_en_US.ftl → ...esources/template.plain.default_en_US.ftl
diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...ail/src/main/webapp/WEB-INF/jboss-web.xml → ...ail/src/main/webapp/WEB-INF/jboss-web.xml b/...ail/src/main/webapp/WEB-INF/jboss-web.xml → ...ail/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...ons-email/src/main/webapp/WEB-INF/web.xml → ...ons-email/src/main/webapp/WEB-INF/web.xml b/...ons-email/src/main/webapp/WEB-INF/web.xml → ...ons-email/src/main/webapp/WEB-INF/web.xml
diff --git a/...ons/email/listener/EmailListenerTest.java → ...ons/email/listener/EmailListenerTest.java b/...ons/email/listener/EmailListenerTest.java → ...ons/email/listener/EmailListenerTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.email.listener;
+package org.hawkular.alerts.actions.email.listener;
 
 import static org.hawkular.alerts.api.model.condition.Alert.Status;
 import static org.hawkular.alerts.api.model.data.Availability.AvailabilityType;
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 import javax.mail.Message;
-import org.hawkular.actions.api.model.ActionMessage;
+import org.hawkular.alerts.actions.api.model.ActionMessage;
 import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;

diff --git a/...ns/email/templates/EmailTemplateTest.java → ...ns/email/templates/EmailTemplateTest.java b/...ns/email/templates/EmailTemplateTest.java → ...ns/email/templates/EmailTemplateTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.email.templates;
+package org.hawkular.alerts.actions.email.templates;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -29,8 +29,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.hawkular.actions.email.EmailPlugin;
-import org.hawkular.actions.email.template.EmailTemplate;
+import org.hawkular.alerts.actions.email.EmailPlugin;
+import org.hawkular.alerts.actions.email.template.EmailTemplate;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;

diff --git a/...email/src/test/resources/log4j.properties → ...email/src/test/resources/log4j.properties b/...email/src/test/resources/log4j.properties → ...email/src/test/resources/log4j.properties
diff --git a/...resources/template.html.default_en_US.ftl → ...resources/template.html.default_en_US.ftl b/...resources/template.html.default_en_US.ftl → ...resources/template.html.default_en_US.ftl
diff --git a/...esources/template.plain.default_en_US.ftl → ...esources/template.plain.default_en_US.ftl b/...esources/template.plain.default_en_US.ftl → ...esources/template.plain.default_en_US.ftl
diff --git a/...lugins/hawkular-actions-pagerduty/pom.xml → ...hawkular-alerts-actions-pagerduty/pom.xml b/...lugins/hawkular-actions-pagerduty/pom.xml → ...hawkular-alerts-actions-pagerduty/pom.xml
@@ -22,14 +22,14 @@
 
   <parent>
     <groupId>org.hawkular.alerts</groupId>
-    <artifactId>hawkular-actions-plugins</artifactId>
+    <artifactId>hawkular-alerts-actions-plugins</artifactId>
     <version>0.4.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>hawkular-actions-pagerduty</artifactId>
+  <artifactId>hawkular-alerts-actions-pagerduty</artifactId>
   <packaging>war</packaging>
 
-  <name>Hawkular Action PagerDuty Plugin</name>
+  <name>Hawkular Alerts Action PagerDuty Plugin</name>
 
   <dependencies>
     <dependency>

diff --git a/...pagerduty/listener/PagerDutyListener.java → ...pagerduty/listener/PagerDutyListener.java b/...pagerduty/listener/PagerDutyListener.java → ...pagerduty/listener/PagerDutyListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.pagerduty.listener;
+package org.hawkular.alerts.actions.pagerduty.listener;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -31,8 +31,8 @@
 import com.squareup.pagerduty.incidents.PagerDuty;
 import com.squareup.pagerduty.incidents.Trigger;
 
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.api.model.ActionMessage;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.api.model.ActionMessage;
 import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.bus.common.consumer.BasicMessageListener;

diff --git a/...erduty/registration/RegistrationInit.java → ...erduty/registration/RegistrationInit.java b/...erduty/registration/RegistrationInit.java → ...erduty/registration/RegistrationInit.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.pagerduty.registration;
+package org.hawkular.alerts.actions.pagerduty.registration;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -27,8 +27,8 @@
 import javax.jms.JMSException;
 import javax.jms.QueueConnectionFactory;
 
-import org.hawkular.actions.api.log.MsgLogger;
-import org.hawkular.actions.api.model.ActionPluginMessage;
+import org.hawkular.alerts.actions.api.log.MsgLogger;
+import org.hawkular.alerts.actions.api.model.ActionPluginMessage;
 import org.hawkular.bus.common.ConnectionContextFactory;
 import org.hawkular.bus.common.Endpoint;
 import org.hawkular.bus.common.MessageId;

diff --git a/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml b/...pp/WEB-INF/jboss-deployment-structure.xml → ...pp/WEB-INF/jboss-deployment-structure.xml
diff --git a/...uty/src/main/webapp/WEB-INF/jboss-web.xml → ...uty/src/main/webapp/WEB-INF/jboss-web.xml b/...uty/src/main/webapp/WEB-INF/jboss-web.xml → ...uty/src/main/webapp/WEB-INF/jboss-web.xml
diff --git a/...pagerduty/src/main/webapp/WEB-INF/web.xml → ...pagerduty/src/main/webapp/WEB-INF/web.xml b/...pagerduty/src/main/webapp/WEB-INF/web.xml → ...pagerduty/src/main/webapp/WEB-INF/web.xml
diff --git a/...rduty/listener/PagerDutyListenerTest.java → ...rduty/listener/PagerDutyListenerTest.java b/...rduty/listener/PagerDutyListenerTest.java → ...rduty/listener/PagerDutyListenerTest.java
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.hawkular.actions.pagerduty.listener;
+package org.hawkular.alerts.actions.pagerduty.listener;
 
-import static org.hawkular.actions.pagerduty.listener.PagerDutyListener.API_KEY_PROPERTY;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -25,7 +24,7 @@
 import com.squareup.pagerduty.incidents.FakePagerDuty;
 import com.squareup.pagerduty.incidents.NotifyResult;
 
-import org.hawkular.actions.api.model.ActionMessage;
+import org.hawkular.alerts.actions.api.model.ActionMessage;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,7 +36,7 @@ public class PagerDutyListenerTest {
 
     @BeforeClass
     public static void configureListener() {
-        System.setProperty(API_KEY_PROPERTY, "test");
+        System.setProperty(PagerDutyListener.API_KEY_PROPERTY, "test");
     }
 
     private FakePagerDuty fakePagerDuty;