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

Merge branch 'master' of https://github.com/wso2/product-iots

Browse Source
application-manager-new
Rasika Perera 8 years ago
parent 96d0d048df 5cd3b6a2a8
commit 17f01a137e
3 changed files with 73 additions and 7 deletions
Show Stats Download Patch File Download Diff File

65
modules/broker/distribution/src/main/assembly/bin.xml
Unescape View File

@ -223,6 +223,33 @@
</excludes>
<fileMode>644</fileMode>
</fileSet>
<!--QPID related configurations-->
<fileSet>
<directory>
../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
</directory>
<outputDirectory>wso2iot-broker-${pom.version}/repository/conf/advanced</outputDirectory>
<includes>
<include>**/qpid-config.xml</include>
<include>**/qpid-virtualhosts.xml</include>
<include>**/qpid-jmxremote.access</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
<!--Multitenancy related file -->
<fileSet>
<directory>
../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory>
<outputDirectory>wso2iot-broker-${pom.version}/repository/conf/multitenancy</outputDirectory>
<includes>
<include>**/stratos.xml</include>
<include>**/multitenancy-packages.xml</include>
<include>**/usage-throttling-agent-config.xml</include>
<include>**/cloud-services-desc.xml</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
<!-- copy the landing page webapp -->
<fileSet>
<directory>lib/home</directory>
@ -409,6 +436,30 @@
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
</source>
<outputDirectory>wso2iot-broker-${pom.version}/repository/conf/etc/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
<outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/conf/metrics.xml</source>
<outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
@ -442,5 +493,19 @@
<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
<fileMode>644</fileMode>
</file>
<!--End of Cipher Tool Files-->
<file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
</files>
</assembly>

1
modules/core/distribution/src/assembly/bin.xml
Unescape View File

@ -200,6 +200,7 @@
<include>**/i18n/</include>
<include>**/ws/</include>
<include>**/appmgtpublisher/</include>
<include>**/appstore/</include>
<include>**/store/</include>
<include>**/lifecycle/</include>
<include>**/utils/</include>

14
pom.xml
Unescape View File

@ -1215,7 +1215,7 @@
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>${andes.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
@ -1521,7 +1521,7 @@
<identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version>
<identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
<identity.carbon.auth.saml2.version>5.1.2</identity.carbon.auth.saml2.version>
<identity.carbon.auth.saml2.version>5.1.3</identity.carbon.auth.saml2.version>
<identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
<identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
<identity.user.ws.version>5.1.2</identity.user.ws.version>
@ -1580,8 +1580,8 @@
<!-- IoT Broker Dependencies -->
<product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
<andes.version>3.2.0-SNAPSHOT</andes.version>
<carbon.messaging.version>3.2.0-SNAPSHOT</carbon.messaging.version>
<andes.version>3.1.3</andes.version>
<carbon.messaging.version>3.1.3</carbon.messaging.version>
<!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version>
@ -1656,7 +1656,7 @@
<caramel.version>1.0.1</caramel.version>
<!-- App manager version-->
<appmgt.feature.version>1.2.5</appmgt.feature.version>
<appmgt.feature.version>1.2.8-SNAPSHOT</appmgt.feature.version>
<!-- Carbon Store version-->
<carbon.store.version>1.4.4</carbon.store.version>
@ -1675,7 +1675,7 @@
<project.scm.id>github-scm</project.scm.id>
<!-- Carbon Metrics Features -->
<carbon.metrics.version>1.2.0</carbon.metrics.version>
<carbon.metrics.version>1.2.2</carbon.metrics.version>
<!--http client version-->
<httpclient.version>4.5.2</httpclient.version>
@ -1879,4 +1879,4 @@
</repository>
</repositories>
</project>
</project>

Write Preview
Loading…
Cancel
Save