HWKALERTS-145 Remove Hawkular Accounts dependency

hawkular · May 5, 2016 · 2b9f512 · 2b9f512
1 parent cb7405e
commit 2b9f512
Show file tree

Hide file tree

Showing 34 changed files with 25 additions and 411 deletions.
diff --git a/...s/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...s/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus"/>
     </dependencies>
   </deployment>

diff --git a/...ts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-web.xml b/...ts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/aerogear</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/...r-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/web.xml b/...r-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
          version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/...gins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...gins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...lerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-web.xml b/...lerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/email</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/...ular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/web.xml b/...ular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/...ugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...ugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-web.xml b/...alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/file</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/web.xml b/hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/...lugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...lugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-web.xml b/...-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/irc</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/web.xml b/hawkular-alerts-actions-plugins/hawkular-alerts-actions-irc/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/.../hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/.../hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...s-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-web.xml b/...s-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/pagerduty</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/...-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/web.xml b/...-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/...lugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...lugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml b/...-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/sms</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/web.xml b/hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/...ugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...ugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml b/...alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/jboss-web.xml
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/snmp</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/web.xml b/hawkular-alerts-actions-plugins/hawkular-alerts-actions-snmp/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>
diff --git a/...ns/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/...ns/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -20,8 +20,6 @@
 <jboss-deployment-structure>
   <deployment>
     <dependencies>
-      <module name="org.hawkular.commons.cassandra-driver" export="true" />
-      <module name="com.google.guava" export="true" />
       <module name="org.hawkular.bus" />
     </dependencies>
   </deployment>

diff --git a/...rts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-web.xml b/...rts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright 2015 Red Hat, Inc. and/or its affiliates
+    Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,5 +19,4 @@
 -->
 <jboss-web>
   <context-root>/hawkular/actions/webhook</context-root>
-  <security-domain>keycloak</security-domain>
 </jboss-web>
diff --git a/...ar-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/web.xml b/...ar-alerts-actions-plugins/hawkular-alerts-actions-webhook/src/main/webapp/WEB-INF/web.xml
@@ -21,31 +21,4 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
-  <context-param>
-    <param-name>org.keycloak.secretstore.enabled</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>REST endpoints</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>KEYCLOAK</auth-method>
-    <realm-name>hawkular</realm-name>
-  </login-config>
-
-  <security-role>
-    <role-name>user</role-name>
-  </security-role>
-  <security-role>
-    <role-name>admin</role-name>
-  </security-role>
-
 </web-app>