You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2013/12/02 19:30:46 UTC

svn commit: r1547133 - /karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java

Author: janstey
Date: Mon Dec  2 18:30:46 2013
New Revision: 1547133

URL: http://svn.apache.org/r1547133
Log:
KARAF-2404 - bin script is not Unix executable in the zip distribution

Modified:
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java?rev=1547133&r1=1547132&r2=1547133&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java Mon Dec  2 18:30:46 2013
@@ -169,8 +169,25 @@ public class CreateArchiveMojo extends M
             fs.setDir(source);
             fs.setPrefix(serverName);
             fs.setProject(project);
+            fs.setExcludes("bin/");
             zip.addFileset(fs);
 
+            fs = new ZipFileSet();
+            fs.setDir(source);
+            fs.setPrefix(serverName);
+            fs.setProject(project);
+            fs.setIncludes("bin/");
+            fs.setExcludes("bin/*.bat");
+            fs.setFileMode("755");
+            zip.add(fs);
+
+            fs = new ZipFileSet();
+            fs.setDir(source);
+            fs.setPrefix(serverName);
+            fs.setProject(project);
+            fs.setIncludes("bin/*.bat");
+            zip.add(fs);
+
             for (Resource resource: this.project.getResources()) {
                 File resourceFile = new File(resource.getDirectory());
                 if (resourceFile.exists()) {