From 2c35edd8207bcc3279c98a9f039df1058b3dfd4a Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Mon, 13 Mar 2017 12:22:44 +0530
Subject: [PATCH] Fixing the startup issues in core after copying all jars into
 components with bin.xml.

---
 modules/distribution/src/analytics/bin/wso2server.sh | 6 ++++++
 modules/distribution/src/assembly/bin.xml            | 6 ++++++
 modules/distribution/src/assembly/filter.properties  | 4 ++++
 pom.xml                                              | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/distribution/src/analytics/bin/wso2server.sh b/modules/distribution/src/analytics/bin/wso2server.sh
index ee921c11..e0a938c1 100755
--- a/modules/distribution/src/analytics/bin/wso2server.sh
+++ b/modules/distribution/src/analytics/bin/wso2server.sh
@@ -357,6 +357,12 @@ do
     -Dfile.encoding=UTF8 \
     -Djava.net.preferIPv4Stack=true \
     -Dcom.ibm.cacheLocalHost=true \
+    -Dmqtt.broker.host="localhost" \
+    -Dmqtt.broker.port="1886" \
+    -Diot.keymanager.host="localhost" \
+    -Diot.keymanager.https.port="9443" \
+    -Diot.gateway.host="localhost" \
+    -Diot.gateway.https.port="8243" \
     -DworkerNode=false \
     -Dorg.apache.cxf.io.CachedOutputStream.Threshold=104857600 \
     -Dcarbon.das.c5.enabled="true" \
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 8cf318e8..acb36603 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -606,6 +606,9 @@
                 <exclude>**/.settings</exclude>
                 <exclude>features/**</exclude>
                 <exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
+                <exclude>**/lib</exclude>
+                <exclude>**/json_2.0.0.wso2v1.jar</exclude>
+                <exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
             </excludes>
         </fileSet>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
@@ -811,6 +814,9 @@
                 <exclude>**/.settings</exclude>
                 <exclude>features/**</exclude>
                 <exclude>**/org.wso2.carbon.feature.mgt.ui*</exclude>
+                <exclude>**/lib</exclude>
+                <exclude>**/json_2.0.0.wso2v1.jar</exclude>
+                <exclude>**/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
             </excludes>
         </fileSet>
 
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index 41ed4b3b..96928997 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -22,4 +22,8 @@ product.version=3.1.0
 
 carbon.version=4.4.14
 default.server.role=IoTServer
+cep.server.role=ComplexEventProcessor
+das.server.role=DataAnalyticsServer
+cdmf.platform.role=CDMFPlatform
+geodashboard.role=GeoDashboard
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
diff --git a/pom.xml b/pom.xml
index 3c21476e..692d9acb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1557,7 +1557,7 @@
         <!-- Carbon Analytics Common (DAS) -->
         <carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>
         <carbon.analytics.version>1.3.3</carbon.analytics.version>
-        <carbon.analytics.das.version>1.3.0</carbon.analytics.das.version>
+        <carbon.analytics.das.version>1.3.5</carbon.analytics.das.version>
         <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>
         <product.das.version>3.1.0</product.das.version>
         <product.mb.version>3.1.0</product.mb.version>