From 190f97cd208cec7a1360b6487b0e3b12e677a303 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Fri, 20 Jan 2017 00:29:16 +0530
Subject: [PATCH 1/2] fixes for synapse configs

---
 .../default/api/_API_Application_Registration_.xml   | 12 ++++++------
 .../synapse-configs/default/api/_AuthorizeAPI_.xml   |  4 ++--
 .../synapse-configs/default/api/_RevokeAPI_.xml      |  4 ++--
 .../synapse-configs/default/api/_TokenAPI_.xml       |  4 ++--
 .../synapse-configs/default/api/_UserInfoAPI_.xml    |  4 ++--
 .../synapse-configs/default/api/_AuthorizeAPI_.xml   |  4 ++--
 .../synapse-configs/default/api/_RevokeAPI_.xml      |  4 ++--
 .../synapse-configs/default/api/_TokenAPI_.xml       |  4 ++--
 .../synapse-configs/default/api/_UserInfoAPI_.xml    |  4 ++--
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
index 7e25c013..42d6c1cb 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2APIRegistrationApplication_" context="/api-application-registration">
     <resource methods="POST" url-mapping="/register/tenants" faultSequence="_api_registration_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
-            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
@@ -20,8 +20,8 @@
     </resource>
     <resource methods="POST" url-mapping="/register" faultSequence="_api_registration_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
-            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
@@ -39,8 +39,8 @@
     </resource>
     <resource methods="DELETE" url-mapping="/unregister" faultSequence="_api_registration_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
-            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
index 4221f0c2..571c5b61 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
index 8c5fc818..f227eecf 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
index 43268da1..74a0315b 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                      <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
index e8c32195..3e649879 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMUserInfoAPI_" context="/userinfo">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/userinfo">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
index 4221f0c2..458007b8 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
index 8c5fc818..f227eecf 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
index 43268da1..eb85c584 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                      <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
index e8c32195..3e649879 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMUserInfoAPI_" context="/userinfo">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/userinfo">

From 68c46d10b3345ddbe651e8106d4143345f9b0b43 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Fri, 20 Jan 2017 01:03:34 +0530
Subject: [PATCH 2/2] fixes for synapse configs

---
 .../default/api/_API_Application_Registration_.xml   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
index 42d6c1cb..7e25c013 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2APIRegistrationApplication_" context="/api-application-registration">
     <resource methods="POST" url-mapping="/register/tenants" faultSequence="_api_registration_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
-            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
@@ -20,8 +20,8 @@
     </resource>
     <resource methods="POST" url-mapping="/register" faultSequence="_api_registration_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
-            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
@@ -39,8 +39,8 @@
     </resource>
     <resource methods="DELETE" url-mapping="/unregister" faultSequence="_api_registration_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
-            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">