Repository: activemq-openwire
Updated Branches:
  refs/heads/master 45ecbaf56 -> 49ea39f1a


http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/49ea39f1/openwire-core/src/main/java/org/apache/activemq/openwire/commands/CommandTypes.java
----------------------------------------------------------------------
diff --git 
a/openwire-core/src/main/java/org/apache/activemq/openwire/commands/CommandTypes.java
 
b/openwire-core/src/main/java/org/apache/activemq/openwire/commands/CommandTypes.java
index b522c81..9acc094 100644
--- 
a/openwire-core/src/main/java/org/apache/activemq/openwire/commands/CommandTypes.java
+++ 
b/openwire-core/src/main/java/org/apache/activemq/openwire/commands/CommandTypes.java
@@ -22,10 +22,13 @@ package org.apache.activemq.openwire.commands;
 public interface CommandTypes {
 
     // What is the latest version of the openwire protocol
-    byte PROTOCOL_VERSION = 10;
+    byte PROTOCOL_VERSION = 11;
 
-    // What is the latest version of the message store
-    byte PROTOCOL_STORE_VERSION = 6;
+    // What is the latest version of the openwire protocol used in the stores
+    byte PROTOCOL_STORE_VERSION = 11;
+
+    // What is the legacy version that old KahaDB store's most commonly used
+    byte PROTOCOL_LEGACY_STORE_VERSION = 6;
 
     // A marshaling layer can use this type to specify a null object.
     byte NULL = 0;

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/49ea39f1/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/OpenWireV11Test.java
----------------------------------------------------------------------
diff --git 
a/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/OpenWireV11Test.java
 
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/OpenWireV11Test.java
new file mode 100644
index 0000000..736747d
--- /dev/null
+++ 
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/OpenWireV11Test.java
@@ -0,0 +1,34 @@
+/**
+ * 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.activemq.openwire.codec.v11;
+
+import org.apache.activemq.openwire.codec.OpenWireInteropTests;
+
+public class OpenWireV11Test extends OpenWireInteropTests {
+
+    /**
+     * @param tightEncodingEnabled
+     */
+    public OpenWireV11Test(boolean tightEncodingEnabled) {
+        super(tightEncodingEnabled);
+    }
+
+    @Override
+    protected int getOpenWireVersion() {
+        return 11;
+    }
+}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/49ea39f1/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/WireFormatInfoV11MarshaledSizeTest.java
----------------------------------------------------------------------
diff --git 
a/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/WireFormatInfoV11MarshaledSizeTest.java
 
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/WireFormatInfoV11MarshaledSizeTest.java
new file mode 100644
index 0000000..b40bfb4
--- /dev/null
+++ 
b/openwire-interop-tests/src/test/java/org/apache/activemq/openwire/codec/v11/WireFormatInfoV11MarshaledSizeTest.java
@@ -0,0 +1,30 @@
+/**
+ * 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.activemq.openwire.codec.v11;
+
+import org.apache.activemq.openwire.codec.WireFormatInfoMarshaledSizeTest;
+
+/**
+ * Test marshaling with WireFormatInfo for this Version.
+ */
+public class WireFormatInfoV11MarshaledSizeTest extends 
WireFormatInfoMarshaledSizeTest {
+
+    @Override
+    public int getVersion() {
+        return 11;
+    }
+}

Reply via email to