community
/
product-iots
10
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Including mb features in pack

Browse Source
merge-requests/1/head
Ace 9 years ago
parent 4752b12545
commit 82c0c226f9
4 changed files with 144 additions and 6 deletions
Show Stats Download Patch File Download Diff File

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

@ -594,6 +594,54 @@
</includes>
</fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/metrics</outputDirectory>
<includes>
<include>**/*.sql</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/mb-store
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/mb-store</outputDirectory>
<includes>
<include>**/*.*</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
<!-- messaging related configs -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
</outputDirectory>
<includes>
<include>**/broker.xml</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
<!--QPID related configurations-->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
</directory>
<outputDirectory>${pom.artifactId}-${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>
<!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
<fileSet>
<directory>
@ -804,9 +852,14 @@
<!-- Copying event-broker.xml -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source>
<source>src/repository/conf/event-broker.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon-event-broker.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
@ -920,6 +973,34 @@
<fileMode>644</fileMode>
</file>
<!--Metrics-->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
<filtered>false</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/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-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MB_DB.h2.db</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- nTask Component -->
<file>
<source>

22
modules/distribution/src/repository/conf/datasources/master-datasources.xml
Unescape View File

@ -85,6 +85,28 @@
</definition>
</datasource>
<datasource>
<name>WSO2_MB_STORE_DB</name>
<description>The datasource used for message broker database</description>
<jndiConfig>
<name>WSO2MBStoreDB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2MB_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
<defaultAutoCommit>false</defaultAutoCommit>
</configuration>
</definition>
</datasource>
<!--<datasource>-->
<!--<name>WSO2_IDENTITY_DB</name>-->
<!--<description>The datasource used for Identity configurations</description>-->

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

@ -620,18 +620,18 @@
</featureArtifactDef>
<!-- Carbon Deployment Features -->
<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<!--+++++++++++++++++++++++++++++++++++++++++++++-->
<featureArtifactDef>
org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version}
</featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}-->
<!--</featureArtifactDef>-->
<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<!--+++++++++++++++++++++++++++++++++++++++++++++-->
<!-- End of Carbon Deployment Features -->
<!-- Registry Features -->
<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
<!--+++++++++++++++++++++++++++++++++++++++++++++-->
<featureArtifactDef>
org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.server.feature:${carbon.registry.version}
@ -788,6 +788,20 @@
<featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
</featureArtifactDef>
<!-- MB Features -->
<featureArtifactDef>
org.wso2.carbon.messaging:org.wso2.carbon.andes.feature:${carbon.messaging.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.mb:org.wso2.mb.styles.feature:${product.mb.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.mb:org.wso2.stratos.mb.dashboard.ui.feature:${product.mb.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@ -1663,6 +1677,22 @@
<id>org.wso2.carbon.dashboards.portal.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.messaging.andes.feature.group</id>
<version>${carbon.messaging.version}</version>
</feature>
<feature>
<id>org.wso2.mb.styles.feature.group</id>
<version>${product.mb.version}</version>
</feature>
<feature>
<id>org.wso2.stratos.mb.dashboard.ui.feature.group</id>
<version>${product.mb.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.metrics.feature.group</id>
<version>${carbon.metrics.version}</version>
</feature>
</features>
</configuration>
</execution>

5
pom.xml
Unescape View File

@ -1121,6 +1121,11 @@
<project.scm.id>github-scm</project.scm.id>
<uuf.version>1.0.0-SNAPSHOT</uuf.version>
<!-- MB Features -->
<carbon.messaging.version>3.0.1</carbon.messaging.version>
<product.mb.version>3.0.0</product.mb.version>
<carbon.metrics.version>1.1.1</carbon.metrics.version>
</properties>
<scm>

Write Preview
Loading…
Cancel
Save