Import of qpid from etp:

  URL: https://etp.108.redhat.com/svn/etp/trunk/blaze
  Repository Root: https://etp.108.redhat.com/svn/etp
  Repository UUID: 06e15bec-b515-0410-bef0-cc27a458cf48
  Revision: 608



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@447994 13f79535-47bb-0310-9956-ffa450edef68

20 files changed, 1064 insertions, 0 deletions

diff --git a/cpp/common/framing/inc/AMQBody.h b/cpp/common/framing/inc/AMQBody.h
new file mode 100644
index 0000000000..d4b436c949
--- /dev/null
+++ b/cpp/common/framing/inc/AMQBody.h
@@ -0,0 +1,46 @@
+/*
+ *
+ * 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 "memory.h"
+#include "amqp_types.h"
+#include "Buffer.h"
+
+#ifndef _AMQBody_
+#define _AMQBody_
+
+namespace qpid {
+    namespace framing {
+
+        class AMQBody
+        {
+        public:
+            typedef std::tr1::shared_ptr<AMQBody> shared_ptr;
+
+            virtual u_int32_t size() const = 0;
+            virtual u_int8_t type() const = 0;
+            virtual void encode(Buffer& buffer) const = 0;
+            virtual void decode(Buffer& buffer, u_int32_t size) = 0;
+            inline virtual ~AMQBody(){}
+        };
+
+        enum body_types {METHOD_BODY = 1, HEADER_BODY = 2, CONTENT_BODY = 3, HEARTBEAT_BODY = 8};
+
+    }
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/AMQContentBody.h b/cpp/common/framing/inc/AMQContentBody.h
new file mode 100644
index 0000000000..8e97c31edb
--- /dev/null
+++ b/cpp/common/framing/inc/AMQContentBody.h
@@ -0,0 +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.
+ *
+ */
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+
+#ifndef _AMQContentBody_
+#define _AMQContentBody_
+
+namespace qpid {
+namespace framing {
+
+class AMQContentBody : virtual public AMQBody
+{
+    string data;
+
+public:
+    typedef std::tr1::shared_ptr<AMQContentBody> shared_ptr;
+
+    AMQContentBody();
+    AMQContentBody(string& data);
+    inline virtual ~AMQContentBody(){}
+    inline u_int8_t type() const { return CONTENT_BODY; };
+    inline string& getData(){ return data; }
+    u_int32_t size() const;
+    void encode(Buffer& buffer) const;
+    void decode(Buffer& buffer, u_int32_t size);
+};
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/AMQDataBlock.h b/cpp/common/framing/inc/AMQDataBlock.h
new file mode 100644
index 0000000000..6c47c78864
--- /dev/null
+++ b/cpp/common/framing/inc/AMQDataBlock.h
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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 "Buffer.h"
+
+#ifndef _AMQDataBlock_
+#define _AMQDataBlock_
+
+namespace qpid {
+namespace framing {
+
+class AMQDataBlock
+{
+public:
+    virtual ~AMQDataBlock() {}
+    virtual void encode(Buffer& buffer) = 0; 
+    virtual bool decode(Buffer& buffer) = 0; 
+    virtual u_int32_t size() const = 0;
+};
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/AMQFrame.h b/cpp/common/framing/inc/AMQFrame.h
new file mode 100644
index 0000000000..5656d20377
--- /dev/null
+++ b/cpp/common/framing/inc/AMQFrame.h
@@ -0,0 +1,61 @@
+/*
+ *
+ * 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 "amqp_methods.h"
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "AMQDataBlock.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "Buffer.h"
+
+#ifndef _AMQFrame_
+#define _AMQFrame_
+
+namespace qpid {
+    namespace framing {
+
+        class AMQFrame : virtual public AMQDataBlock
+        {
+            u_int16_t channel;
+            u_int8_t type;//used if the body is decoded separately from the 'head'
+            AMQBody::shared_ptr body;
+
+        public:
+            AMQFrame();
+            AMQFrame(u_int16_t channel, AMQBody* body);
+            AMQFrame(u_int16_t channel, AMQBody::shared_ptr& body);
+            virtual ~AMQFrame();
+            virtual void encode(Buffer& buffer); 
+            virtual bool decode(Buffer& buffer); 
+            virtual u_int32_t size() const;
+            u_int16_t getChannel();
+            AMQBody::shared_ptr& getBody();
+
+            u_int32_t decodeHead(Buffer& buffer); 
+            void decodeBody(Buffer& buffer, uint32_t size); 
+
+            friend std::ostream& operator<<(std::ostream& out, const AMQFrame& body);
+        };
+
+    }
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/AMQHeaderBody.h b/cpp/common/framing/inc/AMQHeaderBody.h
new file mode 100644
index 0000000000..369db8a9c8
--- /dev/null
+++ b/cpp/common/framing/inc/AMQHeaderBody.h
@@ -0,0 +1,55 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+#include "HeaderProperties.h"
+
+#ifndef _AMQHeaderBody_
+#define _AMQHeaderBody_
+
+namespace qpid {
+namespace framing {
+
+class AMQHeaderBody : virtual public AMQBody
+{
+    HeaderProperties* properties;
+    u_int16_t weight;
+    u_int64_t contentSize;
+
+    void createProperties(int classId);
+public:
+    typedef std::tr1::shared_ptr<AMQHeaderBody> shared_ptr;
+
+    AMQHeaderBody(int classId);
+    AMQHeaderBody();
+    inline u_int8_t type() const { return HEADER_BODY; }
+    HeaderProperties* getProperties(){ return properties; }
+    inline u_int64_t getContentSize() const { return contentSize; }
+    inline void setContentSize(u_int64_t size) { contentSize = size; }
+    virtual ~AMQHeaderBody();
+    virtual u_int32_t size() const;
+    virtual void encode(Buffer& buffer) const;
+    virtual void decode(Buffer& buffer, u_int32_t size);
+};
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/AMQHeartbeatBody.h b/cpp/common/framing/inc/AMQHeartbeatBody.h
new file mode 100644
index 0000000000..ca2def977a
--- /dev/null
+++ b/cpp/common/framing/inc/AMQHeartbeatBody.h
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+
+#ifndef _AMQHeartbeatBody_
+#define _AMQHeartbeatBody_
+
+namespace qpid {
+namespace framing {
+
+class AMQHeartbeatBody : virtual public AMQBody
+{
+public:
+    typedef std::tr1::shared_ptr<AMQHeartbeatBody> shared_ptr;
+
+    virtual ~AMQHeartbeatBody() {}
+    inline u_int32_t size() const { return 0; }
+    inline u_int8_t type() const { return HEARTBEAT_BODY; }
+    inline void encode(Buffer& buffer) const {}
+    inline void decode(Buffer& buffer, u_int32_t size) {}
+};
+
+}
+}
+
+#endif
diff --git a/cpp/common/framing/inc/AMQMethodBody.h b/cpp/common/framing/inc/AMQMethodBody.h
new file mode 100644
index 0000000000..59d5dd5212
--- /dev/null
+++ b/cpp/common/framing/inc/AMQMethodBody.h
@@ -0,0 +1,56 @@
+/*
+ *
+ * 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 <iostream>
+#include "amqp_types.h"
+#include "AMQBody.h"
+#include "Buffer.h"
+#include "AMQP_ServerOperations.h"
+
+#ifndef _AMQMethodBody_
+#define _AMQMethodBody_
+
+namespace qpid {
+namespace framing {
+
+class AMQMethodBody : virtual public AMQBody
+{
+public:
+    typedef std::tr1::shared_ptr<AMQMethodBody> shared_ptr;
+
+    inline u_int8_t type() const { return METHOD_BODY; }
+    inline u_int32_t size() const { return 4 + bodySize(); }
+    inline virtual ~AMQMethodBody(){}
+    virtual void print(std::ostream& out) const = 0;
+    virtual u_int16_t amqpMethodId() const = 0;
+    virtual u_int16_t amqpClassId() const = 0;
+    virtual void invoke(AMQP_ServerOperations& target, u_int16_t channel);
+    virtual void encodeContent(Buffer& buffer) const = 0;
+    virtual void decodeContent(Buffer& buffer) = 0;
+    virtual u_int32_t bodySize() const = 0;
+    void encode(Buffer& buffer) const;
+    void decode(Buffer& buffer, u_int32_t size);
+    bool match(AMQMethodBody* other) const;
+};
+
+std::ostream& operator<<(std::ostream& out, const AMQMethodBody& body);
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/BasicHeaderProperties.h b/cpp/common/framing/inc/BasicHeaderProperties.h
new file mode 100644
index 0000000000..8688a37bf9
--- /dev/null
+++ b/cpp/common/framing/inc/BasicHeaderProperties.h
@@ -0,0 +1,93 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "amqp_methods.h"
+#include "Buffer.h"
+#include "HeaderProperties.h"
+
+#ifndef _BasicHeaderProperties_
+#define _BasicHeaderProperties_
+
+namespace qpid {
+namespace framing {
+
+    //TODO: This could be easily generated from the spec
+    class BasicHeaderProperties : public HeaderProperties
+    {
+	string contentType;
+	string contentEncoding;
+	FieldTable headers;
+	u_int8_t deliveryMode;
+	u_int8_t priority;
+	string correlationId;
+	string replyTo;
+	string expiration;
+	string messageId;
+	u_int64_t timestamp;
+	string type;
+	string userId;
+	string appId;
+	string clusterId;
+	
+	u_int16_t getFlags() const;
+
+    public:
+	BasicHeaderProperties();
+	virtual ~BasicHeaderProperties();
+	virtual u_int32_t size() const;
+	virtual void encode(Buffer& buffer) const;
+	virtual void decode(Buffer& buffer, u_int32_t size);
+
+	inline virtual u_int8_t classId(){ return BASIC; }
+
+	inline string& getContentType(){ return contentType; }
+	inline string& getContentEncoding(){ return contentEncoding; }
+	inline FieldTable& getHeaders(){ return headers; }
+	inline u_int8_t getDeliveryMode(){ return deliveryMode; }
+	inline u_int8_t getPriority(){ return priority; }
+	inline string& getCorrelationId(){return correlationId; }
+	inline string& getReplyTo(){ return replyTo; }
+	inline string& getExpiration(){ return expiration; }
+	inline string& getMessageId(){return messageId; }
+	inline u_int64_t getTimestamp(){ return timestamp; }
+	inline string& getType(){ return type; }
+	inline string& getUserId(){ return userId; }
+	inline string& getAppId(){ return appId; }
+	inline string& getClusterId(){ return clusterId; }
+
+	void inline setContentType(string& type){ contentType = type; }
+	void inline setContentEncoding(string& encoding){ contentEncoding = encoding; }
+	void inline setHeaders(FieldTable& headers){ this->headers = headers; }
+	void inline setDeliveryMode(u_int8_t mode){ deliveryMode = mode; }
+	void inline setPriority(u_int8_t priority){ this->priority = priority; }
+	void inline setCorrelationId(string& correlationId){ this->correlationId = correlationId; }
+	void inline setReplyTo(string& replyTo){ this->replyTo = replyTo;}
+	void inline setExpiration(string&  expiration){ this->expiration = expiration; }
+	void inline setMessageId(string& messageId){ this->messageId = messageId; }
+	void inline setTimestamp(u_int64_t timestamp){ this->timestamp = timestamp; }
+	void inline setType(string& type){ this->type = type; }
+	void inline setUserId(string& userId){ this->userId = userId; }
+	void inline setAppId(string& appId){this->appId = appId; }
+	void inline setClusterId(string& clusterId){ this->clusterId = clusterId; }
+    };
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/BodyHandler.h b/cpp/common/framing/inc/BodyHandler.h
new file mode 100644
index 0000000000..f92ae66804
--- /dev/null
+++ b/cpp/common/framing/inc/BodyHandler.h
@@ -0,0 +1,50 @@
+/*
+ *
+ * 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 <string>
+
+#ifndef _BodyHandler_
+#define _BodyHandler_
+
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+
+namespace qpid {
+namespace framing {
+
+    class BodyHandler{
+    public:
+	virtual void handleMethod(AMQMethodBody::shared_ptr body) = 0;
+	virtual void handleHeader(AMQHeaderBody::shared_ptr body) = 0;
+	virtual void handleContent(AMQContentBody::shared_ptr body) = 0;
+	virtual void handleHeartbeat(AMQHeartbeatBody::shared_ptr body) = 0;
+
+        void handleBody(AMQBody::shared_ptr& body);
+    };
+
+    class UnknownBodyType{
+    public:
+	const u_int16_t type;
+	inline UnknownBodyType(u_int16_t _type) : type(_type){}
+    };
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/Buffer.h b/cpp/common/framing/inc/Buffer.h
new file mode 100644
index 0000000000..1ff4611f1f
--- /dev/null
+++ b/cpp/common/framing/inc/Buffer.h
@@ -0,0 +1,77 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "FieldTable.h" 
+
+#ifndef _Buffer_
+#define _Buffer_
+
+namespace qpid {
+namespace framing {
+
+class Buffer
+{
+    const int size;
+    char* data;
+    int position;
+    int limit;
+    int r_position;
+    int r_limit;
+
+public:
+
+    Buffer(int size);
+    ~Buffer();
+
+    void flip();
+    void clear();
+    void compact();
+    void record();
+    void restore();
+    int available();
+    char* start();
+    void move(int bytes);
+    
+    void putOctet(u_int8_t i);
+    void putShort(u_int16_t i);
+    void putLong(u_int32_t i);
+    void putLongLong(u_int64_t i);
+
+    u_int8_t getOctet();
+    u_int16_t getShort(); 
+    u_int32_t getLong();
+    u_int64_t getLongLong();
+
+    void putShortString(const string& s);
+    void putLongString(const string& s);
+    void getShortString(string& s);
+    void getLongString(string& s);
+
+    void putFieldTable(const FieldTable& t);
+    void getFieldTable(FieldTable& t);
+
+    void putRawData(const string& s);
+    void getRawData(string& s, u_int32_t size);
+
+};
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/FieldTable.h b/cpp/common/framing/inc/FieldTable.h
new file mode 100644
index 0000000000..cf935d3284
--- /dev/null
+++ b/cpp/common/framing/inc/FieldTable.h
@@ -0,0 +1,68 @@
+/*
+ *
+ * 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 <iostream>
+#include <vector>
+#include "amqp_types.h"
+
+#ifndef _FieldTable_
+#define _FieldTable_
+
+namespace qpid {
+namespace framing {
+
+    class NamedValue;
+    class Value;
+    class Buffer;
+
+    class FieldTable
+    {
+	std::vector<NamedValue*> values;
+	NamedValue* find(const std::string& name) const;
+
+	Value* getValue(const std::string& name) const;
+	void setValue(const std::string& name, Value* value);
+
+    public:
+	~FieldTable();
+	u_int32_t size() const;
+	int count() const;
+	void setString(const std::string& name, const std::string& value);
+	void setInt(const std::string& name, int value);
+	void setTimestamp(const std::string& name, u_int64_t value);
+	void setTable(const std::string& name, const FieldTable& value);
+	//void setDecimal(string& name, xxx& value);
+        std::string getString(const std::string& name);
+	int getInt(const std::string& name);
+	u_int64_t getTimestamp(const std::string& name);
+	void getTable(const std::string& name, FieldTable& value);
+	//void getDecimal(string& name, xxx& value);
+
+	void encode(Buffer& buffer) const;
+	void decode(Buffer& buffer);
+
+	friend std::ostream& operator<<(std::ostream& out, const FieldTable& body);
+    };
+
+    class FieldNotFoundException{};
+    class UnknownFieldName : public FieldNotFoundException{};
+    class IncorrectFieldType : public FieldNotFoundException{};
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/HeaderProperties.h b/cpp/common/framing/inc/HeaderProperties.h
new file mode 100644
index 0000000000..f84345c203
--- /dev/null
+++ b/cpp/common/framing/inc/HeaderProperties.h
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "Buffer.h"
+
+#ifndef _HeaderProperties_
+#define _HeaderProperties_
+
+namespace qpid {
+namespace framing {
+
+    enum header_classes{BASIC = 60};
+
+    class HeaderProperties
+    {
+	
+    public:
+	inline virtual ~HeaderProperties(){}
+	virtual u_int8_t classId() = 0;
+	virtual u_int32_t size() const = 0;
+	virtual void encode(Buffer& buffer) const = 0;
+	virtual void decode(Buffer& buffer, u_int32_t size) = 0;
+    };
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/InitiationHandler.h b/cpp/common/framing/inc/InitiationHandler.h
new file mode 100644
index 0000000000..2e8d1e652b
--- /dev/null
+++ b/cpp/common/framing/inc/InitiationHandler.h
@@ -0,0 +1,37 @@
+/*
+ *
+ * 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 <string>
+
+#ifndef _InitiationHandler_
+#define _InitiationHandler_
+
+#include "ProtocolInitiation.h"
+
+namespace qpid {
+namespace framing {
+
+    class InitiationHandler{
+    public:
+	virtual void initiated(ProtocolInitiation* header) = 0;
+    };
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/InputHandler.h b/cpp/common/framing/inc/InputHandler.h
new file mode 100644
index 0000000000..2722cae0ed
--- /dev/null
+++ b/cpp/common/framing/inc/InputHandler.h
@@ -0,0 +1,37 @@
+/*
+ *
+ * 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 <string>
+
+#ifndef _InputHandler_
+#define _InputHandler_
+
+#include "AMQFrame.h"
+
+namespace qpid {
+namespace framing {
+
+    class InputHandler{
+    public:
+	virtual void received(AMQFrame* frame) = 0;
+    };
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/NamedValue.h b/cpp/common/framing/inc/NamedValue.h
new file mode 100644
index 0000000000..729b5d08a7
--- /dev/null
+++ b/cpp/common/framing/inc/NamedValue.h
@@ -0,0 +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.
+ *
+ */
+#include <iostream>
+#include <vector>
+#include "amqp_types.h"
+#include "Value.h"
+
+#ifndef _NamedValue_
+#define _NamedValue_
+
+namespace qpid {
+namespace framing {
+
+    class Buffer;
+
+    class NamedValue{
+	string name;
+	Value* value;
+    public:
+	NamedValue();
+	NamedValue(const string& name, Value* value);
+	~NamedValue();
+	void encode(Buffer& buffer);
+	void decode(Buffer& buffer);
+	u_int32_t size() const;
+	inline const string& getName() const { return name; }
+	inline Value* getValue() const { return value; }
+	inline void setValue(Value* val) { value = val; }
+    };
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/OutputHandler.h b/cpp/common/framing/inc/OutputHandler.h
new file mode 100644
index 0000000000..7fe63660c3
--- /dev/null
+++ b/cpp/common/framing/inc/OutputHandler.h
@@ -0,0 +1,37 @@
+/*
+ *
+ * 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 <string>
+
+#ifndef _OutputHandler_
+#define _OutputHandler_
+
+#include "AMQFrame.h"
+
+namespace qpid {
+namespace framing {
+
+    class OutputHandler{
+    public:
+	virtual void send(AMQFrame* frame) = 0;
+    };
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/ProtocolInitiation.h b/cpp/common/framing/inc/ProtocolInitiation.h
new file mode 100644
index 0000000000..ab9734e6b3
--- /dev/null
+++ b/cpp/common/framing/inc/ProtocolInitiation.h
@@ -0,0 +1,48 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "Buffer.h"
+#include "AMQDataBlock.h"
+
+#ifndef _ProtocolInitiation_
+#define _ProtocolInitiation_
+
+namespace qpid {
+namespace framing {
+
+class ProtocolInitiation : virtual public AMQDataBlock
+{
+    u_int8_t pmajor;
+    u_int8_t pminor;
+    
+public:
+    ProtocolInitiation();
+    ProtocolInitiation(u_int8_t major, u_int8_t minor);
+    virtual ~ProtocolInitiation();
+    virtual void encode(Buffer& buffer); 
+    virtual bool decode(Buffer& buffer); 
+    inline virtual u_int32_t size() const { return 8; }
+    inline u_int8_t getMajor(){ return pmajor; }
+    inline u_int8_t getMinor(){ return pminor; }
+};
+
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/Value.h b/cpp/common/framing/inc/Value.h
new file mode 100644
index 0000000000..e3d2a2c1d6
--- /dev/null
+++ b/cpp/common/framing/inc/Value.h
@@ -0,0 +1,109 @@
+/*
+ *
+ * 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 <iostream>
+#include <vector>
+#include "amqp_types.h"
+#include "FieldTable.h"
+
+#ifndef _Value_
+#define _Value_
+
+namespace qpid {
+namespace framing {
+
+    class Buffer;
+
+    class Value{
+    public:
+	inline virtual ~Value(){}
+	virtual u_int32_t size() const = 0;
+	virtual char getType() const = 0;
+	virtual void encode(Buffer& buffer) = 0;
+	virtual void decode(Buffer& buffer) = 0;
+    };
+
+    class StringValue : public virtual Value{
+	string value;
+	
+    public:
+	inline StringValue(const string& v) : value(v){}
+        inline StringValue(){}
+	inline string getValue(){ return value; }
+	~StringValue(){}
+	inline virtual u_int32_t size() const { return 4 + value.length(); }
+	inline virtual char getType() const { return 'S'; }
+	virtual void encode(Buffer& buffer);
+	virtual void decode(Buffer& buffer);
+    };
+
+    class IntegerValue : public virtual Value{
+	int value;
+    public:
+	inline IntegerValue(int v) : value(v){}
+	inline IntegerValue(){}
+	inline int getValue(){ return value; }
+	~IntegerValue(){}
+	inline virtual u_int32_t size() const { return 4; }
+	inline virtual char getType() const { return 'I'; }
+	virtual void encode(Buffer& buffer);
+	virtual void decode(Buffer& buffer);
+    };
+
+    class TimeValue : public virtual Value{
+	u_int64_t value;
+    public:
+	inline TimeValue(int v) : value(v){}
+	inline TimeValue(){}
+	inline u_int64_t getValue(){ return value; }
+	~TimeValue(){}
+	inline virtual u_int32_t size() const { return 8; }
+	inline virtual char getType() const { return 'T'; }
+	virtual void encode(Buffer& buffer);
+	virtual void decode(Buffer& buffer);
+    };
+
+    class DecimalValue : public virtual Value{
+	u_int8_t decimals;
+	u_int32_t value;
+    public:
+	inline DecimalValue(int v) : value(v){}
+	inline DecimalValue(){}
+	~DecimalValue(){}
+	inline virtual u_int32_t size() const { return 5; }
+	inline virtual char getType() const { return 'D'; }
+	virtual void encode(Buffer& buffer);
+	virtual void decode(Buffer& buffer);
+    };
+
+    class FieldTableValue : public virtual Value{
+	FieldTable value;
+    public:
+	inline FieldTableValue(const FieldTable& v) : value(v){}
+	inline FieldTableValue(){}
+	inline FieldTable getValue(){ return value; }
+	~FieldTableValue(){}
+	inline virtual u_int32_t size() const { return 4 + value.size(); }
+	inline virtual char getType() const { return 'F'; }
+	virtual void encode(Buffer& buffer);
+	virtual void decode(Buffer& buffer);
+    };
+}
+}
+
+
+#endif
diff --git a/cpp/common/framing/inc/amqp_framing.h b/cpp/common/framing/inc/amqp_framing.h
new file mode 100644
index 0000000000..adb0045ee5
--- /dev/null
+++ b/cpp/common/framing/inc/amqp_framing.h
@@ -0,0 +1,31 @@
+/*
+ *
+ * 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 "amqp_types.h"
+#include "AMQFrame.h"
+#include "AMQBody.h"
+#include "BodyHandler.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "amqp_methods.h"
+#include "InputHandler.h"
+#include "OutputHandler.h"
+#include "InitiationHandler.h"
+#include "ProtocolInitiation.h"
+#include "BasicHeaderProperties.h"
diff --git a/cpp/common/framing/inc/amqp_types.h b/cpp/common/framing/inc/amqp_types.h
new file mode 100644
index 0000000000..6f8ef0862a
--- /dev/null
+++ b/cpp/common/framing/inc/amqp_types.h
@@ -0,0 +1,36 @@
+/*
+ *
+ * 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 <string>
+#ifdef _WINDOWS
+#include "windows.h"
+typedef unsigned char  u_int8_t;
+typedef unsigned short u_int16_t;
+typedef unsigned int   u_int32_t;
+typedef unsigned __int64 u_int64_t;
+#endif
+#ifndef _WINDOWS
+#include "sys/types.h"
+#endif
+
+#ifndef AMQP_TYPES_H
+#define AMQP_TYPES_H
+
+
+typedef std::string string;
+
+#endif