You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2009/09/25 22:24:24 UTC
svn commit: r818994 [2/2] - in /qpid/trunk/qpid/cpp: bindings/qmf/
bindings/qmf/python/ bindings/qmf/ruby/ bindings/qmf/tests/ include/qmf/
include/qmf/engine/ src/ src/qmf/ src/qmf/engine/ src/qpid/broker/
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/ObjectIdImpl.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/ObjectIdImpl.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ObjectIdImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.cpp Fri Sep 25 20:24:22 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-#include "qmf/ObjectIdImpl.h"
+#include "qmf/engine/ObjectIdImpl.h"
#include <stdlib.h>
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using qpid::framing::Buffer;
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/ObjectIdImpl.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.h&p1=qpid/trunk/qpid/cpp/src/qmf/ObjectIdImpl.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ObjectIdImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ObjectIdImpl.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfObjectIdImpl_
-#define _QmfObjectIdImpl_
+#ifndef _QmfEngineObjectIdImpl_
+#define _QmfEngineObjectIdImpl_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,10 +20,11 @@
* under the License.
*/
-#include <qmf/ObjectId.h>
+#include <qmf/engine/ObjectId.h>
#include <qpid/framing/Buffer.h>
namespace qmf {
+namespace engine {
struct AgentAttachment {
uint64_t first;
@@ -64,6 +65,7 @@
bool operator>(const ObjectIdImpl& other) const;
};
}
+}
#endif
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/ObjectImpl.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/ObjectImpl.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ObjectImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.cpp Fri Sep 25 20:24:22 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-#include "qmf/ObjectImpl.h"
-#include "qmf/ValueImpl.h"
-#include "qmf/BrokerProxyImpl.h"
+#include "qmf/engine/ObjectImpl.h"
+#include "qmf/engine/ValueImpl.h"
+#include "qmf/engine/BrokerProxyImpl.h"
#include <qpid/sys/Time.h>
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using namespace qpid::sys;
using qpid::framing::Buffer;
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/ObjectImpl.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.h&p1=qpid/trunk/qpid/cpp/src/qmf/ObjectImpl.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ObjectImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ObjectImpl.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfObjectImpl_
-#define _QmfObjectImpl_
+#ifndef _QmfEngineObjectImpl_
+#define _QmfEngineObjectImpl_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@
* under the License.
*/
-#include <qmf/Object.h>
-#include <qmf/ObjectIdImpl.h>
+#include <qmf/engine/Object.h>
+#include <qmf/engine/ObjectIdImpl.h>
#include <map>
#include <set>
#include <string>
@@ -30,6 +30,7 @@
#include <qpid/sys/Mutex.h>
namespace qmf {
+namespace engine {
class BrokerProxyImpl;
@@ -69,6 +70,7 @@
void encodeStatistics(qpid::framing::Buffer& buffer) const;
};
}
+}
#endif
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/Protocol.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/Protocol.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Protocol.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.cpp Fri Sep 25 20:24:22 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-#include "qmf/Protocol.h"
+#include "qmf/engine/Protocol.h"
#include "qpid/framing/Buffer.h"
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using namespace qpid::framing;
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/Protocol.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.h&p1=qpid/trunk/qpid/cpp/src/qmf/Protocol.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Protocol.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/Protocol.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfProtocol_
-#define _QmfProtocol_
+#ifndef _QmfEngineProtocol_
+#define _QmfEngineProtocol_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,6 +29,7 @@
}
namespace qmf {
+namespace engine {
class Protocol {
public:
@@ -62,6 +63,7 @@
};
}
+}
#endif
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/QueryImpl.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/QueryImpl.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/QueryImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.cpp Fri Sep 25 20:24:22 2009
@@ -17,13 +17,13 @@
* under the License.
*/
-#include "qmf/QueryImpl.h"
-#include "qmf/ObjectIdImpl.h"
+#include "qmf/engine/QueryImpl.h"
+#include "qmf/engine/ObjectIdImpl.h"
#include "qpid/framing/Buffer.h"
#include "qpid/framing/FieldTable.h"
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using namespace qpid::framing;
bool QueryElementImpl::evaluate(const Object* /*object*/) const
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/QueryImpl.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.h&p1=qpid/trunk/qpid/cpp/src/qmf/QueryImpl.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/QueryImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/QueryImpl.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfQueryImpl_
-#define _QmfQueryImpl_
+#ifndef _QmfEngineQueryImpl_
+#define _QmfEngineQueryImpl_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@
* under the License.
*/
-#include "qmf/Query.h"
-#include "qmf/Schema.h"
+#include "qmf/engine/Query.h"
+#include "qmf/engine/Schema.h"
#include <string>
#include <boost/shared_ptr.hpp>
@@ -32,6 +32,7 @@
}
namespace qmf {
+namespace engine {
struct QueryElementImpl {
QueryElementImpl(const std::string& a, const Value* v, ValueOper o) : attrName(a), value(v), oper(o) {}
@@ -94,5 +95,6 @@
bool orderDecreasing;
};
}
+}
#endif
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ResilientConnection.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ResilientConnection.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ResilientConnection.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ResilientConnection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ResilientConnection.cpp Fri Sep 25 20:24:22 2009
@@ -17,9 +17,9 @@
* under the License.
*/
-#include "qmf/ResilientConnection.h"
-#include "qmf/MessageImpl.h"
-#include "qmf/ConnectionSettingsImpl.h"
+#include "qmf/engine/ResilientConnection.h"
+#include "qmf/engine/MessageImpl.h"
+#include "qmf/engine/ConnectionSettingsImpl.h"
#include <qpid/client/Connection.h>
#include <qpid/client/Session.h>
#include <qpid/client/MessageListener.h>
@@ -41,11 +41,12 @@
#include <boost/noncopyable.hpp>
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using namespace qpid;
using qpid::sys::Mutex;
namespace qmf {
+namespace engine {
struct ResilientConnectionEventImpl {
ResilientConnectionEvent::EventKind kind;
void* sessionContext;
@@ -87,7 +88,7 @@
void popEvent();
bool createSession(const char* name, void* sessionContext, SessionHandle& handle);
void destroySession(SessionHandle handle);
- void sendMessage(SessionHandle handle, qmf::Message& message);
+ void sendMessage(SessionHandle handle, qmf::engine::Message& message);
void declareQueue(SessionHandle handle, char* queue);
void deleteQueue(SessionHandle handle, char* queue);
void bind(SessionHandle handle, char* exchange, char* queue, char* key);
@@ -120,6 +121,7 @@
set<RCSession::Ptr> sessions;
};
}
+}
ResilientConnectionEvent ResilientConnectionEventImpl::copy()
{
@@ -166,7 +168,7 @@
void RCSession::received(client::Message& msg)
{
- qmf::MessageImpl qmsg;
+ MessageImpl qmsg;
qmsg.body = msg.getData();
qpid::framing::MessageProperties p = msg.getMessageProperties();
@@ -252,7 +254,7 @@
}
}
-void ResilientConnectionImpl::sendMessage(SessionHandle handle, qmf::Message& message)
+void ResilientConnectionImpl::sendMessage(SessionHandle handle, qmf::engine::Message& message)
{
Mutex::ScopedLock _lock(lock);
RCSession::Ptr sess = RCSession::Ptr((RCSession*) handle.impl);
@@ -393,7 +395,7 @@
void ResilientConnectionImpl::EnqueueEvent(ResilientConnectionEvent::EventKind kind,
void* sessionContext,
- const qmf::MessageImpl& message,
+ const MessageImpl& message,
const string& errorText)
{
Mutex::ScopedLock _lock(lock);
@@ -450,7 +452,7 @@
impl->destroySession(handle);
}
-void ResilientConnection::sendMessage(SessionHandle handle, qmf::Message& message)
+void ResilientConnection::sendMessage(SessionHandle handle, qmf::engine::Message& message)
{
impl->sendMessage(handle, message);
}
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/SchemaImpl.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/SchemaImpl.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/SchemaImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.cpp Fri Sep 25 20:24:22 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "qmf/SchemaImpl.h"
+#include "qmf/engine/SchemaImpl.h"
#include <qpid/framing/Buffer.h>
#include <qpid/framing/FieldTable.h>
#include <qpid/framing/Uuid.h>
@@ -26,7 +26,7 @@
#include <vector>
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using qpid::framing::Buffer;
using qpid::framing::FieldTable;
using qpid::framing::Uuid;
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/SchemaImpl.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.h&p1=qpid/trunk/qpid/cpp/src/qmf/SchemaImpl.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/SchemaImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/SchemaImpl.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfSchemaImpl_
-#define _QmfSchemaImpl_
+#ifndef _QmfEngineSchemaImpl_
+#define _QmfEngineSchemaImpl_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,12 +20,13 @@
* under the License.
*/
-#include "qmf/Schema.h"
+#include "qmf/engine/Schema.h"
#include <string>
#include <vector>
#include <qpid/framing/Buffer.h>
namespace qmf {
+namespace engine {
// TODO: Destructors for schema classes
// TODO: Add "frozen" attribute for schema classes so they can't be modified after
@@ -215,6 +216,7 @@
const SchemaArgument* getArgument(int idx) const;
};
}
+}
#endif
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/SequenceManager.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/SequenceManager.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/SequenceManager.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.cpp Fri Sep 25 20:24:22 2009
@@ -17,10 +17,10 @@
* under the License.
*/
-#include "qmf/SequenceManager.h"
+#include "qmf/engine/SequenceManager.h"
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using namespace qpid::sys;
SequenceManager::SequenceManager() : nextSequence(1) {}
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/SequenceManager.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.h&p1=qpid/trunk/qpid/cpp/src/qmf/SequenceManager.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/SequenceManager.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/SequenceManager.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfSequenceManager_
-#define _QmfSequenceManager_
+#ifndef _QmfEngineSequenceManager_
+#define _QmfEngineSequenceManager_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +31,7 @@
}
namespace qmf {
+namespace engine {
class SequenceContext {
public:
@@ -61,6 +62,7 @@
};
}
+}
#endif
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.cpp (from r818917, qpid/trunk/qpid/cpp/src/qmf/ValueImpl.cpp)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.cpp?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.cpp&p1=qpid/trunk/qpid/cpp/src/qmf/ValueImpl.cpp&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ValueImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.cpp Fri Sep 25 20:24:22 2009
@@ -17,11 +17,11 @@
* under the License.
*/
-#include "qmf/ValueImpl.h"
+#include "qmf/engine/ValueImpl.h"
#include <qpid/framing/FieldTable.h>
using namespace std;
-using namespace qmf;
+using namespace qmf::engine;
using qpid::framing::Buffer;
ValueImpl::ValueImpl(Typecode t, Buffer& buf) : typecode(t)
Copied: qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.h (from r818917, qpid/trunk/qpid/cpp/src/qmf/ValueImpl.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.h?p2=qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.h&p1=qpid/trunk/qpid/cpp/src/qmf/ValueImpl.h&r1=818917&r2=818994&rev=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ValueImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/engine/ValueImpl.h Fri Sep 25 20:24:22 2009
@@ -1,5 +1,5 @@
-#ifndef _QmfValueImpl_
-#define _QmfValueImpl_
+#ifndef _QmfEngineValueImpl_
+#define _QmfEngineValueImpl_
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@
* under the License.
*/
-#include <qmf/Value.h>
-#include <qmf/ObjectIdImpl.h>
-#include <qmf/Object.h>
+#include <qmf/engine/Value.h>
+#include <qmf/engine/ObjectIdImpl.h>
+#include <qmf/engine/Object.h>
#include <qpid/framing/Buffer.h>
#include <string>
#include <string.h>
@@ -31,6 +31,7 @@
#include <boost/shared_ptr.hpp>
namespace qmf {
+namespace engine {
// TODO: set valid flag on all value settors
// TODO: add a modified flag and accessors
@@ -143,6 +144,7 @@
void deleteArrayItem(uint32_t idx);
};
}
+}
#endif
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=818994&r1=818993&r2=818994&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Fri Sep 25 20:24:22 2009
@@ -65,7 +65,7 @@
tagGenerator("sgen"),
dtxSelected(false),
authMsg(getSession().getBroker().getOptions().auth && !getSession().getConnection().isFederationLink()),
- userID(getSession().getConnection().getUserId().substr(0,getSession().getConnection().getUserId().find('@')))
+ userID(getSession().getConnection().getUserId())
{
acl = getSession().getBroker().getAcl();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org