KEYCLOAK-2312 Move client-registration libs into integration

keycloak · Jan 21, 2016 · 59c7cfc · 59c7cfc
1 parent 6677995
commit 59c7cfc
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 24 deletions.
diff --git a/client-registration/pom.xml b/client-registration/pom.xml
diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml
@@ -3,10 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-parent</artifactId>
+        <artifactId>keycloak-integration-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/client-registration/cli/pom.xml → integration/client-registration-cli/pom.xml b/client-registration/cli/pom.xml → integration/client-registration-cli/pom.xml
diff --git a/...gistration/cli/ClientRegistrationCLI.java → ...gistration/cli/ClientRegistrationCLI.java b/...gistration/cli/ClientRegistrationCLI.java → ...gistration/cli/ClientRegistrationCLI.java
diff --git a/...loak/client/registration/cli/Context.java → ...loak/client/registration/cli/Context.java b/...loak/client/registration/cli/Context.java → ...loak/client/registration/cli/Context.java
diff --git a/...istration/cli/commands/CreateCommand.java → ...istration/cli/commands/CreateCommand.java b/...istration/cli/commands/CreateCommand.java → ...istration/cli/commands/CreateCommand.java
diff --git a/...egistration/cli/commands/ExitCommand.java → ...egistration/cli/commands/ExitCommand.java b/...egistration/cli/commands/ExitCommand.java → ...egistration/cli/commands/ExitCommand.java
diff --git a/...gistration/cli/commands/SetupCommand.java → ...gistration/cli/commands/SetupCommand.java b/...gistration/cli/commands/SetupCommand.java → ...gistration/cli/commands/SetupCommand.java
diff --git a/client-registration/api/pom.xml → integration/client-registration/pom.xml b/client-registration/api/pom.xml → integration/client-registration/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>keycloak-client-registration-parent</artifactId>
+        <artifactId>keycloak-integration-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
     </parent>

diff --git a/...rg/keycloak/client/registration/Auth.java → ...rg/keycloak/client/registration/Auth.java b/...rg/keycloak/client/registration/Auth.java → ...rg/keycloak/client/registration/Auth.java
diff --git a/...ient/registration/ClientRegistration.java → ...ient/registration/ClientRegistration.java b/...ient/registration/ClientRegistration.java → ...ient/registration/ClientRegistration.java
diff --git a/...stration/ClientRegistrationException.java → ...stration/ClientRegistrationException.java b/...stration/ClientRegistrationException.java → ...stration/ClientRegistrationException.java
diff --git a/...gistration/ClientRepresentationMixIn.java → ...gistration/ClientRepresentationMixIn.java b/...gistration/ClientRepresentationMixIn.java → ...gistration/ClientRepresentationMixIn.java
diff --git a/...ient/registration/HttpErrorException.java → ...ient/registration/HttpErrorException.java b/...ient/registration/HttpErrorException.java → ...ient/registration/HttpErrorException.java
diff --git a/...eycloak/client/registration/HttpUtil.java → ...eycloak/client/registration/HttpUtil.java b/...eycloak/client/registration/HttpUtil.java → ...eycloak/client/registration/HttpUtil.java
diff --git a/...ration/OIDCClientRepresentationMixIn.java → ...ration/OIDCClientRepresentationMixIn.java b/...ration/OIDCClientRepresentationMixIn.java → ...ration/OIDCClientRepresentationMixIn.java
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -10,10 +10,11 @@
     <description/>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-integration-pom</artifactId>
+    <artifactId>keycloak-integration-parent</artifactId>
     <packaging>pom</packaging>
 
     <modules>
         <module>admin-client</module>
+        <module>client-registration</module>
     </modules>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -139,7 +139,6 @@
     <modules>
         <module>common</module>
         <module>core</module>
-        <module>client-registration</module>
         <module>dependencies</module>
         <module>server-spi</module>
         <module>saml</module>