Merge pull request #148 from dnwick/master

added the dependecy org.wso2.carbon.utils.feature for editor and also copy workspace folder to deployment

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>

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>

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>