From f8e9356504d2458c47dbfbd46c77d41231a29531 Mon Sep 17 00:00:00 2001 From: Shabirmean Date: Tue, 22 Dec 2015 16:27:56 +0530 Subject: [PATCH] Revert "Merge pull request #55 from sdkottegoda/embed-messaging-feature" This reverts commit fd0912287285f20637aa33dbda5f26b6b4f43c55, reversing changes made to e340d88608a4e9fabddd8d66df280a3df5206ba0. --- modules/distribution/src/assembly/bin.xml | 76 +------------------ .../conf/datasources/master-datasources.xml | 22 ------ .../src/repository/conf/event-broker.xml | 47 ------------ modules/p2-profile-gen/pom.xml | 29 +------ pom.xml | 3 - 5 files changed, 4 insertions(+), 173 deletions(-) delete mode 100644 modules/distribution/src/repository/conf/event-broker.xml diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 08a6f80e..6a216834 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -584,54 +584,6 @@ - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/ - - ${pom.artifactId}-${pom.version}/dbscripts/metrics - - **/*.sql - - 644 - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/mb-store - - ${pom.artifactId}-${pom.version}/dbscripts/mb-store - - **/*.* - - 644 - - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/ - - ${pom.artifactId}-${pom.version}/repository/conf - - - **/broker.xml - - 644 - - - - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/ - - ${pom.artifactId}-${pom.version}/repository/conf/advanced - - **/qpid-config.xml - **/qpid-virtualhosts.xml - **/qpid-jmxremote.access - - 644 - - @@ -826,7 +778,9 @@ - src/repository/conf/event-broker.xml + + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml + ${pom.artifactId}-${pom.version}/repository/conf true 644 @@ -940,30 +894,6 @@ 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties - ${pom.artifactId}-${pom.version}/repository/conf/ - false - 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml - ${pom.artifactId}-${pom.version}/repository/conf/ - false - 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml - ${pom.artifactId}-${pom.version}/repository/conf/datasources/ - 644 - - - ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db - ${pom.artifactId}-${pom.version}/repository/database/ - 644 - - diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml index 61c2e973..a05ea7f0 100755 --- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml +++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml @@ -85,28 +85,6 @@ - - WSO2_MB_STORE_DB - The datasource used for message broker database - - WSO2MBStoreDB - - - - jdbc:h2:repository/database/WSO2MB_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000 - wso2carbon - wso2carbon - org.h2.Driver - 50 - 60000 - true - SELECT 1 - 30000 - false - - - - diff --git a/modules/distribution/src/repository/conf/event-broker.xml b/modules/distribution/src/repository/conf/event-broker.xml deleted file mode 100644 index 4487dc8e..00000000 --- a/modules/distribution/src/repository/conf/event-broker.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - event/topics - - - - - event/topics - event/topicIndex - - - - - - - - - - 5 - 50 - 1000 - 1000 - - - diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 3cc53bed..6855ee8a 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -788,18 +788,6 @@ org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version} - - 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.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version} - @@ -897,6 +885,7 @@ org.wso2.mdm.mdmmgt.server.feature.group ${carbon.mobile.device.mgt.version} + org.wso2.carbon.device.mgt.iot.feature.group ${carbon.mobile.device.mgt.version} @@ -1674,22 +1663,6 @@ org.wso2.carbon.dashboards.portal.feature.group ${carbon.dashboard.version} - - org.wso2.carbon.messaging.andes.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} - diff --git a/pom.xml b/pom.xml index 7f47228b..6df3b65f 100644 --- a/pom.xml +++ b/pom.xml @@ -1081,9 +1081,6 @@ 1.0.4 1.0.0-wso2v3 1.0.9 - 3.0.1 - 3.0.0 - 1.1.1 1.0.0 2.0.9 4.3.2