From 242ddb8c2544923fbe76a01fd78d7c8d2c73d141 Mon Sep 17 00:00:00 2001
From: damith <dnsnipe123@gmail.com>
Date: Tue, 16 May 2017 15:41:06 +0530
Subject: [PATCH 1/2] added the dependecy org.wso2.carbon.utils.feature for
 editor and also copy workspace folder to deployment

---
 modules/distribution/pom.xml              | 13 +++++++++++++
 modules/distribution/src/assembly/bin.xml |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 0a409d5d..c2748982 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -52,6 +52,11 @@
             <artifactId>org.wso2.carbon.runtime.feature</artifactId>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.utils</groupId>
+            <artifactId>org.wso2.carbon.utils.feature</artifactId>
+            <type>zip</type>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.transport</groupId>
             <artifactId>org.wso2.carbon.transport.http.netty.feature</artifactId>
@@ -198,6 +203,10 @@
                         <configuration>
                             <targetRepository>file:${basedir}/target/p2-repo</targetRepository>
                             <features>
+                                <feature>
+                                    <id>org.wso2.carbon.utils.feature</id>
+                                    <version>${carbon.utils.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.kernel.feature</id>
                                     <version>${carbon.kernel.version}</version>
@@ -679,6 +688,10 @@
                                     <id>org.wso2.carbon.transport.http.netty.feature.group</id>
                                     <version>${org.wso2.carbon.transport.http.netty.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.utils.feature.group</id>
+                                    <version>${carbon.utils.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.messaging.feature.group</id>
                                     <version>${carbon.messaging.version}</version>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 84f3ce6b..e28b13dc 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -112,6 +112,12 @@
             </excludes>
         </fileSet>
 
+        <fileSet>
+            <directory>carbon-home/deployment/workspace</directory>
+            <outputDirectory>deployment/workspace</outputDirectory>
+            <fileMode>644</fileMode>
+        </fileSet>
+
         <fileSet>
             <directory>.</directory>
             <outputDirectory>deployment/csv-files</outputDirectory>

From 799e618c666ccfb5b8c1bb00d156c6799771aaa0 Mon Sep 17 00:00:00 2001
From: damith <dnsnipe123@gmail.com>
Date: Tue, 16 May 2017 15:45:01 +0530
Subject: [PATCH 2/2] added the dependecy org.wso2.carbon.utils.feature

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 46669699..4ad6bb69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,12 @@
                 <version>${carbon.kernel.version}</version>
                 <type>zip</type>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.utils</groupId>
+                <artifactId>org.wso2.carbon.utils.feature</artifactId>
+                <version>${carbon.utils.version}</version>
+                <type>zip</type>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.runtime.feature</artifactId>
@@ -668,6 +674,7 @@
 
         <carbon.datasources.version>1.1.0</carbon.datasources.version>
         <carbon.metrics.version>2.0.1</carbon.metrics.version>
+        <carbon.utils.version>1.2.1</carbon.utils.version>
         <carbon.jndi.version>1.0.2</carbon.jndi.version>
         <carbon.cache.version>1.1.3</carbon.cache.version>