SM-2266: Fix a few issues with the binary/source assembly
git-svn-id: https://svn.apache.org/repos/asf/servicemix/smx5/trunk@1577471 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 1adea81..d220327 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -131,13 +131,6 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <configuration>
- <appendedResourcesDirectory>${basedir}/target/shared/appended-resources</appendedResourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${karaf.version}</version>
diff --git a/assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm b/assembly/src/main/appended-resources/META-INF/LICENSE.vm
similarity index 99%
rename from assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm
rename to assembly/src/main/appended-resources/META-INF/LICENSE.vm
index d123dbc..b3f4d8e 100644
--- a/assembly/src/main/resources/appended-resources/META-INF/LICENSE.vm
+++ b/assembly/src/main/appended-resources/META-INF/LICENSE.vm
@@ -37,3 +37,4 @@
#end
#end
#end
+
diff --git a/assembly/src/main/appended-resources/META-INF/NOTICE b/assembly/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..896541a
--- /dev/null
+++ b/assembly/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+This product contains software developed by
+Open Participation Software for Java (http://www.ops4j.org/).
+
+This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/),
+which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License)
+or under the (unmodified) EPL 1.0 (Eclipse Public License).
+An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
+
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
index 1fccf0e..5ea35c3 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -23,19 +23,19 @@
<fileSets>
<!-- Copy license and other files from root -->
<fileSet>
- <directory>${basedir}/../..</directory>
+ <directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>BUILDING.txt</include>
- <include>README.txt</include>
- <include>RELEASE*.txt</include>
+ <include>BUILDING</include>
+ <include>README</include>
+ <include>RELEASE*</include>
</includes>
<lineEnding>unix</lineEnding>
</fileSet>
<!-- Binary Files -->
<fileSet>
- <directory>${basedir}/../..</directory>
+ <directory>${basedir}/..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*.jpeg</include>
@@ -53,7 +53,6 @@
<include>**/*.jnilib</include>
<include>**/*.cert</include>
<include>**/*.jks</include>
- <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
<exclude>**/eclipse-classes/**</exclude>
@@ -63,7 +62,7 @@
<!-- Text Files -->
<fileSet>
- <directory>${basedir}/../..</directory>
+ <directory>${basedir}/..</directory>
<outputDirectory>src</outputDirectory>
<includes>
<include>**/*</include>
@@ -83,7 +82,6 @@
<exclude>**/*.bin</exclude>
<exclude>**/*.jnilib</exclude>
<exclude>**/*.cert</exclude>
- <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
<exclude>activemq-data/**</exclude>
@@ -110,14 +108,14 @@
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
- <destName>LICENSE.txt</destName>
+ <destName>LICENSE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
<outputDirectory>/</outputDirectory>
- <destName>NOTICE.txt</destName>
+ <destName>NOTICE</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
diff --git a/assembly/src/main/resources/appended-resources/META-INF/NOTICE b/assembly/src/main/resources/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 0e6fb2a..0000000
--- a/assembly/src/main/resources/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-This product contains software developed by
-Open Participation Software for Java (http://www.ops4j.org/).
-
-Additional copyright notices and license terms applicable are
-present in the licenses directory of this distribution.
\ No newline at end of file
diff --git a/assembly/src/main/resources/common-unix-bin.xml b/assembly/src/main/resources/common-unix-bin.xml
index 17b5a8a..a1fe05b 100644
--- a/assembly/src/main/resources/common-unix-bin.xml
+++ b/assembly/src/main/resources/common-unix-bin.xml
@@ -64,9 +64,9 @@
<fileMode>0755</fileMode>
</fileSet>
- <!-- Copy license and other files from root -->
+ <!-- Copy README and RELEASE-NOTES from root -->
<fileSet>
- <directory>${basedir}/../..</directory>
+ <directory>${basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README</include>
