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

KEYCLOAK-1929 Change package names. Fix Fuse demo

Browse source
This commit is contained in:
mposolda 2015-10-16 16:30:32 +02:00
parent c21b56d596
commit 4587fd23b6
341 changed files with 524 additions and 663 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ package org.keycloak.broker.oidc;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.jboss.logging.Logger;
import org.keycloak.ClientConnection;
import org.keycloak.common.ClientConnection;
import org.keycloak.OAuth2Constants;
import org.keycloak.broker.provider.util.SimpleHttp;
import org.keycloak.broker.provider.AbstractIdentityProvider;

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

@ -42,7 +42,7 @@ import org.keycloak.services.messages.Messages;
import org.keycloak.services.resources.IdentityBrokerService;
import org.keycloak.services.resources.RealmsResource;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.PemUtils;
import org.keycloak.common.util.PemUtils;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

4
broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java
View file

@ -1,8 +1,8 @@
package org.keycloak.broker.saml;
import org.jboss.logging.Logger;
import org.keycloak.ClientConnection;
import org.keycloak.VerificationException;
import org.keycloak.common.ClientConnection;
import org.keycloak.common.VerificationException;
import org.keycloak.broker.provider.BrokeredIdentityContext;
import org.keycloak.broker.provider.IdentityBrokerException;
import org.keycloak.broker.provider.IdentityProvider;

2
client-api/src/main/java/org/keycloak/client/registration/ClientRegistration.java
View file

@ -12,7 +12,7 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.util.Base64;
import org.keycloak.common.util.Base64;
import org.keycloak.util.JsonSerialization;
import java.io.IOException;

2
common/pom.xml
View file

@ -18,7 +18,7 @@
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<keycloak.osgi.export>
org.keycloak.*
org.keycloak.common.*
</keycloak.osgi.export>
<keycloak.osgi.import>
*;resolution:=optional

2
common/src/main/java/org/keycloak/ClientConnection.java → common/src/main/java/org/keycloak/common/ClientConnection.java
View file

@ -1,4 +1,4 @@
package org.keycloak;
package org.keycloak.common;
/**
* Information about the client connection

2
common/src/main/java/org/keycloak/VerificationException.java → common/src/main/java/org/keycloak/common/VerificationException.java
View file

@ -1,4 +1,4 @@
package org.keycloak;
package org.keycloak.common;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

4
common/src/main/java/org/keycloak/Version.java → common/src/main/java/org/keycloak/common/Version.java
View file

@ -1,6 +1,6 @@
package org.keycloak;
package org.keycloak.common;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import java.io.IOException;
import java.io.InputStream;

2
common/src/main/java/org/keycloak/constants/GenericConstants.java → common/src/main/java/org/keycloak/common/constants/GenericConstants.java
View file

@ -1,4 +1,4 @@
package org.keycloak.constants;
package org.keycloak.common.constants;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

2
common/src/main/java/org/keycloak/constants/KerberosConstants.java → common/src/main/java/org/keycloak/common/constants/KerberosConstants.java
View file

@ -1,4 +1,4 @@
package org.keycloak.constants;
package org.keycloak.common.constants;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

2
common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java → common/src/main/java/org/keycloak/common/constants/ServiceAccountConstants.java
View file

@ -1,4 +1,4 @@
package org.keycloak.constants;
package org.keycloak.common.constants;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

2
common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java → common/src/main/java/org/keycloak/common/enums/RelativeUrlsUsed.java
View file

@ -1,4 +1,4 @@
package org.keycloak.enums;
package org.keycloak.common.enums;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

4
common/src/main/java/org/keycloak/enums/SslRequired.java → common/src/main/java/org/keycloak/common/enums/SslRequired.java
View file

@ -1,6 +1,6 @@
package org.keycloak.enums;
package org.keycloak.common.enums;
import org.keycloak.ClientConnection;
import org.keycloak.common.ClientConnection;
import java.net.InetAddress;
import java.net.UnknownHostException;

2
common/src/main/java/org/keycloak/util/Base64.java → common/src/main/java/org/keycloak/common/util/Base64.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
/**
* <p>Encodes and decodes to and from Base64 notation.</p>

4
common/src/main/java/org/keycloak/util/Base64Url.java → common/src/main/java/org/keycloak/common/util/Base64Url.java
View file

@ -1,8 +1,6 @@
package org.keycloak.util;
package org.keycloak.common.util;
import org.keycloak.util.Base64;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $

2
common/src/main/java/org/keycloak/util/BouncyIntegration.java → common/src/main/java/org/keycloak/common/util/BouncyIntegration.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import org.bouncycastle.jce.provider.BouncyCastleProvider;

3
common/src/main/java/org/keycloak/util/CertificateUtils.java → common/src/main/java/org/keycloak/common/util/CertificateUtils.java
View file

@ -1,10 +1,9 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.math.BigInteger;
import java.security.KeyPair;
import java.security.PrivateKey;
import java.security.SecureRandom;
import java.security.Security;
import java.security.cert.X509Certificate;
import java.util.Calendar;
import java.util.Date;

2
common/src/main/java/org/keycloak/util/CollectionUtil.java → common/src/main/java/org/keycloak/common/util/CollectionUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.Collection;
import java.util.Iterator;

2
common/src/main/java/org/keycloak/util/DerUtils.java → common/src/main/java/org/keycloak/common/util/DerUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.DataInputStream;
import java.io.InputStream;

2
common/src/main/java/org/keycloak/util/Encode.java → common/src/main/java/org/keycloak/common/util/Encode.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;

2
common/src/main/java/org/keycloak/util/EnvUtil.java → common/src/main/java/org/keycloak/common/util/EnvUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

4
common/src/main/java/org/keycloak/util/FindFile.java → common/src/main/java/org/keycloak/common/util/FindFile.java
View file

@ -1,6 +1,6 @@
package org.keycloak.util;
package org.keycloak.common.util;
import org.keycloak.constants.GenericConstants;
import org.keycloak.common.constants.GenericConstants;
import java.io.FileInputStream;
import java.io.FileNotFoundException;

2
common/src/main/java/org/keycloak/util/HostUtils.java → common/src/main/java/org/keycloak/common/util/HostUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.net.InetAddress;
import java.net.UnknownHostException;

2
common/src/main/java/org/keycloak/util/HtmlUtils.java → common/src/main/java/org/keycloak/common/util/HtmlUtils.java
View file

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.keycloak.util;
package org.keycloak.common.util;
/**
* @author pedroigor

7
common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java → common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@ -12,13 +12,12 @@ import java.lang.reflect.Method;
import javax.security.auth.kerberos.KerberosTicket;
import org.keycloak.util.Base64;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSManager;
import org.ietf.jgss.Oid;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.util.reflections.Reflections;
import org.keycloak.common.constants.KerberosConstants;
import org.keycloak.common.util.reflections.Reflections;
import sun.security.jgss.GSSCredentialImpl;
import sun.security.jgss.GSSManagerImpl;
import sun.security.jgss.krb5.Krb5InitCredential;

2
common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java → common/src/main/java/org/keycloak/common/util/KeycloakUriBuilder.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.net.URI;

4
common/src/main/java/org/keycloak/util/KeystoreUtil.java → common/src/main/java/org/keycloak/common/util/KeystoreUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.File;
import java.io.FileInputStream;
@ -6,7 +6,7 @@ import java.io.InputStream;
import java.security.KeyStore;
import java.security.PrivateKey;
import org.keycloak.constants.GenericConstants;
import org.keycloak.common.constants.GenericConstants;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
common/src/main/java/org/keycloak/util/MimeTypeUtil.java → common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import javax.activation.MimetypesFileTypeMap;
import java.io.File;

2
common/src/main/java/org/keycloak/util/MultivaluedHashMap.java → common/src/main/java/org/keycloak/common/util/MultivaluedHashMap.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.ArrayList;
import java.util.Collection;

2
common/src/main/java/org/keycloak/util/NetworkUtils.java → common/src/main/java/org/keycloak/common/util/NetworkUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
/*
* JBoss, Home of Professional Open Source.

2
common/src/main/java/org/keycloak/util/ObjectUtil.java → common/src/main/java/org/keycloak/common/util/ObjectUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

2
common/src/main/java/org/keycloak/util/PathHelper.java → common/src/main/java/org/keycloak/common/util/PathHelper.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.regex.Pattern;

4
common/src/main/java/org/keycloak/util/PemUtils.java → common/src/main/java/org/keycloak/common/util/PemUtils.java
View file

@ -1,8 +1,6 @@
package org.keycloak.util;
package org.keycloak.common.util;
import org.keycloak.util.Base64;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;

2
common/src/main/java/org/keycloak/util/ServerCookie.java → common/src/main/java/org/keycloak/common/util/ServerCookie.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.Serializable;
import java.text.DateFormat;

2
common/src/main/java/org/keycloak/util/StreamUtil.java → common/src/main/java/org/keycloak/common/util/StreamUtil.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.BufferedReader;
import java.io.IOException;

2
common/src/main/java/org/keycloak/util/StringPropertyReplacer.java → common/src/main/java/org/keycloak/common/util/StringPropertyReplacer.java
View file

@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.File;
import java.util.Properties;

2
common/src/main/java/org/keycloak/util/SystemEnvProperties.java → common/src/main/java/org/keycloak/common/util/SystemEnvProperties.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.Properties;

2
common/src/main/java/org/keycloak/util/Time.java → common/src/main/java/org/keycloak/common/util/Time.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.util.Date;

2
common/src/main/java/org/keycloak/util/UriUtils.java → common/src/main/java/org/keycloak/common/util/UriUtils.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util;
package org.keycloak.common.util;
import java.io.UnsupportedEncodingException;
import java.net.URI;

2
common/src/main/java/org/keycloak/util/reflections/Reflections.java → common/src/main/java/org/keycloak/common/util/reflections/Reflections.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util.reflections;
package org.keycloak.common.util.reflections;
import java.beans.Introspector;
import java.io.Serializable;

2
common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java → common/src/main/java/org/keycloak/common/util/reflections/SetAccessiblePrivilegedAction.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util.reflections;
package org.keycloak.common.util.reflections;
import java.lang.reflect.AccessibleObject;
import java.security.PrivilegedAction;

2
common/src/main/java/org/keycloak/util/reflections/Types.java → common/src/main/java/org/keycloak/common/util/reflections/Types.java
View file

@ -1,4 +1,4 @@
package org.keycloak.util.reflections;
package org.keycloak.common.util.reflections;
import java.lang.reflect.Type;

4
connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
View file

@ -12,8 +12,8 @@ import org.jboss.logging.Logger;
import org.keycloak.Config;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.util.EnvUtil;
import org.keycloak.util.KeystoreUtil;
import org.keycloak.common.util.EnvUtil;
import org.keycloak.common.util.KeystoreUtil;
import java.io.IOException;
import java.io.InputStream;

3
connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/types/BasicDBObjectMapper.java
View file

@ -9,11 +9,10 @@ import org.keycloak.connections.mongo.api.types.MapperRegistry;
import org.keycloak.connections.mongo.impl.EntityInfo;
import org.keycloak.connections.mongo.impl.MongoStoreImpl;
import org.keycloak.models.utils.reflection.Property;
import org.keycloak.util.reflections.Types;
import org.keycloak.common.util.reflections.Types;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

4
core/src/main/java/org/keycloak/AbstractOAuthClient.java
View file

@ -1,7 +1,7 @@
package org.keycloak;
import org.keycloak.enums.RelativeUrlsUsed;
import org.keycloak.util.KeycloakUriBuilder;
import org.keycloak.common.enums.RelativeUrlsUsed;
import org.keycloak.common.util.KeycloakUriBuilder;
import java.util.Map;
import java.util.UUID;

2
core/src/main/java/org/keycloak/KeycloakSecurityContext.java
View file

@ -2,7 +2,7 @@ package org.keycloak;
import org.keycloak.representations.AccessToken;
import org.keycloak.representations.IDToken;
import org.keycloak.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import org.keycloak.util.JsonSerialization;
import java.io.IOException;

1
core/src/main/java/org/keycloak/RSATokenVerifier.java
View file

@ -1,5 +1,6 @@
package org.keycloak;
import org.keycloak.common.VerificationException;
import org.keycloak.jose.jws.JWSInput;
import org.keycloak.jose.jws.crypto.RSAProvider;
import org.keycloak.representations.AccessToken;

4
core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java
View file

@ -1,14 +1,12 @@
package org.keycloak.jose.jwk;
import org.keycloak.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import java.math.BigInteger;
import java.security.Key;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
/**

2
core/src/main/java/org/keycloak/jose/jwk/JWKParser.java
View file

@ -1,7 +1,7 @@
package org.keycloak.jose.jwk;
import org.codehaus.jackson.type.TypeReference;
import org.keycloak.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import org.keycloak.util.JsonSerialization;
import java.math.BigInteger;

2
core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java
View file

@ -2,7 +2,7 @@ package org.keycloak.jose.jws;
import org.keycloak.jose.jws.crypto.HMACProvider;
import org.keycloak.jose.jws.crypto.RSAProvider;
import org.keycloak.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import org.keycloak.util.JsonSerialization;
import javax.crypto.SecretKey;

3
core/src/main/java/org/keycloak/jose/jws/JWSInput.java
View file

@ -1,8 +1,7 @@
package org.keycloak.jose.jws;
import org.keycloak.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import org.keycloak.util.JsonSerialization;
import static org.keycloak.jose.jws.Algorithm.*;
import java.io.IOException;
import java.io.UnsupportedEncodingException;

2
core/src/main/java/org/keycloak/jose/jws/crypto/HMACProvider.java
View file

@ -3,7 +3,7 @@ package org.keycloak.jose.jws.crypto;
import org.keycloak.jose.jws.Algorithm;
import org.keycloak.jose.jws.JWSInput;
import org.keycloak.util.Base64Url;
import org.keycloak.common.util.Base64Url;
import javax.crypto.Mac;
import javax.crypto.SecretKey;

2
core/src/main/java/org/keycloak/jose/jws/crypto/RSAProvider.java
View file

@ -3,7 +3,7 @@ package org.keycloak.jose.jws.crypto;
import org.keycloak.jose.jws.Algorithm;
import org.keycloak.jose.jws.JWSInput;
import org.keycloak.util.PemUtils;
import org.keycloak.common.util.PemUtils;
import java.security.PrivateKey;
import java.security.PublicKey;

2
core/src/main/java/org/keycloak/representations/JsonWebToken.java
View file

@ -8,7 +8,7 @@ import org.codehaus.jackson.map.annotate.JsonDeserialize;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.keycloak.json.StringOrArrayDeserializer;
import org.keycloak.json.StringOrArraySerializer;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import java.io.Serializable;
import java.util.HashMap;

2
core/src/main/java/org/keycloak/representations/PasswordToken.java
View file

@ -1,6 +1,6 @@
package org.keycloak.representations;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
/**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

2
core/src/main/java/org/keycloak/representations/VersionRepresentation.java
View file

@ -1,7 +1,7 @@
package org.keycloak.representations;
import org.codehaus.jackson.annotate.JsonProperty;
import org.keycloak.Version;
import org.keycloak.common.Version;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java
View file

@ -1,7 +1,7 @@
package org.keycloak.representations.adapters.action;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
/**
* Posted to managed client from admin server.

2
core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java
View file

@ -3,7 +3,7 @@ package org.keycloak.representations.idm;
import org.bouncycastle.openssl.PEMWriter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.keycloak.util.PemUtils;
import org.keycloak.common.util.PemUtils;
import java.io.IOException;
import java.io.StringWriter;

2
core/src/main/java/org/keycloak/util/BasicAuthHelper.java
View file

@ -1,6 +1,6 @@
package org.keycloak.util;
import org.keycloak.util.Base64;
import org.keycloak.common.util.Base64;
import java.io.IOException;
import java.io.UnsupportedEncodingException;

3
core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java
View file

@ -3,13 +3,14 @@ package org.keycloak.util;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.util.Map;
import java.util.Properties;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.io.IOContext;
import org.codehaus.jackson.map.MappingJsonFactory;
import org.codehaus.jackson.util.JsonParserDelegate;
import org.keycloak.common.util.StringPropertyReplacer;
import org.keycloak.common.util.SystemEnvProperties;
/**
* Provides replacing of system properties for parsed values

3
core/src/test/java/org/keycloak/RSAVerifierTest.java
View file

@ -7,9 +7,10 @@ import org.bouncycastle.x509.X509V1CertificateGenerator;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.keycloak.common.VerificationException;
import org.keycloak.jose.jws.JWSBuilder;
import org.keycloak.representations.AccessToken;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import org.keycloak.util.TokenUtil;
import javax.security.auth.x500.X500Principal;

1
core/src/test/java/org/keycloak/util/UriUtilsTest.java
View file

@ -1,6 +1,7 @@
package org.keycloak.util;
import org.junit.Test;
import org.keycloak.common.util.UriUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

2
distribution/adapters/osgi/features/src/main/resources/features.xml
View file

@ -12,6 +12,7 @@
<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/${jboss.logging.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-common/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-core/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-adapter-core/${project.version}</bundle>
</feature>
@ -26,6 +27,7 @@
<details>The keycloak Jetty8 adapter</details>
<feature>keycloak-adapter-core</feature>
<feature version="[8.1,9)">jetty</feature>
<bundle>mvn:org.keycloak/keycloak-jetty-adapter-spi/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty-core/${project.version}</bundle>
<bundle>mvn:org.keycloak/keycloak-jetty81-adapter/${project.version}</bundle>
</feature>

2
docbook/auth-server-docs/reference/en/en-US/modules/multi-tenancy.xml
View file

@ -43,7 +43,7 @@
<listitem>
A concrete implementation of <literal>org.keycloak.adapters.KeycloakConfigResolver</literal>. Keycloak will call the
<literal>resolve(org.keycloak.adapters.HttpFacade.Request)</literal> method and expects a complete
<literal>resolve(org.keycloak.adapters.spi.HttpFacade.Request)</literal> method and expects a complete
<literal>org.keycloak.adapters.KeycloakDeployment</literal> in response. Note that Keycloak will call this for every request,
so, take the usual performance precautions.
</listitem>

2
docbook/saml-adapter-docs/reference/en/en-US/modules/multi-tenancy.xml
View file

@ -43,7 +43,7 @@
<listitem>
A concrete implementation of <literal>org.keycloak.adapters.KeycloakConfigResolver</literal>. Keycloak will call the
<literal>resolve(org.keycloak.adapters.HttpFacade.Request)</literal> method and expects a complete
<literal>resolve(org.keycloak.adapters.spi.HttpFacade.Request)</literal> method and expects a complete
<literal>org.keycloak.adapters.KeycloakDeployment</literal> in response. Note that Keycloak will call this for every request,
so, take the usual performance precautions.
</listitem>

4
events/api/src/main/java/org/keycloak/events/EventBuilder.java
View file

@ -1,13 +1,13 @@
package org.keycloak.events;
import org.jboss.logging.Logger;
import org.keycloak.ClientConnection;
import org.keycloak.common.ClientConnection;
import org.keycloak.models.ClientModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserSessionModel;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import java.util.HashMap;
import java.util.LinkedList;

2
examples/admin-client/src/main/webapp/index.jsp
View file

@ -1,7 +1,7 @@
<%@ page import="org.keycloak.admin.client.Keycloak" %>
<%@ page import="org.keycloak.admin.client.resource.ClientsResource" %>
<%@ page import="org.keycloak.representations.idm.ClientRepresentation" %>
<%@ page import="org.keycloak.util.UriUtils" %>
<%@ page import="org.keycloak.common.util.UriUtils" %>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
<%@ page session="false" %>
<html>

6
examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java
View file

@ -13,10 +13,10 @@ import org.keycloak.OAuth2Constants;
import org.keycloak.constants.ServiceUrlConstants;
import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.util.HostUtils;
import org.keycloak.common.util.HostUtils;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.KeycloakUriBuilder;
import org.keycloak.util.UriUtils;
import org.keycloak.common.util.KeycloakUriBuilder;
import org.keycloak.common.util.UriUtils;
import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayOutputStream;

2
examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java
View file

@ -7,7 +7,7 @@ import org.codehaus.jackson.map.SerializationConfig;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.keycloak.adapters.ServerRequest;
import org.keycloak.adapters.installed.KeycloakInstalled;
import org.keycloak.util.Time;
import org.keycloak.common.util.Time;
import java.io.BufferedReader;
import java.io.IOException;

2
examples/demo-template/customer-app/src/main/webapp/customers/session.jsp
View file

@ -3,7 +3,7 @@
<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
<%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
<%@ page import="org.keycloak.representations.IDToken" %>
<%@ page import="org.keycloak.util.HostUtils" %>
<%@ page import="org.keycloak.common.util.HostUtils" %>
<html>
<head>
<title>Customer Session Page</title>

2
examples/demo-template/customer-app/src/main/webapp/customers/view.jsp
View file

@ -3,7 +3,7 @@
<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
<%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
<%@ page import="org.keycloak.representations.IDToken" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %>
<%@ page session="false" %>
<html>
<head>

8
examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java
View file

@ -17,7 +17,7 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.AdapterDeploymentContext;
import org.keycloak.adapters.HttpFacade;
import org.keycloak.adapters.spi.HttpFacade;
import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.RefreshableKeycloakSecurityContext;
import org.keycloak.adapters.ServerRequest;
@ -25,9 +25,9 @@ import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.representations.RefreshToken;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.TokenUtil;
import org.keycloak.util.StreamUtil;
import org.keycloak.util.Time;
import org.keycloak.util.UriUtils;
import org.keycloak.common.util.StreamUtil;
import org.keycloak.common.util.Time;
import org.keycloak.common.util.UriUtils;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

2
examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineExampleUris.java
View file

@ -1,7 +1,7 @@
package org.keycloak.example;
import org.keycloak.constants.ServiceUrlConstants;
import org.keycloak.util.KeycloakUriBuilder;
import org.keycloak.common.util.KeycloakUriBuilder;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

2
examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/RefreshTokenDAO.java
View file

@ -7,7 +7,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import org.keycloak.util.StreamUtil;
import org.keycloak.common.util.StreamUtil;
/**
* Very simple DAO, which stores/loads just one token per whole application into file in tmp directory. Useful just for example purposes.

2
examples/demo-template/product-app/src/main/webapp/products/view.jsp
View file

@ -2,7 +2,7 @@
pageEncoding="ISO-8859-1"%>
<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
<%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %>
<%@ page session="false" %>
<html>
<head>

4
examples/demo-template/service-account/src/main/java/org/keycloak/example/ProductServiceAccountServlet.java
View file

@ -24,7 +24,7 @@ import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.keycloak.OAuth2Constants;
import org.keycloak.RSATokenVerifier;
import org.keycloak.VerificationException;
import org.keycloak.common.VerificationException;
import org.keycloak.adapters.KeycloakDeployment;
import org.keycloak.adapters.KeycloakDeploymentBuilder;
import org.keycloak.adapters.ServerRequest;
@ -32,7 +32,7 @@ import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils;
import org.keycloak.representations.AccessToken;
import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.UriUtils;
import org.keycloak.common.util.UriUtils;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

4
examples/demo-template/service-account/src/main/webapp/WEB-INF/page.jsp
View file

@ -2,8 +2,8 @@
pageEncoding="ISO-8859-1" %>
<%@ page import="org.keycloak.example.ProductServiceAccountServlet" %>
<%@ page import="org.keycloak.representations.AccessToken" %>
<%@ page import="org.keycloak.constants.ServiceAccountConstants" %>
<%@ page import="org.keycloak.util.Time" %>
<%@ page import="org.keycloak.common.constants.ServiceAccountConstants" %>
<%@ page import="org.keycloak.common.util.Time" %>
<html>
<head>
<title>Service account portal</title>

1
examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/DatabaseClient.java
View file

@ -10,7 +10,6 @@ import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.AdapterUtils;
import org.keycloak.servlet.ServletOAuthClient;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.UriUtils;
import javax.enterprise.context.ApplicationScoped;
import javax.faces.application.FacesMessage;

2
examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java vendored
View file

@ -11,7 +11,7 @@ import org.keycloak.adapters.ServerRequest;
import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.servlet.ServletOAuthClient;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.UriUtils;
import org.keycloak.common.util.UriUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

4
examples/fuse/README.md
View file

@ -71,8 +71,8 @@ which automatically installs all other needed stuff.
Once you run Apache Karaf, you need to run these commands from Karaf console (Make sure to replace keycloak versions in the example with actual Keycloak version):
```
feature:repo-add mvn:org.apache.camel.karaf/apache-camel/2.12.5/xml/features
feature:repo-add mvn:org.apache.cxf.karaf/apache-cxf/2.7.14/xml/features
feature:repo-add mvn:org.apache.camel.karaf/apache-camel/2.15.1/xml/features
feature:repo-add mvn:org.apache.cxf.karaf/apache-cxf/3.0.4/xml/features
feature:repo-add mvn:org.keycloak/keycloak-osgi-features/1.2.0.Beta1/xml/features
feature:repo-add mvn:org.keycloak.example.demo/keycloak-fuse-example-features/1.2.0.Beta1/xml/features
feature:install keycloak-fuse-example

2
examples/fuse/camel/pom.xml
View file

@ -15,7 +15,7 @@
<description/>
<properties>
<camel.version>2.12.5</camel.version>
<camel.version>2.15.1</camel.version>
<keycloak.osgi.export>
</keycloak.osgi.export>
<keycloak.osgi.import>

2
examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file

@ -46,7 +46,7 @@
<property name="realmName" value="does-not-matter"/>
</bean>
<bean id="sessionHandler" class="org.keycloak.adapters.jetty.core.WrappingSessionHandler">
<bean id="sessionHandler" class="org.keycloak.adapters.jetty.spi.WrappingSessionHandler">
<property name="handler" ref="securityHandler" />
</bean>

2
examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java
View file

@ -15,7 +15,7 @@ import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.HttpClientBuilder;
import org.keycloak.representations.IDToken;
import org.keycloak.util.JsonSerialization;
import org.keycloak.util.UriUtils;
import org.keycloak.common.util.UriUtils;
/**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

2
examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp
View file

@ -3,7 +3,7 @@
<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
<%@ page import="org.keycloak.example.CxfRsClient" %>
<%@ page import="org.keycloak.representations.IDToken" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %>
<%@ page session="false" %>
<html>
<head>

2
examples/fuse/cxf-jaxrs/pom.xml
View file

@ -14,7 +14,7 @@
<name>CXF JAXRS Example - Secured in Karaf/Fuse</name>
<properties>
<cxf.version>2.7.14</cxf.version>
<cxf.version>3.0.4</cxf.version>
<keycloak.osgi.export>
</keycloak.osgi.export>
<keycloak.osgi.import>

2
examples/fuse/cxf-jaxws/pom.xml
View file

@ -15,7 +15,7 @@
<description/>
<properties>
<cxf.version>2.7.14</cxf.version>
<cxf.version>3.0.4</cxf.version>
<keycloak.osgi.export>
</keycloak.osgi.export>
<keycloak.osgi.import>

2
examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java
View file

@ -21,7 +21,7 @@ import org.keycloak.KeycloakSecurityContext;
import org.keycloak.constants.ServiceUrlConstants;
import org.keycloak.example.ws.Product;
import org.keycloak.example.ws.UnknownProductFault;
import org.keycloak.util.KeycloakUriBuilder;
import org.keycloak.common.util.KeycloakUriBuilder;
/**
* Servlet for receiving informations about products from backend JAXWS service

4
examples/kerberos/README.md
View file

@ -196,8 +196,8 @@ GSSException: Invalid name provided (Mechanism level: KrbException: Cannot locat
### Symptom
```
17:32:19,825 ERROR [stderr] (default task-24) org.keycloak.util.KerberosSerializationUtils$KerberosSerializationException: Null credential given as input. Did you enable kerberos credential delegation for your web browser and mapping of gss credential to access token?, Java version: 1.8.0_60, runtime version: 1.8.0_60-b27, vendor: Oracle Corporation, os: 4.1.6-200.fc22.x86_64
17:32:19,826 ERROR [stderr] (default task-24) at org.keycloak.util.KerberosSerializationUtils.deserializeCredential(KerberosSerializationUtils.java:109)
17:32:19,825 ERROR [stderr] (default task-24) org.keycloak.common.util.KerberosSerializationUtils$KerberosSerializationException: Null credential given as input. Did you enable kerberos credential delegation for your web browser and mapping of gss credential to access token?, Java version: 1.8.0_60, runtime version: 1.8.0_60-b27, vendor: Oracle Corporation, os: 4.1.6-200.fc22.x86_64
17:32:19,826 ERROR [stderr] (default task-24) at org.keycloak.common.util.KerberosSerializationUtils.deserializeCredential(KerberosSerializationUtils.java:109)
17:32:19,827 ERROR [stderr] (default task-24) at org.keycloak.example.kerberos.GSSCredentialsClient.getUserFromLDAP(GSSCredentialsClient.java:42)
```

4
examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java
View file

@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletRequest;
import org.ietf.jgss.GSSCredential;
import org.keycloak.KeycloakPrincipal;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.common.constants.KerberosConstants;
import org.keycloak.representations.AccessToken;
import org.keycloak.util.KerberosSerializationUtils;
import org.keycloak.common.util.KerberosSerializationUtils;
/**
* Sample client able to authenticate against ApacheDS LDAP server with Krb5 GSS Credential.

2
examples/kerberos/src/main/webapp/index.jsp
View file

@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1" %>
<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.example.kerberos.GSSCredentialsClient" %>
<%@ page import="org.keycloak.example.kerberos.GSSCredentialsClient.LDAPUser" %>
<%@ page session="false" %>

2
examples/ldap/src/main/webapp/index.jsp
View file

@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1" %>
<%@ page import="org.keycloak.constants.ServiceUrlConstants" %>
<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %>
<%@ page import="org.keycloak.KeycloakSecurityContext" %>
<%@ page import="org.keycloak.representations.IDToken" %>
<%@ page import="org.keycloak.representations.AccessToken" %>

5
export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java
View file

@ -1,9 +1,6 @@
package org.keycloak.exportimport.util;
import org.keycloak.models.session.PersistentClientSessionModel;
import org.keycloak.models.session.PersistentUserSessionModel;
import org.keycloak.representations.idm.OfflineUserSessionRepresentation;
import org.keycloak.util.Base64;
import org.keycloak.common.util.Base64;
import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;

2
federation/kerberos/src/main/java/org/keycloak/federation/kerberos/CommonKerberosConfig.java
View file

@ -3,7 +3,7 @@ package org.keycloak.federation.kerberos;
import java.util.Map;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.common.constants.KerberosConstants;
/**
* Common configuration useful for all providers

2
federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosConfig.java
View file

@ -1,6 +1,6 @@
package org.keycloak.federation.kerberos;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.common.constants.KerberosConstants;
import org.keycloak.models.LDAPConstants;
import org.keycloak.models.UserFederationProvider;
import org.keycloak.models.UserFederationProviderModel;

2
federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java
View file

@ -20,7 +20,7 @@ import org.keycloak.models.UserCredentialValueModel;
import org.keycloak.models.UserFederationProvider;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.models.UserModel;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.common.constants.KerberosConstants;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

4
federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java
View file

@ -5,14 +5,14 @@ import java.security.PrivilegedExceptionAction;
import javax.security.auth.Subject;
import org.keycloak.util.Base64;
import org.keycloak.common.util.Base64;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
import org.ietf.jgss.GSSManager;
import org.jboss.logging.Logger;
import org.keycloak.federation.kerberos.CommonKerberosConfig;
import org.keycloak.util.KerberosSerializationUtils;
import org.keycloak.common.util.KerberosSerializationUtils;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

5
federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java
View file

@ -13,7 +13,6 @@ import org.keycloak.federation.ldap.kerberos.LDAPProviderKerberosConfig;
import org.keycloak.federation.ldap.mappers.LDAPFederationMapper;
import org.keycloak.models.CredentialValidationOutput;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionTask;
import org.keycloak.models.LDAPConstants;
import org.keycloak.models.ModelDuplicateException;
import org.keycloak.models.ModelException;
@ -25,10 +24,8 @@ import org.keycloak.mappers.UserFederationMapper;
import org.keycloak.models.UserFederationMapperModel;
import org.keycloak.models.UserFederationProvider;
import org.keycloak.models.UserFederationProviderModel;
import org.keycloak.models.UserFederationSyncResult;
import org.keycloak.models.UserModel;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.models.utils.KeycloakModelUtils;
import org.keycloak.common.constants.KerberosConstants;
import java.util.ArrayList;
import java.util.Arrays;

2
federation/ldap/src/main/java/org/keycloak/federation/ldap/kerberos/LDAPProviderKerberosConfig.java
View file

@ -1,7 +1,7 @@
package org.keycloak.federation.ldap.kerberos;
import org.keycloak.federation.kerberos.CommonKerberosConfig;
import org.keycloak.constants.KerberosConstants;
import org.keycloak.common.constants.KerberosConstants;
import org.keycloak.models.UserFederationProviderModel;
/**

1
forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/AccountBean.java
View file

@ -2,7 +2,6 @@ package org.keycloak.account.freemarker.model;
import org.jboss.logging.Logger;
import org.keycloak.models.UserModel;
import org.keycloak.util.MultivaluedHashMap;
import javax.ws.rs.core.MultivaluedMap;
import java.util.HashMap;

2
forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/ApplicationsBean.java
View file

@ -14,7 +14,7 @@ import org.keycloak.models.RoleModel;
import org.keycloak.models.UserModel;
import org.keycloak.protocol.oidc.TokenManager;
import org.keycloak.services.managers.UserSessionManager;
import org.keycloak.util.MultivaluedHashMap;
import org.keycloak.common.util.MultivaluedHashMap;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

Some files were not shown because too many files have changed in this diff Show more