From 01f3c6ceb74293f933ee8490238e2ee799309718 Mon Sep 17 00:00:00 2001 From: Bill Burke Date: Wed, 20 Jan 2016 15:38:09 -0500 Subject: [PATCH] reorg event log/email --- dependencies/server-all/pom.xml | 9 ---- dependencies/server-min/pom.xml | 6 +-- .../keycloak-events-email/main/module.xml | 18 -------- .../main/module.xml | 18 -------- .../WEB-INF/jboss-deployment-structure.xml | 2 - .../keycloak-services/main/module.xml | 2 - events/email/pom.xml | 38 ---------------- ...ycloak.events.EventListenerProviderFactory | 1 - events/jboss-logging/pom.xml | 43 ------------------- events/pom.xml | 2 - pom.xml | 13 +----- .../email/EmailEventListenerProvider.java | 0 .../EmailEventListenerProviderFactory.java | 0 .../JBossLoggingEventListenerProvider.java | 0 ...ssLoggingEventListenerProviderFactory.java | 0 ...ycloak.events.EventListenerProviderFactory | 1 + 16 files changed, 3 insertions(+), 150 deletions(-) delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml delete mode 100755 distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml delete mode 100755 events/email/pom.xml delete mode 100644 events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory delete mode 100755 events/jboss-logging/pom.xml rename {events/email => services}/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java (100%) rename {events/email => services}/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java (100%) rename {events/jboss-logging => services}/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java (100%) rename {events/jboss-logging => services}/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java (100%) rename {events/jboss-logging => services}/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory (51%) mode change 100644 => 100755 diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml index 4a2ff44ac0..f2f0ac30c3 100755 --- a/dependencies/server-all/pom.xml +++ b/dependencies/server-all/pom.xml @@ -28,15 +28,6 @@ org.keycloak keycloak-model-infinispan - - org.keycloak - keycloak-events-jboss-logging - - - org.keycloak - keycloak-events-email - - org.keycloak diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml index c7c6375f3e..4dddea7d8f 100755 --- a/dependencies/server-min/pom.xml +++ b/dependencies/server-min/pom.xml @@ -43,11 +43,7 @@ org.keycloak keycloak-server-spi - - org.keycloak - keycloak-events-jboss-logging - - + org.keycloak keycloak-js-adapter diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml deleted file mode 100755 index 082c8fbc2d..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml deleted file mode 100755 index 3c37f2ddc7..0000000000 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml index 352871e17f..07cdcf25ea 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml @@ -3,8 +3,6 @@ - - diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml index c013524519..46916be2fe 100755 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml @@ -11,8 +11,6 @@ - - diff --git a/events/email/pom.xml b/events/email/pom.xml deleted file mode 100755 index 6769ae3972..0000000000 --- a/events/email/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - keycloak-events-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - - - 4.0.0 - - keycloak-events-email - Keycloak Events Email Provider - - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.jboss.logging - jboss-logging - provided - - - junit - junit - test - - - - diff --git a/events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory b/events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory deleted file mode 100644 index 31448f3ad3..0000000000 --- a/events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory +++ /dev/null @@ -1 +0,0 @@ -org.keycloak.events.email.EmailEventListenerProviderFactory \ No newline at end of file diff --git a/events/jboss-logging/pom.xml b/events/jboss-logging/pom.xml deleted file mode 100755 index 89646bb080..0000000000 --- a/events/jboss-logging/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - keycloak-events-parent - org.keycloak - 1.9.0.CR1-SNAPSHOT - - - 4.0.0 - - keycloak-events-jboss-logging - Keycloak Events JBoss Logging Provider - - - - - org.jboss.logging - jboss-logging - provided - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.jboss.resteasy - resteasy-jaxrs - provided - - - junit - junit - test - - - - diff --git a/events/pom.xml b/events/pom.xml index 1307cdb50f..45e28e5916 100755 --- a/events/pom.xml +++ b/events/pom.xml @@ -16,8 +16,6 @@ pom - email - jboss-logging syslog diff --git a/pom.xml b/pom.xml index 7b910ee9d9..f200a2afb7 100755 --- a/pom.xml +++ b/pom.xml @@ -149,13 +149,12 @@ model events saml - broker social forms - examples util wildfly + examples testsuite @@ -635,16 +634,6 @@ keycloak-client-api ${project.version} - - org.keycloak - keycloak-events-email - ${project.version} - - - org.keycloak - keycloak-events-jboss-logging - ${project.version} - org.keycloak keycloak-events-syslog diff --git a/events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java similarity index 100% rename from events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java rename to services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java diff --git a/events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java similarity index 100% rename from events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java rename to services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java diff --git a/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java similarity index 100% rename from events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java rename to services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java diff --git a/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java similarity index 100% rename from events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java rename to services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java diff --git a/events/jboss-logging/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory old mode 100644 new mode 100755 similarity index 51% rename from events/jboss-logging/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory rename to services/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory index c1ebc1f1a3..8591bfd0ed --- a/events/jboss-logging/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory +++ b/services/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory @@ -1 +1,2 @@ +org.keycloak.events.email.EmailEventListenerProviderFactory org.keycloak.events.log.JBossLoggingEventListenerProviderFactory \ No newline at end of file