From 2726db0be946000af3d28b91e7362a71f83f0fc4 Mon Sep 17 00:00:00 2001
From: Marko Strukelj <marko.strukelj@gmail.com>
Date: Mon, 30 Nov 2015 12:53:29 +0100
Subject: [PATCH] KEYCLOAK-2166 Name clash of bin/adapter-install.cli in
 adapter-dist and saml-adapter-dist

---
 .../saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml | 2 +-
 .../as7-eap6-adapter/eap6-adapter-zip/assembly.xml              | 2 +-
 .../{adapter-install.cli => adapter-install-saml.cli}           | 0
 .../wildfly-adapter/wildfly-adapter-zip/assembly.xml            | 2 +-
 .../reference/en/en-US/modules/jboss-adapter.xml                | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename distribution/saml-adapters/shared-cli/{adapter-install.cli => adapter-install-saml.cli} (100%)

diff --git a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
index 1acb6aa511..78c4823d66 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/as7-adapter-zip/assembly.xml
@@ -29,7 +29,7 @@
     </fileSets>
     <files>
         <file>
-             <source>../../shared-cli/adapter-install.cli</source>
+             <source>../../shared-cli/adapter-install-saml.cli</source>
              <outputDirectory>bin</outputDirectory>
         </file>
     </files>
diff --git a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
index f844a41510..1ed0089ea1 100755
--- a/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/as7-eap6-adapter/eap6-adapter-zip/assembly.xml
@@ -29,7 +29,7 @@
     </fileSets>
     <files>
         <file>
-             <source>../../shared-cli/adapter-install.cli</source>
+             <source>../../shared-cli/adapter-install-saml.cli</source>
              <outputDirectory>bin</outputDirectory>
         </file>
     </files>
diff --git a/distribution/saml-adapters/shared-cli/adapter-install.cli b/distribution/saml-adapters/shared-cli/adapter-install-saml.cli
similarity index 100%
rename from distribution/saml-adapters/shared-cli/adapter-install.cli
rename to distribution/saml-adapters/shared-cli/adapter-install-saml.cli
diff --git a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
index 26126510f2..952415c7d1 100755
--- a/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
+++ b/distribution/saml-adapters/wildfly-adapter/wildfly-adapter-zip/assembly.xml
@@ -29,7 +29,7 @@
     </fileSets>
     <files>
         <file>
-             <source>../../shared-cli/adapter-install.cli</source>
+             <source>../../shared-cli/adapter-install-saml.cli</source>
              <outputDirectory>bin</outputDirectory>
         </file>
     </files>
diff --git a/docbook/saml-adapter-docs/reference/en/en-US/modules/jboss-adapter.xml b/docbook/saml-adapter-docs/reference/en/en-US/modules/jboss-adapter.xml
index df07d8dbbb..675cc0b467 100755
--- a/docbook/saml-adapter-docs/reference/en/en-US/modules/jboss-adapter.xml
+++ b/docbook/saml-adapter-docs/reference/en/en-US/modules/jboss-adapter.xml
@@ -38,7 +38,7 @@ $ unzip keycloak-saml-eap6-adapter-dist.zip
         from the server's bin directory:
 <programlisting>
 $ cd $JBOSS_HOME/bin
-$ jboss-cli.sh -c --file=adapter-install.cli
+$ jboss-cli.sh -c --file=adapter-install-saml.cli
 </programlisting>
         The script will add the extension, subsystem, and optional security-domain as described below.
     </para>