Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6112 

Fixing file permissions in assembly tar.  Some permissions were not
being set explicitly which means the value used could change depending
on where the assembly was built. Permissions are now being set to fix
this.

(cherry picked from commit 43d493e527)
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-01-07 15:33:46 +00:00
parent 26665fa1b9
commit 2f062488c3
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assembly/src/main/descriptors/common-bin.xml
View File

@ -30,6 +30,8 @@
<include>conf/*.cert</include> <include>conf/*.cert</include>
<include>webapps/*.ico</include> <include>webapps/*.ico</include>
</includes> </includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<!-- lets copy the portions of the admin web app we need - as we can't exclude stuff from the WAR --> <!-- lets copy the portions of the admin web app we need - as we can't exclude stuff from the WAR -->
@ -39,6 +41,8 @@
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/styles</directory> <directory>../activemq-web-console/src/main/webapp/styles</directory>
@ -46,6 +50,8 @@
<includes> <includes>
<include>*</include> <include>*</include>
</includes> </includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp</directory> <directory>../activemq-web-console/src/main/webapp</directory>
@ -54,6 +60,8 @@
<exclude>**/activemq.xml</exclude> <exclude>**/activemq.xml</exclude>
<exclude>**/webconsole-embedded.xml</exclude> <exclude>**/webconsole-embedded.xml</exclude>
</excludes> </excludes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/target/classes</directory> <directory>../activemq-web-console/target/classes</directory>
@ -61,6 +69,8 @@
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<!-- the web demo --> <!-- the web demo -->
@ -71,24 +81,34 @@
<exclude>**/activemq.xml</exclude> <exclude>**/activemq.xml</exclude>
<exclude>**/webconsole-embedded.xml</exclude> <exclude>**/webconsole-embedded.xml</exclude>
</excludes> </excludes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/styles/</directory> <directory>../activemq-web-console/src/main/webapp/styles/</directory>
<outputDirectory>/webapps-demo/demo/styles/</outputDirectory> <outputDirectory>/webapps-demo/demo/styles/</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/images/</directory> <directory>../activemq-web-console/src/main/webapp/images/</directory>
<outputDirectory>/webapps-demo/demo/images/</outputDirectory> <outputDirectory>/webapps-demo/demo/images/</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-web-console/src/main/webapp/js/</directory> <directory>../activemq-web-console/src/main/webapp/js/</directory>
<outputDirectory>/webapps-demo/demo/js/</outputDirectory> <outputDirectory>/webapps-demo/demo/js/</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<!-- the file server --> <!-- the file server -->
<fileSet> <fileSet>
<directory>../activemq-fileserver/src/main/webapp</directory> <directory>../activemq-fileserver/src/main/webapp</directory>
<outputDirectory>/webapps/fileserver</outputDirectory> <outputDirectory>/webapps/fileserver</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>../activemq-fileserver/target/classes</directory> <directory>../activemq-fileserver/target/classes</directory>
@ -96,6 +116,8 @@
<includes> <includes>
<include>**/*.class</include> <include>**/*.class</include>
</includes> </includes>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet> </fileSet>
</fileSets> </fileSets>
@ -109,6 +131,7 @@
<includes> <includes>
<include>${pom.groupId}:activemq-run</include> <include>${pom.groupId}:activemq-run</include>
</includes> </includes>
<fileMode>0644</fileMode>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>