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

Merge pull request #111 from ayyoob/merge-latest

Browse Source 
Changed analytics to released version and temporally disabled mobile …
application-manager-new
Prabath Abeysekara 9 years ago
parent 155867b334 5b81f8a6a3
commit e679648ffb
5 changed files with 88 additions and 86 deletions
Show Stats Download Patch File Download Diff File

87
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -744,22 +744,22 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<!-- End of "portal" app specific modifications --> <!-- End of "portal" app specific modifications -->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-android-agent.war-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
</outputDirectory> <!--</outputDirectory>-->
<fileMode>755</fileMode> <!--<fileMode>755</fileMode>-->
</file> <!--</file>-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-windows-agent.war-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
</outputDirectory> <!--</outputDirectory>-->
<fileMode>755</fileMode> <!--<fileMode>755</fileMode>-->
</file> <!--</file>-->
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mdm-admin.war
@ -1036,21 +1036,22 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!--Notification Config File-->
<!-- Copying the modified registry.xml file-->
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/notification-messages.xml src/repository/conf/registry.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying the modified registry.xml file--> <!-- Copying email-sender-config.xml -->
<file> <file>
<source> <source>
src/repository/conf/registry.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
@ -1156,23 +1157,23 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying MOBILE-ANDROID H2 database --> <!-- Copying MOBILE-ANDROID H2 database -->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileAndroid_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>WSO2MobileAndroid_DB.h2.db</destName> <!--<destName>WSO2MobileAndroid_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<!-- Copying MOBILE-WINDOWS H2 database --> <!--&lt;!&ndash; Copying MOBILE-WINDOWS H2 database &ndash;&gt;-->
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MobileWindows_DB.h2.db-->
</source> <!--</source>-->
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
<destName>WSO2MobileWindows_DB.h2.db</destName> <!--<destName>WSO2MobileWindows_DB.h2.db</destName>-->
<fileMode>644</fileMode> <!--<fileMode>644</fileMode>-->
</file> <!--</file>-->
<file> <file>
<source>src/repository/conf/carbon.xml <source>src/repository/conf/carbon.xml
</source> </source>
@ -1369,6 +1370,14 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-analytics-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers/CDMF_DEFAULT_IDP.xml

3
modules/features/org.wso2.iot.styles.feature/pom.xml
Unescape View File

@ -24,13 +24,12 @@
<parent> <parent>
<groupId>org.wso2.iot</groupId> <groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-features</artifactId> <artifactId>wso2iot-features</artifactId>
<version>2.0.4-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.iot.styles.feature</artifactId> <artifactId>org.wso2.iot.styles.feature</artifactId>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT Server Styles Feature</name> <name>WSO2 IoT Server Styles Feature</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

1
modules/features/pom.xml
Unescape View File

@ -30,7 +30,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-features</artifactId> <artifactId>wso2iot-features</artifactId>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT Server UI Features</name> <name>WSO2 IoT Server UI Features</name>
<url>http://wso2.org</url> <url>http://wso2.org</url>

75
modules/p2-profile-gen/pom.xml
Unescape View File

@ -112,10 +112,7 @@
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
@ -139,13 +136,16 @@
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.devicemgt.ui.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.data.publisher.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.jwt.client.extension.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
@ -153,15 +153,12 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version} <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef> <!--<featureArtifactDef>-->
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version} <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Mobile Device Management Features --> <!-- Mobile Device Management Features -->
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
@ -421,7 +418,7 @@
<!--- MDM Features --> <!--- MDM Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.iot:org.wso2.iot.styles.feature:${carbon.device.mgt.plugin.version} org.wso2.iot:org.wso2.iot.styles.feature:${carbon.iot.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Mediation Features --> <!-- Mediation Features -->
@ -805,6 +802,7 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version} org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
</featureArtifactDef> </featureArtifactDef>
<!--JWT grant type handler-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version} org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
</featureArtifactDef> </featureArtifactDef>
@ -834,25 +832,29 @@
<!-- IoTServer Features --> <!-- IoTServer Features -->
<feature> <feature>
<id>org.wso2.iot.styles.feature.group</id> <id>org.wso2.iot.styles.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.server.feature.group</id> <id>org.wso2.carbon.device.mgt.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.group.server.feature.group</id> <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.extensions.feature.group</id> <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id> <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.email.sender.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
@ -876,11 +878,7 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.jwt.client.extension.feature.group</id> <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.devicemgt.ui.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!--<feature>--> <!--<feature>-->
@ -888,7 +886,7 @@
<!--<version>${carbon.device.mgt.version}</version>--> <!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>--> <!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
@ -897,18 +895,14 @@
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature> <!--<feature>-->
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id> <!--<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<feature>
<id>org.wso2.mdm.mdmmgt.server.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.feature.group</id>
@ -1707,6 +1701,7 @@
<id>org.wso2.carbon.metrics.feature.group</id> <id>org.wso2.carbon.metrics.feature.group</id>
<version>${carbon.metrics.version}</version> <version>${carbon.metrics.version}</version>
</feature> </feature>
<!--jwt grant type handler-->
<feature> <feature>
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>

8
pom.xml
Unescape View File

@ -1049,7 +1049,7 @@
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version> <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>2.0.4-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<mdm.version>2.0.0-SNAPSHOT</mdm.version> <mdm.version>2.0.0-SNAPSHOT</mdm.version>
<!-- API Management --> <!-- API Management -->
@ -1059,7 +1059,7 @@
<carbon.mediation.version>4.5.1</carbon.mediation.version> <carbon.mediation.version>4.5.1</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.0.11-SNAPSHOT</carbon.analytics.common.version> <carbon.analytics.common.version>5.0.12-SNAPSHOT</carbon.analytics.common.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1076,10 +1076,10 @@
<!--DAS--> <!--DAS-->
<carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version> <carbon.analytics.version>1.0.6-SNAPSHOT</carbon.analytics.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version> <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<carbon.dashboard.version>1.0.14-SNAPSHOT</carbon.dashboard.version> <carbon.dashboard.version>1.0.13</carbon.dashboard.version>
<shindig.version>1.0.0</shindig.version> <shindig.version>1.0.0</shindig.version>
<carbon.event-processing.version>2.0.12</carbon.event-processing.version> <carbon.event-processing.version>2.0.12</carbon.event-processing.version>
<carbon.data.version>4.3.5-SNAPSHOT</carbon.data.version> <carbon.data.version>4.3.4</carbon.data.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient> <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
<wss4j.security.version>1.6.17</wss4j.security.version> <wss4j.security.version>1.6.17</wss4j.security.version>

Write Preview
Loading…
Cancel
Save