svn commit: r742496 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/store/ broker/src/test/java/org/apache/qpid/server/ack/ broker/src/test/java/org/apache/qpid/server/exchange

2009-02-09 Thread ritchiem
Author: ritchiem
Date: Mon Feb  9 13:46:00 2009
New Revision: 742496

URL: http://svn.apache.org/viewvc?rev=742496&view=rev
Log:
QPID-1652 : Created MessagePublishInfoImpl and Unit Test, removed the several 
annoynmous classes that did all the same work.

Added:

qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImpl.java

qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/

qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
Removed:

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockMessagePublishInfo.java
Modified:

qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/TxAckTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java

qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java

qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java

qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java

Modified: 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=742496&r1=742495&r2=742496&view=diff
==
--- 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
 (original)
+++ 
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
 Mon Feb  9 13:46:00 2009
@@ -29,6 +29,7 @@
 
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.MessageHandleFactory;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
 import org.apache.qpid.AMQException;
@@ -1148,34 +1149,7 @@
 final AMQShortString routingKey = rs.getString(2) == null ? 
null : new AMQShortString(rs.getString(2));
 final boolean mandatory = (rs.getShort(3) != (short)0);
 final boolean immediate = (rs.getShort(4) != (short)0);
-MessagePublishInfo info = new MessagePublishInfo()
-{
-
-public AMQShortString 
getExchange()
-{
-return exchange;
-}
-
-public void 
setExchange(AMQShortString exchange)
-{
-
-}
-
-public boolean isImmediate()
-{
-return immediate;
-}
-
-public boolean isMandatory()
-{
-return mandatory;
-}
-
-public AMQShortString 
getRoutingKey()
-{
-return routingKey;
-}
-}   ;
+MessagePublishInfo info = new 
MessagePublishInfoImpl(exchange,immediate,mandatory,routingKey);
 
 Blob dataAsBlob = rs.getBlo

svn commit: r742498 - /qpid/trunk/qpid/java/management/client/build.xml

2009-02-09 Thread agazzarini
Author: agazzarini
Date: Mon Feb  9 13:47:26 2009
New Revision: 742498

URL: http://svn.apache.org/viewvc?rev=742498&view=rev
Log:
QPID-1581 : Removed unnecessary Jetty dependencies on Qman Admin Console

Modified:
qpid/trunk/qpid/java/management/client/build.xml

Modified: qpid/trunk/qpid/java/management/client/build.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/client/build.xml?rev=742498&r1=742497&r2=742498&view=diff
==
--- qpid/trunk/qpid/java/management/client/build.xml (original)
+++ qpid/trunk/qpid/java/management/client/build.xml Mon Feb  9 13:47:26 2009
@@ -88,7 +88,10 @@
  
 
 
-
+
+   
+   
+
 
 
 



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



svn commit: r742515 - in /qpid/trunk/qpid/cpp: configure.ac examples/Makefile.am examples/tradedemo/ examples/tradedemo/Makefile.am examples/tradedemo/declare_queues.cpp examples/tradedemo/topic_liste

2009-02-09 Thread cctrieloff
Author: cctrieloff
Date: Mon Feb  9 14:19:23 2009
New Revision: 742515

URL: http://svn.apache.org/viewvc?rev=742515&view=rev
Log:
QPID-1595 from william -- trade demo

Added:
qpid/trunk/qpid/cpp/examples/tradedemo/
qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am
qpid/trunk/qpid/cpp/examples/tradedemo/declare_queues.cpp
qpid/trunk/qpid/cpp/examples/tradedemo/topic_listener.cpp
qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp
Modified:
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/examples/Makefile.am

Modified: qpid/trunk/qpid/cpp/configure.ac
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=742515&r1=742514&r2=742515&view=diff
==
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Mon Feb  9 14:19:23 2009
@@ -380,6 +380,7 @@
   examples/failover/Makefile
   examples/xml-exchange/Makefile
   examples/qmf-console/Makefile
+  examples/tradedemo/Makefile
   managementgen/Makefile
   etc/Makefile
   src/Makefile

Modified: qpid/trunk/qpid/cpp/examples/Makefile.am
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/Makefile.am?rev=742515&r1=742514&r2=742515&view=diff
==
--- qpid/trunk/qpid/cpp/examples/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/Makefile.am Mon Feb  9 14:19:23 2009
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-SUBDIRS = direct fanout pub-sub request-response failover qmf-console
+SUBDIRS = direct fanout pub-sub request-response failover qmf-console 
tradedemo 
 if HAVE_XML
   SUBDIRS += xml-exchange
   broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module 
$(top_builddir)/src/.libs/xml.so" 

Added: qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am?rev=742515&view=auto
==
--- qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am (added)
+++ qpid/trunk/qpid/cpp/examples/tradedemo/Makefile.am Mon Feb  9 14:19:23 2009
@@ -0,0 +1,53 @@
+#
+# 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.
+#
+examplesdir=$(pkgdatadir)/examples/pub-sub
+
+include $(top_srcdir)/examples/makedist.mk
+
+noinst_PROGRAMS=topic_listener topic_publisher declare_queues
+
+topic_listener_SOURCES=topic_listener.cpp
+topic_listener_LDADD=$(CLIENT_LIB)
+
+topic_publisher_SOURCES=topic_publisher.cpp 
+topic_publisher_LDADD=$(CLIENT_LIB)
+
+declare_queues_SOURCES=declare_queues.cpp
+declare_queues_LDADD=$(CLIENT_LIB)
+
+
+examples_DATA=   \
+   topic_listener.cpp   \
+   topic_publisher.cpp  \
+   declare_queues.cpp  \
+   $(MAKEDIST)
+
+EXTRA_DIST=  \
+   $(examples_DATA) \
+   verify   \
+   verify.in\
+   verify_cpp_python\
+   verify_cpp_python.in \
+   verify_python_cpp\
+   verify_python_cpp.in
+
+
+
+
+

Added: qpid/trunk/qpid/cpp/examples/tradedemo/declare_queues.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/tradedemo/declare_queues.cpp?rev=742515&view=auto
==
--- qpid/trunk/qpid/cpp/examples/tradedemo/declare_queues.cpp (added)
+++ qpid/trunk/qpid/cpp/examples/tradedemo/declare_queues.cpp Mon Feb  9 
14:19:23 2009
@@ -0,0 +1,98 @@
+/*
+ *
+ * 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 WARRANTI

svn commit: r742520 - /qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp

2009-02-09 Thread aconway
Author: aconway
Date: Mon Feb  9 14:27:22 2009
New Revision: 742520

URL: http://svn.apache.org/viewvc?rev=742520&view=rev
Log:
Demote CPG flow control warning message to debug.

Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp?rev=742520&r1=742519&r2=742520&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp Mon Feb  9 14:27:22 2009
@@ -108,7 +108,7 @@
 
 bool Cpg::mcast(const iovec* iov, int iovLen) {
 if (isFlowControlEnabled()) {
-QPID_LOG(warning, "CPG flow control enabled")
+QPID_LOG(debug, "CPG flow control enabled")
 return false;
 }
 cpg_error_t result;



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



svn commit: r742563 - /qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp

2009-02-09 Thread aconway
Author: aconway
Date: Mon Feb  9 15:27:19 2009
New Revision: 742563

URL: http://svn.apache.org/viewvc?rev=742563&view=rev
Log:
Fix "no virtual destructor" warning.

Modified:
qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp

Modified: qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp?rev=742563&r1=742562&r2=742563&view=diff
==
--- qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/tradedemo/topic_publisher.cpp Mon Feb  9 
15:27:19 2009
@@ -90,7 +90,7 @@
 
 virtual void publish_ticker(const std::string queue, unsigned short& 
curr_price);
 virtual void publish_market(const std::string queue, unsigned short& 
curr_price, int i);
-~Publisher() { };
+virtual ~Publisher() { };
 };
 
 Publisher::Publisher(Session& session, int ttl_time, const unsigned long 
shares[6]) : 



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



svn commit: r742602 - in /qpid/trunk/qpid/cpp/src/tests: ClusterFixture.cpp cluster_test.cpp

2009-02-09 Thread aconway
Author: aconway
Date: Mon Feb  9 16:33:48 2009
New Revision: 742602

URL: http://svn.apache.org/viewvc?rev=742602&view=rev
Log:
Fix doubly-defined function.

Modified:
qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp

Modified: qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp?rev=742602&r1=742601&r2=742602&view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/ClusterFixture.cpp Mon Feb  9 16:33:48 2009
@@ -60,18 +60,6 @@
 
 #include "ClusterFixture.h"
 
-
-/** Parse broker & cluster options */
-Broker::Options parseOpts(size_t argc, const char* argv[]) {
-Broker::Options opts;
-Plugin::addOptions(opts); // Pick up cluster options.
-opts.parse(argc, argv, "", true); // Allow-unknown for --load-module
-return opts;
-}
-
-
-
-
 ClusterFixture::ClusterFixture(size_t n, int localIndex_) : 
name(Uuid(true).str()), localIndex(localIndex_) {
 add(n);
 }
@@ -97,6 +85,16 @@
 }
 }
 
+namespace {
+/** Parse broker & cluster options */
+Broker::Options parseOpts(size_t argc, const char* argv[]) {
+Broker::Options opts;
+Plugin::addOptions(opts); // Pick up cluster options.
+opts.parse(argc, argv, "", true); // Allow-unknown for --load-module
+return opts;
+}
+}
+
 void ClusterFixture::addLocal() {
 assert(int(size()) == localIndex || localIndex == -1);
 localIndex = size();

Modified: qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp?rev=742602&r1=742601&r2=742602&view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp Mon Feb  9 16:33:48 2009
@@ -64,13 +64,6 @@
 using boost::shared_ptr;
 using qpid::cluster::Cluster;
 
-/** Parse broker & cluster options */
-Broker::Options parseOpts(size_t argc, const char* argv[]) {
-Broker::Options opts;
-Plugin::addOptions(opts); // Pick up cluster options.
-opts.parse(argc, argv, "", true); // Allow-unknown for --load-module
-return opts;
-}
 
 ostream& operator<<(ostream& o, const cpg_name* n) {
 return o << qpid::cluster::Cpg::str(*n);



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



[CONF] Apache Qpid: Java authorization plugins (page edited)

2009-02-09 Thread confluence










Page Edited :
qpid :
Java authorization plugins



 
Java authorization plugins
has been edited by Aidan Skinner
(Feb 09, 2009).
 

 
 (View changes)
 

Content:
The Qpid Java Server supports pluggable authorization modules through OSGi bundles.

New plugins must implement two classes. One of these should implement the org.apache.qpid.server.security.access.ACLPlugin interface. The other should implement the org.apache.qpid.server.security.access.ACLPluginFactory interface.

The ACLPluginFactory Interface.

This interface has two methods: boolean supportsTag(String) and ACLPlugin newInstance(Configuration). If the Factory can produce a plugin which is capable of handling the tag passed into supportsTag it must return true, otherwise it must return false.

If the plugin that the Factory is associated with supports that particular configuration tag, a new instance of that plugin should be created by newInstance and configured with the Configuration instance that is passed in.

The ACLPlugin Interface.

This interface has two types of method. setConfiguration is used to pass a Configuration object to the plugin to allow it to access configuration information. This will always be the complete children of one of the  sections of the server configuration file (either server-wide or one for a specific virtualhost).

The AuthzResult authorise* methods allow the plugin to restrict or grant access for a particular action. All methods take in an AMQProtocolSession to provide access to the authentication data and the underlying socket. If access should be granted, AuthzResult.ALLOWED should be returned. If access should be denied, AuthzResult.DENIED should be returned. If the plugin has no opinion as to whether access should be permitted, it should return AuthzResult.ABSTAIN. 

How authorization works

The collection of configured ACLPlugins are managed by an ACLManager class. This is queried by frame handlers as to whether access should be allowed or not. When this occurs, the manager conducts a vote amongst it's plugins. If any plugin votes to deny access, authorization is denied. If a server-level plugin denies access, but a virtualhost level plugin explicitly allows access, the virtualhost vote overrides the server-level plugins and it's vote is for access to be allowed. An instance of a plugin may abstain from a vote.











Powered by
Atlassian Confluence
(Version: 2.2.9 Build:#527 Sep 07, 2006)
-
Bug/feature request

Unsubscribe or edit your notifications preferences







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



svn commit: r742774 - in /qpid/trunk/qpid/cpp: examples/tradedemo/ src/ src/qpid/broker/ src/qpid/cluster/ src/qpid/framing/ src/tests/ xml/

2009-02-09 Thread aconway
Author: aconway
Date: Mon Feb  9 22:25:26 2009
New Revision: 742774

URL: http://svn.apache.org/viewvc?rev=742774&view=rev
Log:
Cluster support for message time-to-live.

Added:
qpid/trunk/qpid/cpp/src/qpid/broker/ExpiryPolicy.cpp   (with props)
qpid/trunk/qpid/cpp/src/qpid/broker/ExpiryPolicy.h   (with props)
qpid/trunk/qpid/cpp/src/qpid/cluster/ExpiryPolicy.cpp   (with props)
qpid/trunk/qpid/cpp/src/qpid/cluster/ExpiryPolicy.h   (with props)
Modified:
qpid/trunk/qpid/cpp/examples/tradedemo/   (props changed)
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/cluster.mk
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
qpid/trunk/qpid/cpp/src/qpid/broker/Message.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h
qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
qpid/trunk/qpid/cpp/src/qpid/framing/FrameSet.h
qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
qpid/trunk/qpid/cpp/src/tests/cluster_test.cpp
qpid/trunk/qpid/cpp/xml/cluster.xml

Propchange: qpid/trunk/qpid/cpp/examples/tradedemo/
--
--- svn:ignore (added)
+++ svn:ignore Mon Feb  9 22:25:26 2009
@@ -0,0 +1 @@
+Makefile.in

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=742774&r1=742773&r2=742774&view=diff
==
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Mon Feb  9 22:25:26 2009
@@ -358,6 +358,8 @@
   qpid/broker/Broker.cpp \
   qpid/broker/BrokerSingleton.cpp \
   qpid/broker/Exchange.cpp \
+  qpid/broker/ExpiryPolicy.h \
+  qpid/broker/ExpiryPolicy.cpp \
   qpid/broker/Queue.cpp \
   qpid/broker/QueueCleaner.cpp \
   qpid/broker/QueueListeners.cpp \

Modified: qpid/trunk/qpid/cpp/src/cluster.mk
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.mk?rev=742774&r1=742773&r2=742774&view=diff
==
--- qpid/trunk/qpid/cpp/src/cluster.mk (original)
+++ qpid/trunk/qpid/cpp/src/cluster.mk Mon Feb  9 22:25:26 2009
@@ -63,6 +63,8 @@
   qpid/cluster/Event.h \
   qpid/cluster/EventFrame.h\
   qpid/cluster/EventFrame.cpp  \
+  qpid/cluster/ExpiryPolicy.h  \
+  qpid/cluster/ExpiryPolicy.cpp\
   qpid/cluster/FailoverExchange.cpp\
   qpid/cluster/FailoverExchange.h  \
   qpid/cluster/Multicaster.cpp \

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=742774&r1=742773&r2=742774&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Mon Feb  9 22:25:26 2009
@@ -30,6 +30,7 @@
 #include "SecureConnectionFactory.h"
 #include "TopicExchange.h"
 #include "Link.h"
+#include "ExpiryPolicy.h"
 
 #include "qmf/org/apache/qpid/broker/Package.h"
 #include "qmf/org/apache/qpid/broker/ArgsBrokerEcho.h"
@@ -150,6 +151,7 @@
 queueCleaner(queues, timer),
 queueEvents(poller),
 recovery(true),
+expiryPolicy(new ExpiryPolicy),
 getKnownBrokers(boost::bind(&Broker::getKnownBrokersImpl, this))
 {
 if (conf.enableMgmt) {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=742774&r1=742773&r2=742774&view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Mon Feb  9 22:25:26 2009
@@ -36,6 +36,7 @@
 #include "Vhost.h"
 #include "System.h"
 #include "Timer.h"
+#include "ExpiryPolicy.h"
 #include "qpid/management/Manageable.h"
 #include "qpid/management/ManagementBroker.h"
 #include "qmf/org/apache/qpid/broker/Broker.h"
@@ -65,6 +66,8 @@
 
 namespace broker {
 
+class ExpiryPolicy;
+
 static const  uint16_t DEFAULT_PORT=5672;
 
 struct NoSuchTransportException : qpid::Exception
@@ -111,6 +114,8 @@
   private:
 typedef std::map > 
ProtocolFactoryMap;
 
+void declareStandardExchange(const std::string& name, const std::string& 
type);
+
 boost::shared_ptr poller;