Repository: activemq Updated Branches: refs/heads/master b7db97d8e -> 43d493e52
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. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/43d493e5 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/43d493e5 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/43d493e5 Branch: refs/heads/master Commit: 43d493e527ccd7d940858646d37819d3bda0a806 Parents: b7db97d Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Thu Jan 7 15:33:46 2016 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Thu Jan 7 15:33:46 2016 +0000 ---------------------------------------------------------------------- assembly/src/main/descriptors/common-bin.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/43d493e5/assembly/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index 13f1078..bf700e6 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -30,6 +30,8 @@ <include>conf/*.cert</include> <include>webapps/*.ico</include> </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <!-- 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> <include>*</include> </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-web-console/src/main/webapp/styles</directory> @@ -46,6 +50,8 @@ <includes> <include>*</include> </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-web-console/src/main/webapp</directory> @@ -54,6 +60,8 @@ <exclude>**/activemq.xml</exclude> <exclude>**/webconsole-embedded.xml</exclude> </excludes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-web-console/target/classes</directory> @@ -61,6 +69,8 @@ <includes> <include>**/*.class</include> </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <!-- the web demo --> @@ -71,24 +81,34 @@ <exclude>**/activemq.xml</exclude> <exclude>**/webconsole-embedded.xml</exclude> </excludes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-web-console/src/main/webapp/styles/</directory> <outputDirectory>/webapps-demo/demo/styles/</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-web-console/src/main/webapp/images/</directory> <outputDirectory>/webapps-demo/demo/images/</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-web-console/src/main/webapp/js/</directory> <outputDirectory>/webapps-demo/demo/js/</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <!-- the file server --> <fileSet> <directory>../activemq-fileserver/src/main/webapp</directory> <outputDirectory>/webapps/fileserver</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> <fileSet> <directory>../activemq-fileserver/target/classes</directory> @@ -96,6 +116,8 @@ <includes> <include>**/*.class</include> </includes> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> </fileSet> </fileSets> @@ -109,6 +131,7 @@ <includes> <include>${pom.groupId}:activemq-run</include> </includes> + <fileMode>0644</fileMode> </dependencySet> <dependencySet>
