summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-04-27 16:18:21 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-04-27 16:18:21 +0000
commit14e7a372a7ed8c8e4458b83168fc57e8deed592a (patch)
tree51182cdac93bca3a22466119f98800b779dbadd7 /qpid/java
parentb14a104465abf986af6f3d6851084c92ec3f2177 (diff)
downloadqpid-python-14e7a372a7ed8c8e4458b83168fc57e8deed592a.tar.gz
Merged revisions 533140-533141 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r533140 | ritchiem | 2007-04-27 16:28:44 +0100 (Fri, 27 Apr 2007) | 1 line Removed reference to bdbbackup ........ r533141 | ritchiem | 2007-04-27 16:31:54 +0100 (Fri, 27 Apr 2007) | 1 line Added reference for qpid.start and brought bin-test in line with bin. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@533158 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/distribution/src/main/assembly/bin-test.xml18
-rw-r--r--qpid/java/distribution/src/main/assembly/bin.xml12
2 files changed, 24 insertions, 6 deletions
diff --git a/qpid/java/distribution/src/main/assembly/bin-test.xml b/qpid/java/distribution/src/main/assembly/bin-test.xml
index 6d78687fa7..a9e769e312 100644
--- a/qpid/java/distribution/src/main/assembly/bin-test.xml
+++ b/qpid/java/distribution/src/main/assembly/bin-test.xml
@@ -107,6 +107,24 @@
<fileMode>420</fileMode>
</file>
<file>
+ <source>../broker/bin/qpid.start</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid.start</destName>
+ <fileMode>493</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/qpid.stop</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid.stop</destName>
+ <fileMode>493</fileMode>
+ </file>
+ <file>
+ <source>../broker/bin/qpid.stopall</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid.stopall</destName>
+ <fileMode>493</fileMode>
+ </file>
+ <file>
<source>../common/bin/qpid-run</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid-run</destName>
diff --git a/qpid/java/distribution/src/main/assembly/bin.xml b/qpid/java/distribution/src/main/assembly/bin.xml
index ef85137f90..0461f0f643 100644
--- a/qpid/java/distribution/src/main/assembly/bin.xml
+++ b/qpid/java/distribution/src/main/assembly/bin.xml
@@ -131,6 +131,12 @@
<fileMode>420</fileMode>
</file>
<file>
+ <source>../broker/bin/qpid.start</source>
+ <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+ <destName>qpid.start</destName>
+ <fileMode>493</fileMode>
+ </file>
+ <file>
<source>../broker/bin/qpid.stop</source>
<outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
<destName>qpid.stop</destName>
@@ -178,12 +184,6 @@
<destName>runAll</destName>
<fileMode>493</fileMode>
</file>
- <file>
- <source>../broker/bin/bdbbackup</source>
- <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
- <destName>bdbbackup</destName>
- <fileMode>493</fileMode>
- </file>
</files>
<dependencySets>
<dependencySet>