From 7b2c0a71f8d95046063ffb748b8c6153b467501a Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 7 Dec 2016 14:52:14 +0530
Subject: [PATCH 1/3] Replacing application-authentication.xml from IoT

---
 modules/core/distribution/src/assembly/bin.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 7aa807ce..ef3aec78 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -822,15 +822,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
@@ -851,6 +842,12 @@
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/identity/application-authentication.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
+            </outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>src/repository/conf/identity/thrift-authentication.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>

From b7bc800cecc53cc5f7962bdb920a42a6ecefbe2e Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 7 Dec 2016 14:52:14 +0530
Subject: [PATCH 2/3] Replacing application-authentication.xml from IoT

---
 modules/core/distribution/src/assembly/bin.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 7aa807ce..ef3aec78 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -822,15 +822,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
@@ -851,6 +842,12 @@
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/identity/application-authentication.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
+            </outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>src/repository/conf/identity/thrift-authentication.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>

From e7f6c0797fb7300f3aa07eb060fbc98dc31df888 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Thu, 8 Dec 2016 14:59:42 +0530
Subject: [PATCH 3/3] Revert back changes done to sso

---
 .../core/distribution/src/assembly/bin.xml    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index ef3aec78..4ed31f2b 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -320,7 +320,7 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-        
+
         <!-- Copying Certificate management related dbscripts -->
         <fileSet>
             <directory>
@@ -822,6 +822,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
+            </outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
@@ -842,12 +851,6 @@
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>src/repository/conf/identity/application-authentication.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
-            </outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>src/repository/conf/identity/thrift-authentication.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
@@ -883,8 +886,8 @@
             <fileMode>644</fileMode>
         </file>
 
-	<!-- Copy APILifeCycle.xml -->
-	<file>
+        <!-- Copy APILifeCycle.xml -->
+        <file>
             <source>src/repository/resources/lifecycles/APILifeCycle.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/lifecycles</outputDirectory>
             <fileMode>644</fileMode>