From b525895ac282e19c47c02f2803b95cc5b50122e0 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Mon, 5 Oct 2015 12:01:28 +0530
Subject: [PATCH] Fix sso-idp-config issue

---
 modules/distribution/src/assembly/bin.xml       | 17 +++++------------
 .../repository/conf/identity/sso-idp-config.xml |  4 ++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 1455c752..fcf9983b 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -78,7 +78,7 @@
                 <!--below dependency fails synapse startup-->
                 <exclude>**/repository/components/plugins/asm-all_4.1.0.wso2v1.jar</exclude>
 
-                <exclude>**/conf/identity/sso-idp-config.xml</exclude>
+                <exclude>**/sso-idp-config.xml</exclude>
             </excludes>
         </fileSet>
 
@@ -126,6 +126,9 @@
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/conf/identity/</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <excludes>
+                <exclude>**/sso-idp-config.xml</exclude>
+            </excludes>
         </fileSet>
 
 
@@ -203,7 +206,7 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <includes>
                 <include>**/api-manager.xml</include>
-                <!--<include>**/sso-idp-config.xml</include>-->
+                <include>**/sso-idp-config.xml</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -1043,15 +1046,5 @@
             <filtered>true</filtered>
         </file>
 
-        <!--copy idp config of es-->
-        <file>
-            <source>src/repository/conf/identity/sso-idp-config.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-
-
-
     </files>
 </assembly>
diff --git a/modules/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules/distribution/src/repository/conf/identity/sso-idp-config.xml
index 5823cfa7..b9b14218 100755
--- a/modules/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/distribution/src/repository/conf/identity/sso-idp-config.xml
@@ -27,14 +27,14 @@
         </ServiceProvider>
         <ServiceProvider>
             <Issuer>social</Issuer>
-            <AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
+            <AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/social/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
             <DefaultAssertionConsumerServiceURL>https://localhost:9443/social/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/social/login</CustomLoginPage>
         </ServiceProvider>
         <ServiceProvider>
             <Issuer>publisher</Issuer>
-            <AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
+            <AssertionConsumerServiceURLs><AssertionConsumerServiceURL>https://localhost:9443/publisher/acs</AssertionConsumerServiceURL></AssertionConsumerServiceURLs>
             <DefaultAssertionConsumerServiceURL>https://localhost:9443/publisher/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/publisher/controllers/login.jag</CustomLoginPage>