fixes for synapse configs

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">

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">

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">

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">

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">

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">

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">

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">

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">