Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionManager.h (from r463084, incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionManager.h) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionManager.h?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionManager.h&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionManager.h&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/common/io/inc/SessionManager.h (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpid/io/SessionManager.h Mon Oct 16 06:50:26 2006 @@ -18,8 +18,8 @@ #ifndef _SessionManager_ #define _SessionManager_ -#include "SessionContext.h" -#include "SessionHandler.h" +#include "qpid/io/SessionContext.h" +#include "qpid/io/SessionHandler.h" namespace qpid { namespace io {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp (from r463376, incubator/qpid/trunk/qpid/cpp/qpidd/src/qpidd.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/qpidd/src/qpidd.cpp&r1=463376&p2=incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/qpidd/src/qpidd.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp Mon Oct 16 06:50:26 2006 @@ -15,12 +15,8 @@ * limitations under the License. * */ -#include "../../broker/inc/../../broker/inc/Broker.h" -#include "../../broker/inc/Broker.h" -#include "../../broker/inc/Configuration.h" -#include "../../broker/inc/SessionHandlerFactoryImpl.h" -#include "Acceptor.h" -#include "QpidError.h" +#include "qpid/broker/Broker.h" +#include "qpid/broker/Configuration.h" #include "apr_signal.h" #include <iostream> #include <memory> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/ChannelTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp Mon Oct 16 06:50:26 2006 @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "Channel.h" -#include "Message.h" +#include "../../src/qpid/broker/Channel.h" +#include "../../src/qpid/broker/Message.h" #include <qpid_test_plugin.h> #include <iostream> #include <memory> @@ -108,7 +108,7 @@ msg->addContent(body); Queue::shared_ptr queue(new Queue("my_queue")); - ConnectionToken* owner; + ConnectionToken* owner(0); string tag("no_ack"); channel.consume(tag, queue, false, false, owner); Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/ExchangeTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/ExchangeTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/ExchangeTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp Mon Oct 16 06:50:26 2006 @@ -16,10 +16,10 @@ * */ -#include "DirectExchange.h" -#include "Exchange.h" -#include "Queue.h" -#include "TopicExchange.h" +#include "../../src/qpid/broker/DirectExchange.h" +#include "../../src/qpid/broker/Exchange.h" +#include "../../src/qpid/broker/Queue.h" +#include "../../src/qpid/broker/TopicExchange.h" #include <qpid_test_plugin.h> #include <iostream> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/HeadersExchangeTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/HeadersExchangeTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/HeadersExchangeTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp Mon Oct 16 06:50:26 2006 @@ -16,9 +16,9 @@ * */ -#include "HeadersExchange.h" -#include "FieldTable.h" -#include "Value.h" +#include "../../src/qpid/broker/HeadersExchange.h" +#include "../../src/qpid/framing/FieldTable.h" +#include "../../src/qpid/framing/Value.h" #include <qpid_test_plugin.h> using namespace qpid::broker; Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/MessageTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/MessageTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/MessageTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp Mon Oct 16 06:50:26 2006 @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "APRBase.h" -#include "Message.h" +#include "../../src/qpid/concurrent/APRBase.h" +#include "../../src/qpid/broker/Message.h" #include <qpid_test_plugin.h> #include <iostream> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/QueueRegistryTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/QueueRegistryTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/QueueRegistryTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp Mon Oct 16 06:50:26 2006 @@ -1,4 +1,4 @@ -#include "QueueRegistry.h" +#include "../../src/qpid/broker/QueueRegistry.h" #include <qpid_test_plugin.h> #include <string> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/QueueTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/QueueTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/QueueTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp Mon Oct 16 06:50:26 2006 @@ -15,8 +15,8 @@ * limitations under the License. * */ -#include "Queue.h" -#include "QueueRegistry.h" +#include "../../src/qpid/broker/Queue.h" +#include "../../src/qpid/broker/QueueRegistry.h" #include <qpid_test_plugin.h> #include <iostream> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/RouterTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/RouterTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/RouterTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp Mon Oct 16 06:50:26 2006 @@ -15,11 +15,11 @@ * limitations under the License. * */ -#include "Channel.h" -#include "Exchange.h" -#include "ExchangeRegistry.h" -#include "Message.h" -#include "Router.h" +#include "../../src/qpid/broker/Channel.h" +#include "../../src/qpid/broker/Exchange.h" +#include "../../src/qpid/broker/ExchangeRegistry.h" +#include "../../src/qpid/broker/Message.h" +#include "../../src/qpid/broker/Router.h" #include <qpid_test_plugin.h> #include <iostream> #include <memory> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/TopicExchangeTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/TopicExchangeTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/TopicExchangeTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp Mon Oct 16 06:50:26 2006 @@ -1,4 +1,4 @@ -#include "TopicExchange.h" +#include "../../src/qpid/broker/TopicExchange.h" #include <qpid_test_plugin.h> using namespace qpid::broker; Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/broker/test/ValueTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/broker/test/ValueTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/broker/test/ValueTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp Mon Oct 16 06:50:26 2006 @@ -1,4 +1,4 @@ -#include "Value.h" +#include "../../src/qpid/framing/Value.h" #include <qpid_test_plugin.h> using namespace qpid::framing; Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/BodyHandlerTest.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/test/BodyHandlerTest.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/common/framing/test/BodyHandlerTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp Mon Oct 16 06:50:26 2006 @@ -16,7 +16,7 @@ * */ #include <iostream> -#include "amqp_framing.h" +#include "../../src/qpid/framing/amqp_framing.h" #include "qpid_test_plugin.h" using namespace qpid::framing; Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/field_table_test.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/test/field_table_test.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/common/framing/test/field_table_test.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp Mon Oct 16 06:50:26 2006 @@ -16,7 +16,7 @@ * */ #include <iostream> -#include "amqp_framing.h" +#include "../../src/qpid/framing/amqp_framing.h" #include <qpid_test_plugin.h> using namespace qpid::framing; Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/framing_test.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/framing_test.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/framing_test.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/test/framing_test.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/framing_test.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/common/framing/test/framing_test.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/framing_test.cpp Mon Oct 16 06:50:26 2006 @@ -15,7 +15,7 @@ * limitations under the License. * */ -#include "amqp_framing.h" +#include "../../src/qpid/framing/amqp_framing.h" #include "ConnectionRedirectBody.h" #include <iostream> #include <sstream> Copied: incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/header_test.cpp (from r463084, incubator/qpid/trunk/qpid/cpp/common/framing/test/header_test.cpp) URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/header_test.cpp?view=diff&rev=464494&p1=incubator/qpid/trunk/qpid/cpp/common/framing/test/header_test.cpp&r1=463084&p2=incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/header_test.cpp&r2=464494 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/common/framing/test/header_test.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/header_test.cpp Mon Oct 16 06:50:26 2006 @@ -16,7 +16,7 @@ * */ #include <iostream> -#include "amqp_framing.h" +#include "../../src/qpid/framing/amqp_framing.h" #include <qpid_test_plugin.h> using namespace qpid::framing;
