2 files changed, 43 insertions, 0 deletions
diff --git a/java/common/src/main/java/org/apache/qpid/framing/Content.java b/java/common/src/main/java/org/apache/qpid/framing/Content.java
new file mode 100644
index 0000000000..e5feeec2a4
--- /dev/null
+++ b/java/common/src/main/java/org/apache/qpid/framing/Content.java
@@ -0,0 +1,26 @@
+/*
+ *
+ * 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.
+ *
+ */
+package org.apache.qpid.framing;
+
+public interface Content
+{
+	// TODO: New Content class required for AMQP 0-9.
+}
diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
index 65589a0cb9..bc818b66ad 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
@@ -98,6 +98,12 @@ public class EncodingUtils
         }
     }
 
+    public static int encodedContentLength(Content table)
+    {
+    	// TODO: New Content class required for AMQP 0-9.
+        return 0;
+    }
+
     public static void writeShortStringBytes(ByteBuffer buffer, String s)
     {
         if (s != null)
@@ -225,6 +231,11 @@ public class EncodingUtils
         }
     }
 
+    public static void writeContentBytes(ByteBuffer buffer, Content content)
+    {
+    	// TODO: New Content class required for AMQP 0-9.
+    }
+
     public static void writeBooleans(ByteBuffer buffer, boolean[] values)
     {
         byte packedValue = 0;
@@ -289,6 +300,12 @@ public class EncodingUtils
         }
     }
 
+    public static Content readContent(ByteBuffer buffer) throws AMQFrameDecodingException
+    {
+    	// TODO: New Content class required for AMQP 0-9.
+    	return new Content();
+    }
+
     public static String readShortString(ByteBuffer buffer)
     {
         short length = buffer.getUnsigned();