diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-02-09 12:54:13 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-02-09 12:54:13 +0000 |
| commit | 91b5375d201f83c80bef23b74c87a86cbc71bb59 (patch) | |
| tree | 687aa1b3c14c88c042d5c9fcf0fadd9ab4d4e4c6 /qpid/java/distribution/src | |
| parent | 54260c15b9105a1e81bee43c860ef61013d98a39 (diff) | |
| download | qpid-python-91b5375d201f83c80bef23b74c87a86cbc71bb59.tar.gz | |
Merged revisions 504915-505241,505243-505256 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk
........
r504915 | rgreig | 2007-02-08 14:36:16 +0000 (Thu, 08 Feb 2007) | 1 line
QPID-353 : Amend type of JMS destination type from byte to int
........
r505255 | marnie | 2007-02-09 11:32:52 +0000 (Fri, 09 Feb 2007) | 1 line
Rerverted to octal values for fileMode as we have reverted to assembly 2.1
........
r505256 | marnie | 2007-02-09 11:38:06 +0000 (Fri, 09 Feb 2007) | 1 line
Rerverted to octal values for fileMode as we have reverted to assembly 2.1
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting_persistent@505275 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/distribution/src')
| -rw-r--r-- | qpid/java/distribution/src/main/assembly/bin-test.xml | 18 | ||||
| -rw-r--r-- | qpid/java/distribution/src/main/assembly/bin.xml | 22 |
2 files changed, 26 insertions, 14 deletions
diff --git a/qpid/java/distribution/src/main/assembly/bin-test.xml b/qpid/java/distribution/src/main/assembly/bin-test.xml index b7896bd697..6d78687fa7 100644 --- a/qpid/java/distribution/src/main/assembly/bin-test.xml +++ b/qpid/java/distribution/src/main/assembly/bin-test.xml @@ -74,67 +74,73 @@ <source>../common/etc/qpid-run.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-run.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/config.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>config.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/log4j.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>log4j.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/passwd</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>passwd</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/qpid-server.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-server.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/virtualhosts.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>virtualhosts.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../common/bin/qpid-run</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-run</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.sh</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.sh</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/runAll</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>runAll</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> </files> <dependencySets> diff --git a/qpid/java/distribution/src/main/assembly/bin.xml b/qpid/java/distribution/src/main/assembly/bin.xml index 978ee4df82..27eb239d28 100644 --- a/qpid/java/distribution/src/main/assembly/bin.xml +++ b/qpid/java/distribution/src/main/assembly/bin.xml @@ -68,73 +68,79 @@ </fileSet> </fileSets> <files> - <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have - to use decimal numbers to specify fileMode --> + <!-- due to a bug in the assembly 2.1 plugin (MASSEMBLY-153) you have + to use octal numbers to specify fileMode note not valid in 2.2 assembly plugin --> <file> <source>../common/etc/qpid-run.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-run.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/config.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>config.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/log4j.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>log4j.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/passwd</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>passwd</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/qpid-server.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-server.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/virtualhosts.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>virtualhosts.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../common/bin/qpid-run</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-run</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.sh</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.sh</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/runAll</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>runAll</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> </files> <dependencySets> |