Skip to content

Commit

Permalink
Merge pull request #226 from codenvy/IDEX-4219
Browse files Browse the repository at this point in the history
IDEX-4219 avoid duplication of templates across the packagings
  • Loading branch information
Roman Iuvshin committed Jan 27, 2016
2 parents 6341095 + 65bb44f commit 5d5b25b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 342 deletions.
5 changes: 5 additions & 0 deletions assembly-main/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
<artifactId>assembly-machine-server</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-templates</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.che.dashboard</groupId>
<artifactId>che-dashboard-war</artifactId>
Expand Down
17 changes: 13 additions & 4 deletions assembly-main/src/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@
<include>org.eclipse.che.plugin:che-plugin-sdk-tools</include>
</includes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<unpack>true</unpack>
<outputDirectory>templates</outputDirectory>
<includes>
<include>org.eclipse.che.core:che-core-ide-templates</include>
</includes>
<unpackOptions>
<excludes>
<exclude>META-INF/**</exclude>
</excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
Expand All @@ -94,10 +107,6 @@
<directory>${project.basedir}/src/assembly/plugins</directory>
<outputDirectory>plugins</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/assembly/templates</directory>
<outputDirectory>templates</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/assembly/webapps</directory>
<outputDirectory>tomcat/webapps</outputDirectory>
Expand Down
338 changes: 0 additions & 338 deletions assembly-main/src/assembly/templates/samples.json

This file was deleted.

0 comments on commit 5d5b25b

Please sign in to comment.