libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

final re-org work

Browse source
This commit is contained in:
Bill Burke 2016-01-20 17:26:26 -05:00
parent d9487a8745
commit efd8317259
66 changed files with 53 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adapters/oidc/adapter-core/pom.xml
View file

@ -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>

2
adapters/oidc/as7-eap6/as7-adapter-spi/pom.xml
View file

@ -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>

2
adapters/oidc/as7-eap6/as7-adapter/pom.xml
View file

@ -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>

2
adapters/oidc/as7-eap6/as7-subsystem/pom.xml
View file

@ -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>

2
adapters/oidc/as7-eap6/pom.xml
View file

@ -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/>

2
adapters/oidc/installed/pom.xml
View file

@ -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>

2
adapters/oidc/jaxrs-oauth-client/pom.xml
View file

@ -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>

2
adapters/oidc/jetty/jetty-adapter-spi/pom.xml
View file

@ -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>

2
adapters/oidc/jetty/jetty-core/pom.xml
View file

@ -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>

2
adapters/oidc/jetty/jetty8.1/pom.xml
View file

@ -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>

2
adapters/oidc/jetty/jetty9.1/pom.xml
View file

@ -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>

2
adapters/oidc/jetty/jetty9.2/pom.xml
View file

@ -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>

2
adapters/oidc/jetty/pom.xml
View file

@ -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/>

2
adapters/oidc/js/pom.xml
View file

@ -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>

2
adapters/oidc/osgi-adapter/pom.xml
View file

@ -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>

2
adapters/oidc/servlet-filter/pom.xml
View file

@ -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>

2
adapters/oidc/servlet-oauth-client/pom.xml
View file

@ -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>

2
adapters/oidc/spring-boot/pom.xml
View file

@ -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>

2
adapters/oidc/spring-security/pom.xml
View file

@ -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>

3
adapters/oidc/tomcat/pom.xml
View file

@ -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/>
@ -14,7 +14,6 @@
<packaging>pom</packaging>
<modules>
<module>tomcat-adapter-spi</module>
<module>tomcat-core</module>
<module>tomcat6</module>
<module>tomcat7</module>

2
adapters/oidc/tomcat/tomcat-core/pom.xml
View file

@ -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>

2
adapters/oidc/tomcat/tomcat6/pom.xml
View file

@ -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>

2
adapters/oidc/tomcat/tomcat7/pom.xml
View file

@ -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>

2
adapters/oidc/tomcat/tomcat8/pom.xml
View file

@ -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>

2
adapters/oidc/undertow/pom.xml
View file

@ -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>

2
adapters/oidc/wildfly/pom.xml Normal file → Executable file
View file

@ -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/>

2
adapters/oidc/wildfly/wf8-subsystem/pom.xml
View file

@ -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>

2
adapters/oidc/wildfly/wildfly-adapter/pom.xml
View file

@ -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>

2
adapters/oidc/wildfly/wildfly-subsystem/pom.xml
View file

@ -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>

2
adapters/spi/adapter-spi/pom.xml
View file

@ -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>

2
adapters/spi/jboss-adapter-core/pom.xml
View file

@ -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>

2
adapters/spi/servlet-adapter-spi/pom.xml
View file

@ -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>

2
adapters/spi/undertow-adapter-spi/pom.xml
View file

@ -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>

9
docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
View file

@ -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>

0
services/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java → server-spi/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java
View file

0
services/src/main/java/org/keycloak/authentication/AuthenticationFlow.java → server-spi/src/main/java/org/keycloak/authentication/AuthenticationFlow.java
View file

0
services/src/main/java/org/keycloak/authentication/AuthenticationFlowContext.java → server-spi/src/main/java/org/keycloak/authentication/AuthenticationFlowContext.java
View file

0
services/src/main/java/org/keycloak/authentication/AuthenticationFlowError.java → server-spi/src/main/java/org/keycloak/authentication/AuthenticationFlowError.java
View file

0
services/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java → server-spi/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java
View file

0
services/src/main/java/org/keycloak/authentication/Authenticator.java → server-spi/src/main/java/org/keycloak/authentication/Authenticator.java
View file

0
services/src/main/java/org/keycloak/authentication/AuthenticatorFactory.java → server-spi/src/main/java/org/keycloak/authentication/AuthenticatorFactory.java
View file

0
services/src/main/java/org/keycloak/authentication/AuthenticatorSpi.java → server-spi/src/main/java/org/keycloak/authentication/AuthenticatorSpi.java
View file

0
services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlowContext.java → server-spi/src/main/java/org/keycloak/authentication/ClientAuthenticationFlowContext.java
View file

0
services/src/main/java/org/keycloak/authentication/ClientAuthenticator.java → server-spi/src/main/java/org/keycloak/authentication/ClientAuthenticator.java
View file

0
services/src/main/java/org/keycloak/authentication/ClientAuthenticatorFactory.java → server-spi/src/main/java/org/keycloak/authentication/ClientAuthenticatorFactory.java
View file

0
services/src/main/java/org/keycloak/authentication/ClientAuthenticatorSpi.java → server-spi/src/main/java/org/keycloak/authentication/ClientAuthenticatorSpi.java
View file

0
services/src/main/java/org/keycloak/authentication/ConfigurableAuthenticatorFactory.java → server-spi/src/main/java/org/keycloak/authentication/ConfigurableAuthenticatorFactory.java
View file

0
services/src/main/java/org/keycloak/authentication/FlowStatus.java → server-spi/src/main/java/org/keycloak/authentication/FlowStatus.java
View file

0
services/src/main/java/org/keycloak/authentication/ForkFlowException.java → server-spi/src/main/java/org/keycloak/authentication/ForkFlowException.java
View file

0
services/src/main/java/org/keycloak/authentication/FormAction.java → server-spi/src/main/java/org/keycloak/authentication/FormAction.java
View file

0
services/src/main/java/org/keycloak/authentication/FormActionFactory.java → server-spi/src/main/java/org/keycloak/authentication/FormActionFactory.java
View file

0
services/src/main/java/org/keycloak/authentication/FormActionSpi.java → server-spi/src/main/java/org/keycloak/authentication/FormActionSpi.java
View file

0
services/src/main/java/org/keycloak/authentication/FormAuthenticator.java → server-spi/src/main/java/org/keycloak/authentication/FormAuthenticator.java
View file

0
services/src/main/java/org/keycloak/authentication/FormAuthenticatorFactory.java → server-spi/src/main/java/org/keycloak/authentication/FormAuthenticatorFactory.java
View file

0
services/src/main/java/org/keycloak/authentication/FormAuthenticatorSpi.java → server-spi/src/main/java/org/keycloak/authentication/FormAuthenticatorSpi.java
View file

0
services/src/main/java/org/keycloak/authentication/FormContext.java → server-spi/src/main/java/org/keycloak/authentication/FormContext.java
View file

0
services/src/main/java/org/keycloak/authentication/RequiredActionContext.java → server-spi/src/main/java/org/keycloak/authentication/RequiredActionContext.java
View file

0
services/src/main/java/org/keycloak/authentication/RequiredActionFactory.java → server-spi/src/main/java/org/keycloak/authentication/RequiredActionFactory.java
View file

0
services/src/main/java/org/keycloak/authentication/RequiredActionProvider.java → server-spi/src/main/java/org/keycloak/authentication/RequiredActionProvider.java
View file

0
services/src/main/java/org/keycloak/authentication/RequiredActionSpi.java → server-spi/src/main/java/org/keycloak/authentication/RequiredActionSpi.java
View file

0
services/src/main/java/org/keycloak/authentication/ValidationContext.java → server-spi/src/main/java/org/keycloak/authentication/ValidationContext.java
View file

6
server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -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
services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
View file

@ -136,7 +136,7 @@ public abstract class AbstractOAuth2IdentityProvider<C extends OAuth2IdentityPro
return null;
}
protected BrokeredIdentityContext getFederatedIdentity(String response) {
public BrokeredIdentityContext getFederatedIdentity(String response) {
String accessToken = extractTokenFromResponse(response, OAUTH2_PARAMETER_ACCESS_TOKEN);
if (accessToken == null) {
@ -168,7 +168,7 @@ public abstract class AbstractOAuth2IdentityProvider<C extends OAuth2IdentityPro
* @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())
@ -180,7 +180,7 @@ public abstract class AbstractOAuth2IdentityProvider<C extends OAuth2IdentityPro
return null;
}
protected JsonNode asJsonNode(String json) throws IOException {
public JsonNode asJsonNode(String json) throws IOException {
return mapper.readTree(json);
}

2
services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java
View file

@ -195,7 +195,7 @@ public class OIDCIdentityProvider extends AbstractOAuth2IdentityProvider<OIDCIde
}
@Override
protected BrokeredIdentityContext getFederatedIdentity(String response) {
public BrokeredIdentityContext getFederatedIdentity(String response) {
AccessTokenResponse tokenResponse = null;
try {
tokenResponse = JsonSerialization.readValue(response, AccessTokenResponse.class);

2
services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java
View file

@ -144,7 +144,7 @@ public abstract class AbstractJsonUserAttributeMapper extends AbstractIdentityPr
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) {

5
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