diff --git a/README.md b/README.md index 3133f93..e5df20b 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ Keycloak Social Login extension for Discord. ## Install -Download `keycloak-discord-ear-.ear` from [Releases page](https://github.com/wadahiro/keycloak-discord/releases). -Then deploy it into `$KEYCLOAK_HOME/standalone/deployments/` directory. +Download `keycloak-discord-.jar` from [Releases page](https://github.com/wadahiro/keycloak-discord/releases). +Then deploy it into `$KEYCLOAK_HOME/providers` directory. ## Setup @@ -27,7 +27,7 @@ Note: You don't need to setup the theme in `master` realm from v0.3.0. ## Source Build Clone this repository and run `mvn package`. -You can see `keycloak-discord-ear-.ear` under `ear/target` directory. +You can see `keycloak-discord-.jar` under `target` directory. ## Licence diff --git a/ear/pom.xml b/ear/pom.xml deleted file mode 100755 index 7d88f43..0000000 --- a/ear/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - org.keycloak.extensions - keycloak-discord-parent - 0.3.2-SNAPSHOT - - - Keycloak Discord EAR - - 4.0.0 - - keycloak-discord-ear - ear - - - - org.keycloak.extensions - keycloak-discord-ejb - ejb - - - - - - - org.apache.maven.plugins - maven-ear-plugin - 2.10 - - 7 - lib - no-version - - - - org.wildfly.plugins - wildfly-maven-plugin - - false - - - - - diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/ear/src/main/application/META-INF/jboss-deployment-structure.xml deleted file mode 100755 index 6d7e67c..0000000 --- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/ejb/pom.xml b/ejb/pom.xml deleted file mode 100755 index b163125..0000000 --- a/ejb/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - org.keycloak.extensions - keycloak-discord-parent - 0.3.2-SNAPSHOT - - - Keycloak Discord EJB - - 4.0.0 - - keycloak-discord-ejb - jar - - - - org.keycloak - keycloak-core - provided - - - org.keycloak - keycloak-server-spi - provided - - - org.keycloak - keycloak-server-spi-private - provided - - - org.keycloak - keycloak-services - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - diff --git a/pom.xml b/pom.xml index fd356c0..775fbed 100755 --- a/pom.xml +++ b/pom.xml @@ -6,62 +6,52 @@ 4.0.0 org.keycloak.extensions - keycloak-discord-parent + keycloak-discord 0.3.2-SNAPSHOT - pom + jar - 9.0.2 - 1.1.0.Final + 17.0.0 - - - - org.keycloak.bom - keycloak-spi-bom - ${version.keycloak} - pom - import - - - org.keycloak.extensions - keycloak-discord-ejb - ${project.version} - ejb - - - org.keycloak - keycloak-server-spi-private - provided - ${version.keycloak} - - - org.keycloak - keycloak-services - provided - ${version.keycloak} - - - - - - ejb - ear - + + + org.keycloak + keycloak-core + provided + ${version.keycloak} + + + org.keycloak + keycloak-server-spi + provided + ${version.keycloak} + + + org.keycloak + keycloak-server-spi-private + provided + ${version.keycloak} + + + org.keycloak + keycloak-services + provided + ${version.keycloak} + + - - - - org.wildfly.plugins - wildfly-maven-plugin - ${version.wildfly.maven.plugin} - - true - - - - + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java similarity index 100% rename from ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java rename to src/main/java/org/keycloak/social/discord/DiscordIdentityProvider.java diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java similarity index 100% rename from ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java rename to src/main/java/org/keycloak/social/discord/DiscordIdentityProviderConfig.java diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java b/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java similarity index 100% rename from ejb/src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java rename to src/main/java/org/keycloak/social/discord/DiscordIdentityProviderFactory.java diff --git a/ejb/src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java b/src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java similarity index 100% rename from ejb/src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java rename to src/main/java/org/keycloak/social/discord/DiscordUserAttributeMapper.java diff --git a/ejb/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper b/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper similarity index 100% rename from ejb/src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper rename to src/main/resources/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper diff --git a/ejb/src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory b/src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory similarity index 100% rename from ejb/src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory rename to src/main/resources/META-INF/services/org.keycloak.broker.social.SocialIdentityProviderFactory diff --git a/ejb/src/main/resources/theme-resources/messages/admin-messages_en.properties b/src/main/resources/theme-resources/messages/admin-messages_en.properties similarity index 100% rename from ejb/src/main/resources/theme-resources/messages/admin-messages_en.properties rename to src/main/resources/theme-resources/messages/admin-messages_en.properties diff --git a/ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html similarity index 100% rename from ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html rename to src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord-ext.html diff --git a/ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html b/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html similarity index 100% rename from ejb/src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html rename to src/main/resources/theme-resources/resources/partials/realm-identity-provider-discord.html