From 09285aea5eb5a813ea2daf3a50ae37cdaa8f955b Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 24 Sep 2015 12:07:25 +0530 Subject: [PATCH] resolved build issues --- modules/distribution/pom.xml | 18 + modules/distribution/src/assembly/bin.xml | 60 ++- .../src/repository/conf/axis2/axis2.xml | 8 +- .../repository/conf/axis2/axis2_client.xml | 8 +- .../src/repository/conf/etc/bam.xml | 4 + .../src/repository/conf/identity.xml | 356 ++++++------------ .../customsequences/fault/json_fault.xml | 0 .../in/json_to_xml_in_message.xml | 0 .../customsequences/in/log_in_message.xml | 0 .../in/preserve_accept_header.xml | 0 .../in/xml_to_json_in_message.xml | 0 .../out/apply_accept_header.xml | 0 .../out/json_to_xml_out_message.xml | 0 .../customsequences/out/log_out_message.xml | 0 .../out/xml_to_json_out_message.xml | 0 .../default/api/_AuthorizeAPI_.xml | 24 ++ .../default/api/_RevokeAPI_.xml | 25 ++ .../default/api/_TokenAPI_.xml | 25 ++ .../WorkflowCallbackService.xml | 145 +++++++ .../conf/synapse-configs/default/registry.xml | 25 ++ .../sequences/_auth_failure_handler_.xml | 4 + .../default/sequences/_build_.xml | 26 ++ .../sequences/_cors_request_handler_.xml | 21 ++ .../sequences/_production_key_error_.xml | 24 ++ .../sequences/_resource_mismatch_handler_.xml | 24 ++ .../default/sequences/_sandbox_key_error_.xml | 24 ++ .../sequences/_throttle_out_handler_.xml | 5 + .../default/sequences/_token_fault_.xml | 40 ++ .../default/sequences/fault.xml | 72 ++++ .../default/sequences/main.xml | 98 +++++ .../conf/synapse-configs/default/synapse.xml | 25 ++ modules/p2-profile-gen/pom.xml | 98 ++++- pom.xml | 15 +- 33 files changed, 882 insertions(+), 292 deletions(-) create mode 100644 modules/distribution/src/repository/conf/etc/bam.xml rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/fault/json_fault.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/json_to_xml_in_message.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/log_in_message.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/preserve_accept_header.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/xml_to_json_in_message.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/apply_accept_header.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/json_to_xml_out_message.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/log_out_message.xml (100%) rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/xml_to_json_out_message.xml (100%) create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/registry.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 12f59031..31a17cc7 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -127,6 +127,24 @@ maven-antrun-plugin + + 1-replace-datasource-property-thrift-authentication + package + + run + + + + + + + + + diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 9d9b6232..07167f2c 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -501,7 +501,7 @@ - apim-resources/customsequences + src/repository/conf/resources/customsequences ${pom.artifactId}-${pom.version}/repository/resources/customsequences **/**.xml @@ -539,6 +539,18 @@ + + src/repository/conf/synapse-configs + ${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs + + **/empty.txt + + + + src/repository/conf/synapse-configs/default/sequences + ${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/ + + @@ -740,13 +752,21 @@ 644 + + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/msg-mgt.properties + + ${pom.artifactId}-${pom.version}/repository/conf + 644 + + - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml - ${pom.artifactId}-${pom.version}/repository/conf/identity + ${pom.artifactId}-${pom.version}/repository/conf/ true 644 @@ -764,7 +784,7 @@ src/repository/conf/identity.xml - ${pom.artifactId}-${pom.version}/repository/conf/identity + ${pom.artifactId}-${pom.version}/repository/conf 644 @@ -906,6 +926,13 @@ true 644 + + src/repository/conf/axis2/axis2.xml + ${pom.artifactId}-${pom.version}/repository/conf/axis2/ + true + 644 + + target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/launch.ini @@ -951,14 +978,6 @@ - - - target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2.xml - ${pom.artifactId}-${pom.version}/repository/conf/axis2/ - true - 644 - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-mgt.properties @@ -1037,14 +1056,15 @@ - - - - - - - - + + + + src/repository/conf/etc/bam.xml + + ${pom.artifactId}-${pom.version}/repository/conf/etc + true + 644 + diff --git a/modules/distribution/src/repository/conf/axis2/axis2.xml b/modules/distribution/src/repository/conf/axis2/axis2.xml index e6103df9..3b795a2a 100644 --- a/modules/distribution/src/repository/conf/axis2/axis2.xml +++ b/modules/distribution/src/repository/conf/axis2/axis2.xml @@ -93,9 +93,7 @@ true - - ./repository/deployment/server/synapse-configs - + repository/deployment/server/synapse-configs . @@ -577,7 +575,7 @@ - + + - + - + - + \ No newline at end of file diff --git a/modules/distribution/src/repository/conf/etc/bam.xml b/modules/distribution/src/repository/conf/etc/bam.xml new file mode 100644 index 00000000..45e47cc3 --- /dev/null +++ b/modules/distribution/src/repository/conf/etc/bam.xml @@ -0,0 +1,4 @@ + + disable + disable + \ No newline at end of file diff --git a/modules/distribution/src/repository/conf/identity.xml b/modules/distribution/src/repository/conf/identity.xml index e9af104a..ae58884c 100755 --- a/modules/distribution/src/repository/conf/identity.xml +++ b/modules/distribution/src/repository/conf/identity.xml @@ -1,44 +1,59 @@ - + + https://localhost:9443/openidserver + + https://localhost:9443/openid/ + + false + + 7200 + - + jdbc/WSO2AM_DB - - - - + + true - - - 120 - 20160 - 20160 - 1140 - - - + - + + ${carbon.home}/repository/resources/security/userRP.jks + + JKS + + wso2carbon + + wso2carbon + + + ${carbon.home}/conf/keystores @@ -53,106 +68,39 @@ - - - - - - - false - - 7200 - - false - - false - - 36000 - - false - org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever - - - - - - - - - - - - - - - - - - - - - - -1 - -1 - -1 - -1 - - - https://localhost:9443/oauth/request-token - https://localhost:9443/oauth/authorize-url - https://localhost:9443/oauth/access-token - - - - + https://localhost:9443/oauth/request-token + https://localhost:9443/oauth/access-token + https://localhost:9443/oauth/authorize-url 300 - + 3600 - + + 3600 + 3600 - - 84600 300 - + true - - true - - org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor - + + + org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor + + + false + @@ -168,20 +116,26 @@ authorization_code - org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler + org.wso2.carbon.apimgt.keymgt.handlers.ExtendedAuthorizationCodeGrantHandler password - org.wso2.carbon.apimgt.keymgt.handlers.ExtendedPasswordGrantHandler + + + refresh_token org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler client_credentials - org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler + org.wso2.carbon.apimgt.keymgt.handlers.ExtendedClientCredentialsGrantHandler urn:ietf:params:oauth:grant-type:saml2-bearer @@ -195,24 +149,33 @@ - - + + + + + + + + + false - + false - + + + false org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator @@ -221,30 +184,25 @@ SHA256withRSA 15 + - - org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder - - - http://wso2.org/claims/givenname - org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback - 3600 - http://wso2.org/claims - org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever - org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator - org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator - org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder - false - + + + - gtalk @@ -258,59 +216,15 @@ - 157680000 - 157680000 - localhost - - - 5 - 60000 - - false - 36000 - - - org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder - http://wso2.org/claims - false - org.wso2.carbon.identity.sso.saml.builders.claims.DefaultClaimsRetriever - org.wso2.carbon.identity.sso.saml.builders.assertion.DefaultSAMLAssertionBuilder - org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter - org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner - org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator - - - - 5 - false + https://localhost:9443/samlsso - - - - - - - - - - - + true 36000 @@ -319,54 +233,16 @@ true - false + true ${Ports.ThriftEntitlementReceivePort} 10000 ${carbon.home}/repository/resources/security/wso2carbon.jks wso2carbon - - localhost - - - - - - - 5 - - - 10 - local://services - - - - - - - - - - - - - + + false \ No newline at end of file diff --git a/modules/distribution/apim-resources/customsequences/fault/json_fault.xml b/modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/fault/json_fault.xml rename to modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml diff --git a/modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml rename to modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml diff --git a/modules/distribution/apim-resources/customsequences/in/log_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/in/log_in_message.xml rename to modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml diff --git a/modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml rename to modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml diff --git a/modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml rename to modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml diff --git a/modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml rename to modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml diff --git a/modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml rename to modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml diff --git a/modules/distribution/apim-resources/customsequences/out/log_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/out/log_out_message.xml rename to modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml diff --git a/modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml similarity index 100% rename from modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml rename to modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml new file mode 100644 index 00000000..4221f0c2 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml @@ -0,0 +1,24 @@ + + + + + + + + + + 60000 + fault + + + + + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml new file mode 100644 index 00000000..8a72d753 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml @@ -0,0 +1,25 @@ + + + + + + + + + + 60000 + fault + + + + + + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml new file mode 100644 index 00000000..43268da1 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml @@ -0,0 +1,25 @@ + + + + + + + + + + 60000 + fault + + + + + + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml b/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml new file mode 100644 index 00000000..722d81b0 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml @@ -0,0 +1,145 @@ + + + + + + + + +
+ + + + + + + + + + + WorkflowCallbackService + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml b/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml new file mode 100644 index 00000000..b19a4c89 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml @@ -0,0 +1,25 @@ + + + + + + + 15000 + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml new file mode 100644 index 00000000..5a5213d8 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml @@ -0,0 +1,4 @@ + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml new file mode 100644 index 00000000..64e8fe39 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml new file mode 100644 index 00000000..503bc372 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml new file mode 100644 index 00000000..77199419 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml new file mode 100644 index 00000000..f88ce6b6 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml new file mode 100644 index 00000000..12906f2e --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml new file mode 100644 index 00000000..40e81240 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml new file mode 100644 index 00000000..1e4a9825 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml @@ -0,0 +1,40 @@ + + + + + + + + + + $1 + Status report + Runtime Error + $2 + + + + + + + + + + + + + + + + +
+ + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml new file mode 100644 index 00000000..3b915492 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + $1 + Status report + Runtime Error + $2 + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml new file mode 100644 index 00000000..9063e8ad --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml @@ -0,0 +1,98 @@ + + + + + + The default main sequence for API manager - Returns 404 Not Found + + + + + + + + + + 403 + Status report + Forbidden + Unsupported Transport [ $2 ]. The requested resource (/$1) is not available. + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + 404 + Status report + Not Found + The requested resource (/$1) is not available. + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml b/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml new file mode 100644 index 00000000..d7f60ec4 --- /dev/null +++ b/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index e123bddb..47a538af 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -135,7 +135,7 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version} - + End of Device Management Features @@ -291,7 +291,7 @@ org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version} - org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version} + org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version} @@ -302,9 +302,9 @@ org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version} - - - + + org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version} + org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version} @@ -376,6 +376,14 @@ org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version} + + + + org.apache.axis2.transport:org.apache.axis2.transport.tcp.feature:${axis2-transports.wso2.version} + + + + org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version} @@ -497,14 +505,34 @@ org.wso2.ciphertool:org.wso2.ciphertool.feature:${ciphertool.version} - + org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version} - + + org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version} + + + org.wso2.carbon.mediation:org.wso2.carbon.task.server.feature:${carbon.mediation.version} + + + org.wso2.carbon.mediation:org.apache.synapse.transport.nhttp.feature:${carbon.mediation.version} + + + org.wso2.carbon.mediation:org.wso2.carbon.inbound.endpoints.server.feature:${carbon.mediation.version} + + + org.wso2.carbon.mediation:org.wso2.carbon.mediation.ntask.feature:${carbon.mediation.version} + + + + + + + @@ -919,10 +947,10 @@ org.wso2.carbon.identity.core.feature.group ${carbon.identity.version} - - - - + + org.wso2.carbon.identity.self.registration.server.feature.group + ${carbon.identity.version} + org.wso2.carbon.identity.oauth.feature.group ${carbon.identity.version} @@ -931,10 +959,10 @@ org.wso2.carbon.identity.provider.server.feature.group ${carbon.identity.version} - - - - + + org.wso2.carbon.identity.relying.party.server.feature.group + ${carbon.identity.version} + org.wso2.carbon.um.ws.service.server.feature.group ${carbon.identity.version} @@ -1033,6 +1061,43 @@ org.wso2.carbon.apimgt.store.feature.group ${carbon.api.mgt.version} + + org.wso2.carbon.mediation.initializer.feature.group + ${carbon.mediation.version} + + + org.wso2.carbon.task.server.feature.group + ${carbon.mediation.version} + + + org.apache.synapse.transport.nhttp.feature.group + ${carbon.mediation.version} + + + org.apache.synapse.wso2.feature.group + ${carbon.mediation.version} + + + + org.apache.axis2.transport.tcp.feature.group + ${axis2-transports.wso2.version} + + + org.wso2.carbon.inbound.endpoints.server.feature.group + ${carbon.mediation.version} + + + org.wso2.carbon.mediation.ntask.feature.group + ${carbon.mediation.version} + + + + + + + + + @@ -1041,6 +1106,9 @@ ${axis2-transports.wso2.version} + + + org.wso2.carbon.device.mgt.enterprise.store.feature.group diff --git a/pom.xml b/pom.xml index 61c9005d..23cea62b 100644 --- a/pom.xml +++ b/pom.xml @@ -856,7 +856,7 @@ 4.5.2 - 4.5.10-SNAPSHOT + 4.5.6 4.4.1 @@ -879,8 +879,7 @@ 4.4.5 - 1.3.0-SNAPSHOT - 1.10.0-SNAPSHOT + 4.3.0-SNAPSHOT 7.0.59.wso2v1 @@ -892,17 +891,17 @@ 1.49 2.0.0 3.0.21 - 1.1.0-wso2v13 + 1.1.0-wso2v12 - 1.0.3-SNAPSHOT + 1.0.3 5.0.2 - 3.0.0-SNAPSHOT - 4.3.1-SNAPSHOT 1.0.0-wso2v3 1.0.0 - 1.0.1-SNAPSHOT 2.0.5 + 3.0.0-SNAPSHOT + 4.3.1-SNAPSHOT + 1.0.1-SNAPSHOT 3.1.0.wso2v2