qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r527639 - in /incubator/qpid/trunk/qpid/cpp: ./ docs/api/ gentools/src/org/apache/qpid/gentools/ gentools/templ.cpp/ rpm/ src/ src/broker/ src/client/ src/framing/ src/tests/
Date Wed, 11 Apr 2007 19:53:34 GMT
Author: aconway
Date: Wed Apr 11 12:53:32 2007
New Revision: 527639

URL: http://svn.apache.org/viewvc?view=rev&rev=527639
Log:

* cpp/qpidc.spec.in: Added qpidd-devel sub-package.
* cpp/configure.ac: Use a more reliable srcdir test file.
* cpp/docs/api/Makefile.am:  Fix bug in VPATH builds.
* cpp/gentools/*, src/**.h,**.cpp: Fix #includes of files in gen/
* cpp/rpm/Makefile.am: Removed. RPM targets defined in top level Makefile.am.
* cpp/Makefile.am: Add RPM targets, fix VPATH bug with RPM targets
* cpp/rpm/README.qpidd-devel: placeholder for qpidd-devel documentation.

Added:
    incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel   (with props)
Removed:
    incubator/qpid/trunk/qpid/cpp/rpm/Makefile.am
Modified:
    incubator/qpid/trunk/qpid/cpp/Makefile.am
    incubator/qpid/trunk/qpid/cpp/README
    incubator/qpid/trunk/qpid/cpp/configure.ac
    incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
    incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in
    incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
    incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
    incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h
    incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h
    incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp
    incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp
    incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h
    incubator/qpid/trunk/qpid/cpp/src/broker/Connection.cpp
    incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h
    incubator/qpid/trunk/qpid/cpp/src/broker/HandlerImpl.h
    incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h
    incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp
    incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.h
    incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp
    incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp
    incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h
    incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp
    incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h
    incubator/qpid/trunk/qpid/cpp/src/framing/AMQRequestBody.cpp
    incubator/qpid/trunk/qpid/cpp/src/framing/AMQResponseBody.cpp
    incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h
    incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h
    incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
    incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp
    incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp

Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Wed Apr 11 12:53:32 2007
@@ -1,13 +1,15 @@
 AUTOMAKE_OPTIONS = 1.9.2 foreign
 ACLOCAL_AMFLAGS = -I m4
 
+SPEC=$(PACKAGE).spec
+
 EXTRA_DIST = \
   LICENSE NOTICE README \
   etc/qpidd \
-  $(PACKAGE).spec \
-  $(PACKAGE).spec.in
+  $(SPEC) $(SPEC).in \
+  rpm/README.qpidd-devel 
 
-SUBDIRS = src docs/api docs/man rpm 
+SUBDIRS = src docs/api docs/man
 
 # Update libtool, if needed.
 libtool: $(LIBTOOL_DEPS)
@@ -16,11 +18,31 @@
 # This cannot be done by AC_CONFIG_FILES, because automake's
 # make distcheck target does not like auto-generated files
 # being included in the distributed archive.
-$(PACKAGE).spec: %: %.in
+$(SPEC): %: %.in Makefile
 	sed 's/@''PACKAGE@/@PACKAGE@/;s/@''VERSION@/@VERSION@/' $< > $@-tmp
 	mv $@-tmp $@
-MAINTAINERCLEANFILES = $(PACKAGE).spec
+MAINTAINERCLEANFILES = $(SPEC)
+
+#
+# Build RPMs from the distribution tarball.
+#
+RPMDIRS=rpm/BUILD  rpm/RPMS rpm/SPECS rpm/SRPMS
+RPMMACROS=--define "_topdir @abs_builddir@/rpm" --define "_sourcedir @abs_builddir@"
+# Override this variable e.g. with -bs to produce srpm only
+RPMOPTS=-ba
+
+clean-local:
+	-rm -rf $(RPMDIRS)
+
+.PHONY: rpmbuild
+
+rpmbuild: $(SPEC) dist-gzip
+	mkdir -p $(RPMDIRS)
+	rpmbuild $(RPMMACROS) $(RPMOPTS) $(SPEC)
+if HAS_RPMLINT
+	rpmlint `find rpm -name '*.rpm'`
+else
+	@echo "WARNING: rpmlint not found, could not validate RPMs."
+endif
+
 
-.PHONY: rpm srpm
-rpm srpm: dist
-	cd rpm && $(MAKE) $(MAKEFLAGS_AM) $@

Modified: incubator/qpid/trunk/qpid/cpp/README
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Wed Apr 11 12:53:32 2007
@@ -1,12 +1,12 @@
 = Qpid C++ =
 
 Qpid C++ is a C++ implementation of the AMQP protcol described at
-  http://amqp.org/
+	http://amqp.org/
 
 The Qpid project also provides Java, Ruby and Python implementations.
 
 For additional software or information on the Qpid project go to:
-     http://incubator.apache.org/qpid/index.html
+	http://cwiki.apache.org/qpid/
 
 
 Available documentation:

Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Apr 11 12:53:32 2007
@@ -16,7 +16,7 @@
 AC_PREREQ(2.59)
 
 AC_CONFIG_HEADERS([config.h:config.in])
-AC_CONFIG_SRCDIR([src/broker/Broker.cpp])
+AC_CONFIG_SRCDIR([qpidc.spec.in])
 
 AC_PROG_CC_STDC
 #AM_PROG_CC_C_O
@@ -41,7 +41,7 @@
 build=yes
 test x$JAVA  = xno && build=no
 test x$JAVAC = xno && build=no
-test -d $srcdir/../gentools || build=no
+test -d $srcdir/gentools || build=no
 test -d $srcdir/../specs    || build=no
 AM_CONDITIONAL([CAN_GENERATE_CODE], [test x$build = xyes])
 
@@ -136,6 +136,10 @@
 AC_CHECK_PROG([VALGRIND], [valgrind], [valgrind])
 test "$enable_VALGRIND" = no && VALGRIND=
 
+# If rpmlint is availalbe we'll run it when building RPMs.
+AC_CHECK_PROG([RPMLINT], [rpmlint], [rpmlint])
+AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"])
+	
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
@@ -144,7 +148,6 @@
   docs/api/Makefile
   docs/api/user.doxygen
   docs/api/developer.doxygen
-  rpm/Makefile
   ])
 
 AC_OUTPUT

Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Wed Apr 11 12:53:32 2007
@@ -13,10 +13,12 @@
 sources: $(src)/*.cpp $(src)/*/*.cpp $(src)/*/*/*.cpp
 
 html: headers user.doxygen
-	doxygen $(srcdir)/user.doxygen
+	doxygen user.doxygen
+	touch $@
 
 html-dev: headers sources developer.doxygen
-	doxygen $(srcdir)/developer.doxygen
+	doxygen developer.doxygen
+	touch $@
 
 clean-local:
 	rm -rf html html-dev 

Modified: incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in Wed Apr 11 12:53:32 2007
@@ -456,7 +456,7 @@
 # and error messages should be written. If left blank the output is written 
 # to stderr.
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           = doxygen.log
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files

Modified: incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
(original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/src/org/apache/qpid/gentools/CppGenerator.java
Wed Apr 11 12:53:32 2007
@@ -1103,8 +1103,8 @@
         for (String thisMethodName : thisClass.methodMap.keySet())
             {
                 AmqpMethod method = thisClass.methodMap.get(thisMethodName);
-                sb.append(indent + "#include <" + thisClass.name +
-                          Utils.firstUpper(method.name) + "Body.h>" + cr);
+                sb.append(indent + "#include \"" + thisClass.name +
+                          Utils.firstUpper(method.name) + "Body.h\"" + cr);
             }
         return sb.toString();       
     }

Modified: incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl (original)
+++ incubator/qpid/trunk/qpid/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl Wed Apr
11 12:53:32 2007
@@ -46,7 +46,7 @@
     virtual ProtocolVersion getVersion() const = 0;
 
     // Include framing constant declarations
-    #include <AMQP_Constants.h>
+    #include "AMQP_Constants.h"
 
     // Inner classes
 

Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Wed Apr 11 12:53:32 2007
@@ -1,11 +1,11 @@
 #
-# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd
+# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd, qpidd-devel
 #
-%define daemon qpidd
+%define qpidd qpidd
 
 Name:           @PACKAGE@
 Version:        @VERSION@
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        Apache Software License
@@ -48,15 +48,25 @@
 Libraries, header files and documentation for developing AMQP clients
 in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 
-%package -n %{daemon}
+%package -n %{qpidd}
 Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
 Requires: %name = %version-%release
 
-%description -n %{daemon}
+%description -n %{qpidd}
 A message broker daemon that receives stores and routes messages using
 the open AMQP messaging protocol.
 
+%package -n %{qpidd}-devel
+Summary: Libraries and header files for developing Qpid broker extensions
+Group: Development/System
+Requires: %name-devel = %version-%release
+Requires: %{qpidd} = %version-%release
+
+%description -n %{qpidd}-devel
+Libraries and header files for developing extensions to the
+Qpid broker daemon.
+
 %prep
 %setup -q
 
@@ -72,9 +82,6 @@
 install  -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.la
-# There's no qpidd-devel package so no .so for the broker needed.
-rm -f %{buildroot}%_libdir/libqpidbroker.so
-
 
 %clean
 rm -rf %{buildroot}
@@ -92,37 +99,46 @@
 
 %files devel
 %defattr(-,root,root,-)
-%_includedir/qpidc
+%_includedir/qpid/*.h
+%_includedir/qpid/client
+%_includedir/qpid/framing
+%_includedir/qpid/gen
+%_includedir/qpid/sys
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
 %doc docs/api/html
-# We don't need this perl script and it causes rpmlint to complain.
-# There is probably a more polite way of calculating the devel docdir.
 
-%files -n %{daemon}
+%files -n %{qpidd}
+%defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
-%_sbindir/%{daemon}
-%{_initrddir}/qpidd
-%doc %_mandir/man1/%{daemon}.*
+%_sbindir/%{qpidd}
+%{_initrddir}/%{qpidd}
+%doc %_mandir/man1/%{qpidd}.*
+
+%files -n %{qpidd}-devel
+%doc rpm/README.qpidd-devel 
+%defattr(-,root,root,-)
+%_libdir/libqpidbroker.so
+%_includedir/qpid/broker
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post -n %{daemon}
+%post -n %{qpidd}
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add qpidd
 /sbin/ldconfig
 
-%preun -n %{daemon}
+%preun -n %{qpidd}
 # Check that this is actual deinstallation, not just removing for upgrade.
 if [ $1 = 0 ]; then
         /sbin/service qpidd stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del qpidd
 fi
 
-%postun -n %{daemon}
+%postun -n %{qpidd}
 if [ "$1" -ge "1" ]; then
         /sbin/service qpidd condrestart >/dev/null 2>&1 || :
 fi
@@ -130,6 +146,9 @@
 
 %changelog
 
+* Wed Apr 11 2007 Alan Conway <aconway@redhat.com> - 0.1-5
+- Add qpidd-devel sub-package.
+
 * Mon Feb 19 2007 Jim Meyering <meyering@redhat.com> - 0.1-4
 - Address http://bugzilla.redhat.com/220630:
 - Remove redundant "cppunit" build-requires.
@@ -145,3 +164,4 @@
 * Fri Dec  8 2006 David Lutterkort <dlutter@redhat.com> - 0.1-1
 - Initial version based on Jim Meyering's sketch and discussions with Alan
   Conway
+

Added: incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel?view=auto&rev=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel (added)
+++ incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel Wed Apr 11 12:53:32 2007
@@ -0,0 +1,11 @@
+
+This package provides header files needed to implement extensions to
+the Qpid broker daemon. It is not require for normal use of Qpid.
+
+Support for broker extensions is still a work-in-progress. We will be
+providing API documentation soon, in the meantime go to:
+
+	http://cwiki.apache.org/qpid/
+
+for more information.
+

Propchange: incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/qpid/trunk/qpid/cpp/rpm/README.qpidd-devel
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Apr 11 12:53:32 2007
@@ -7,7 +7,7 @@
 AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS)
 
 # -I top_builddir for config.h
-INCLUDES = -I$(top_builddir)  -I$(srcdir)/gen 
+INCLUDES = -I$(top_builddir)  -I$(srcdir)
 
 qpidd_LDADD = \
   libqpidbroker.la \
@@ -156,7 +156,9 @@
   $(client)/ResponseHandler.cpp				\
   $(client)/ReturnedMessageHandler.cpp
 
-nobase_pkginclude_HEADERS = \
+# Install into include/qpid rather than include/qpidc.
+qpidincludedir=$(includedir)/qpid
+nobase_qpidinclude_HEADERS = \
   $(generated_headers) \
   $(platform_hdr) \
   $(broker)/AccumulatedAck.h \
@@ -280,14 +282,11 @@
   ExceptionHolder.h \
   QpidError.h \
   SharedObject.h \
-  doxygen_mainpage.h \
   shared_ptr.h 
 
 # Distribute the generated sources, at least for now, since
 # the generator code is in java.
 EXTRA_DIST += $(BUILT_SOURCES)
-maintainer-clean-local:
-	rm -rf $(gen)
 
 # Don't attempt to run the code generator unless configure has set
 # CAN_GENERATE_CODE, indicating that the amqp.xml and tools needed
@@ -297,12 +296,7 @@
 
 gentools_dir = $(srcdir)/../gentools
 spec_dir = $(srcdir)/../../specs
-
-# FIXME aconway 2007-01-04: Enabling Basic class until
-# new messaging class is ready to replace it.
-# spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml
 spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
-
 gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
 
 $(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerAdapter.h Wed Apr 11 12:53:32 2007
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  */
-#include "AMQP_ServerOperations.h"
+#include "../gen/AMQP_ServerOperations.h"
 #include "HandlerImpl.h"
 #include "MessageHandlerImpl.h"
 #include "../Exception.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerChannel.h Wed Apr 11 12:53:32 2007
@@ -36,7 +36,7 @@
 #include "Prefetch.h"
 #include "TxBuffer.h"
 #include "../framing/ChannelAdapter.h"
-#include "ChannelOpenBody.h"
+#include "../gen/ChannelOpenBody.h"
 #include "CompletionHandler.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessage.cpp Wed Apr 11 12:53:32 2007
@@ -26,8 +26,8 @@
 #include "InMemoryContent.h"
 #include "LazyLoadedContent.h"
 #include "MessageStore.h"
-#include "BasicDeliverBody.h"
-#include "BasicGetOkBody.h"
+#include "../gen/BasicDeliverBody.h"
+#include "../gen/BasicGetOkBody.h"
 #include "../framing/AMQContentBody.h"
 #include "../framing/AMQHeaderBody.h"
 #include "../framing/AMQMethodBody.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.cpp Wed Apr 11 12:53:32
2007
@@ -21,10 +21,10 @@
 #include "../QpidError.h"
 #include "BrokerMessageMessage.h"
 #include "../framing/ChannelAdapter.h"
-#include "MessageTransferBody.h"
-#include "MessageOpenBody.h"
-#include "MessageCloseBody.h"
-#include "MessageAppendBody.h"
+#include "../gen/MessageTransferBody.h"
+#include "../gen/MessageOpenBody.h"
+#include "../gen/MessageCloseBody.h"
+#include "../gen/MessageAppendBody.h"
 #include "Reference.h"
 #include "../framing/AMQFrame.h"
 #include "../framing/FieldTable.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/BrokerMessageMessage.h Wed Apr 11 12:53:32 2007
@@ -22,7 +22,7 @@
  *
  */
 #include "BrokerMessageBase.h"
-#include "MessageTransferBody.h"
+#include "../gen/MessageTransferBody.h"
 #include "../framing/amqp_types.h"
 #include <boost/weak_ptr.hpp>
 #include <vector>

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Connection.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Connection.cpp Wed Apr 11 12:53:32 2007
@@ -23,7 +23,7 @@
 
 #include "Connection.h"
 #include "BrokerChannel.h"
-#include "AMQP_ClientProxy.h"
+#include "../gen/AMQP_ClientProxy.h"
 #include "BrokerAdapter.h"
 
 using namespace boost;

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Connection.h Wed Apr 11 12:53:32 2007
@@ -27,8 +27,8 @@
 #include <boost/ptr_container/ptr_map.hpp>
 
 #include "../framing/AMQFrame.h"
-#include "AMQP_ServerOperations.h"
-#include "AMQP_ClientProxy.h"
+#include "../gen/AMQP_ServerOperations.h"
+#include "../gen/AMQP_ClientProxy.h"
 #include "../sys/ConnectionOutputHandler.h"
 #include "../sys/ConnectionInputHandler.h"
 #include "../sys/TimeoutHandler.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/HandlerImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/HandlerImpl.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/HandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/HandlerImpl.h Wed Apr 11 12:53:32 2007
@@ -20,7 +20,7 @@
  */
 
 #include "BrokerChannel.h"
-#include "AMQP_ClientProxy.h"
+#include "../gen/AMQP_ClientProxy.h"
 
 namespace qpid {
 

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageBuilder.h Wed Apr 11 12:53:32 2007
@@ -28,7 +28,7 @@
 #include "MessageStore.h"
 #include "../framing/AMQContentBody.h"
 #include "../framing/AMQHeaderBody.h"
-#include "BasicPublishBody.h"
+#include "../gen/BasicPublishBody.h"
 #include "CompletionHandler.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.cpp Wed Apr 11 12:53:32 2007
@@ -23,8 +23,8 @@
 #include "Connection.h"
 #include "Broker.h"
 #include "BrokerMessageMessage.h"
-#include "MessageAppendBody.h"
-#include "MessageTransferBody.h"
+#include "../gen/MessageAppendBody.h"
+#include "../gen/MessageTransferBody.h"
 #include "BrokerAdapter.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/MessageHandlerImpl.h Wed Apr 11 12:53:32 2007
@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include "AMQP_ServerOperations.h"
-#include "AMQP_ClientProxy.h"
+#include "../gen/AMQP_ServerOperations.h"
+#include "../gen/AMQP_ClientProxy.h"
 #include "Reference.h"
 #include "HandlerImpl.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/broker/Reference.cpp Wed Apr 11 12:53:32 2007
@@ -20,7 +20,7 @@
 #include "Reference.h"
 #include "BrokerMessageMessage.h"
 #include "../QpidError.h"
-#include "MessageAppendBody.h"
+#include "../gen/MessageAppendBody.h"
 #include "CompletionHandler.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/client/ClientAdapter.cpp Wed Apr 11 12:53:32 2007
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "AMQP_ClientOperations.h"
+#include "../gen/AMQP_ClientOperations.h"
 #include "ClientAdapter.h"
 #include "Connection.h"
 #include "../Exception.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQFrame.h Wed Apr 11 12:53:32 2007
@@ -30,8 +30,8 @@
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-#include "AMQP_MethodVersionMap.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "Buffer.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.cpp Wed Apr 11 12:53:32 2007
@@ -21,7 +21,7 @@
 #include "AMQFrame.h"
 #include "AMQMethodBody.h"
 #include "../QpidError.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQMethodBody.h Wed Apr 11 12:53:32 2007
@@ -25,7 +25,7 @@
 #include "amqp_types.h"
 #include "AMQBody.h"
 #include "Buffer.h"
-#include "AMQP_ServerOperations.h"
+#include "../gen/AMQP_ServerOperations.h"
 #include "MethodContext.h"
 
 namespace qpid {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQRequestBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQRequestBody.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQRequestBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQRequestBody.cpp Wed Apr 11 12:53:32 2007
@@ -17,7 +17,7 @@
  */
 
 #include "AMQRequestBody.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/AMQResponseBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/AMQResponseBody.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/AMQResponseBody.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/AMQResponseBody.cpp Wed Apr 11 12:53:32 2007
@@ -18,7 +18,7 @@
 
 #include "AMQFrame.h"
 #include "AMQResponseBody.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {

Modified: incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/framing/amqp_framing.h Wed Apr 11 12:53:32 2007
@@ -26,7 +26,7 @@
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-#include "AMQP_MethodVersionMap.h"
+#include "../gen/AMQP_MethodVersionMap.h"
 #include "InputHandler.h"
 #include "OutputHandler.h"
 #include "InitiationHandler.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/BrokerChannelTest.cpp Wed Apr 11 12:53:32 2007
@@ -26,7 +26,7 @@
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQFrame.h"
 #include "MockChannel.h"
 #include "../broker/Connection.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ExchangeTest.cpp Wed Apr 11 12:53:32 2007
@@ -26,7 +26,7 @@
 #include "../broker/TopicExchange.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "BasicGetBody.h"
+#include "../gen/BasicGetBody.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/FramingTest.cpp Wed Apr 11 12:53:32 2007
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ConnectionRedirectBody.h"
+#include "../gen/ConnectionRedirectBody.h"
 #include "../framing/ProtocolVersion.h"
 #include "../framing/amqp_framing.h"
 #include <iostream>
@@ -26,7 +26,7 @@
 #include <sstream>
 #include <typeinfo>
 #include "../QpidError.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQRequestBody.h"
 #include "../framing/AMQResponseBody.h"
 #include "../framing/Requester.h"
@@ -36,7 +36,7 @@
 #include "../client/ClientExchange.h"
 #include "../client/ClientQueue.h"
 #include "../framing/Correlator.h"
-#include "BasicGetOkBody.h"
+#include "../gen/BasicGetOkBody.h"
 #include <memory>
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/InMemoryContentTest.cpp Wed Apr 11 12:53:32 2007
@@ -20,7 +20,7 @@
  */
 #include "../broker/InMemoryContent.h"
 #include "qpid_test_plugin.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include <iostream>
 #include <list>
 #include "../framing/AMQFrame.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/InProcessBroker.h Wed Apr 11 12:53:32 2007
@@ -18,7 +18,7 @@
  * limitations under the License.
  *
  */
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQFrame.h"
 #include "../broker/Broker.h"
 #include "../broker/Connection.h"

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/LazyLoadedContentTest.cpp Wed Apr 11 12:53:32
2007
@@ -19,7 +19,7 @@
  *
  */
 #include "../broker/LazyLoadedContent.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../broker/NullMessageStore.h"
 #include "qpid_test_plugin.h"
 #include <iostream>

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Apr 11 12:53:32 2007
@@ -61,16 +61,20 @@
 CLIENT_TESTS = client_test quick_topictest
 TESTS = run-unit-tests start_broker $(CLIENT_TESTS) python_tests kill_broker
 
-EXTRA_DIST =		\
-  run-unit-tests start_broker python_tests kill_broker \
-  .valgrind.supp	\
-  .valgrindrc-default   \
-  InProcessBroker.h	\
-  MockChannel.h		\
-  MockConnectionInputHandler.h \
-  qpid_test_plugin.h	\
-  test_env		\
-  topictest		\
+EXTRA_DIST =					\
+  test_env					\
+  topictest					\
+  quick_topictest				\
+  run-unit-tests				\
+  start_broker					\
+  python_tests					\
+  kill_broker					\
+  .valgrind.supp				\
+  .valgrindrc-default				\
+  InProcessBroker.h				\
+  MockChannel.h					\
+  MockConnectionInputHandler.h			\
+  qpid_test_plugin.h				\
   APRBaseTest.cpp
 
 CLEANFILES=qpidd.log

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageHandlerTest.cpp Wed Apr 11 12:53:32 2007
@@ -19,7 +19,7 @@
  *
  */
 //#include <iostream>
-//#include <AMQP_HighestVersion.h>
+//#include "../gen/AMQP_HighestVersion.h>
 #include "../framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Wed Apr 11 12:53:32 2007
@@ -21,7 +21,7 @@
 #include "../broker/BrokerMessage.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../framing/AMQFrame.h"
 #include "MockChannel.h"
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h Wed Apr 11 12:53:32 2007
@@ -23,7 +23,7 @@
 #include "../framing/ChannelAdapter.h"
 #include "../framing/OutputHandler.h"
 #include "../framing/AMQFrame.h"
-#include "BasicGetBody.h"
+#include "../gen/BasicGetBody.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ProducerConsumerTest.cpp Wed Apr 11 12:53:32 2007
@@ -27,7 +27,7 @@
 #include "InProcessBroker.h"
 #include "../sys/ProducerConsumer.h"
 #include "../sys/Thread.h"
-#include "AMQP_HighestVersion.h"
+#include "../gen/AMQP_HighestVersion.h"
 #include "../sys/AtomicCount.h"
 
 using namespace qpid;

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp?view=diff&rev=527639&r1=527638&r2=527639
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp Wed Apr 11 12:53:32 2007
@@ -23,8 +23,8 @@
 #include "qpid_test_plugin.h"
 #include "../broker/Reference.h"
 #include "../broker/BrokerMessageMessage.h"
-#include "MessageTransferBody.h"
-#include "MessageAppendBody.h"
+#include "../gen/MessageTransferBody.h"
+#include "../gen/MessageAppendBody.h"
 #include "../broker/CompletionHandler.h"
 
 using namespace boost;



Mime
View raw message