Merge branch 'master' into 3.2.x

roles/apim-analytics-dashboard/templates/carbon-home/conf/dashboard/deployment.yaml.j2

@@ -281,7 +281,7 @@ wso2.datasources:
         idleTimeout: 60000
         connectionTestQuery: {{ wso2_permissions_db_test_query }}
         validationTimeout: 30000
-        isAutoCommit: false
+        isAutoCommit: false 
 
   #Data source for APIM Analytics
   - name: APIM_ANALYTICS_DB

roles/apim-devportal/templates/carbon-home/repository/conf/deployment.toml.j2

@@ -31,9 +31,9 @@ password =  "{{ key_store_password }}"
 alias =  "{{ key_store_key_alias }}"
 key_password =  "{{ key_store_key_password }}"
 
-[truststore]
-file_name = "{{ trust_store_location }}"
-type = "JKS"
+[truststore]	
+file_name = "{{ trust_store_location }}"	
+type = "JKS"	
 password = "{{ trust_store_password }}"
 
 {% for environment in gateway_environments %}

roles/apim-gateway/templates/carbon-home/bin/wso2server.sh.j2

@@ -33,7 +33,7 @@
 # OS specific support.  $var _must_ be set to either true or false.
 #ulimit -n 100000
 
-export JAVA_HOME={{ java_symlink }};
+export JAVA_HOME={{ java_symlink }};	
 cygwin=false;
 darwin=false;
 os400=false;

roles/apim-gateway/templates/carbon-home/repository/conf/deployment.toml.j2

@@ -12,6 +12,9 @@ username = "{{ admin_username }}"
 password = "{{ admin_password }}"
 create_admin_account = true
 
+[user_store]
+type = "database_unique_id"
+
 [database.shared_db]
 type = "{{ wso2shared_db_type }}"
 url = "{{ wso2shared_db_url }}"
@@ -30,7 +33,28 @@ file_name = "{{ trust_store_location }}"
 type = "JKS"
 password = "{{ trust_store_password }}"
 
-# key manager implementation
+[apim.cache.gateway_token]
+enable = true
+expiry_time = "900s"
+
+[apim.cache.resource]
+enable = true
+expiry_time = "900s"
+
+[apim.analytics]
+enable = "{{ analytics_enabled }}"	
+receiver_username = "{{ stream_processor_username }}"	
+receiver_password = "{{ stream_processor_password }}"	
+store_api_url = "{{ stream_processor_rest_api_url }}"	
+store_api_username = "{{ stream_processor_rest_api_username }}"	
+store_api_password = "{{ stream_processor_rest_api_password }}"
+
+{% for url_group in analytics_url_group %}	
+[[apim.analytics.url_group]]	
+analytics_url =[{% for url in url_group['analytics_urls'] %}"{{ url }}"{%- if not loop.last -%},{% endif %}{% endfor %}]	
+analytics_auth_url =[{% for url in url_group['analytics_auth_urls'] %}"{{ url }}"{%- if not loop.last -%},{% endif %}{% endfor %}]
+{% endfor %}
+
 [apim.key_manager]
 service_url = "{{ key_manager_server_url }}"
 username= "$ref{super_admin.username}"
@@ -45,7 +69,6 @@ enable_header_based_throttling = false
 enable_jwt_claim_based_throttling = false
 enable_query_param_based_throttling = false
 throttle_decision_endpoints = [{% for endpoint in throttle_decision_endpoints %}"{{ endpoint }}"{%- if not loop.last -%},{% endif %}{% endfor %}]
-
 {% for url_group in throttling_url_group %}
 [[apim.throttling.url_group]]
 traffic_manager_urls=[{% for url in url_group['traffic_manager_urls'] %}"{{ url }}"{%- if not loop.last -%},{% endif %}{% endfor %}]

roles/apim-km/templates/carbon-home/repository/conf/deployment.toml.j2

@@ -12,6 +12,9 @@ username = "{{ admin_username }}"
 password = "{{ admin_password }}"
 create_admin_account = true
 
+[user_store]
+type = "database_unique_id"
+
 [database.apim_db]
 type = "{{ wso2am_db_type }}"
 url = "{{ wso2am_db_url }}"

roles/apim-publisher/templates/carbon-home/repository/conf/deployment.toml.j2

@@ -12,6 +12,9 @@ username = "{{ admin_username }}"
 password = "{{ admin_password }}"
 create_admin_account = true
 
+[user_store]
+type = "database_unique_id"
+
 [database.apim_db]
 type = "{{ wso2am_db_type }}"
 url = "{{ wso2am_db_url }}"
@@ -49,6 +52,12 @@ password = "{{ trust_store_password }}"
     https_endpoint = "{{ environment.https_endpoint }}"
 {% endfor %}
 
+[apim.cache.scopes]
+enable = true
+
+[apim.cache.publisher_roles]
+enable = true
+
 [apim.analytics]
 enable = "{{ analytics_enabled }}"	
 receiver_username = "{{ stream_processor_username }}"	

roles/apim-tm/templates/carbon-home/repository/conf/deployment.toml.j2

@@ -12,6 +12,9 @@ username = "{{ admin_username }}"
 password = "{{ admin_password }}"
 create_admin_account = true
 
+[user_store]
+type = "database_unique_id"
+
 [database.shared_db]
 type = "{{ wso2shared_db_type }}"
 url = "{{ wso2shared_db_url }}"

roles/apim/templates/carbon-home/repository/conf/deployment.toml.j2

@@ -132,6 +132,20 @@ password = "$ref{super_admin.password}"
 #enable_user_claims = true
 #claims_extractor_impl = "org.wso2.carbon.apimgt.impl.token.ExtendedDefaultClaimsRetriever"
 
+#[apim.idp]
+#authorize_endpoint = "https://localhost:${mgt.transport.https.port}/oauth2/authorize"
+#oidc_logout_endpoint = "https://localhost:${mgt.transport.https.port}/oidc/logout"
+
+#[apim.jwt]
+#enable = true
+#encoding = "base64" # base64,base64url
+#generator_impl = "org.wso2.carbon.apimgt.keymgt.token.JWTGenerator"
+#claim_dialect = "http://wso2.org/claims"
+#header = "X-JWT-Assertion"
+#signing_algorithm = "SHA256withRSA"
+#enable_user_claims = true
+#claims_extractor_impl = "org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever"
+
 [apim.oauth_config]
 enable_outbound_auth_header = false
 auth_header = "Authorization"