From 4e1735463fdb63f87d03541c33a816a5c7af563f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 12 Dec 2006 16:05:01 +0000 Subject: 2006-12-11 Alan Conway * SPECS/qpid-cpp.spec: Draft RPM spec file for C++. Based on initial draft provided by David Lutterkort * cpp Makefiles: Renamed libraries with qpid prefix: libqpidclient etc. * cpp/man/: moved to docs/man/ * docs/api/usr.doxygen: more restricted, user-oriented doc settings. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@486207 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 18 ++++++++++++++++++ qpid/cpp/docs/man/qpidd.x | 5 +++++ 2 files changed, 23 insertions(+) create mode 100644 qpid/cpp/docs/man/Makefile.am create mode 100644 qpid/cpp/docs/man/qpidd.x (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am new file mode 100644 index 0000000000..1edfdd55d2 --- /dev/null +++ b/qpid/cpp/docs/man/Makefile.am @@ -0,0 +1,18 @@ +dist_man_MANS = qpidd.1 + +man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x) +EXTRA_DIST = $(man_aux) $(optional_mans) +MAINTAINERCLEANFILES = $(dist_man_MANS) + +qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd.cpp + +# Depend on configure.ac to get version number changes. +$(dist_man_MANS): $(top_srcdir)/configure.ac + +SUFFIXES = .x .1 +.x.1: + @rm -f $@ + @echo "Updating man page $@" + $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$* + @chmod a-w $@-t + @mv $@-t $@ diff --git a/qpid/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x new file mode 100644 index 0000000000..e60505cc9c --- /dev/null +++ b/qpid/cpp/docs/man/qpidd.x @@ -0,0 +1,5 @@ +[NAME] +qpidd \- the Qpid broker daemon + +[DESCRIPTION] +.\" Add any additional description here -- cgit v1.2.1 From 1a5f3f72cc85d88e23d47d4b7ccb52c281205942 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Sat, 23 Dec 2006 17:20:37 +0000 Subject: - rpm: make rpm now builds RPMs under rpm/ directory. - src/qpidd.cpp: added --daemon option to run as daemon. - etc/qpidd: fixed bugs in init.rc script. - qpidc.spec: fixed rpmlint warnings, added apache URL git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@489905 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am index 1edfdd55d2..f637328cbb 100644 --- a/qpid/cpp/docs/man/Makefile.am +++ b/qpid/cpp/docs/man/Makefile.am @@ -4,7 +4,9 @@ man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x) EXTRA_DIST = $(man_aux) $(optional_mans) MAINTAINERCLEANFILES = $(dist_man_MANS) -qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd.cpp +dist-hook: $(man_aux) + +qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd # Depend on configure.ac to get version number changes. $(dist_man_MANS): $(top_srcdir)/configure.ac -- cgit v1.2.1 From 732544fe86089ab86c03fcc48d5ca4c72667c275 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:05:56 +0000 Subject: * cpp: svn removed, will rename cpp-0-9 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520705 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 20 -------------------- qpid/cpp/docs/man/qpidd.x | 5 ----- 2 files changed, 25 deletions(-) delete mode 100644 qpid/cpp/docs/man/Makefile.am delete mode 100644 qpid/cpp/docs/man/qpidd.x (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am deleted file mode 100644 index f637328cbb..0000000000 --- a/qpid/cpp/docs/man/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -dist_man_MANS = qpidd.1 - -man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x) -EXTRA_DIST = $(man_aux) $(optional_mans) -MAINTAINERCLEANFILES = $(dist_man_MANS) - -dist-hook: $(man_aux) - -qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd - -# Depend on configure.ac to get version number changes. -$(dist_man_MANS): $(top_srcdir)/configure.ac - -SUFFIXES = .x .1 -.x.1: - @rm -f $@ - @echo "Updating man page $@" - $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$* - @chmod a-w $@-t - @mv $@-t $@ diff --git a/qpid/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x deleted file mode 100644 index e60505cc9c..0000000000 --- a/qpid/cpp/docs/man/qpidd.x +++ /dev/null @@ -1,5 +0,0 @@ -[NAME] -qpidd \- the Qpid broker daemon - -[DESCRIPTION] -.\" Add any additional description here -- cgit v1.2.1 From d2eb3361494710466280341c98f76c03536d2ebe Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 21 Mar 2007 02:08:18 +0000 Subject: Renamed cpp-0-9 to cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@520706 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 20 ++++++++++++++++++++ qpid/cpp/docs/man/qpidd.x | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 qpid/cpp/docs/man/Makefile.am create mode 100644 qpid/cpp/docs/man/qpidd.x (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am new file mode 100644 index 0000000000..f637328cbb --- /dev/null +++ b/qpid/cpp/docs/man/Makefile.am @@ -0,0 +1,20 @@ +dist_man_MANS = qpidd.1 + +man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x) +EXTRA_DIST = $(man_aux) $(optional_mans) +MAINTAINERCLEANFILES = $(dist_man_MANS) + +dist-hook: $(man_aux) + +qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd + +# Depend on configure.ac to get version number changes. +$(dist_man_MANS): $(top_srcdir)/configure.ac + +SUFFIXES = .x .1 +.x.1: + @rm -f $@ + @echo "Updating man page $@" + $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$* + @chmod a-w $@-t + @mv $@-t $@ diff --git a/qpid/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x new file mode 100644 index 0000000000..e60505cc9c --- /dev/null +++ b/qpid/cpp/docs/man/qpidd.x @@ -0,0 +1,5 @@ +[NAME] +qpidd \- the Qpid broker daemon + +[DESCRIPTION] +.\" Add any additional description here -- cgit v1.2.1 From 86336dc0d461ea6069f61aae72778e9fe6511b86 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 11 Apr 2007 13:06:30 +0000 Subject: * Fixes to enable VPATH builds. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@527481 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am index f637328cbb..7d2acd7227 100644 --- a/qpid/cpp/docs/man/Makefile.am +++ b/qpid/cpp/docs/man/Makefile.am @@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(dist_man_MANS) dist-hook: $(man_aux) -qpidd.1: $(srcdir)/qpidd.x $(top_srcdir)/src/qpidd +qpidd.1: $(srcdir)/qpidd.x $(top_builddir)/src/qpidd # Depend on configure.ac to get version number changes. $(dist_man_MANS): $(top_srcdir)/configure.ac -- cgit v1.2.1 From 11cc4a33f5b6ef065445322036a89bb92cffc041 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 26 Apr 2007 14:13:14 +0000 Subject: - docs/man/qpidd.x: explain file and environment configuration. - src/qpidd.cpp: read config from file. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@532750 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/qpidd.x | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x index e60505cc9c..91d3c3a969 100644 --- a/qpid/cpp/docs/man/qpidd.x +++ b/qpid/cpp/docs/man/qpidd.x @@ -1,5 +1,16 @@ [NAME] -qpidd \- the Qpid broker daemon +qpidd \- the Qpid AMQP broker daemon [DESCRIPTION] -.\" Add any additional description here + +Start the AMQP broker. The broker options can be specified on the command line (e.g. --worker-threads 10), in an environment variable (e.g. export QPID_WORKER_THREADS=10), or as a line in a configuration file (e.g. worker-threads=10). + +Command line options take precedence over environment variables, which +take precedence over the config file. + + + + + + + -- cgit v1.2.1 From c53511771a1ad0de123a249105f3d4f633518249 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 1 May 2007 16:10:42 +0000 Subject: Makefile fixes to get make distcheck passing. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@534143 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am index 7d2acd7227..c8df4eab6a 100644 --- a/qpid/cpp/docs/man/Makefile.am +++ b/qpid/cpp/docs/man/Makefile.am @@ -1,8 +1,8 @@ dist_man_MANS = qpidd.1 -man_aux = $(dist_man_MANS:.1=.x) $(optional_mans:.1=.x) -EXTRA_DIST = $(man_aux) $(optional_mans) -MAINTAINERCLEANFILES = $(dist_man_MANS) +man_aux = $(dist_man_MANS:.1=.x) +EXTRA_DIST = $(man_aux) +DISTCLEANFILES = $(dist_man_MANS) dist-hook: $(man_aux) -- cgit v1.2.1 From 9193f94dd996458e76506134ad4b506444badd99 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 30 May 2007 16:13:58 +0000 Subject: Logging infrastructure: See qpidd --long-help for details. * src/qpid/log/*: Logging infrastructure, QPID_LOG macro. * src/*: changed output to cout/cerr to logging. * src/qpidd.cpp: logging options. * src/tests/Makefile.am: fixed issues with valgrind * src/tests/kill|start_broker: use broker daemon options. * src/tests/run_test: run tests in valgrind. Disabled till leaks in client_test are fixed. * src/test/unit/logging.cpp: Logging unit test using boost test framework. Eventually we should move all unit tests to boost & drop CppUnit. * src/test/unit/test_tools.h: useful extensions to boost framework: Regular expression check, ostream << for vectors. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@542855 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am index c8df4eab6a..f9fff2d520 100644 --- a/qpid/cpp/docs/man/Makefile.am +++ b/qpid/cpp/docs/man/Makefile.am @@ -15,6 +15,6 @@ SUFFIXES = .x .1 .x.1: @rm -f $@ @echo "Updating man page $@" - $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$* + $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t -h --long-help ../../src/$* @chmod a-w $@-t @mv $@-t $@ -- cgit v1.2.1 From 8ea91b2aa2b1a6a3fdbf47a2eb36e7c2c997bec8 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 27 Jun 2007 00:12:26 +0000 Subject: Make check now starts a broker on a dynamically assigned port, so multiple qpid builds on one host will not conflict. * src/tests/run_test, start_broker, kill_broker: Broker writes port to file, run_test sets QPID_PORT in environment of all tests. * src/tests/topic_publisher.cpp, topic_listener.cpp, client_test.cpp: All test clients use TestOptions to parse options from args and env. * src/qpid/Options.h: Renamed from CommonOptions.h Simplified use of Options class. * src/qpid/Url.h: Renamed defaultPort constant. * src/tests/logging.cpp: * src/tests/interop_runner.cpp: * src/tests/TestOptions.h: * src/qpidd.cpp: * src/qpid/log/Options.cpp: * src/qpid/log/Logger.cpp: * src/qpid/broker/Broker.cpp: Updated for changes to Options. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@550993 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/Makefile.am b/qpid/cpp/docs/man/Makefile.am index f9fff2d520..c8df4eab6a 100644 --- a/qpid/cpp/docs/man/Makefile.am +++ b/qpid/cpp/docs/man/Makefile.am @@ -15,6 +15,6 @@ SUFFIXES = .x .1 .x.1: @rm -f $@ @echo "Updating man page $@" - $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t -h --long-help ../../src/$* + $(HELP2MAN) --no-info --include=$(srcdir)/$*.x --output=$@-t ../../src/$* @chmod a-w $@-t @mv $@-t $@ -- cgit v1.2.1 From f6afed79c8618f02431bdd9d3ca25e75deef184e Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 4 Oct 2007 15:32:45 +0000 Subject: * docs/man/qpidd.x: Explain configuration options. * etc/qpidd.conf: Placeholder configuration file. * qpidc.spec.in: Install qpidd.conf * Makefile.am: Install qpidd.conf * src/qpid/Options.cpp, h, src/qpidd.cpp: Option formatting fixes. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@581951 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/docs/man/qpidd.x | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/docs/man') diff --git a/qpid/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x index 91d3c3a969..5d4ce974e1 100644 --- a/qpid/cpp/docs/man/qpidd.x +++ b/qpid/cpp/docs/man/qpidd.x @@ -1,16 +1,46 @@ [NAME] + qpidd \- the Qpid AMQP broker daemon +[SYNOPSIS] + +qpidd [options] + [DESCRIPTION] -Start the AMQP broker. The broker options can be specified on the command line (e.g. --worker-threads 10), in an environment variable (e.g. export QPID_WORKER_THREADS=10), or as a line in a configuration file (e.g. worker-threads=10). +An AMQP broker daemon that stores, routes and forwards messages via +the AMQP protocol. + +[OPTIONS] + +Options may be specified via command line, environment variable or configuration file. See FILES and ENVIRONMENT below for details. + +[FILES] +.I /etc/qpidd.conf +.RS +Default configuration file. +.RE -Command line options take precedence over environment variables, which -take precedence over the config file. +Configuration file settings are over-ridden by command line or environment variable settings. '--config ' or 'export QPID_CONFIG=' specifies an alternate file. +Each line is a name=value pair. Blank lines and lines beginning with # are ignored. For example: + # My qpidd configuration file. + port=6000 + max-connections=10 + log.output=stdout + log.output=/tmp/qpidd.log +[ENVIRONMENT] +.I QPID_