Skip to content

Commit c70bf3e

Browse files
author
Kim van der Riet
committed
QPID-4984: WIP - Merge from trunk r.1525056
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1525101 13f79535-47bb-0310-9956-ffa450edef68
1 parent fcdf172 commit c70bf3e

File tree

1,235 files changed

+29381
-60899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,235 files changed

+29381
-60899
lines changed

‎qpid/QPID_VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.23
1+
0.25

‎qpid/bin/release.sh‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,15 @@ if [ "PYTHON" == "$PYTHON" ] ; then
211211

212212
# create the swigged python sources
213213
mkdir qpid-${VER}/python-qpid_messaging-${VER}
214+
mkdir qpid-${VER}/python-qpid_messaging-${VER}/examples
214215
cp qpid-${VER}/cpp/bindings/qpid/python/python.i \
215216
qpid-${VER}/cpp/bindings/qpid/python/LICENSE \
216217
qpid-${VER}/cpp/bindings/qpid/python/README \
217218
qpid-${VER}/cpp/bindings/qpid/python/ChangeLog \
218219
qpid-${VER}/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt \
219220
qpid-${VER}/python-qpid_messaging-${VER}
220-
# TODO: copy python examples into the directory as well
221+
cp qpid-${VER}/cpp/bindings/qpid/examples/python/* \
222+
qpid-${VER}/python-qpid_messaging-${VER}/examples
221223
pushd qpid-${VER}
222224
tar -czf ../artifacts/python-qpid_messaging-${VER}.tar.gz \
223225
python-qpid_messaging-${VER}
@@ -248,8 +250,8 @@ if [ "JAVA" == "$JAVA" ] ; then
248250

249251
# now generate the binary packages, with the glue for optional features
250252
pushd qpid-${VER}/java
251-
ant build release-bin -Dsvnversion.output=${REV} -Dmodules.opt="bdbstore,bdbstore/jmx" -Ddownload-bdb=true
252-
ant release-mvn -Dsvnversion.output=${REV} -Dmodules.opt="bdbstore,bdbstore/jmx" -Dmaven.snapshot=false
253+
ant build release-bin -Dsvnversion.output=${REV} -Doptional=true
254+
ant release-mvn -Dsvnversion.output=${REV} -Doptional=true -Dmaven.snapshot=false
253255
popd
254256

255257
cp qpid-${VER}/java/broker/release/*.tar.gz artifacts/qpid-java-broker-${VER}.tar.gz
@@ -268,8 +270,18 @@ if [ "JAVA" == "$JAVA" ] ; then
268270
cp -a qpid-${VER}/java/management/common/release/maven artifacts/
269271
cp -a qpid-${VER}/java/amqp-1-0-common/release/maven artifacts/
270272
cp -a qpid-${VER}/java/broker-plugins/access-control/release/maven artifacts/
271-
cp -a qpid-${VER}/java/broker-plugins/management-jmx/release/maven artifacts/
273+
cp -a qpid-${VER}/java/broker-plugins/amqp-0-8-protocol/release/maven artifacts/
274+
cp -a qpid-${VER}/java/broker-plugins/amqp-0-10-protocol/release/maven artifacts/
275+
cp -a qpid-${VER}/java/broker-plugins/amqp-1-0-protocol/release/maven artifacts/
276+
cp -a qpid-${VER}/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/release/maven artifacts/
277+
cp -a qpid-${VER}/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/release/maven artifacts/
278+
cp -a qpid-${VER}/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/release/maven artifacts/
279+
cp -a qpid-${VER}/java/broker-plugins/derby-store/release/maven artifacts/
280+
cp -a qpid-${VER}/java/broker-plugins/jdbc-provider-bone/release/maven artifacts/
281+
cp -a qpid-${VER}/java/broker-plugins/jdbc-store/release/maven artifacts/
272282
cp -a qpid-${VER}/java/broker-plugins/management-http/release/maven artifacts/
283+
cp -a qpid-${VER}/java/broker-plugins/management-jmx/release/maven artifacts/
284+
cp -a qpid-${VER}/java/broker-plugins/memory-store/release/maven artifacts/
273285
cp -a qpid-${VER}/java/bdbstore/jmx/release/maven artifacts/
274286
fi
275287

‎qpid/cpp/BuildInstallSettings.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ if (WIN32)
9393
"Directory to install SASL configuration files")
9494
set (QPID_INSTALL_DATADIR conf CACHE STRING
9595
"Directory to install read-only arch.-independent data root")
96-
set (QPID_INSTALL_EXAMPLESDIR qpid/examples CACHE STRING
96+
set (QPID_INSTALL_EXAMPLESDIR examples CACHE STRING
9797
"Directory to install programming examples in")
9898
set (QPID_INSTALL_DOCDIR docs CACHE STRING
9999
"Directory to install documentation")

‎qpid/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ set_absolute_install_path (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf)
6464
set_absolute_install_path (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf)
6565

6666
install(FILES LICENSE NOTICE DESTINATION ${QPID_INSTALL_DOCDIR})
67-
install(FILES include/qmf/qmfengine.i
68-
include/qmf/qmf2.i
67+
install(FILES include/qmf/qmf2.i
6968
DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf)
7069

7170
if (WIN32)

‎qpid/cpp/INSTALL‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,13 @@ all of the above plus:
150150
* doxygen <ftp://ftp.stack.nl/pub/users/dimitri/> (1.5.1)
151151
* graphviz <http://www.graphviz.org/> (2.12)
152152
* ruby 1.8 <http://www.ruby-lang.org> (1.8.4)
153-
153+
* python 2.x <http://www.python.org> (2.4.3)
154154

155155
NOTE: make sure to install the related '-devel' packages also!!!!
156156

157+
NOTE: Python 3.x is know to NOT work - please use 2.7 or earlier.
158+
Ruby should be prior to version 2.
159+
157160
To build the QMF (Qpid Management Framework) bindings for Ruby and Python,
158161
the following must also be installed:
159162

‎qpid/cpp/INSTALL-AUTOTOOLS‎

Lines changed: 0 additions & 281 deletions
This file was deleted.

‎qpid/cpp/INSTALL-WINDOWS‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,17 @@ Take these as a recommended minimum version.
4141
The following libraries and header files must be installed to build
4242
from either a source checkout or a source distribution:
4343

44-
* boost <http://www.boost.org> (1.35)(*)
45-
46-
earlier versions of boost e.g. 1.33 also work
44+
* boost <http://www.boost.org> (1.35)
4745

4846
To build from a source repository (SVN) checkout you will need boost plus:
4947

5048
* CMake <http://www.cmake.org> (2.4)
5149
* python <http://www.python.org> (2.5.2)
5250
* ruby <http://www.ruby-lang.org> (1.8.4)
5351

52+
NOTE: Python 3.x is known to NOT work - please use 2.7 or earlier.
53+
Ruby should be prior to version 2.
54+
5455
Regardless of which type of build you perform, if you wish to run the full
5556
test suite, you will need to have python, listed above, installed.
5657

‎qpid/cpp/Makefile.am‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎qpid/cpp/README-HA.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,4 @@ The queue state replication mechanism implemented by the modules `replicating_li
136136
[ha-virtual-ip]: http://qpid.apache.org/books/0.22/AMQP-Messaging-Broker-CPP-Book/html/chapter-ha.html#ha-virtual-ip
137137
[ha-replicate-values]: http://qpid.apache.org/books/0.22/AMQP-Messaging-Broker-CPP-Book/html/chapter-ha.html#ha-replicate-values
138138
[ha-rm-config]: http://qpid.apache.org/books/0.22/AMQP-Messaging-Broker-CPP-Book/html/chapter-ha.html#ha-rm-config
139-
[ha-queue-replication]: http://qpid.apache.org/books/0.22/AMQP-Messaging-Broker-CPP-Book/html/chapter-ha.html#ha-queue-replication
139+
[ha-queue-replication]: http://qpid.apache.org/releases/qpid-0.22/cpp-broker/book/ha-queue-replication.html

0 commit comments

Comments
 (0)