servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ksobkow...@apache.org
Subject servicemix git commit: SM-2492: Wrong sample keystore format in examples contained in the assembly
Date Wed, 01 Apr 2015 21:41:15 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.1.x 00759a4f8 -> 19e019bbb


SM-2492: Wrong sample keystore format in examples contained in the assembly


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/19e019bb
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/19e019bb
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/19e019bb

Branch: refs/heads/servicemix-5.1.x
Commit: 19e019bbbf83d5e25663bca33dd93af27d68d619
Parents: 00759a4
Author: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Authored: Wed Apr 1 23:38:28 2015 +0200
Committer: Krzysztof Sobkowiak <krzys.sobkowiak@gmail.com>
Committed: Wed Apr 1 23:41:10 2015 +0200

----------------------------------------------------------------------
 assembly/src/main/resources/examples-unix-bin.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/19e019bb/assembly/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/examples-unix-bin.xml b/assembly/src/main/resources/examples-unix-bin.xml
index c235eaf..d75a416 100644
--- a/assembly/src/main/resources/examples-unix-bin.xml
+++ b/assembly/src/main/resources/examples-unix-bin.xml
@@ -46,12 +46,26 @@
                 <exclude>**/.project</exclude>
                 <exclude>**/.settings/**</exclude>
                 <exclude>**/*.i??</exclude>
+                <exclude>**/*.jks</exclude>
             </excludes>
         </fileSet>
 
         <fileSet>
             <directory>${basedir}/../examples</directory>
             <outputDirectory>/examples/</outputDirectory>
+            <lineEnding>keep</lineEnding>
+            <includes>
+                <include>activemq/**/*.jks</include>
+                <include>activiti/**/*.jks</include>
+                <include>akka/**/*.jks</include>
+                <include>camel/**/*.jks</include>
+                <include>cxf/**/*.jks</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>${basedir}/../examples</directory>
+            <outputDirectory>/examples/</outputDirectory>
             <lineEnding>unix</lineEnding>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>


Mime
View raw message