You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2006/11/09 22:55:40 UTC
svn commit: r473087 [1/2] - in /incubator/qpid/trunk/qpid/cpp: ./ src/
src/qpid/ src/qpid/apr/ src/qpid/broker/ src/qpid/client/ src/qpid/framing/
src/qpid/posix/ src/qpid/sys/ test/client/ test/unit/qpid/apr/
test/unit/qpid/broker/ test/unit/qpid/fram...
Author: aconway
Date: Thu Nov 9 13:55:34 2006
New Revision: 473087
URL: http://svn.apache.org/viewvc?view=rev&rev=473087
Log:
Added POSIX equivalents to APR classes used by clients, inlined trivial calls.
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp
- copied, changed from r472731, incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Acceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.cpp (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/PosixAcceptor.cpp (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/Socket.cpp (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/Thread.cpp (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.cpp (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/posix/check.h (with props)
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.cpp (with props)
Removed:
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Acceptor.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Acceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Monitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Thread.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Time.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/platform.h
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile
incubator/qpid/trunk/qpid/cpp/README
incubator/qpid/trunk/qpid/cpp/options.mk
incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Thread.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AccumulatedAck.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Message.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/MessageListener.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Queue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ResponseHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQDataBlock.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/AMQMethodBody.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/BodyHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Buffer.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldTable.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/HeaderProperties.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InitiationHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/InputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersion.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/ProtocolVersionException.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Value.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Acceptor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Monitor.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/SessionContext.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/SessionHandler.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/doxygen_summary.h
incubator/qpid/trunk/qpid/cpp/src/qpidd.cpp
incubator/qpid/trunk/qpid/cpp/test/client/client_test.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/test/client/topic_publisher.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/apr/APRBaseTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TxAckTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TxBufferTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/TxPublishTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/FieldTableTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/FramingTest.cpp
incubator/qpid/trunk/qpid/cpp/test/unit/qpid/framing/HeaderTest.cpp
Modified: incubator/qpid/trunk/qpid/cpp/Makefile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Thu Nov 9 13:55:34 2006
@@ -51,26 +51,30 @@
## Library rules
-LIB_common := $(call LIBFILE,common,1.0)
-$(LIB_common): $(call OBJECTS,qpid qpid/framing qpid/sys qpid/$(PLATFORM))
+LIB_common := $(call LIBFILE,common,1.0)
+DIRS_common := qpid qpid/framing qpid/sys qpid/$(PLATFORM)
+$(LIB_common): $(call OBJECTS, $(DIRS_common))
$(LIB_COMMAND)
-LIB_client :=$(call LIBFILE,client,1.0)
-$(LIB_client): $(call OBJECTS,qpid/client) $(LIB_common)
+LIB_client := $(call LIBFILE,client,1.0)
+DIRS_client := qpid/client
+$(LIB_client): $(call OBJECTS,$(DIRS_client)) $(LIB_common)
$(LIB_COMMAND)
-LIB_broker :=$(call LIBFILE,broker,1.0)
-$(LIB_broker): $(call OBJECTS,qpid/broker) $(LIB_common)
+LIB_broker := $(call LIBFILE,broker,1.0)
+DIRS_broker := qpid/broker
+$(LIB_broker): $(call OBJECTS,$(DIRS_broker)) $(LIB_common)
$(LIB_COMMAND)
## Daemon executable
$(BINDIR)/qpidd: $(OBJDIR)/qpidd.o $(LIB_common) $(LIB_broker)
mkdir -p $(dir $@)
- $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) -lapr-1 $^
+ $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $^
all-nogen: $(BINDIR)/qpidd
## Unit tests.
UNITTEST_SRC:=$(shell find test/unit -name *Test.cpp)
+UNITTEST_SRC:=$(filter-out test/unit/qpid/$(IGNORE)/%,$(UNITTEST_SRC))
UNITTESTS:=$(UNITTEST_SRC:test/unit/%.cpp=$(TESTDIR)/%.so)
unittest: all
@@ -100,7 +104,7 @@
$(foreach dir,$(SRCDIRS),$(eval $(call CPPRULE,$(dir))))
# Unit test plugin libraries.
-$(TESTDIR)/%Test.so: test/unit/%Test.cpp $(LIB_common) $(LIB_client)
+$(TESTDIR)/%Test.so: test/unit/%Test.cpp $(LIB_common) $(LIB_broker)
mkdir -p $(dir $@)
$(CXX) -shared -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS) -lcppunit $(LIB_common) $(LIB_broker)
@@ -111,6 +115,7 @@
CLIENT_TEST_SRC := $(wildcard test/client/*.cpp)
CLIENT_TEST_EXE := $(CLIENT_TEST_SRC:test/client/%.cpp=$(TESTDIR)/%)
all-nogen: $(CLIENT_TEST_EXE)
+client: $(CLIENT_TEST_EXE)
## include dependencies
DEPFILES:=$(wildcard $(OBJDIR)/*.d $(OBJDIR)/*/*.d $(OBJDIR)/*/*/*.d)
Modified: incubator/qpid/trunk/qpid/cpp/README
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README (original)
+++ incubator/qpid/trunk/qpid/cpp/README Thu Nov 9 13:55:34 2006
@@ -20,13 +20,11 @@
You can have mutltiple builds in the same working copy.
For example for a release build using APR platform:
- make PLATFORM=apr TYPE=release
+ make USE_APR=1 RELEASE=1
This will create build/apr-release containing the bin/ lib/ and test/ subdirs.
-To set your preferred default create file options-local.mk with
-PLATFORM=<my platform>
-TYPE=<my type>
+You can set your preferred defaults in options-local.mk.
Generated code goes in build/gen and is shared between all builds.
@@ -51,9 +49,9 @@
The source tree is structured as follows:
* src/ - .h and .cpp source files, directories mirror namespaces.
* qpid/
- * sys/ - system abstractions: threading, IO.
+ * sys/ - system portability abstractions: threading, io etc.
* posix/ - posix implementations for sys
- * apr/ - portable APR implementation for sys (client side)
+ * apr/ - portable APR implementation for sys
* framing - encoding/decoding AMQP messages
* client - client classes.
* broker - broker classes.
Modified: incubator/qpid/trunk/qpid/cpp/options.mk
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/options.mk?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/options.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/options.mk Thu Nov 9 13:55:34 2006
@@ -1,39 +1,49 @@
- #
- # Copyright (c) 2006 The Apache Software Foundation
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #
+#
+# Copyright (c) 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
-## Build platform and type defaults
-TYPE := debug
-PLATFORM := apr
+# Use APR by default till Posix is complete.
+USE_APR := 1
-# Local options, may override PLATFORM and/or TYPE
+# Local options.
-include options-local.mk
-## Platform specific options
+## Release vs. debug build.
+ifdef RELEASE
+BUILD := release
+CXXFLAGS := $(CXXFLAGS) -O3 -DNDEBUG
+else
+BUILD := debug
+CXXFLAGS := $(CXXFLAGS) -ggdb3
+endif
-# apr: Apache Portable Runtime.
-CXXFLAGS_apr := -I/usr/local/apr/include
-LDFLAGS_apr := -L/usr/local/apr/lib -lapr-1
-
-# posix: Native posix implementation
-CXXFLAGS_posix :=
-LDFLAGS_posix :=
+## Platform specific options
+ifdef USE_APR
+PLATFORM := apr
+IGNORE := posix
+CXXFLAGS := $(CXXFLAGS) -DUSE_APR -I/usr/local/apr/include
+LDFLAGS := $(LDFLAGS) -L/usr/local/apr/lib -lapr-1
+else
+PLATFORM := posix
+IGNORE := apr
+LDFLAGS := $(LDFLAGS) -lpthread -lrt
+endif
## Build directories.
-BUILD=$(PLATFORM)-$(TYPE)
+BUILD :=$(PLATFORM)-$(BUILD)
GENDIR:=build/gen
BINDIR:=build/$(BUILD)/bin
LIBDIR:=build/$(BUILD)/lib
@@ -51,23 +61,19 @@
## Compile flags
-# Release vs. debug flags.
-CXXFLAGS_debug := -ggdb3
-CXXFLAGS_release := -O3 -DNDEBUG
-
# Warnings: Enable as many as possible, keep the code clean. Please
# do not disable warnings or remove -Werror without discussing on
# qpid-dev list.
#
# The following warnings deliberately omitted, they warn on valid code.
-# -Wno-unreachable-code -Wpadded -Winline
+# -Wunreachable-code -Wpadded -Winline
+# -Wshadow - warns about boost headers.
#
-WARN := -Werror -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch
+WARN := -Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers
-INCLUDES := $(SRCDIRS:%=-I%) $(EXTRA_INCLUDES)
-DEFINES := -DPLATFORM=$(PLATFORM)
-LDFLAGS := -L$(LIBDIR) $(LDFLAGS_$(PLATFORM))
-CXXFLAGS := $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES) $(CXXFLAGS_$(PLATFORM)) $(CXXFLAGS_$(TYPE))
+INCLUDES := $(SRCDIRS:%=-I%) $(EXTRA_INCLUDES)
+LDFLAGS := $(LDFLAGS) -L$(LIBDIR)
+CXXFLAGS := $(CXXFLAGS) $(WARN) -MMD -fpic $(INCLUDES)
## Macros for linking, must be late evaluated
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/Exception.cpp Thu Nov 9 13:55:34 2006
@@ -16,6 +16,6 @@
*
*/
-#include "qpid/Exception.h"
+#include <qpid/Exception.h>
qpid::Exception::~Exception() throw() {}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.cpp Thu Nov 9 13:55:34 2006
@@ -16,7 +16,7 @@
*
*/
-#include "qpid/QpidError.h"
+#include <qpid/QpidError.h>
#include <sstream>
using namespace qpid;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/QpidError.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
*
*/
#include <string>
-#include "qpid/Exception.h"
+#include <qpid/Exception.h>
namespace qpid {
Copied: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp (from r472731, incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Acceptor.cpp)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp?view=diff&rev=473087&p1=incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Acceptor.cpp&r1=472731&p2=incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Acceptor.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRAcceptor.cpp Thu Nov 9 13:55:34 2006
@@ -15,13 +15,40 @@
* limitations under the License.
*
*/
-#include "Acceptor.h"
+#include <qpid/sys/Acceptor.h>
+#include <qpid/sys/SessionHandlerFactory.h>
+#include "LFProcessor.h"
+#include "LFSessionContext.h"
#include "APRBase.h"
#include "APRPool.h"
-using namespace qpid::sys;
+namespace qpid {
+namespace sys {
-Acceptor::Acceptor(int16_t port_, int backlog, int threads) :
+class APRAcceptor : public Acceptor
+{
+ public:
+ APRAcceptor(int16_t port, int backlog, int threads);
+ virtual int16_t getPort() const;
+ virtual void run(qpid::sys::SessionHandlerFactory* factory);
+ virtual void shutdown();
+
+ private:
+ int16_t port;
+ LFProcessor processor;
+ apr_socket_t* socket;
+ volatile bool running;
+};
+
+// Define generic Acceptor::create() to return APRAcceptor.
+Acceptor::shared_ptr Acceptor::create(int16_t port, int backlog, int threads)
+{
+ return Acceptor::shared_ptr(new APRAcceptor(port, backlog, threads));
+}
+// Must define Acceptor virtual dtor.
+Acceptor::~Acceptor() {}
+
+APRAcceptor::APRAcceptor(int16_t port_, int backlog, int threads) :
port(port_),
processor(APRPool::get(), threads, 1000, 5000000)
{
@@ -33,13 +60,13 @@
CHECK_APR_SUCCESS(apr_socket_listen(socket, backlog));
}
-int16_t Acceptor::getPort() const {
+int16_t APRAcceptor::getPort() const {
apr_sockaddr_t* address;
CHECK_APR_SUCCESS(apr_socket_addr_get(&address, APR_LOCAL, socket));
return address->port;
}
-void Acceptor::run(SessionHandlerFactory* factory) {
+void APRAcceptor::run(SessionHandlerFactory* factory) {
running = true;
processor.start();
std::cout << "Listening on port " << getPort() << "..." << std::endl;
@@ -65,7 +92,7 @@
shutdown();
}
-void Acceptor::shutdown() {
+void APRAcceptor::shutdown() {
// TODO aconway 2006-10-12: Cleanup, this is not thread safe.
if (running) {
running = false;
@@ -75,3 +102,4 @@
}
+}}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRBase.h Thu Nov 9 13:55:34 2006
@@ -19,8 +19,8 @@
#define _APRBase_
#include <string>
-#include "apr-1/apr_thread_mutex.h"
-#include "apr-1/apr_errno.h"
+#include <apr-1/apr_thread_mutex.h>
+#include <apr-1/apr_errno.h>
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/APRSocket.h Thu Nov 9 13:55:34 2006
@@ -18,8 +18,8 @@
#ifndef _APRSocket_
#define _APRSocket_
-#include "apr-1/apr_network_io.h"
-#include "qpid/framing/Buffer.h"
+#include <apr-1/apr_network_io.h>
+#include <qpid/framing/Buffer.h>
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFProcessor.h Thu Nov 9 13:55:34 2006
@@ -18,12 +18,12 @@
#ifndef _LFProcessor_
#define _LFProcessor_
-#include "apr-1/apr_poll.h"
+#include <apr-1/apr_poll.h>
#include <iostream>
#include <vector>
#include <qpid/sys/Monitor.h>
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Thread.h"
+#include <qpid/sys/Runnable.h>
+#include <qpid/sys/Thread.h>
namespace qpid {
namespace sys {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.cpp Thu Nov 9 13:55:34 2006
@@ -17,7 +17,7 @@
*/
#include "LFSessionContext.h"
#include "APRBase.h"
-#include "qpid/QpidError.h"
+#include <qpid/QpidError.h>
#include <assert.h>
using namespace qpid::sys;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/LFSessionContext.h Thu Nov 9 13:55:34 2006
@@ -20,15 +20,15 @@
#include <queue>
-#include "apr-1/apr_network_io.h"
-#include "apr-1/apr_poll.h"
-#include "apr-1/apr_time.h"
+#include <apr-1/apr_network_io.h>
+#include <apr-1/apr_poll.h>
+#include <apr-1/apr_time.h>
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/sys/SessionContext.h"
-#include "qpid/sys/SessionHandler.h"
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/framing/Buffer.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/sys/SessionContext.h>
+#include <qpid/sys/SessionHandler.h>
#include "APRSocket.h"
#include "LFProcessor.h"
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.cpp?view=auto&rev=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.cpp Thu Nov 9 13:55:34 2006
@@ -0,0 +1,76 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+
+#include <qpid/sys/Socket.h>
+#include <qpid/apr/APRBase.h>
+#include <qpid/apr/APRPool.h>
+
+
+using namespace qpid::sys;
+
+Socket::Socket()
+{
+ CHECK_APR_SUCCESS(
+ apr_socket_create(
+ &socket, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
+ APRPool::get()));
+}
+
+void Socket::setTimeout(long msecs)
+{
+ apr_socket_timeout_set(socket, msecs*1000);
+}
+
+void Socket::connect(const std::string& host, int port)
+{
+ apr_sockaddr_t* address;
+ CHECK_APR_SUCCESS(
+ apr_sockaddr_info_get(
+ &address, host.c_str(), APR_UNSPEC, port, APR_IPV4_ADDR_OK,
+ APRPool::get()));
+ CHECK_APR_SUCCESS(apr_socket_connect(socket, address));
+}
+
+void Socket::close()
+{
+ if (socket == 0) return;
+ CHECK_APR_SUCCESS(apr_socket_close(socket));
+ socket = 0;
+}
+
+ssize_t Socket::send(const char* data, size_t size)
+{
+ apr_size_t sent = size;
+ apr_status_t status = apr_socket_send(socket, data, &sent);
+ if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
+ if (APR_STATUS_IS_EOF(status)) return SOCKET_EOF;
+ CHECK_APR_SUCCESS(status);
+ return sent;
+}
+
+ssize_t Socket::recv(char* data, size_t size)
+{
+ apr_size_t received = size;
+ apr_status_t status = apr_socket_recv(socket, data, &received);
+ if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
+ CHECK_APR_SUCCESS(status);
+ return received;
+}
+
+
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Socket.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Thread.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Thread.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Thread.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/apr/Thread.cpp Thu Nov 9 13:55:34 2006
@@ -16,40 +16,15 @@
*
*/
-#include "Thread.h"
-#include "APRPool.h"
-#include "APRBase.h"
-#include <apr-1/apr_portable.h>
+#include <qpid/sys/Thread.h>
using namespace qpid::sys;
using qpid::sys::Runnable;
-namespace {
-void* APR_THREAD_FUNC run(apr_thread_t* thread, void *data) {
+void* APR_THREAD_FUNC Thread::runRunnable(apr_thread_t* thread, void *data) {
reinterpret_cast<Runnable*>(data)->run();
CHECK_APR_SUCCESS(apr_thread_exit(thread, APR_SUCCESS));
return NULL;
}
-}
-Thread::Thread() : thread(0) {}
-Thread::Thread(Runnable* runnable) {
- CHECK_APR_SUCCESS(
- apr_thread_create(&thread, NULL, run, runnable, APRPool::get()));
-}
-
-void Thread::join(){
- apr_status_t status;
- if (thread != 0)
- CHECK_APR_SUCCESS(apr_thread_join(&status, thread));
-}
-
-Thread::Thread(apr_thread_t* t) : thread(t) {}
-
-Thread Thread::current(){
- apr_thread_t* thr;
- apr_os_thread_t osthr = apr_os_thread_current();
- CHECK_APR_SUCCESS(apr_os_thread_put(&thr, &osthr, APRPool::get()));
- return Thread(thr);
-}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AccumulatedAck.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AccumulatedAck.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AccumulatedAck.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AccumulatedAck.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/AccumulatedAck.h"
+#include <qpid/broker/AccumulatedAck.h>
using std::less_equal;
using std::bind2nd;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/AutoDelete.h"
+#include <qpid/broker/AutoDelete.h>
+#include <qpid/sys/Time.h>
using namespace qpid::broker;
using namespace qpid::sys;
@@ -59,7 +60,7 @@
Monitor::ScopedLock l(monitor);
while(!stopped){
process();
- monitor.wait(msecsToNsecs(period));
+ monitor.wait(period * Time::NSEC_PER_MSEC);
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AutoDelete.h Thu Nov 9 13:55:34 2006
@@ -21,9 +21,9 @@
#include <iostream>
#include <queue>
#include <qpid/sys/Monitor.h>
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/sys/Thread.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/sys/Thread.h>
namespace qpid {
namespace broker{
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Binding.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _Binding_
#define _Binding_
-#include "qpid/framing/FieldTable.h"
+#include <qpid/framing/FieldTable.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Thu Nov 9 13:55:34 2006
@@ -17,16 +17,16 @@
*/
#include <iostream>
#include <memory>
-#include "qpid/broker/Broker.h"
+#include <qpid/broker/Broker.h>
using namespace qpid::broker;
using namespace qpid::sys;
Broker::Broker(const Configuration& config) :
- acceptor(new Acceptor(config.getPort(),
- config.getConnectionBacklog(),
- config.getWorkerThreads()))
+ acceptor(Acceptor::create(config.getPort(),
+ config.getConnectionBacklog(),
+ config.getWorkerThreads()))
{ }
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Thu Nov 9 13:55:34 2006
@@ -19,59 +19,59 @@
*
*/
-#include "qpid/broker/Configuration.h"
-#include "qpid/broker/SessionHandlerFactoryImpl.h"
-#include "qpid/sys/Runnable.h"
-#include "qpid/sys/Acceptor.h"
+#include <qpid/broker/Configuration.h>
+#include <qpid/broker/SessionHandlerFactoryImpl.h>
+#include <qpid/sys/Runnable.h>
+#include <qpid/sys/Acceptor.h>
#include <qpid/SharedObject.h>
namespace qpid {
- namespace broker {
- /**
- * A broker instance.
- */
- class Broker : public qpid::sys::Runnable,
- public qpid::SharedObject<Broker>
- {
- public:
- static const int16_t DEFAULT_PORT;
+namespace broker {
+/**
+ * A broker instance.
+ */
+class Broker : public qpid::sys::Runnable,
+ public qpid::SharedObject<Broker>
+{
+ public:
+ static const int16_t DEFAULT_PORT;
- virtual ~Broker();
+ virtual ~Broker();
- /**
- * Create a broker.
- * @param port Port to listen on or 0 to pick a port dynamically.
- */
- static shared_ptr create(int16_t port = DEFAULT_PORT);
-
- /**
- * Create a broker using a Configuration.
- */
- static shared_ptr create(const Configuration& config);
-
- /**
- * Return listening port. If called before bind this is
- * the configured port. If called after it is the actual
- * port, which will be different if the configured port is
- * 0.
- */
- virtual int16_t getPort() const { return acceptor->getPort(); }
+ /**
+ * Create a broker.
+ * @param port Port to listen on or 0 to pick a port dynamically.
+ */
+ static shared_ptr create(int16_t port = DEFAULT_PORT);
+
+ /**
+ * Create a broker using a Configuration.
+ */
+ static shared_ptr create(const Configuration& config);
+
+ /**
+ * Return listening port. If called before bind this is
+ * the configured port. If called after it is the actual
+ * port, which will be different if the configured port is
+ * 0.
+ */
+ virtual int16_t getPort() const { return acceptor->getPort(); }
- /**
- * Run the broker. Implements Runnable::run() so the broker
- * can be run in a separate thread.
- */
- virtual void run();
-
- /** Shut down the broker */
- virtual void shutdown();
-
- private:
- Broker(const Configuration& config);
- qpid::sys::Acceptor::shared_ptr acceptor;
- SessionHandlerFactoryImpl factory;
- };
- }
+ /**
+ * Run the broker. Implements Runnable::run() so the broker
+ * can be run in a separate thread.
+ */
+ virtual void run();
+
+ /** Shut down the broker */
+ virtual void shutdown();
+
+ private:
+ Broker(const Configuration& config);
+ qpid::sys::Acceptor::shared_ptr acceptor;
+ SessionHandlerFactoryImpl factory;
+};
+}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/Channel.h"
-#include "qpid/QpidError.h"
+#include <qpid/broker/Channel.h>
+#include <qpid/QpidError.h>
#include <iostream>
#include <sstream>
#include <assert.h>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Channel.h Thu Nov 9 13:55:34 2006
@@ -22,26 +22,26 @@
#include <functional>
#include <list>
#include <map>
-#include "qpid/broker/AccumulatedAck.h"
-#include "qpid/broker/Binding.h"
-#include "qpid/broker/Consumer.h"
-#include "qpid/broker/DeletingTxOp.h"
-#include "qpid/broker/DeliverableMessage.h"
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageBuilder.h"
-#include "qpid/broker/NameGenerator.h"
-#include "qpid/broker/Prefetch.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TransactionalStore.h"
-#include "qpid/broker/TxAck.h"
-#include "qpid/broker/TxBuffer.h"
-#include "qpid/broker/TxPublish.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/BasicPublishBody.h"
+#include <qpid/broker/AccumulatedAck.h>
+#include <qpid/broker/Binding.h>
+#include <qpid/broker/Consumer.h>
+#include <qpid/broker/DeletingTxOp.h>
+#include <qpid/broker/DeliverableMessage.h>
+#include <qpid/broker/DeliveryRecord.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageBuilder.h>
+#include <qpid/broker/NameGenerator.h>
+#include <qpid/broker/Prefetch.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TransactionalStore.h>
+#include <qpid/broker/TxAck.h>
+#include <qpid/broker/TxBuffer.h>
+#include <qpid/broker/TxPublish.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/BasicPublishBody.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/Configuration.h"
+#include <qpid/broker/Configuration.h>
#include <string.h>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Configuration.h Thu Nov 9 13:55:34 2006
@@ -21,7 +21,7 @@
#include <cstdlib>
#include <iostream>
#include <vector>
-#include "qpid/Exception.h"
+#include <qpid/Exception.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Consumer.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _Consumer_
#define _Consumer_
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/DeletingTxOp.h"
+#include <qpid/broker/DeletingTxOp.h>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeletingTxOp.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _DeletingTxOp_
#define _DeletingTxOp_
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/TxOp.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Deliverable.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _Deliverable_
#define _Deliverable_
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/DeliverableMessage.h"
+#include <qpid/broker/DeliverableMessage.h>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h Thu Nov 9 13:55:34 2006
@@ -18,9 +18,9 @@
#ifndef _DeliverableMessage_
#define _DeliverableMessage_
-#include "qpid/broker/Deliverable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Deliverable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/Channel.h"
+#include <qpid/broker/DeliveryRecord.h>
+#include <qpid/broker/Channel.h>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h Thu Nov 9 13:55:34 2006
@@ -20,10 +20,10 @@
#include <algorithm>
#include <list>
-#include "qpid/broker/AccumulatedAck.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/Prefetch.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/AccumulatedAck.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/Prefetch.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
#include <iostream>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h Thu Nov 9 13:55:34 2006
@@ -20,11 +20,11 @@
#include <map>
#include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Thu Nov 9 13:55:34 2006
@@ -19,9 +19,9 @@
#define _Exchange_
#include <boost/shared_ptr.hpp>
-#include "qpid/broker/Deliverable.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/framing/FieldTable.h"
+#include <qpid/broker/Deliverable.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/framing/FieldTable.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/ExchangeBinding.h"
-#include "qpid/broker/Exchange.h"
+#include <qpid/broker/ExchangeBinding.h>
+#include <qpid/broker/Exchange.h>
using namespace qpid::broker;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeBinding.h Thu Nov 9 13:55:34 2006
@@ -18,9 +18,9 @@
#ifndef _ExchangeBinding_
#define _ExchangeBinding_
-#include "qpid/broker/Binding.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Binding.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp Thu Nov 9 13:55:34 2006
@@ -15,11 +15,11 @@
* limitations under the License.
*
*/
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/broker/ExchangeRegistry.h>
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/TopicExchange.h>
using namespace qpid::broker;
using namespace qpid::sys;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Thu Nov 9 13:55:34 2006
@@ -19,8 +19,8 @@
#define _ExchangeRegistry_
#include <map>
-#include "qpid/broker/Exchange.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/sys/Monitor.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
#include <algorithm>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/FanOutExchange.h Thu Nov 9 13:55:34 2006
@@ -20,11 +20,11 @@
#include <map>
#include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.cpp Thu Nov 9 13:55:34 2006
@@ -15,10 +15,10 @@
* limitations under the License.
*
*/
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
-#include "qpid/framing/Value.h"
-#include "qpid/QpidError.h"
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
+#include <qpid/framing/Value.h>
+#include <qpid/QpidError.h>
#include <algorithm>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h Thu Nov 9 13:55:34 2006
@@ -19,11 +19,11 @@
#define _HeadersExchange_
#include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
#include <iostream>
using namespace boost;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Thu Nov 9 13:55:34 2006
@@ -19,13 +19,13 @@
#define _Message_
#include <boost/shared_ptr.hpp>
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/TxBuffer.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/BasicHeaderProperties.h"
-#include "qpid/framing/BasicPublishBody.h"
-#include "qpid/framing/OutputHandler.h"
+#include <qpid/broker/ConnectionToken.h>
+#include <qpid/broker/TxBuffer.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/BasicHeaderProperties.h>
+#include <qpid/framing/BasicPublishBody.h>
+#include <qpid/framing/OutputHandler.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/MessageBuilder.h"
+#include <qpid/broker/MessageBuilder.h>
using namespace qpid::broker;
using namespace qpid::framing;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h Thu Nov 9 13:55:34 2006
@@ -18,12 +18,12 @@
#ifndef _MessageBuilder_
#define _MessageBuilder_
-#include "qpid/QpidError.h"
-#include "qpid/broker/Exchange.h"
-#include "qpid/broker/Message.h"
-#include "qpid/framing/AMQContentBody.h"
-#include "qpid/framing/AMQHeaderBody.h"
-#include "qpid/framing/BasicPublishBody.h"
+#include <qpid/QpidError.h>
+#include <qpid/broker/Exchange.h>
+#include <qpid/broker/Message.h>
+#include <qpid/framing/AMQContentBody.h>
+#include <qpid/framing/AMQHeaderBody.h>
+#include <qpid/framing/BasicPublishBody.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/MessageStore.h Thu Nov 9 13:55:34 2006
@@ -18,9 +18,9 @@
#ifndef _MessageStore_
#define _MessageStore_
-#include "qpid/broker/Message.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TransactionalStore.h"
+#include <qpid/broker/Message.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TransactionalStore.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/NameGenerator.h"
+#include <qpid/broker/NameGenerator.h>
#include <sstream>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NameGenerator.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _NameGenerator_
#define _NameGenerator_
-#include "qpid/broker/Message.h"
+#include <qpid/broker/Message.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.cpp Thu Nov 9 13:55:34 2006
@@ -16,10 +16,10 @@
*
*/
-#include "qpid/broker/NullMessageStore.h"
+#include <qpid/broker/NullMessageStore.h>
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/QueueRegistry.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/QueueRegistry.h>
#include <iostream>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Thu Nov 9 13:55:34 2006
@@ -18,9 +18,9 @@
#ifndef _NullMessageStore_
#define _NullMessageStore_
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Prefetch.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _Prefetch_
#define _Prefetch_
-#include "qpid/framing/amqp_types.h"
+#include <qpid/framing/amqp_types.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Thu Nov 9 13:55:34 2006
@@ -15,9 +15,10 @@
* limitations under the License.
*
*/
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/sys/Time.h>
#include <iostream>
using namespace qpid::broker;
@@ -38,7 +39,7 @@
exclusive(0),
persistenceId(0)
{
- if(autodelete) lastUsed = getTimeMsecs();
+ if(autodelete) lastUsed = Time::now().msecs();
}
Queue::~Queue(){
@@ -133,7 +134,7 @@
void Queue::cancel(Consumer* c){
Mutex::ScopedLock locker(lock);
consumers.erase(find(consumers.begin(), consumers.end(), c));
- if(autodelete && consumers.empty()) lastUsed = getTimeMsecs();
+ if(autodelete && consumers.empty()) lastUsed = Time::now().msecs();
if(exclusive == c) exclusive = 0;
}
@@ -166,7 +167,7 @@
bool Queue::canAutoDelete() const{
Mutex::ScopedLock locker(lock);
- return lastUsed && (getTimeMsecs() - lastUsed > autodelete);
+ return lastUsed && (Time::now().msecs() - lastUsed > autodelete);
}
void Queue::enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const string * const xid)
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Thu Nov 9 13:55:34 2006
@@ -21,12 +21,12 @@
#include <vector>
#include <queue>
#include <boost/shared_ptr.hpp>
-#include "qpid/framing/amqp_types.h"
-#include "qpid/broker/Binding.h"
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/Consumer.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/framing/amqp_types.h>
+#include <qpid/broker/Binding.h>
+#include <qpid/broker/ConnectionToken.h>
+#include <qpid/broker/Consumer.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/broker/SessionHandlerImpl.h"
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/broker/SessionHandlerImpl.h>
#include <sstream>
#include <assert.h>
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h Thu Nov 9 13:55:34 2006
@@ -19,8 +19,8 @@
#define _QueueRegistry_
#include <map>
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp Thu Nov 9 13:55:34 2006
@@ -15,13 +15,13 @@
* limitations under the License.
*
*/
-#include "qpid/broker/SessionHandlerFactoryImpl.h"
+#include <qpid/broker/SessionHandlerFactoryImpl.h>
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/NullMessageStore.h"
-#include "qpid/broker/SessionHandlerImpl.h"
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/NullMessageStore.h>
+#include <qpid/broker/SessionHandlerImpl.h>
using namespace qpid::broker;
using namespace qpid::sys;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h Thu Nov 9 13:55:34 2006
@@ -18,16 +18,16 @@
#ifndef _SessionHandlerFactoryImpl_
#define _SessionHandlerFactoryImpl_
-#include "qpid/broker/AutoDelete.h"
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/sys/SessionContext.h"
-#include "qpid/sys/SessionHandler.h"
-#include "qpid/sys/SessionHandlerFactory.h"
-#include "qpid/sys/TimeoutHandler.h"
+#include <qpid/broker/AutoDelete.h>
+#include <qpid/broker/ExchangeRegistry.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/sys/SessionContext.h>
+#include <qpid/sys/SessionHandler.h>
+#include <qpid/sys/SessionHandlerFactory.h>
+#include <qpid/sys/TimeoutHandler.h>
#include <memory>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp Thu Nov 9 13:55:34 2006
@@ -16,10 +16,10 @@
*
*/
#include <iostream>
-#include "qpid/broker/SessionHandlerImpl.h"
-#include "qpid/broker/FanOutExchange.h"
-#include "qpid/broker/HeadersExchange.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/broker/SessionHandlerImpl.h>
+#include <qpid/broker/FanOutExchange.h>
+#include <qpid/broker/HeadersExchange.h>
+#include <qpid/broker/TopicExchange.h>
#include "assert.h"
using namespace boost;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h Thu Nov 9 13:55:34 2006
@@ -22,21 +22,21 @@
#include <sstream>
#include <vector>
#include <exception>
-#include "qpid/framing/AMQFrame.h"
-#include "qpid/framing/AMQP_ClientProxy.h"
-#include "qpid/framing/AMQP_ServerOperations.h"
-#include "qpid/broker/AutoDelete.h"
-#include "qpid/broker/ExchangeRegistry.h"
-#include "qpid/broker/Channel.h"
-#include "qpid/broker/ConnectionToken.h"
-#include "qpid/broker/DirectExchange.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/broker/QueueRegistry.h"
-#include "qpid/sys/SessionContext.h"
-#include "qpid/sys/SessionHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
-#include "qpid/broker/TopicExchange.h"
+#include <qpid/framing/AMQFrame.h>
+#include <qpid/framing/AMQP_ClientProxy.h>
+#include <qpid/framing/AMQP_ServerOperations.h>
+#include <qpid/broker/AutoDelete.h>
+#include <qpid/broker/ExchangeRegistry.h>
+#include <qpid/broker/Channel.h>
+#include <qpid/broker/ConnectionToken.h>
+#include <qpid/broker/DirectExchange.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/broker/QueueRegistry.h>
+#include <qpid/sys/SessionContext.h>
+#include <qpid/sys/SessionHandler.h>
+#include <qpid/sys/TimeoutHandler.h>
+#include <qpid/broker/TopicExchange.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/broker/TopicExchange.h"
-#include "qpid/broker/ExchangeBinding.h"
+#include <qpid/broker/TopicExchange.h>
+#include <qpid/broker/ExchangeBinding.h>
#include <algorithm>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Thu Nov 9 13:55:34 2006
@@ -20,11 +20,11 @@
#include <map>
#include <vector>
-#include "qpid/broker/Exchange.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/broker/Queue.h"
+#include <qpid/broker/Exchange.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/broker/Queue.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/TxAck.h"
+#include <qpid/broker/TxAck.h>
using std::bind1st;
using std::bind2nd;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxAck.h Thu Nov 9 13:55:34 2006
@@ -21,9 +21,9 @@
#include <algorithm>
#include <functional>
#include <list>
-#include "qpid/broker/AccumulatedAck.h"
-#include "qpid/broker/DeliveryRecord.h"
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/AccumulatedAck.h>
+#include <qpid/broker/DeliveryRecord.h>
+#include <qpid/broker/TxOp.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/TxBuffer.h"
+#include <qpid/broker/TxBuffer.h>
using std::mem_fun;
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h Thu Nov 9 13:55:34 2006
@@ -21,8 +21,8 @@
#include <algorithm>
#include <functional>
#include <vector>
-#include "qpid/broker/TransactionalStore.h"
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/TransactionalStore.h>
+#include <qpid/broker/TxOp.h>
/**
* Represents a single transaction. As such, an instance of this class
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxOp.h Thu Nov 9 13:55:34 2006
@@ -18,7 +18,7 @@
#ifndef _TxOp_
#define _TxOp_
-#include "qpid/broker/TransactionalStore.h"
+#include <qpid/broker/TransactionalStore.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/broker/TxPublish.h"
+#include <qpid/broker/TxPublish.h>
using namespace qpid::broker;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h Thu Nov 9 13:55:34 2006
@@ -21,11 +21,11 @@
#include <algorithm>
#include <functional>
#include <list>
-#include "qpid/broker/Deliverable.h"
-#include "qpid/broker/Message.h"
-#include "qpid/broker/MessageStore.h"
-#include "qpid/broker/Queue.h"
-#include "qpid/broker/TxOp.h"
+#include <qpid/broker/Deliverable.h>
+#include <qpid/broker/Message.h>
+#include <qpid/broker/MessageStore.h>
+#include <qpid/broker/Queue.h>
+#include <qpid/broker/TxOp.h>
namespace qpid {
namespace broker {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp Thu Nov 9 13:55:34 2006
@@ -15,10 +15,10 @@
* limitations under the License.
*
*/
-#include "qpid/client/Channel.h"
-#include "qpid/sys/Monitor.h"
-#include "qpid/client/Message.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/Channel.h>
+#include <qpid/sys/Monitor.h>
+#include <qpid/client/Message.h>
+#include <qpid/QpidError.h>
using namespace boost; //to use dynamic_pointer_cast
using namespace qpid::client;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h Thu Nov 9 13:55:34 2006
@@ -23,15 +23,15 @@
#ifndef _Channel_
#define _Channel_
-#include "qpid/framing/amqp_framing.h"
-#include "qpid/client/Connection.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/IncomingMessage.h"
-#include "qpid/client/Message.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
-#include "qpid/client/ResponseHandler.h"
-#include "qpid/client/ReturnedMessageHandler.h"
+#include <qpid/framing/amqp_framing.h>
+#include <qpid/client/Connection.h>
+#include <qpid/client/Exchange.h>
+#include <qpid/client/IncomingMessage.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/client/Queue.h>
+#include <qpid/client/ResponseHandler.h>
+#include <qpid/client/ReturnedMessageHandler.h>
namespace qpid {
namespace client {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Thu Nov 9 13:55:34 2006
@@ -15,10 +15,10 @@
* limitations under the License.
*
*/
-#include "qpid/client/Connection.h"
-#include "qpid/client/Channel.h"
-#include "qpid/client/Message.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/Connection.h>
+#include <qpid/client/Channel.h>
+#include <qpid/client/Message.h>
+#include <qpid/QpidError.h>
#include <iostream>
using namespace qpid::client;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Thu Nov 9 13:55:34 2006
@@ -21,18 +21,18 @@
#ifndef _Connection_
#define _Connection_
-#include "qpid/QpidError.h"
-#include "qpid/client/Connector.h"
-#include "qpid/sys/ShutdownHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
+#include <qpid/QpidError.h>
+#include <qpid/client/Connector.h>
+#include <qpid/sys/ShutdownHandler.h>
+#include <qpid/sys/TimeoutHandler.h>
-#include "qpid/framing/amqp_framing.h"
-#include "qpid/client/Exchange.h"
-#include "qpid/client/IncomingMessage.h"
-#include "qpid/client/Message.h"
-#include "qpid/client/MessageListener.h"
-#include "qpid/client/Queue.h"
-#include "qpid/client/ResponseHandler.h"
+#include <qpid/framing/amqp_framing.h>
+#include <qpid/client/Exchange.h>
+#include <qpid/client/IncomingMessage.h>
+#include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
+#include <qpid/client/Queue.h>
+#include <qpid/client/ResponseHandler.h>
namespace qpid {
namespace client {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp Thu Nov 9 13:55:34 2006
@@ -89,7 +89,7 @@
while(written < available && !closed){
ssize_t sent = socket.send(data + written, available-written);
if(sent > 0) {
- lastOut = getTimeMsecs();
+ lastOut = Time::now().msecs();
written += sent;
}
}
@@ -97,7 +97,7 @@
void Connector::checkIdle(ssize_t status){
if(timeoutHandler){
- int64_t now = getTimeMsecs();
+ int64_t now = Time::now().msecs();
if(status == Socket::SOCKET_TIMEOUT) {
if(idleIn && (now - lastIn > idleIn)){
timeoutHandler->idleIn();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h Thu Nov 9 13:55:34 2006
@@ -19,14 +19,14 @@
#define _Connector_
-#include "qpid/framing/InputHandler.h"
-#include "qpid/framing/OutputHandler.h"
-#include "qpid/framing/InitiationHandler.h"
-#include "qpid/framing/ProtocolInitiation.h"
-#include "qpid/sys/ShutdownHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
-#include "qpid/sys/Thread.h"
-#include "qpid/sys/Monitor.h"
+#include <qpid/framing/InputHandler.h>
+#include <qpid/framing/OutputHandler.h>
+#include <qpid/framing/InitiationHandler.h>
+#include <qpid/framing/ProtocolInitiation.h>
+#include <qpid/sys/ShutdownHandler.h>
+#include <qpid/sys/TimeoutHandler.h>
+#include <qpid/sys/Thread.h>
+#include <qpid/sys/Monitor.h>
#include <qpid/sys/Socket.h>
namespace qpid {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Exchange.cpp Thu Nov 9 13:55:34 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-#include "qpid/client/Exchange.h"
+#include <qpid/client/Exchange.h>
qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
const std::string& qpid::client::Exchange::getName() const { return name; }
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.cpp Thu Nov 9 13:55:34 2006
@@ -15,8 +15,8 @@
* limitations under the License.
*
*/
-#include "qpid/client/IncomingMessage.h"
-#include "qpid/QpidError.h"
+#include <qpid/client/IncomingMessage.h>
+#include <qpid/QpidError.h>
#include <iostream>
using namespace qpid::client;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h?view=diff&rev=473087&r1=473086&r2=473087
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/IncomingMessage.h Thu Nov 9 13:55:34 2006
@@ -17,12 +17,12 @@
*/
#include <string>
#include <vector>
-#include "qpid/framing/amqp_framing.h"
+#include <qpid/framing/amqp_framing.h>
#ifndef _IncomingMessage_
#define _IncomingMessage_
-#include "qpid/client/Message.h"
+#include <qpid/client/Message.h>
namespace qpid {
namespace client {