From b77474c58f3056fc8291c639fb1e66921605f4cb Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Wed, 20 Apr 2011 17:38:07 +0400
Subject: [PATCH] SONAR-2378 Fix directory attributes in zip archive

Apply workaround for http://jira.codehaus.org/browse/MASSEMBLY-422
described in comments for http://jira.codehaus.org/browse/MASSEMBLY-449
---
 sonar-application/assembly.xml | 20 +-------------------
 sonar-application/pom.xml      |  8 ++++++++
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index 324bc07cc1e..1c085d8ae45 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -19,8 +19,6 @@
         <exclude>org.codehaus.sonar.plugins:*</exclude>
         <exclude>org.codehaus.sonar.runtime:*</exclude>
       </excludes>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib/deprecated-maven-plugin</outputDirectory>
@@ -28,8 +26,6 @@
       <includes>
         <include>org.codehaus.sonar.runtime:sonar-core-maven-plugin</include>
       </includes>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <!-- Plugins -->
     <dependencySet>
@@ -38,8 +34,6 @@
       <includes>
         <include>org.codehaus.sonar.plugins:*</include>
       </includes>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <!-- Server -->
     <dependencySet>
@@ -48,8 +42,6 @@
         <include>org.codehaus.sonar:sonar-server</include>
       </includes>
       <unpack>true</unpack>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <!-- JDBC drivers -->
     <dependencySet>
@@ -59,8 +51,6 @@
       </includes>
       <unpack>false</unpack>
       <scope>runtime</scope>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <dependencySet>
       <outputDirectory>extensions/jdbc-driver/derby/</outputDirectory>
@@ -69,8 +59,6 @@
       </includes>
       <unpack>false</unpack>
       <scope>runtime</scope>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <dependencySet>
       <outputDirectory>extensions/jdbc-driver/postgresql/</outputDirectory>
@@ -79,8 +67,6 @@
       </includes>
       <unpack>false</unpack>
       <scope>runtime</scope>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <dependencySet>
       <outputDirectory>extensions/jdbc-driver/mssql/</outputDirectory>
@@ -89,8 +75,6 @@
       </includes>
       <unpack>false</unpack>
       <scope>runtime</scope>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </dependencySet>
     <!-- Java Service Wrapper -->
     <dependencySet>
@@ -107,6 +91,7 @@
           <exclude>**/sample*/**</exclude>
         </excludes>
       </unpackOptions>
+      <fileMode>0755</fileMode>
     </dependencySet>
   </dependencySets>
 
@@ -121,7 +106,6 @@
       </includes>
       <lineEnding>dos</lineEnding>
       <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </fileSet>
     <!-- Linux Scripts -->
     <fileSet>
@@ -134,7 +118,6 @@
       </includes>
       <lineEnding>unix</lineEnding>
       <fileMode>0755</fileMode>
-      <directoryMode>0755</directoryMode>
     </fileSet>
     <!-- Other stuff -->
     <fileSet>
@@ -148,7 +131,6 @@
         <exclude>**/antRun</exclude>
       </excludes>
       <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
     </fileSet>
     <!-- Empty directories -->
     <fileSet>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 9b48a1a2c6e..e5290ef4ca3 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -27,6 +27,14 @@
               <descriptors>
                 <descriptor>assembly.xml</descriptor>
               </descriptors>
+              <archiverConfig>
+                <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 -->
+                <!-- 420(dec) = 644(oct) -->
+                <fileMode>420</fileMode>
+                <!-- 493(dec) = 755(oct) -->
+                <directoryMode>493</directoryMode>
+                <defaultDirectoryMode>493</defaultDirectoryMode>
+              </archiverConfig>
             </configuration>
           </execution>
         </executions>
-- 
2.39.5