diff --git a/modules/distribution/apim-resources/customsequences/fault/json_fault.xml b/modules/distribution/apim-resources/customsequences/fault/json_fault.xml
new file mode 100644
index 00000000..392990c2
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/fault/json_fault.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+ $1
+ Status report
+ Runtime Error
+ $2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml b/modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml
new file mode 100644
index 00000000..ce9bc526
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/modules/distribution/apim-resources/customsequences/in/log_in_message.xml b/modules/distribution/apim-resources/customsequences/in/log_in_message.xml
new file mode 100644
index 00000000..3975edfb
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/in/log_in_message.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml b/modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml
new file mode 100644
index 00000000..7c79d6aa
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml b/modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml
new file mode 100644
index 00000000..c37a9e84
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml b/modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml
new file mode 100644
index 00000000..dc07e24a
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml b/modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml
new file mode 100644
index 00000000..5c8a060f
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/modules/distribution/apim-resources/customsequences/out/log_out_message.xml b/modules/distribution/apim-resources/customsequences/out/log_out_message.xml
new file mode 100644
index 00000000..65498564
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/out/log_out_message.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml b/modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml
new file mode 100644
index 00000000..8fb99684
--- /dev/null
+++ b/modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 07187467..50b69080 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -97,46 +97,46 @@
maven-antrun-plugin
-
-
- 2-identity-h2-table-gen
- package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- run
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -516,10 +516,6 @@
-
-
-
-
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 10b806a8..12f9692b 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -484,6 +484,16 @@
+
+
+ apim-resources/customsequences
+ ${pom.artifactId}-${pom.version}/repository/resources/customsequences
+
+ **/**.xml
+
+
+
+
+
+
diff --git a/modules/distribution/src/patches/patch0023/org.jaggeryjs.jaggery.core-0.10.1.jar b/modules/distribution/src/patches/patch0023/org.jaggeryjs.jaggery.core-0.10.1.jar
deleted file mode 100644
index 133dad5c..00000000
Binary files a/modules/distribution/src/patches/patch0023/org.jaggeryjs.jaggery.core-0.10.1.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/conf/api-manager.xml b/modules/distribution/src/repository/conf/api-manager.xml
index ec166a68..6788569b 100755
--- a/modules/distribution/src/repository/conf/api-manager.xml
+++ b/modules/distribution/src/repository/conf/api-manager.xml
@@ -10,7 +10,7 @@
EMM
+ By default secure vault is disabled.-->
false
+ JDBC connection string for the database.
+ -->
+ JDBC username for the database.
+ -->
+ JDBC password for the database.
+ -->
+ JDBC driver for the database.
+ -->
@@ -52,11 +52,11 @@
- admin
+ ${admin.username}
- admin
+ ${admin.password}
+ Fully qualified name of the class that will retrieve additional user claims
+ to be appended to the JWT. If not specified no claims will be appended.If user wants to add all user claims in the
+ jwt token, he needs to enable this parameter.
+ The DefaultClaimsRetriever class adds user claims from the default carbon user store.
+ -->
+ The dialectURI under which the claimURIs that need to be appended to the
+ JWT are defined. Not used with custom ClaimsRetriever implementations. The
+ same value is used in the keys for appending the default properties to the
+ JWT.
+ -->
+ Signature algorithm. Accepts "SHA256withRSA" or "NONE". To disable signing explicitly specify "NONE".
+ -->
+ Enable/Disable JWT generation. Default is false.
+ -->
+ This parameter specifies which implementation should be used for generating the Token. JWTGenerator is the
+ default implementation provided.
+ -->
+ org.wso2.carbon.apimgt.impl.token.JWTGenerator
+
+
@@ -121,57 +128,64 @@
-
+ An API deployed on a 'production' type gateway will only support production keys
+ An API deployed on a 'sandbox' type gateway will only support sandbox keys
+ An API deployed on a 'hybrid' type gateway will support both production and sandbox keys -->
+
Production and Sandbox
+ Description of environment
+ Server URL of the API gateway.
+ -->
https://${carbon.local.ip}:${mgt.transport.https.port}/services/
- admin
+ Admin username for the API gateway.
+ -->
+ ${admin.username}
- admin
+ Admin password for the API gateway.
+ -->
+ ${admin.password}
+ Endpoint URLs for the APIs hosted in this API gateway.
+ -->
http://${carbon.local.ip}:${http.nio.port},https://${carbon.local.ip}:${https.nio.port}
false
-
+ true
+
+
referer
+ Enable/Disable Usage metering and billing for api usage
+ -->
false
- false
+ false
- 7612
-
-
- tcp://localhost:7612/
-
-
- admin
-
-
- admin
-
+ false
-
-
-
-
-
- false
-
-
- UA-XXXXXXXX-X
-
-
+
+
+ org.wso2.apimgt.statistics.request
+ 1.0.0
+
+
+ org.wso2.apimgt.statistics.response
+ 1.0.0
+
+
+ org.wso2.apimgt.statistics.fault
+ 1.0.0
+
+
+ org_wso2_apimgt_statistics_destination
+ 1.0.0
+ bam-profile
+
+
+ org.wso2.apimgt.statistics.throttle
+ 1.0.0
+
+
+ org.wso2.apimgt.statistics.workflow
+ 1.0.0
+
+
-
+
@@ -246,12 +244,12 @@
- admin
+ ${admin.username}
- admin
+ ${admin.password}
@@ -270,6 +268,7 @@
-If you are at the Gateway node, you need to point "ThriftClientPort" value to the "ThriftServerPort" value given at KeyManager node.
-If you need to start two API Manager instances in the same machine, you need to give different ports to "ThriftServerPort" value in two nodes.
-ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default.
+ -Gateway use this parameter to connect key validation thrift service.
-->
ThriftClient
@@ -278,26 +277,63 @@
10397
true
+
+
+ am_application_scope
+
-
+ org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler
-
+
+
+
+
- oauth2/token
+ /oauth2/token
+
+
+ https://${carbon.local.ip}:${https.nio.port}/revoke
+ Note: If changing this value to true, change the value of to
+ org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor in the identity.xml -->
false
-
+
+
+
+
+
-
-
- true
-
-
- subscriber
-
- true
-
+
+
+ true
+ false
+ https://${carbon.local.ip}:${mgt.transport.https.port}/store
false
+
+
+ -->
true
+ -->
true
+ This parameter specifies the expiration time of the TagCache. TagCache will
+ only be created when this element is uncommented. When the specified
+ time duration gets elapsed ,tag cache will get re-generated.
+ -->
+
+ false
+
+ false
+ https://${carbon.local.ip}:${mgt.transport.https.port}/publisher
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ Enable/Disable the API Startup Publisher
+ -->
false
-
+ Configuration to create APIs for local endpoints.
+ Endpoint will be computed as http://${carbon.local.ip}:${mgt.transport.http.port}/Context.
+ Define many LocalAPI elements as below to create many APIs
+ for local Endpoints.
+ IconPath should be relative to CARBON_HOME.
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+ /resource
+ http://localhost:9764/resource
+ admin
+ 1.0.0
+ none
+ none
+ Any
+
+
-
-
-
-
-
-
- https://localhost:9443,http://localhost:9763
+ API Store addresses, which is needed for swagger to function.-->
+ *
+
+
+ GET,PUT,POST,DELETE,OPTIONS
authorization,Access-Control-Allow-Origin,Content-Type
-
- GET,POST,PUT,DELETE,OPTIONS
-
+
+
-
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 58d1e39f..0a2305b7 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -225,13 +225,13 @@
-
-
-
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
+
-
-
-
+
+ org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}
+
org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
@@ -251,26 +251,26 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
-
+
+
+
org.wso2.carbon.identity:org.wso2.carbon.user.mgt.feature:${carbon.identity.version}
org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
-
-
-
+
-
-
-
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
+
+
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
+
org.wso2.carbon.identity:org.wso2.carbon.identity.user.profile.feature:${carbon.identity.version}
@@ -285,13 +285,13 @@
org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}
-
-
-
+
+ org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
+
-
-
-
+
+ org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
+
org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
@@ -574,7 +574,9 @@
-
+
+ org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
+
@@ -777,36 +779,36 @@
${carbon.platform.version}
-
-
-
-
+
+ org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.identity.application.authentication.framework.server.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.identity.oauth.server.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.identity.oauth.common.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.idp.mgt.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.identity.authenticator.saml2.sso.feature.group
+ ${carbon.identity.version}
+
org.wso2.carbon.identity.user.profile.feature.group
@@ -825,20 +827,20 @@
${carbon.identity.version}
-
-
-
-
+
+ org.wso2.carbon.identity.application.mgt.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.claim.mgt.server.feature.group
+ ${carbon.identity.version}
+
-
-
-
-
+
+ org.wso2.carbon.claim.mgt.feature.group
+ ${carbon.identity.version}
+
-
+
+ org.apache.synapse.wso2.feature.group
+ ${carbon.mediation.version}
+
diff --git a/pom.xml b/pom.xml
index 0ef6a1c0..66a06561 100644
--- a/pom.xml
+++ b/pom.xml
@@ -797,7 +797,8 @@
4.4.1
- [4.4.0, 4.5.0)
+ [4.4.1, 4.5.0)
+ 4.4.1
1.5.4
@@ -806,11 +807,11 @@
1.3
- 0.10.2
- 1.3.2
- 1.3.2
- 1.3.2
- 1.3.2
+ 0.10.3
+ 1.3.3
+ 1.3.3
+ 1.3.3
+ 1.3.3
1.0.1
@@ -845,22 +846,23 @@
1.1.1
- 4.4.4
+ 4.4.6
- 4.4.1
+ 4.5.0
- 4.5.4
+ 4.5.5
4.4.1
- 4.4.5
+ 4.4.6
+ [4.4.1, 4.5.0)
- 4.5.2
+ 4.5.3
0.9.2-SNAPSHOT
@@ -869,8 +871,12 @@
1.0.0-SNAPSHOT
+
+ 4.4.5
+
1.3.0-SNAPSHOT
+ 1.10.0-SNAPSHOT
7.0.59.wso2v1
@@ -884,6 +890,17 @@
3.0.21
1.1.0-wso2v13
+
+ 1.0.3-SNAPSHOT
+ 5.0.1-SNAPSHOT
+ 3.0.0-SNAPSHOT
+ 4.3.1-SNAPSHOT
+ 1.0.0-wso2v3
+ 1.0.0
+ 1.0.1-SNAPSHOT
+ 2.0.4-SNAPSHOT
+
+
3.1.0.wso2v2
1.6.17
2.0.0