Skip to content

Commit

Permalink
final re-org work
Browse files Browse the repository at this point in the history
  • Loading branch information
@patriot1burke
patriot1burke committed Jan 20, 2016
1 parent d9487a8 commit efd8317
Show file tree
Hide file tree
Showing 66 changed files with 53 additions and 44 deletions.
2 changes: 1 addition & 1 deletion adapters/oidc/adapter-core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/as7-eap6/as7-adapter/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/as7-eap6/as7-subsystem/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>

<artifactId>keycloak-as7-subsystem</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/as7-eap6/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak AS7 / JBoss EAP 6 Integration</name>
<description/>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/installed/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jaxrs-oauth-client/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty-adapter-spi/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty-core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty8.1/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty9.1/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/jetty9.2/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/jetty/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Jetty Integration</name>
<description/>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/js/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/osgi-adapter/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/servlet-filter/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/servlet-oauth-client/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/spring-boot/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/spring-security/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
3 changes: 1 addition & 2 deletions adapters/oidc/tomcat/pom.xml
View file
Expand Up @@ -4,7 +4,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak Tomcat Integration</name>
<description/>
Expand All @@ -14,7 +14,6 @@
<packaging>pom</packaging>

<modules>
<module>tomcat-adapter-spi</module>
<module>tomcat-core</module>
<module>tomcat6</module>
<module>tomcat7</module>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/tomcat/tomcat-core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/tomcat/tomcat6/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/tomcat/tomcat7/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/tomcat/tomcat8/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/undertow/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/wildfly/pom.xml 100644 → 100755
View file
Expand Up @@ -4,7 +4,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<name>Keycloak WildFly Integration</name>
<description/>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/wildfly/wf8-subsystem/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>

<artifactId>keycloak-wf8-subsystem</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/wildfly/wildfly-adapter/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/oidc/wildfly/wildfly-subsystem/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
<relativePath>../../../../pom.xml</relativePath>
</parent>

<artifactId>keycloak-wildfly-subsystem</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion adapters/spi/adapter-spi/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/spi/jboss-adapter-core/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/spi/servlet-adapter-spi/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion adapters/spi/undertow-adapter-spi/pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
9 changes: 9 additions & 0 deletions docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
View file
Expand Up @@ -95,6 +95,15 @@
Feedback in template.ftl has been moved and format has changed slightly.
</para>
</simplesect>
<simplesect>
<title>Module and Source Code Re-org</title>
<para>
Most of our modules and source code have been consolidated into two maven modules: keycloak-server-spi and
keycloak-services. SPI interfaces are in server-spi, implementations are in keycloak-services.
All JPA dependent modules have been consolidated under keycloak-model-jpa. Same goes
with mongo and infinispan under modules keycloak-model-mongo and keycloak-model-infinispan.
</para>
</simplesect>
</section>
<section>
<title>Migrating to 1.8.0</title>
Expand Down
0 ...on/AbstractAuthenticationFlowContext.java → ...on/AbstractAuthenticationFlowContext.java
View file
File renamed without changes.
0 ...ak/authentication/AuthenticationFlow.java → ...ak/authentication/AuthenticationFlow.java
View file
File renamed without changes.
0 ...entication/AuthenticationFlowContext.java → ...entication/AuthenticationFlowContext.java
View file
File renamed without changes.
0 ...thentication/AuthenticationFlowError.java → ...thentication/AuthenticationFlowError.java
View file
File renamed without changes.
0 ...tication/AuthenticationFlowException.java → ...tication/AuthenticationFlowException.java
View file
File renamed without changes.
0 ...eycloak/authentication/Authenticator.java → ...eycloak/authentication/Authenticator.java
View file
File renamed without changes.
0 .../authentication/AuthenticatorFactory.java → .../authentication/AuthenticatorFactory.java
View file
File renamed without changes.
0 ...loak/authentication/AuthenticatorSpi.java → ...loak/authentication/AuthenticatorSpi.java
View file
File renamed without changes.
0 ...tion/ClientAuthenticationFlowContext.java → ...tion/ClientAuthenticationFlowContext.java
View file
File renamed without changes.
0 ...k/authentication/ClientAuthenticator.java → ...k/authentication/ClientAuthenticator.java
View file
File renamed without changes.
0 ...ntication/ClientAuthenticatorFactory.java → ...ntication/ClientAuthenticatorFactory.java
View file
File renamed without changes.
0 ...uthentication/ClientAuthenticatorSpi.java → ...uthentication/ClientAuthenticatorSpi.java
View file
File renamed without changes.
0 ...ion/ConfigurableAuthenticatorFactory.java → ...ion/ConfigurableAuthenticatorFactory.java
View file
File renamed without changes.
0 ...g/keycloak/authentication/FlowStatus.java → ...g/keycloak/authentication/FlowStatus.java
View file
File renamed without changes.
0 ...oak/authentication/ForkFlowException.java → ...oak/authentication/ForkFlowException.java
View file
File renamed without changes.
0 ...g/keycloak/authentication/FormAction.java → ...g/keycloak/authentication/FormAction.java
View file
File renamed without changes.
0 ...oak/authentication/FormActionFactory.java → ...oak/authentication/FormActionFactory.java
View file
File renamed without changes.
0 ...eycloak/authentication/FormActionSpi.java → ...eycloak/authentication/FormActionSpi.java
View file
File renamed without changes.
0 ...oak/authentication/FormAuthenticator.java → ...oak/authentication/FormAuthenticator.java
View file
File renamed without changes.
0 ...hentication/FormAuthenticatorFactory.java → ...hentication/FormAuthenticatorFactory.java
View file
File renamed without changes.
0 .../authentication/FormAuthenticatorSpi.java → .../authentication/FormAuthenticatorSpi.java
View file
File renamed without changes.
0 .../keycloak/authentication/FormContext.java → .../keycloak/authentication/FormContext.java
View file
File renamed without changes.
0 ...authentication/RequiredActionContext.java → ...authentication/RequiredActionContext.java
View file
File renamed without changes.
0 ...authentication/RequiredActionFactory.java → ...authentication/RequiredActionFactory.java
View file
File renamed without changes.
0 ...uthentication/RequiredActionProvider.java → ...uthentication/RequiredActionProvider.java
View file
File renamed without changes.
0 ...oak/authentication/RequiredActionSpi.java → ...oak/authentication/RequiredActionSpi.java
View file
File renamed without changes.
0 ...oak/authentication/ValidationContext.java → ...oak/authentication/ValidationContext.java
View file
File renamed without changes.
6 changes: 6 additions & 0 deletions server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file
Expand Up @@ -27,4 +27,10 @@ org.keycloak.truststore.TruststoreSpi
org.keycloak.connections.httpclient.HttpClientSpi
org.keycloak.models.cache.CacheRealmProviderSpi
org.keycloak.models.cache.CacheUserProviderSpi
org.keycloak.authentication.AuthenticatorSpi
org.keycloak.authentication.ClientAuthenticatorSpi
org.keycloak.authentication.RequiredActionSpi
org.keycloak.authentication.FormAuthenticatorSpi
org.keycloak.authentication.FormActionSpi


6 changes: 3 additions & 3 deletions services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
View file
Expand Up @@ -136,7 +136,7 @@ protected String extractTokenFromResponse(String response, String tokenName) {
return null;
}

protected BrokeredIdentityContext getFederatedIdentity(String response) {
public BrokeredIdentityContext getFederatedIdentity(String response) {
String accessToken = extractTokenFromResponse(response, OAUTH2_PARAMETER_ACCESS_TOKEN);

if (accessToken == null) {
Expand Down Expand Up @@ -168,7 +168,7 @@ protected UriBuilder createAuthorizationUrl(AuthenticationRequest request) {
* @param name of property to get
* @return string value of the property or null.
*/
protected String getJsonProperty(JsonNode jsonNode, String name) {
public String getJsonProperty(JsonNode jsonNode, String name) {
if (jsonNode.has(name) && !jsonNode.get(name).isNull()) {
String s = jsonNode.get(name).asText();
if(s != null && !s.isEmpty())
Expand All @@ -180,7 +180,7 @@ protected String getJsonProperty(JsonNode jsonNode, String name) {
return null;
}

protected JsonNode asJsonNode(String json) throws IOException {
public JsonNode asJsonNode(String json) throws IOException {
return mapper.readTree(json);
}

Expand Down
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java
View file
Expand Up @@ -195,7 +195,7 @@ protected void processAccessTokenResponse(BrokeredIdentityContext context, Publi
}

@Override
protected BrokeredIdentityContext getFederatedIdentity(String response) {
public BrokeredIdentityContext getFederatedIdentity(String response) {
AccessTokenResponse tokenResponse = null;
try {
tokenResponse = JsonSerialization.readValue(response, AccessTokenResponse.class);
Expand Down
2 changes: 1 addition & 1 deletion services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java
View file
Expand Up @@ -144,7 +144,7 @@ protected static String getJsonValue(IdentityProviderMapperModel mapperModel, Br
return value;
}

protected static String getJsonValue(JsonNode baseNode, String fieldPath) {
public static String getJsonValue(JsonNode baseNode, String fieldPath) {
logger.debug("Going to process JsonNode path " + fieldPath + " on data " + baseNode);
if (baseNode != null) {

Expand Down
5 changes: 0 additions & 5 deletions services/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file
@@ -1,9 +1,4 @@
org.keycloak.exportimport.ClientDescriptionConverterSpi
org.keycloak.wellknown.WellKnownSpi
org.keycloak.messages.MessagesSpi
org.keycloak.authentication.AuthenticatorSpi
org.keycloak.authentication.ClientAuthenticatorSpi
org.keycloak.authentication.RequiredActionSpi
org.keycloak.authentication.FormAuthenticatorSpi
org.keycloak.authentication.FormActionSpi
org.keycloak.services.clientregistration.ClientRegistrationSpi

0 comments on commit efd8317

Please sign in to comment.