Merge remote-tracking branch 'upstream/master'

keycloak · Sep 25, 2015 · 0a42a28 · 0a42a28
2 parents 88355d7 + 6d5e3b2
commit 0a42a28
Show file tree

Hide file tree

Showing 91 changed files with 2,081 additions and 272 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -21,7 +21,6 @@
             org.keycloak.*
         </keycloak.osgi.export>
         <keycloak.osgi.import>
-            net.iharder;version=${base64.version},
             *;resolution:=optional
         </keycloak.osgi.import>
     </properties>
@@ -34,10 +33,6 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.iharder</groupId>
-            <artifactId>base64</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>

diff --git a/core/src/main/java/org/keycloak/util/Base64.java b/core/src/main/java/org/keycloak/util/Base64.java
diff --git a/core/src/main/java/org/keycloak/util/Base64Url.java b/core/src/main/java/org/keycloak/util/Base64Url.java
@@ -1,7 +1,7 @@
 package org.keycloak.util;
 
 
-import net.iharder.Base64;
+import org.keycloak.util.Base64;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

diff --git a/core/src/main/java/org/keycloak/util/BasicAuthHelper.java b/core/src/main/java/org/keycloak/util/BasicAuthHelper.java
@@ -1,6 +1,6 @@
 package org.keycloak.util;
 
-import net.iharder.Base64;
+import org.keycloak.util.Base64;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/core/src/main/java/org/keycloak/util/KerberosSerializationUtils.java b/core/src/main/java/org/keycloak/util/KerberosSerializationUtils.java
@@ -12,7 +12,7 @@
 
 import javax.security.auth.kerberos.KerberosTicket;
 
-import net.iharder.Base64;
+import org.keycloak.util.Base64;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;

diff --git a/core/src/main/java/org/keycloak/util/PemUtils.java b/core/src/main/java/org/keycloak/util/PemUtils.java
@@ -1,7 +1,7 @@
 package org.keycloak.util;
 
 
-import net.iharder.Base64;
+import org.keycloak.util.Base64;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
@@ -19,10 +19,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.iharder</groupId>
-            <artifactId>base64</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>

diff --git a/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
@@ -12,7 +12,6 @@
             <directory>${project.build.directory}/unpacked</directory>
             <includes>
                 <include>org/bouncycastle/**</include>
-                <include>net/iharder/base64/**</include>
                 <include>org/keycloak/keycloak-core/**</include>
                 <include>org/keycloak/keycloak-adapter-spi/**</include>
                 <include>org/keycloak/keycloak-adapter-core/**</include>

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/build.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/build.xml
@@ -42,10 +42,6 @@
             <maven-resource group="org.keycloak" artifact="keycloak-core"/>
         </module-def>
 
-        <module-def name="net.iharder.base64">
-            <maven-resource group="net.iharder" artifact="base64"/>
-        </module-def>
-
         <module-def name="org.bouncycastle">
             <maven-resource group="org.bouncycastle" artifact="bcprov-jdk15on"/>
             <maven-resource group="org.bouncycastle" artifact="bcpkix-jdk15on"/>

diff --git a/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml b/distribution/adapters/as7-eap6-adapter/as7-modules/pom.xml
@@ -57,10 +57,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-servlet-oauth-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.iharder</groupId>
-            <artifactId>base64</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>

diff --git a/...s7-eap6-adapter/as7-modules/src/main/resources/modules/net/iharder/base64/main/module.xml b/...s7-eap6-adapter/as7-modules/src/main/resources/modules/net/iharder/base64/main/module.xml
diff --git a/...as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/...as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
@@ -15,7 +15,6 @@
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>
-        <module name="net.iharder.base64"/>
     </dependencies>
 
 </module>
diff --git a/.../as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml b/.../as7-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-spi/main/module.xml
@@ -14,7 +14,6 @@
         <module name="org.apache.httpcomponents"/>
         <module name="org.bouncycastle" />
         <module name="org.keycloak.keycloak-core"/>
-        <module name="net.iharder.base64"/>
     </dependencies>
 
 </module>
diff --git a/...adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/...adapter/as7-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.codehaus.jackson.jackson-mapper-asl"/>
         <module name="org.codehaus.jackson.jackson-xc"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
         <module name="javax.activation.api"/>
         <module name="sun.jdk" optional="true" />

diff --git a/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
@@ -12,7 +12,6 @@
             <directory>${project.build.directory}/unpacked</directory>
             <includes>
                 <include>org/bouncycastle/**</include>
-                <include>net/iharder/base64/**</include>
                 <include>org/keycloak/keycloak-core/**</include>
                 <include>org/keycloak/keycloak-adapter-spi/**</include>
                 <include>org/keycloak/keycloak-adapter-core/**</include>

diff --git a/distribution/adapters/osgi/thirdparty/pom.xml b/distribution/adapters/osgi/thirdparty/pom.xml
@@ -17,7 +17,6 @@
 
     <properties>
         <keycloak.osgi.export>
-            net.iharder;version="${base64.version}",
             org.apache.http.*;version=${apache.httpcomponents.version}
         </keycloak.osgi.export>
         <keycloak.osgi.import>
@@ -26,10 +25,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>net.iharder</groupId>
-            <artifactId>base64</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -53,7 +48,7 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!httpclient|httpcore|base64</Embed-Dependency>
+                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!httpclient|httpcore</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <Bundle-ClassPath>.</Bundle-ClassPath>
                         <Bundle-Name>${project.name}</Bundle-Name>

diff --git a/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml b/distribution/adapters/wf8-adapter/wf8-adapter-zip/assembly.xml
@@ -11,7 +11,6 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked</directory>
             <includes>
-                <include>net/iharder/base64/**</include>
                 <include>org/apache/httpcomponents/**</include>
                 <include>org/keycloak/keycloak-core/**</include>
                 <include>org/keycloak/keycloak-adapter-spi/**</include>

diff --git a/distribution/adapters/wf8-adapter/wf8-modules/build.xml b/distribution/adapters/wf8-adapter/wf8-modules/build.xml
@@ -42,10 +42,6 @@
             <maven-resource group="org.keycloak" artifact="keycloak-core"/>
         </module-def>
 
-        <module-def name="net.iharder.base64">
-            <maven-resource group="net.iharder" artifact="base64"/>
-        </module-def>
-
 
         <!-- subsystems -->
 

diff --git a/...ers/wf8-adapter/wf8-modules/src/main/resources/modules/net/iharder/base64/main/module.xml b/...ers/wf8-adapter/wf8-modules/src/main/resources/modules/net/iharder/base64/main/module.xml
diff --git a/...wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/...wf8-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
@@ -15,7 +15,6 @@
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>
         <module name="org.keycloak.keycloak-core"/>
-        <module name="net.iharder.base64"/>
     </dependencies>
 
 </module>
diff --git a/...adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/...adapter/wf8-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.codehaus.jackson.jackson-mapper-asl"/>
         <module name="org.codehaus.jackson.jackson-xc"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
         <module name="javax.activation.api"/>
         <module name="sun.jdk" optional="true" />

diff --git a/distribution/adapters/wf9-adapter/wf9-adapter-zip/assembly.xml b/distribution/adapters/wf9-adapter/wf9-adapter-zip/assembly.xml
@@ -11,7 +11,6 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked</directory>
             <includes>
-                <include>net/iharder/base64/**</include>
                 <include>org/keycloak/keycloak-core/**</include>
                 <include>org/keycloak/keycloak-adapter-core/**</include>
                 <include>org/keycloak/keycloak-adapter-spi/**</include>

diff --git a/distribution/adapters/wf9-adapter/wf9-modules/build.xml b/distribution/adapters/wf9-adapter/wf9-modules/build.xml
@@ -42,10 +42,6 @@
             <maven-resource group="org.keycloak" artifact="keycloak-core"/>
         </module-def>
 
-        <module-def name="net.iharder.base64">
-            <maven-resource group="net.iharder" artifact="base64"/>
-        </module-def>
-
 
         <!-- subsystems -->
 

diff --git a/...ers/wf9-adapter/wf9-modules/src/main/resources/modules/net/iharder/base64/main/module.xml b/...ers/wf9-adapter/wf9-modules/src/main/resources/modules/net/iharder/base64/main/module.xml
diff --git a/...wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml b/...wf9-modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
@@ -15,7 +15,6 @@
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>
         <module name="org.keycloak.keycloak-core"/>
-        <module name="net.iharder.base64"/>
     </dependencies>
 
 </module>
diff --git a/...adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml b/...adapter/wf9-modules/src/main/resources/modules/org/keycloak/keycloak-core/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.codehaus.jackson.jackson-mapper-asl"/>
         <module name="org.codehaus.jackson.jackson-xc"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
         <module name="javax.activation.api"/>
         <module name="sun.jdk" optional="true" />

diff --git a/...ure-pack/src/main/resources/modules/system/layers/base/net/iharder/base64/main/module.xml b/...ure-pack/src/main/resources/modules/system/layers/base/net/iharder/base64/main/module.xml
diff --git a/...n/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml b/...n/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-core/main/module.xml
@@ -15,7 +15,6 @@
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-adapter-spi"/>
         <module name="org.keycloak.keycloak-core"/>
-        <module name="net.iharder.base64"/>
     </dependencies>
 
 </module>
diff --git a/...in/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-spi/main/module.xml b/...in/resources/modules/system/layers/base/org/keycloak/keycloak-adapter-spi/main/module.xml
@@ -16,7 +16,6 @@
         <module name="javax.servlet.api"/>
         <module name="org.bouncycastle" />
         <module name="org.keycloak.keycloak-core"/>
-        <module name="net.iharder.base64"/>
     </dependencies>
 
 </module>
diff --git a/.../src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml b/.../src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.codehaus.jackson.jackson-mapper-asl"/>
         <module name="org.codehaus.jackson.jackson-xc"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
         <module name="javax.activation.api"/>
         <module name="sun.jdk" optional="true" />

diff --git a/...ure-pack/src/main/resources/modules/system/layers/base/net/iharder/base64/main/module.xml b/...ure-pack/src/main/resources/modules/system/layers/base/net/iharder/base64/main/module.xml
diff --git a/...ain/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml b/...ain/resources/modules/system/layers/base/org/keycloak/keycloak-core-jaxrs/main/module.xml
@@ -13,7 +13,6 @@
         <module name="org.codehaus.jackson.jackson-xc"/>
         <module name="javax.ws.rs.api"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
     </dependencies>
 

diff --git a/.../src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml b/.../src/main/resources/modules/system/layers/base/org/keycloak/keycloak-core/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.codehaus.jackson.jackson-mapper-asl"/>
         <module name="org.codehaus.jackson.jackson-xc"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
         <module name="javax.activation.api"/>
         <module name="sun.jdk" optional="true" />

diff --git a/...ources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml b/...ources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml
@@ -17,7 +17,6 @@
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
     </dependencies>
 

diff --git a/...ources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml b/...ources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml
@@ -18,7 +18,6 @@
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
     </dependencies>
 

diff --git a/...odules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml b/...odules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml
@@ -18,7 +18,6 @@
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
     </dependencies>
 

diff --git a/...ources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml b/...ources/modules/system/layers/base/org/keycloak/keycloak-export-import-zip/main/module.xml
@@ -18,7 +18,6 @@
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="de.idyl.winzipaes"/>
         <module name="javax.api"/>
     </dependencies>

diff --git a/...modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml b/...modules/system/layers/base/org/keycloak/keycloak-invalidation-cache-model/main/module.xml
@@ -13,7 +13,6 @@
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
     </dependencies>
 

diff --git a/...rces/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml b/...rces/modules/system/layers/base/org/keycloak/keycloak-kerberos-federation/main/module.xml
@@ -9,7 +9,6 @@
     <dependencies>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-model-api"/>
-        <module name="net.iharder.base64"/>
         <module name="javax.ws.rs.api"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         <module name="org.jboss.logging"/>

diff --git a/...main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml b/...main/resources/modules/system/layers/base/org/keycloak/keycloak-model-api/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.jboss.logging"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.bouncycastle" />
-        <module name="net.iharder.base64"/>
         <module name="javax.api"/>
     </dependencies>
 

diff --git a/...main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml b/...main/resources/modules/system/layers/base/org/keycloak/keycloak-model-jpa/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.keycloak.keycloak-connections-jpa" services="import"/>
         <module name="javax.persistence.api"/>
-        <module name="net.iharder.base64"/>
         <module name="org.jboss.logging"/>
         <module name="org.javassist"/>
         <module name="org.hibernate" services="import"/>