From f91b5664255cc2d14fd8fd22e896a641ac1dae56 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 14 Apr 2016 19:57:13 +0530 Subject: [PATCH] version update and added das extension feature --- modules/distribution/src/assembly/bin.xml | 19 +- .../src/repository/conf/broker.xml | 483 ++++++++++++++++++ .../identity-providers/CDMF_DEFAULT_IDP.xml | 44 ++ modules/p2-profile-gen/pom.xml | 44 +- pom.xml | 25 +- 5 files changed, 561 insertions(+), 54 deletions(-) create mode 100644 modules/distribution/src/repository/conf/broker.xml create mode 100644 modules/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 2e4ced59..a1a2cc9d 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -111,6 +111,9 @@ **/nimbus-jose-jwt_2.26.1.wso2v2.jar **/org.wso2.carbon.hostobjects.sso_4.4.3.jar **/org.wso2.carbon.hostobjects.sso_4.3.2.jar + **/libthrift_0.8.0.wso2v1.jar + **/am#sample#calculator#v1.war + **/api.war @@ -216,6 +219,7 @@ **/api-manager.xml **/sso-idp-config.xml **/application-authentication.xml + **/broker.xml @@ -620,7 +624,7 @@ ${pom.artifactId}-${pom.version}/repository/conf - **/broker.xml + **/** 644 @@ -843,12 +847,6 @@ 644 - - src/repository/conf/event-broker.xml - ${pom.artifactId}-${pom.version}/repository/conf - true - 644 - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/messaging-event-broker.xml ${pom.artifactId}-${pom.version}/repository/conf @@ -917,6 +915,11 @@ ${pom.artifactId}-${pom.version}/repository/conf 644 + + src/repository/conf/broker.xml + ${pom.artifactId}-${pom.version}/repository/conf + 644 + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml @@ -1378,7 +1381,7 @@ - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml + src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml ${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers true diff --git a/modules/distribution/src/repository/conf/broker.xml b/modules/distribution/src/repository/conf/broker.xml new file mode 100644 index 00000000..b5c41b47 --- /dev/null +++ b/modules/distribution/src/repository/conf/broker.xml @@ -0,0 +1,483 @@ + + + + + + + + + default + + + localhost + 7611 + + 5 + + 10 + + + + + + 0.0.0.0 + + + + + + repository/resources/security/wso2carbon.jks + wso2carbon + + + repository/resources/security/client-truststore.jks + wso2carbon + + + + 10 + false + true + + + + + 0.0.0.0 + + + + + + repository/resources/security/wso2carbon.jks + wso2carbon + + + repository/resources/security/client-truststore.jks + wso2carbon + + + + + 32768 + + + 32768 + + + + + REQUIRED + + + + + https://localhost:9443/services/OAuth2TokenValidationService + admin + admin + 10 + 150 + + + + NOT_REQUIRED + + + + + /permission/admin/mqtt/connect + + + + + + + + + + + + + + + WSO2MBStoreDB + 08 + 23,27,44 + 21,22 + 40 + + + + WSO2MBStoreDB + 08 + 23,27,44 + 21,22 + 40 + + + + + 256 + + 4 + + 2 + + + strong + + + false + + + + org.wso2.andes.server.cluster.coordination.TimeStampBasedMessageIdGenerator + + + 10 + + + + + + + 10000000 + + + + + + + + 2000 + + + 1000 + + + 1000 + + + 5 + + + + + + 1000 + + + 4096 + + + 5 + + + 5 + + + 5 + + + 65000 + + + + 100 + + 120 + + + + + DISCARD_NONE + + 60 + + + + + + 1 + + + 100 + + + 1000 + + + + + + 3 + + + 65500 + + + false + + + 1000 + + + + + + 1 + + + 65536 + + + 70 + + + 180 + + + 1 + + + + + + + + 100 + + + 100000 + + + + + + + + + 800 + 8000 + + + + + 100 + 1000 + + + + + + RDBMS + + + + + + 5 + + + 900 + + + diff --git a/modules/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml b/modules/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml new file mode 100644 index 00000000..d9d04776 --- /dev/null +++ b/modules/distribution/src/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml @@ -0,0 +1,44 @@ + + + + CDMF_DEFAULT_IDP + CDMF_DEFAULT_IDP + + https://localhost:9443/oauth2/token + true + + + + + + + + + + + + + MIIFkzCCA3sCBAKkVfcwDQYJKoZIhvcNAQEFBQAwgY0xCzAJBgNVBAYTAlNMMRAwDgYDVQQIEwdXZXN0ZXJuMRAwDgYDVQQHEwdDb2xvbWJvMQ0wCwYDVQQKEwRXU08yMRQwEgYDVQQLEwtFbmdpbmVlcmluZzESMBAGA1UEAxMJbG9jYWxob3N0MSEwHwYJKoZIhvcNAQkBFhJpb3RzZXJ2ZXJAd3NvMi5jb20wHhcNMTUxMjE3MTMxMTA0WhcNMTcxMjE2MTMxMTA0WjCBjTELMAkGA1UEBhMCU0wxEDAOBgNVBAgTB1dlc3Rlcm4xEDAOBgNVBAcTB0NvbG9tYm8xDTALBgNVBAoTBFdTTzIxFDASBgNVBAsTC0VuZ2luZWVyaW5nMRIwEAYDVQQDEwlsb2NhbGhvc3QxITAfBgkqhkiG9w0BCQEWEmlvdHNlcnZlckB3c28yLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALkiGVQ9tZOKIi/gD/toV+enq+neqOBGYQ8Fq/ABOWnK2QpGWm81+Rets5GbQ6W//D8C5TOBGqK7z+LAgdmILr1XLkvrXWoan0GPdDJ1wpc2/6XDZvM5f7Y8cmRqVPJv7AF+ImgF9dqv97gYCiujy+nNHd5Nk/60pco2LBV5SyLqqrzKXEnSGrS4zoYWpPeJ9YrXPEkW7A6AxTQK0yU9Ej4TktgafbTueythrLomKiZJj4wPxm2lA2lAZscDdws9NWrI5z/LUVLbUMxrY10Nig1liX5b1mrUk5bb1d2tqwkPrpRILKoOBJtI674SQS3GziiUiCJGIO/EGGRn1AJsC/SvnnEez3WKY/DgJ6102MWK/yWtY8NYHUX2anwMBS7UpT5A4BXdsfBz3R+iPF99FxdAGGsS4GQuuPocZaycLqoPCxpTSSxBsKMUcKpn3yaiQRd6uDuiTNt7odDOQj0Tno7uokh/HILgbzvj9EExDOsdwLVvqYmUHBPeLmiICWXfi4kyH/twPOZtV9eVnfWYx5Kwg+2Y4fIb3q4ABr0hzxaMYHQo6NOukSH1BcdAWiQIXbSFFaTZD8p6OfiZpHcQ59HT/Z8GBlCFL2xkYJFmOhXI/Cu+xrcwqEIInv7d8w3eiNQ7MneomEptLbBk9+kMsP0ubo34oOGHR9qk3Lj580c/AgMBAAEwDQYJKoZIhvcNAQEFBQADggIBADw70g2/wrgzrAM8OXBlthGbCEaXZpKwq9IJN0qu+/l+PNwF7csQhj+qW+zMrWaH1DGWJroaei1+NFFrj/pvp61rF/ZeTPGVJd7puCq++SevqIrzKyAEBtwtpXmcFhBpV/FrQAv3ODOJ3bN2wSRPZHUvARTBB3RaUI06g1jCaBzjDEGoMfSxdr5/Ty2WxTI9u9RlIs3Q52AiOmROtLPiEQZQIqfNO3cxCEWojHxPqVEZA/kQYy+rryj4H0zzSrj7QFlQhsMDw5j8bv9AcvTEGmwp29avsgnceDWinI6lwtd8zqh0ZW9QJdH0BRNCM/EkTlTUHeEg04/sOgOrlWcvEfVxDqNEtbUzU9UFxl0lkQkuRn1UdxZlvhWaFnel5iRC9b7OZvi2mkVujLyxEWlJB1tuyMLQxu6PfabBVODP5V8/+uyiiK/gwrB5rYl8RHxGoznJnI1Y3HVzKlA849CrMBaY5vnhE03cNja7QroPzLmmuXBLk2LbI1lu5nJAqKpBUPMI/IU3pF4Q7VTD2ZANI+ktGgGlM8AK4OJHWOhj8W289pWTHVjG8syPLTsaYkhgLjzZl/g9cUwn/96NJNvzd3dkT+7VgE+BJOLofq25CjZcN1M7MhWdl3vbWNj9vzL0+FCnwca8UecfvFS39PIekIvqbtP+Gw8NiYOUGIllZ0JH + + + + \ No newline at end of file diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 3dba82a8..3b234a02 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -175,6 +175,9 @@ org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version} + + org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.event.adapter.extensions.server.feature:${carbon.device.mgt.plugin.version} + @@ -723,7 +726,7 @@ org.wso2.carbon.analytics:org.wso2.carbon.analytics.stream.persistence.server.feature:${carbon.analytics.version} - org.wso2.carbon.event-processing:org.wso2.carbon.event.execution.manager.feature:${carbon.event-processing.version} + org.wso2.carbon.analytics-common:org.wso2.carbon.event.execution.manager.feature:${carbon.analytics.common.version} @@ -746,21 +749,15 @@ - org.wso2.carbon.messaging:org.wso2.carbon.andes.feature:${carbon.messaging.version} - - - org.wso2.mb:org.wso2.mb.styles.feature:${product.mb.version} - - - org.wso2.mb:org.wso2.stratos.mb.dashboard.ui.feature:${product.mb.version} + org.wso2.carbon.messaging:org.wso2.carbon.andes.server.feature:${carbon.messaging.version} org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version} - - - + + org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version} + @@ -878,7 +875,10 @@ org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group ${carbon.device.mgt.plugin.version} - + + org.wso2.carbon.event.adapter.extensions.server.feature.group + ${carbon.device.mgt.plugin.version} + org.wso2.carbon.webapp.mgt.feature.group @@ -1544,7 +1544,7 @@ org.wso2.carbon.event.execution.manager.feature.group - ${carbon.event-processing.version} + ${carbon.analytics.common.version} @@ -1567,26 +1567,18 @@ ${carbon.dashboard.version} - org.wso2.carbon.messaging.andes.feature.group + org.wso2.carbon.andes.server.feature.group ${carbon.messaging.version} - - org.wso2.mb.styles.feature.group - ${product.mb.version} - - - org.wso2.stratos.mb.dashboard.ui.feature.group - ${product.mb.version} - org.wso2.carbon.metrics.feature.group ${carbon.metrics.version} - - - - + + org.wso2.carbon.identity.oauth2.grant.jwt.feature.group + ${identity.jwt.extension.version} + diff --git a/pom.xml b/pom.xml index f79a3997..df2e2d17 100644 --- a/pom.xml +++ b/pom.xml @@ -493,11 +493,6 @@ org.wso2.carbon.policy.mgt.core ${carbon.device.mgt.version} - - - - - org.wso2.carbon.devicemgt org.wso2.carbon.certificate.mgt.core @@ -1054,7 +1049,7 @@ 4.5.1 - 5.0.11 + 5.0.12-alpha 7.0.59.wso2v1 @@ -1069,11 +1064,11 @@ 1.1.0-wso2v17 - 1.0.5 + 1.0.6-ALPHA 1.0.0-wso2v3 1.0.13 1.0.0 - 2.0.12 + 2.0.13-alpha 4.3.4 3.1.0.wso2v2 @@ -1112,8 +1107,8 @@ github-scm - 3.1.0 - 3.1.0 + 3.1.2 + 3.1.2 1.2.0 @@ -1305,16 +1300,6 @@ false - - wso2-staging - WSO2 internal Repository - http://maven.wso2.org/nexus/content/repositories/orgwso2carbonapimgt-174/ - - true - daily - ignore - -