You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2014/01/31 16:02:40 UTC
git commit: Fixes APLO-308 - Filesystem permissions in released
package are broken.
Updated Branches:
refs/heads/trunk a6629f94b -> 2b6867a6c
Fixes APLO-308 - Filesystem permissions in released package are broken.
We now explicitly configure the directory and file modes in the assembly.
Project: http://git-wip-us.apache.org/repos/asf/activemq-apollo/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-apollo/commit/2b6867a6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-apollo/tree/2b6867a6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-apollo/diff/2b6867a6
Branch: refs/heads/trunk
Commit: 2b6867a6ca7834e202a744a20f59caf283f16d54
Parents: a6629f9
Author: Hiram Chirino <hi...@hiramchirino.com>
Authored: Fri Jan 31 09:50:36 2014 -0500
Committer: Hiram Chirino <hi...@hiramchirino.com>
Committed: Fri Jan 31 09:50:36 2014 -0500
----------------------------------------------------------------------
apollo-distro/src/main/descriptors/common-bin.xml | 9 +++++++++
apollo-distro/src/main/descriptors/unix-bin.xml | 4 ++++
apollo-distro/src/main/descriptors/windows-bin.xml | 4 ++++
3 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2b6867a6/apollo-distro/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apollo-distro/src/main/descriptors/common-bin.xml b/apollo-distro/src/main/descriptors/common-bin.xml
index 0ca203d..e21e5dc 100644
--- a/apollo-distro/src/main/descriptors/common-bin.xml
+++ b/apollo-distro/src/main/descriptors/common-bin.xml
@@ -19,6 +19,8 @@
<dependencySets>
<dependencySet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
@@ -105,6 +107,8 @@
</dependencySet>
<dependencySet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<outputDirectory>/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
@@ -123,6 +127,7 @@
<directory>src/main/release/bin</directory>
<outputDirectory>/bin</outputDirectory>
<lineEnding>unix</lineEnding>
+ <directoryMode>755</directoryMode>
<fileMode>0755</fileMode>
<excludes>
<exclude>*.cmd</exclude>
@@ -131,6 +136,8 @@
<!-- Copy the windows scripts .. exclude the unix bits-->
<fileSet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<directory>src/main/release/bin</directory>
<outputDirectory>/bin</outputDirectory>
<lineEnding>dos</lineEnding>
@@ -141,6 +148,8 @@
<!-- copy the website docs -->
<fileSet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<directory>${basedir}/../apollo-website/target/sitegen/</directory>
<outputDirectory>/docs/site</outputDirectory>
</fileSet>
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2b6867a6/apollo-distro/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/apollo-distro/src/main/descriptors/unix-bin.xml b/apollo-distro/src/main/descriptors/unix-bin.xml
index 19ec9ba..7a73586 100755
--- a/apollo-distro/src/main/descriptors/unix-bin.xml
+++ b/apollo-distro/src/main/descriptors/unix-bin.xml
@@ -25,6 +25,8 @@
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<directory>src/main/release</directory>
<outputDirectory>/</outputDirectory>
<excludes>
@@ -36,6 +38,8 @@
<!-- filtered files -->
<fileSet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<directory>src/main/release</directory>
<outputDirectory>/</outputDirectory>
<includes>
http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/2b6867a6/apollo-distro/src/main/descriptors/windows-bin.xml
----------------------------------------------------------------------
diff --git a/apollo-distro/src/main/descriptors/windows-bin.xml b/apollo-distro/src/main/descriptors/windows-bin.xml
index 9dfc12e..90a9a4d 100755
--- a/apollo-distro/src/main/descriptors/windows-bin.xml
+++ b/apollo-distro/src/main/descriptors/windows-bin.xml
@@ -24,6 +24,8 @@
<fileSets>
<!-- Copy over everything that needs to get dos line endings -->
<fileSet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<directory>src/main/release</directory>
<outputDirectory>/</outputDirectory>
<excludes>
@@ -35,6 +37,8 @@
<!-- filtered files -->
<fileSet>
+ <directoryMode>755</directoryMode>
+ <fileMode>644</fileMode>
<directory>src/main/release</directory>
<outputDirectory>/</outputDirectory>
<includes>