svn commit: r825805 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java

2009-10-16 Thread robbie 
Author: robbie
Date: Fri Oct 16 08:20:20 2009
New Revision: 825805

URL: http://svn.apache.org/viewvc?rev=825805&view=rev
Log:
QPID-1304: add vhost access check for missed corner cases, allowing for users 
granted vhost access and otherwise abstaining.

Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java?rev=825805&r1=825804&r2=825805&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
 Fri Oct 16 08:20:20 2009
@@ -378,7 +378,16 @@
 case PURGE:
 case UNBIND:
 default:
-return AuthzResult.DENIED;
+if(_fullVHostAccess)
+{
+//user has been granted full access to the vhost
+return AuthzResult.ALLOWED;
+}
+else
+{
+//SimpleXML ACL does not implement these permissions and 
should abstain
+return AuthzResult.ABSTAIN;
+}
 }
 
 }



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > Tune Broker and Client Memory Usage

2009-10-16 Thread confluence 







Tune Broker and Client Memory Usage
Page  added by Martin Ritchie

 

 
Tuning the broker for your message size.

The default buffer size used per message on the broker and client is 32kb if your message is significantly smaller you can improve your memory usage by lowering this value. 

What size to use
When selecting what size of buffer to include space for any JMS Headers that may be defined (key and value). You should also include 200 bytes for the AMQP routing details, if you have very long queue or topic names you may wish to increase this value further.

How to change the buffer sizes

Broker Buffers
In your broker configuration file the socketSend/ReceiveBuffer value of 32768 is where the buffer size is specified.
Currently your configuration file will contain the following two entries:




...
32768
32768




Modifying these will adjust the size of the ByteBuffers used in conjunction with the socket.

Client Buffers
Adjusting the client buffers can also assist your client heap management if you are prefetching a large number of messages. 
However, adjusting this will not have any affect on the broker's memory usage.
If you also want to modify the client buffer size then there are two system properties that need set:


amqj.sendBufferSize
amqj.receiveBufferSize



These need to be set prior to making the initial connection. 
For more details on these properties see: System Properties



   
Change Notification Preferences
   
   View Online
  |
   Add Comment
   







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r825869 - /qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp

2009-10-16 Thread cctrieloff 
Author: cctrieloff
Date: Fri Oct 16 12:56:46 2009
New Revision: 825869

URL: http://svn.apache.org/viewvc?rev=825869&view=rev
Log:
Protect close method

Modified:
qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=825869&r1=825868&r2=825869&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Fri Oct 16 12:56:46 2009
@@ -148,7 +148,8 @@
 }
 
 void Connection::close() {
-impl->close();
+if ( impl )
+impl->close();
 }
 
 std::vector Connection::getKnownBrokers() {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP Java Broker

2009-10-16 Thread confluence 







AMQP Java Broker
Page  added by Jonathan Robie

 

 


   
Change Notification Preferences
   
   View Online
  |
   Add Comment
   







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP C++ Messaging Broker

2009-10-16 Thread confluence 







AMQP C++ Messaging Broker
Page  added by Jonathan Robie

 

 


   
Change Notification Preferences
   
   View Online
  |
   Add Comment
   







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP Java Messaging Broker

2009-10-16 Thread confluence 







AMQP Java Messaging Broker
Page  added by Jonathan Robie

 

 


   
Change Notification Preferences
   
   View Online
  |
   Add Comment
   







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP Java Broker

2009-10-16 Thread confluence 







 AMQP Java Broker
 Page removed by Jonathan Robie

 
 
 
 







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP Messaging Broker (implemented in Java)

2009-10-16 Thread confluence 







AMQP Messaging Broker (implemented in Java)
Page  added by Jonathan Robie

 

 


   
Change Notification Preferences
   
   View Online
  |
   Add Comment
   







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP Messaging Broker (implemented in C++)

2009-10-16 Thread confluence 







AMQP Messaging Broker (implemented in C++)
Page  added by Jonathan Robie

 

 


   
Change Notification Preferences
   
   View Online
  |
   Add Comment
   







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP Java Messaging Broker

2009-10-16 Thread confluence 







 AMQP Java Messaging Broker
 Page removed by Jonathan Robie

 
 
 
 







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

[CONF] Apache Qpid > AMQP C++ Messaging Broker

2009-10-16 Thread confluence 







 AMQP C++ Messaging Broker
 Page removed by Jonathan Robie

 
 
 
 







-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r826030 - /qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp

2009-10-16 Thread astitcher 
Author: astitcher
Date: Fri Oct 16 18:47:36 2009
New Revision: 826030

URL: http://svn.apache.org/viewvc?rev=826030&view=rev
Log:
Fix creating socket in the wrong place for listen()

Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp?rev=826030&r1=826029&r2=826030&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp Fri Oct 16 18:47:36 2009
@@ -170,13 +170,13 @@
 int Socket::listen(uint16_t port, int backlog) const
 {
 SocketAddress sa("", boost::lexical_cast(port));
-
-createSocket(sa);
 return listen(sa, backlog);
 }
 
 int Socket::listen(const SocketAddress& sa, int backlog) const
 {
+createSocket(sa);
+
 const int& socket = impl->fd;
 int yes=1;
 
QPID_POSIX_CHECK(setsockopt(socket,SOL_SOCKET,SO_REUSEADDR,&yes,sizeof(yes)));



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r826031 - in /qpid/trunk/qpid/cpp/src/qpid: client/ConnectionSettings.cpp sys/Socket.h sys/TCPIOPlugin.cpp sys/posix/Socket.cpp

2009-10-16 Thread astitcher 
Author: astitcher
Date: Fri Oct 16 18:47:42 2009
New Revision: 826031

URL: http://svn.apache.org/viewvc?rev=826031&view=rev
Log:
Fixed tcp nodelay, broken by previous socket code shuffling

Modified:
qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp?rev=826031&r1=826030&r2=826031&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionSettings.cpp Fri Oct 16 
18:47:42 2009
@@ -47,7 +47,7 @@
 void ConnectionSettings::configureSocket(qpid::sys::Socket& socket) const
 {
 if (tcpNoDelay) {
-socket.setTcpNoDelay(tcpNoDelay);
+socket.setTcpNoDelay();
 QPID_LOG(info, "Set TCP_NODELAY");
 }
 }

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h?rev=826031&r1=826030&r2=826031&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h Fri Oct 16 18:47:42 2009
@@ -45,6 +45,8 @@
 /** Set socket non blocking */
 void setNonblocking() const;
 
+QPID_COMMON_EXTERN void setTcpNoDelay() const;
+
 QPID_COMMON_EXTERN void connect(const std::string& host, uint16_t port) 
const;
 QPID_COMMON_EXTERN void connect(const SocketAddress&) const;
 
@@ -97,8 +99,6 @@
 QPID_COMMON_EXTERN int read(void *buf, size_t count) const;
 QPID_COMMON_EXTERN int write(const void *buf, size_t count) const;
 
-QPID_COMMON_EXTERN void setTcpNoDelay(bool nodelay) const;
-
 private:
 /** Create socket */
 void createSocket(const SocketAddress&) const;
@@ -106,6 +106,7 @@
 Socket(IOHandlePrivate*);
 mutable std::string connectname;
 mutable bool nonblocking;
+mutable bool nodelay;
 };
 
 }}

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp?rev=826031&r1=826030&r2=826031&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp Fri Oct 16 18:47:42 2009
@@ -84,7 +84,7 @@
 AsynchIOHandler* async = new AsynchIOHandler(s.getPeerAddress(), f);
 
 if (tcpNoDelay) {
-s.setTcpNoDelay(tcpNoDelay);
+s.setTcpNoDelay();
 QPID_LOG(info, "Set TCP_NODELAY on connection to " << 
s.getPeerAddress());
 }
 

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp?rev=826031&r1=826030&r2=826031&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/Socket.cpp Fri Oct 16 18:47:42 2009
@@ -98,12 +98,14 @@
 
 Socket::Socket() :
 IOHandle(new IOHandlePrivate),
-nonblocking(false)
+nonblocking(false),
+nodelay(false)
 {}
 
 Socket::Socket(IOHandlePrivate* h) :
 IOHandle(h),
-nonblocking(false)
+nonblocking(false),
+nodelay(false)
 {}
 
 void Socket::createSocket(const SocketAddress& sa) const
@@ -116,6 +118,7 @@
 
 try {
 if (nonblocking) setNonblocking();
+if (nodelay) setTcpNoDelay();
 } catch (std::exception&) {
 ::close(s);
 socket = -1;
@@ -134,8 +137,21 @@
 
 void Socket::setNonblocking() const {
 int& socket = impl->fd;
-if (socket != -1) QPID_POSIX_CHECK(::fcntl(socket, F_SETFL, O_NONBLOCK));
 nonblocking = true;
+if (socket != -1) {
+QPID_POSIX_CHECK(::fcntl(socket, F_SETFL, O_NONBLOCK));
+}
+}
+
+void Socket::setTcpNoDelay() const
+{
+int& socket = impl->fd;
+nodelay = true;
+if (socket != -1) {
+int flag = 1;
+int result = setsockopt(impl->fd, IPPROTO_TCP, TCP_NODELAY, (char 
*)&flag, sizeof(flag));
+QPID_POSIX_CHECK(result);
+}
 }
 
 void Socket::connect(const std::string& host, uint16_t port) const
@@ -258,13 +274,4 @@
 return result;
 }
 
-void Socket::setTcpNoDelay(bool nodelay) const
-{
-if (nodelay) {
-int flag = 1;
-int result = setsockopt(impl->fd, IPPROTO_TCP, TCP_NODELAY, (char 
*)&flag, sizeof(flag));
-QPID_POSIX_CHECK(result);
-}
-}
-
 }} // namespace qpid::sys



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org

svn commit: r826032 - in /qpid/trunk/qpid/cpp/src/qpid/sys: AsynchIO.h TCPIOPlugin.cpp posix/AsynchIO.cpp

2009-10-16 Thread astitcher 
Author: astitcher
Date: Fri Oct 16 18:47:47 2009
New Revision: 826032

URL: http://svn.apache.org/viewvc?rev=826032&view=rev
Log:
Rationalised AsynchConnector/Acceptor/IO to all use the same code structure

Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIO.h
qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIO.h
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIO.h?rev=826032&r1=826031&r2=826032&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIO.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIO.h Fri Oct 16 18:47:47 2009
@@ -36,18 +36,13 @@
  * Asynchronous acceptor: accepts connections then does a callback with the
  * accepted fd
  */
-class AsynchAcceptorPrivate;
 class AsynchAcceptor {
 public:
 typedef boost::function1 Callback;
 
-private:
-AsynchAcceptorPrivate* impl;
-
-public:
-QPID_COMMON_EXTERN AsynchAcceptor(const Socket& s, Callback callback);
-QPID_COMMON_EXTERN ~AsynchAcceptor();
-QPID_COMMON_EXTERN void start(boost::shared_ptr poller);
+QPID_COMMON_EXTERN static AsynchAcceptor* create(const Socket& s, Callback 
callback);
+virtual ~AsynchAcceptor() {};
+virtual void start(boost::shared_ptr poller) = 0;
 };
 
 /*

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp?rev=826032&r1=826031&r2=826032&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp Fri Oct 16 18:47:47 2009
@@ -114,7 +114,7 @@
 void AsynchIOProtocolFactory::accept(Poller::shared_ptr poller,
  ConnectionCodec::Factory* fact) {
 acceptor.reset(
-new AsynchAcceptor(listener,
+AsynchAcceptor::create(listener,
boost::bind(&AsynchIOProtocolFactory::established, 
this, poller, _1, fact, false)));
 acceptor->start(poller);
 }

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp?rev=826032&r1=826031&r2=826032&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp Fri Oct 16 18:47:47 2009
@@ -73,11 +73,12 @@
  */
 namespace qpid {
 namespace sys {
+namespace posix {
 
-class AsynchAcceptorPrivate {
+class AsynchAcceptor : public qpid::sys::AsynchAcceptor {
 public:
-AsynchAcceptorPrivate(const Socket& s, AsynchAcceptor::Callback callback);
-~AsynchAcceptorPrivate();
+AsynchAcceptor(const Socket& s, AsynchAcceptor::Callback callback);
+~AsynchAcceptor();
 void start(Poller::shared_ptr poller);
 
 private:
@@ -90,40 +91,27 @@
 
 };
 
-}} // namespace qpid::sys
-
-AsynchAcceptor::AsynchAcceptor(const Socket& s, Callback callback) :
-  impl(new AsynchAcceptorPrivate(s, callback))
-{}
-
-AsynchAcceptor::~AsynchAcceptor()
-{ delete impl;}
-
-void AsynchAcceptor::start(Poller::shared_ptr poller) {
-impl->start(poller);
-}
-
-AsynchAcceptorPrivate::AsynchAcceptorPrivate(const Socket& s,
- AsynchAcceptor::Callback 
callback) :
+AsynchAcceptor::AsynchAcceptor(const Socket& s,
+   AsynchAcceptor::Callback callback) :
 acceptedCallback(callback),
-handle(s, boost::bind(&AsynchAcceptorPrivate::readable, this, _1), 0, 0),
+handle(s, boost::bind(&AsynchAcceptor::readable, this, _1), 0, 0),
 socket(s) {
 
 s.setNonblocking();
 }
 
-AsynchAcceptorPrivate::~AsynchAcceptorPrivate() {
+AsynchAcceptor::~AsynchAcceptor() {
 handle.stopWatch();
 }
 
-void AsynchAcceptorPrivate::start(Poller::shared_ptr poller) {
+void AsynchAcceptor::start(Poller::shared_ptr poller) {
 handle.startWatch(poller);
 }
 
 /*
  * We keep on accepting as long as there is something to accept
  */
-void AsynchAcceptorPrivate::readable(DispatchHandle& h) {
+void AsynchAcceptor::readable(DispatchHandle& h) {
 Socket* s;
 do {
 errno = 0;
@@ -146,13 +134,6 @@
 }
 
 /*
- * Asynch Connector
- */
-namespace qpid {
-namespace sys {
-namespace posix {
-
-/*
  * POSIX version of AsynchIO TCP socket connector.
  *
  * The class is implemented in terms of DispatchHandle to allow it to be
@@ -228,32 +209,12 @@
 DispatchHandle::doDelete();
 }
 
-} // namespace posix
-
-
-AsynchConnector* qpid::sys::AsynchConnector::create(const Socket& s,
-Poller::shared_ptr poller,
-std::string hostname,
-

svn commit: r826033 - in /qpid/trunk/qpid/cpp/src: posix/QpiddBroker.cpp qpid/broker/Broker.cpp tests/BrokerFixture.h

2009-10-16 Thread astitcher 
Author: astitcher
Date: Fri Oct 16 18:47:52 2009
New Revision: 826033

URL: http://svn.apache.org/viewvc?rev=826033&view=rev
Log:
Pull running acceptor out of Broker run loop

Modified:
qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h

Modified: qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp?rev=826033&r1=826032&r2=826033&view=diff
==
--- qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp Fri Oct 16 18:47:52 2009
@@ -124,6 +124,7 @@
 void child() {
 boost::intrusive_ptr brokerPtr(new 
Broker(options->parent->broker));
 qpid::broker::SignalHandler::setBroker(brokerPtr);
+brokerPtr->accept();
 uint16_t port=brokerPtr->getPort(options->daemon.transport);
 ready(port);// Notify parent.
 brokerPtr->run();
@@ -169,6 +170,7 @@
 else {  // Non-daemon broker.
 boost::intrusive_ptr brokerPtr(new Broker(options->broker));
 broker::SignalHandler::setBroker(brokerPtr);
+brokerPtr->accept();
 if (options->broker.port == 0 || myOptions->daemon.transport != TCP)
 cout << uint16_t(brokerPtr->getPort(myOptions->daemon.transport)) 
<< endl;
 brokerPtr->run();

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=826033&r1=826032&r2=826033&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Fri Oct 16 18:47:52 2009
@@ -309,7 +309,6 @@
 }
 
 void Broker::run() {
-accept();
 QPID_LOG(notice, "Broker running");
 Dispatcher d(poller);
 int numIOThreads = config.workerThreads;

Modified: qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h?rev=826033&r1=826032&r2=826033&view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h Fri Oct 16 18:47:52 2009
@@ -66,6 +66,7 @@
 // TODO aconway 2007-12-05: At one point BrokerFixture
 // tests could hang in Connection ctor if the following
 // line is removed. This may not be an issue anymore.
+broker->accept();
 broker->getPort(qpid::broker::Broker::TCP_TRANSPORT);
 brokerThread = qpid::sys::Thread(*broker);
 };



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r826088 - /qpid/trunk/qpid/cpp/docs/api/user.doxygen.in

2009-10-16 Thread shuston 
Author: shuston
Date: Fri Oct 16 21:01:58 2009
New Revision: 826088

URL: http://svn.apache.org/viewvc?rev=826088&view=rev
Log:
Consistently show qpid-based paths in #include directives. Help this work from 
a CMake build. Fixes QPID-2151

Modified:
qpid/trunk/qpid/cpp/docs/api/user.doxygen.in

Modified: qpid/trunk/qpid/cpp/docs/api/user.doxygen.in
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in?rev=826088&r1=826087&r2=826088&view=diff
==
--- qpid/trunk/qpid/cpp/docs/api/user.doxygen.in (original)
+++ qpid/trunk/qpid/cpp/docs/api/user.doxygen.in Fri Oct 16 21:01:58 2009
@@ -113,7 +113,7 @@
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH = @top_builddir@/include @top_builddir@/src/gen
+STRIP_FROM_PATH = @top_srcdir@/include @top_builddir@/include 
@top_builddir@/src/gen
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -122,7 +122,7 @@
 # definition is used. Otherwise one should specify the include paths that 
 # are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_INC_PATH= 
+STRIP_FROM_INC_PATH= @top_srcdir@/include @top_builddir@/include
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
@@ -640,13 +640,13 @@
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER=  ./header.html
+HTML_HEADER=  @srcdir@/header.html
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER= ./footer.html
+HTML_FOOTER= @srcdir@/footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r826092 - in /qpid/trunk/qpid/cpp: CMakeLists.txt docs/api/CMakeLists.txt

2009-10-16 Thread shuston 
Author: shuston
Date: Fri Oct 16 21:24:13 2009
New Revision: 826092

URL: http://svn.apache.org/viewvc?rev=826092&view=rev
Log:
Add API doc generation and install to CMake build.

Added:
qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt   (with props)
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=826092&r1=826091&r2=826092&view=diff
==
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Fri Oct 16 21:24:13 2009
@@ -91,6 +91,8 @@
"Directory to install configuration files")
   set (QPID_INSTALL_DATADIR conf CACHE STRING
"Directory to install read-only arch.-independent data root")
+  set (QPID_INSTALL_HTMLDIR html CACHE STRING
+   "Directory to install HTML documentation")
   set (QPID_INSTALL_INCLUDEDIR include CACHE STRING
"Directory to install programming header files")
   set (QPID_INSTALL_LIBDIR bin CACHE STRING
@@ -121,8 +123,8 @@
 #   gacutil /u 'Apache.Qpid.Channel'
 #   gacutil /u 'Apache.Qpid.Interop'
 #  ")
-
 endif (WIN32)
+
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
   # Set up install locations. Since the Linux install puts some files in
   # /etc and most in the install location, we need to use a DESTDIR build
@@ -146,6 +148,8 @@
"Directory to install configuration files")
   set (QPID_INSTALL_DATADIR share/qpid CACHE STRING
"Directory to install read-only arch.-independent data root")
+  set (QPID_INSTALL_HTMLDIR html CACHE STRING
+   "Directory to install HTML documentation")
   set (QPID_INSTALL_INCLUDEDIR include CACHE STRING
"Directory to install programming header files")
   set (QPID_INSTALL_LIBDIR lib CACHE STRING
@@ -177,7 +181,7 @@
 add_subdirectory(managementgen)
 add_subdirectory(etc)
 add_subdirectory(src)
-# add_subdirectory(docs/api)
+add_subdirectory(docs/api)
 # add_subdirectory(docs/man)
 add_subdirectory(examples)
 

Added: qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt?rev=826092&view=auto
==
--- qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt (added)
+++ qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt Fri Oct 16 21:24:13 2009
@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+if (GEN_DOXYGEN)
+# The user.doxygen.in file was originally written for a
+# configure-generated situation so makes use of configure names that
+# need to be set from the CMake equivalents.
+set (top_builddir ${CMAKE_BINARY_DIR})
+set (top_srcdir ${CMAKE_SOURCE_DIR})
+set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/user.doxygen.in
+${CMAKE_CURRENT_BINARY_DIR}/user.doxygen)
+add_custom_target (user-api-docs COMMAND ${DOXYGEN_EXECUTABLE} 
user.doxygen)
+
+# HTML files are generated to ./html - put those in the install.
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+ DESTINATION ${QPID_INSTALL_HTMLDIR}
+ COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE})
+
+endif (GEN_DOXYGEN)

Propchange: qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt
--
svn:eol-style = native

Propchange: qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt
--
svn:keywords = Author Date Id Revision



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

svn commit: r826093 - /qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp

2009-10-16 Thread shuston 
Author: shuston
Date: Fri Oct 16 21:25:13 2009
New Revision: 826093

URL: http://svn.apache.org/viewvc?rev=826093&view=rev
Log:
Change threshold for reporting a timer as late from 10 to 50 msec. Resolves 
QPID-2150.

Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp?rev=826093&r1=826092&r2=826093&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Timer.cpp Fri Oct 16 21:25:13 2009
@@ -112,7 +112,7 @@
 // Warn on callback overrun
 AbsTime end(AbsTime::now());
 Duration overrun(tasks.top()->nextFireTime, end);
-bool late = delay > 10 * TIME_MSEC;
+bool late = delay > 50 * TIME_MSEC;
 bool overran = overrun > 2 * TIME_MSEC;
 if (late)
 if (overran) {



-
Apache Qpid - AMQP Messaging Implementation
Project:  http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org