From 6964852a9767c66609f76bd56ff6fea313283c66 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 2 Mar 2017 00:56:41 +0530
Subject: [PATCH 1/4] fixed sso bind to localhost

---
 .../src/repository/conf/carbon.xml            |  4 +--
 .../identity/application-authentication.xml   |  4 +--
 .../conf/identity/sso-idp-config.xml          | 28 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/core/distribution/src/repository/conf/carbon.xml b/modules/core/distribution/src/repository/conf/carbon.xml
index 40345945..4949d093 100644
--- a/modules/core/distribution/src/repository/conf/carbon.xml
+++ b/modules/core/distribution/src/repository/conf/carbon.xml
@@ -48,12 +48,12 @@
 	   services deployed on this server instance.
 	-->
 
-	<HostName>localhost</HostName>
+	<!--HostName>localhost</HostName-->
 
 	<!--
 	Host name to be used for the Carbon management console
 	-->
-	<MgtHostName>localhost</MgtHostName>
+	<!--MgtHostName>localhost</MgtHostName-->
 
 	<!--
 		The URL of the back end server. This is where the admin services are hosted and
diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
index 873810cf..461859bf 100644
--- a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
+++ b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
@@ -29,8 +29,8 @@
         AuthenticationEndpointURL is location of the web app containing
         the authentication related pages
     -->
-    <AuthenticationEndpointURL>/devicemgt/login</AuthenticationEndpointURL>
-    <AuthenticationEndpointRetryURL>/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
+    <AuthenticationEndpointURL>https://${carbon.host}:${carbon.management.port}/devicemgt/login</AuthenticationEndpointURL>
+    <AuthenticationEndpointRetryURL>https://${carbon.host}:${carbon.management.port}/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
 
     <!--
         Extensions allow extending the default behaviour of the authentication
diff --git a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
index fb00571f..28493efa 100755
--- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
@@ -21,9 +21,9 @@
         <ServiceProvider>
             <Issuer>devicemgt</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9443/devicemgt/uuf/sso/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/devicemgt/uuf/sso/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9443/devicemgt/uuf/sso/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/devicemgt/uuf/sso/acs</DefaultAssertionConsumerServiceURL>
             <SignAssertion>true</SignAssertion>
             <SignResponse>true</SignResponse>
             <EnableAttributeProfile>false</EnableAttributeProfile>
@@ -44,27 +44,27 @@
         <ServiceProvider>
             <Issuer>store</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/store/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9443/store/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/store/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/store/login.jag</CustomLoginPage>
         </ServiceProvider>
         <ServiceProvider>
             <Issuer>social</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9443/social/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/social/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9443/social/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/social/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/social/login</CustomLoginPage>
         </ServiceProvider>
         <ServiceProvider>
             <Issuer>publisher</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9443/publisher/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/publisher/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9443/publisher/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/publisher/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/publisher/controllers/login.jag</CustomLoginPage>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
@@ -75,9 +75,9 @@
         <ServiceProvider>
             <Issuer>API_STORE</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9443/api-store/jagg/jaggery_acs.jag</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/api-store/jagg/jaggery_acs.jag</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9443/api-store/jagg/jaggery_acs.jag</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/api-store/jagg/jaggery_acs.jag</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
             <AudiencesList>
@@ -87,9 +87,9 @@
         <ServiceProvider>
             <Issuer>portal</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9443/portal/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/portal/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9443/portal/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/portal/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
             <EnableRecipients>true</EnableRecipients>
@@ -103,9 +103,9 @@
         <ServiceProvider>
             <Issuer>analyticsportal</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://${carbon.host}:9445/portal/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:9445/portal/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
             <EnableRecipients>true</EnableRecipients>

From 5990221a50652197e19ce5052f7666bf3f9fdb1e Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 2 Mar 2017 00:57:03 +0530
Subject: [PATCH 2/4] added apim integration client log properties

---
 .../core/distribution/src/repository/conf/log4j.properties   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/core/distribution/src/repository/conf/log4j.properties b/modules/core/distribution/src/repository/conf/log4j.properties
index a8a589ac..35bb231f 100644
--- a/modules/core/distribution/src/repository/conf/log4j.properties
+++ b/modules/core/distribution/src/repository/conf/log4j.properties
@@ -59,6 +59,11 @@ log4j.logger.de.hunsicker.jalopy.io=FATAL
 #log4j.logger.org.apache.synapse.transport.http.headers=DEBUG
 #log4j.logger.org.apache.synapse.transport.http.wire=DEBUG
 
+# uncomment the following logs to see apim integration client headers and messages
+#log4j.logger.org.wso2.carbon.apimgt.integration.client=DEBUG
+#log4j.logger.org.wso2.carbon.apimgt.integration.client.publisher=DEBUG
+#log4j.logger.org.wso2.carbon.apimgt.integration.client.store=DEBUG
+
 #only WARN allowed for access loggers in http transport by default
 log4j.logger.org.apache.synapse.transport.http.access=WARN
 

From b93387993707740f39be9a4cf9da1af3e5ff52fe Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 2 Mar 2017 20:29:49 +0530
Subject: [PATCH 3/4] removed ip bind on localhost

---
 .../src/repository/conf/carbon.xml            |  4 +--
 .../identity/application-authentication.xml   |  4 +--
 .../conf/identity/sso-idp-config.xml          | 28 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/core/distribution/src/repository/conf/carbon.xml b/modules/core/distribution/src/repository/conf/carbon.xml
index 4949d093..40345945 100644
--- a/modules/core/distribution/src/repository/conf/carbon.xml
+++ b/modules/core/distribution/src/repository/conf/carbon.xml
@@ -48,12 +48,12 @@
 	   services deployed on this server instance.
 	-->
 
-	<!--HostName>localhost</HostName-->
+	<HostName>localhost</HostName>
 
 	<!--
 	Host name to be used for the Carbon management console
 	-->
-	<!--MgtHostName>localhost</MgtHostName-->
+	<MgtHostName>localhost</MgtHostName>
 
 	<!--
 		The URL of the back end server. This is where the admin services are hosted and
diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
index 461859bf..873810cf 100644
--- a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
+++ b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
@@ -29,8 +29,8 @@
         AuthenticationEndpointURL is location of the web app containing
         the authentication related pages
     -->
-    <AuthenticationEndpointURL>https://${carbon.host}:${carbon.management.port}/devicemgt/login</AuthenticationEndpointURL>
-    <AuthenticationEndpointRetryURL>https://${carbon.host}:${carbon.management.port}/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
+    <AuthenticationEndpointURL>/devicemgt/login</AuthenticationEndpointURL>
+    <AuthenticationEndpointRetryURL>/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
 
     <!--
         Extensions allow extending the default behaviour of the authentication
diff --git a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
index 28493efa..fb00571f 100755
--- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
@@ -21,9 +21,9 @@
         <ServiceProvider>
             <Issuer>devicemgt</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/devicemgt/uuf/sso/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9443/devicemgt/uuf/sso/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/devicemgt/uuf/sso/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/devicemgt/uuf/sso/acs</DefaultAssertionConsumerServiceURL>
             <SignAssertion>true</SignAssertion>
             <SignResponse>true</SignResponse>
             <EnableAttributeProfile>false</EnableAttributeProfile>
@@ -44,27 +44,27 @@
         <ServiceProvider>
             <Issuer>store</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/store/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/store/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/store/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/store/login.jag</CustomLoginPage>
         </ServiceProvider>
         <ServiceProvider>
             <Issuer>social</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/social/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9443/social/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/social/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/social/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/social/login</CustomLoginPage>
         </ServiceProvider>
         <ServiceProvider>
             <Issuer>publisher</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/publisher/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9443/publisher/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/publisher/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/publisher/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <CustomLoginPage>/publisher/controllers/login.jag</CustomLoginPage>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
@@ -75,9 +75,9 @@
         <ServiceProvider>
             <Issuer>API_STORE</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/api-store/jagg/jaggery_acs.jag</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9443/api-store/jagg/jaggery_acs.jag</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/api-store/jagg/jaggery_acs.jag</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/api-store/jagg/jaggery_acs.jag</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
             <AudiencesList>
@@ -87,9 +87,9 @@
         <ServiceProvider>
             <Issuer>portal</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/portal/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9443/portal/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:${carbon.management.port}/portal/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/portal/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
             <EnableRecipients>true</EnableRecipients>
@@ -103,9 +103,9 @@
         <ServiceProvider>
             <Issuer>analyticsportal</Issuer>
             <AssertionConsumerServiceURLs>
-                <AssertionConsumerServiceURL>https://${carbon.host}:9445/portal/acs</AssertionConsumerServiceURL>
+                <AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
             </AssertionConsumerServiceURLs>
-            <DefaultAssertionConsumerServiceURL>https://${carbon.host}:9445/portal/acs</DefaultAssertionConsumerServiceURL>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
             <SignResponse>true</SignResponse>
             <EnableAudienceRestriction>true</EnableAudienceRestriction>
             <EnableRecipients>true</EnableRecipients>

From 4ae5ac5224a464489ef1c1fa11af03cb1df0cdb4 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 7 Mar 2017 01:57:38 +0530
Subject: [PATCH 4/4] added log property

---
 .../core/distribution/src/repository/conf/log4j.properties | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/core/distribution/src/repository/conf/log4j.properties b/modules/core/distribution/src/repository/conf/log4j.properties
index 35bb231f..73a598e7 100644
--- a/modules/core/distribution/src/repository/conf/log4j.properties
+++ b/modules/core/distribution/src/repository/conf/log4j.properties
@@ -59,11 +59,8 @@ log4j.logger.de.hunsicker.jalopy.io=FATAL
 #log4j.logger.org.apache.synapse.transport.http.headers=DEBUG
 #log4j.logger.org.apache.synapse.transport.http.wire=DEBUG
 
-# uncomment the following logs to see apim integration client headers and messages
-#log4j.logger.org.wso2.carbon.apimgt.integration.client=DEBUG
-#log4j.logger.org.wso2.carbon.apimgt.integration.client.publisher=DEBUG
-#log4j.logger.org.wso2.carbon.apimgt.integration.client.store=DEBUG
-
+# uncomment the following logs to see http calls headers and messages
+#log4j.logger.feign=DEBUG
 #only WARN allowed for access loggers in http transport by default
 log4j.logger.org.apache.synapse.transport.http.access=WARN