kavishka
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrated new kernel and mb version

Browse Source
application-manager-new
ayyoob 8 years ago
parent 1a5c3ab51f
commit 80ecba8528
14 changed files with 595 additions and 559 deletions
Show Stats Download Patch File Download Diff File

3
modules/distribution/src/analytics/conf/log4j.properties
Unescape View File

@ -86,6 +86,9 @@ log4j.logger.org.spark-project=WARN
log4j.logger.akka=WARN
log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR
# uncomment the following logs to see http calls headers and messages
#log4j.logger.feign=DEBUG
log4j.additivity.org.apache.axis2.clustering=false
log4j.additivity.com.atomikos=false
log4j.additivity.org.apache=false

2
modules/distribution/src/assembly/filter.properties
Unescape View File

@ -21,7 +21,7 @@ product.key=IoT
product.version=3.1.0-SNAPSHOT
product.doc.version=310
carbon.version=4.4.14
carbon.version=4.4.16
default.server.role=IoTServer
cep.server.role=ComplexEventProcessor
das.server.role=DataAnalyticsServer

1107
modules/distribution/src/broker/conf/broker.xml
View File

File diff suppressed because it is too large Load Diff

3
modules/distribution/src/broker/conf/log4j.properties
Unescape View File

@ -144,6 +144,9 @@ log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]
log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace
log4j.appender.CARBON_MEMORY.threshold=DEBUG
# uncomment the following logs to see http calls headers and messages
#log4j.logger.feign=DEBUG
# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
log4j.appender.CARBON_LOGFILE=org.apache.log4j.DailyRollingFileAppender
# Log file will be overridden by the configuration setting in the DB

4
modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
Unescape View File

@ -36,9 +36,7 @@
</ProvisioningConnectorConfigs>
<!--<DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>-->
<ClaimConfig></ClaimConfig>
<Certificate>
MIICNTCCAZ6gAwIBAgIES343gjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoMBFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMDAyMTkwNzAyMjZaFw0zNTAyMTMwNzAyMjZaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUp/oV1vWc8/TkQSiAvTousMzOM4asB2iltr2QKozni5aVFu818MpOLZIr8LMnTzWllJvvaA5RAAdpbECb+48FjbBe0hseUdN5HpwvnH/DW8ZccGvk53I6Orq7hLCv1ZHtuOCokghz/ATrhyPq+QktMfXnRS4HrKGJTzxaCcU7OQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEAW5wPR7cr1LAdq+IrR44iQlRG5ITCZXY9hI0PygLP2rHANh+PYfTmxbuOnykNGyhM6FjFLbW2uZHQTY1jMrPprjOrmyK5sjJRO4d1DeGHT/YnIjs9JogRKv4XHECwLtIVdAbIdWHEtVZJyMSktcyysFcvuhPQK8Qc/E/Wq8uHSCo=
</Certificate>
<Certificate>MIIDSTCCAjGgAwIBAgIERUubMzANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxDTALBgNVBAoTBFdTTzIxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xNzAzMjEwOTEzMDdaFw0xNzA2MTkwOTEzMDdaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzENMAsGA1UEChMEV1NPMjESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu8lfLCQV2hbiz8OGA8baKI1E1cgE/QLKefa4Od2G2KextaAwSESr5ICakVX8w6tU5+IhKYQQKt9U3/U0ae9tXf04g6iWh0dRllsr9mOgjSZxQK09/ygUsFH8syL5aD3heRUYzJWZ/KOsd57BXuI2QZnuEjN0g0+5jNvnswfwD/tM01totaJpI3xN+2JZsaBRCc0G5yA/pdW83Aa4IE30EL57wkK7u8YDl3UTcmi+HO74XQmK1VEqSnA+/mFo3M16cRlm2PTZ2Z1E5gd4j+5sV1P5v63uqyFniEU0zPXforBb06pgSBoIRQBintSSDyEmyuVzW0pc2eYC5Dhfgk337QIDAQABoyEwHzAdBgNVHQ4EFgQU4lneZCvKn04NH5DtJItdRXdXankwDQYJKoZIhvcNAQELBQADggEBAEnCNr0JEcAxtF/ypwGgFu1rYOv3i02PB4jDWbFj8s58l1zF1tMr480khVX4d3AmLjsUpvV+Jg83JFIk1rJFLEb48EFv0nJ/G7pTQrCypNKozyuyLzx5UvKNFBMmnGvkHVqt6j4MSiOjnRdlo7ofDluA/umSkSf/VmsOIZ+5610pCJpahnPUkb8GYK0HcwNV2NLU/0X4nSjKjGwWYv0tX8XW8RwJKb/r0GDehA8PESi76XOVrpXSjP9WPK8XaK//8B0SH3hm0xpzmSQYgtkNQwP2MqBe/ZEUuKxrn3pP6oxo9RxeSIQ8dTLiBA/mcsBmAlpQPPi0LqqDKpkyHt8Ar2w=</Certificate>
<PermissionAndRoleConfig></PermissionAndRoleConfig>
<JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
</IdentityProvider>

BIN
modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
View File

Binary file not shown.

BIN
modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
View File

Binary file not shown.

BIN
modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
View File

Binary file not shown.

BIN
modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
View File

Binary file not shown.

2
modules/p2-profile/analytics-profile/carbon.product
Unescape View File

@ -13,7 +13,7 @@
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
</features>
<configurations>

2
modules/p2-profile/broker-profile/carbon.product
Unescape View File

@ -13,7 +13,7 @@
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
</features>
<configurations>

2
modules/p2-profile/iot-core-profile/carbon.product
Unescape View File

@ -14,7 +14,7 @@ version="4.4.14" useFeatures="true" includeLaunchers="true">
</plugins>
<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.16"/>
</features>
<configurations>

19
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -182,6 +182,9 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- End of Device Management Plugin Features -->
<!-- IoT Device Management Features -->
@ -1016,6 +1019,10 @@
<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@ -1136,6 +1143,10 @@
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<!-- End of Carbon Analytics Common Features -->
<feature>
@ -2015,6 +2026,10 @@
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
@ -2647,6 +2662,10 @@
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>

10
pom.xml
Unescape View File

@ -1440,7 +1440,7 @@
<properties>
<!--Carbon kernel versions-->
<carbon.kernel.version>4.4.14</carbon.kernel.version>
<carbon.kernel.version>4.4.16</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>
@ -1512,7 +1512,7 @@
<!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.68</carbon.device.mgt.version>
<carbon.device.mgt.version>2.0.69-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->
@ -1520,7 +1520,7 @@
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.36</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>3.0.37-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
@ -1551,8 +1551,8 @@
<!-- IoT Broker Dependencies -->
<product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
<andes.version>3.1.15</andes.version>
<carbon.messaging.version>3.1.17</carbon.messaging.version>
<andes.version>3.2.19</andes.version>
<carbon.messaging.version>3.2.15</carbon.messaging.version>
<!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version>

Write Preview
Loading…
Cancel
Save