Apply patch for: https://issues.apache.org/jira/browse/AMQ-3383

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

activemq-core/src/main/java/org/apache/activemq/command/ConnectionControl.java

@@ -33,6 +33,7 @@ public class ConnectionControl extends BaseCommand {
     protected boolean faultTolerant;
     protected String connectedBrokers="";
     protected String reconnectTo = "";
+    protected byte[] token;
     protected boolean rebalanceConnection;
 
     public byte getDataStructureType() {
@@ -166,4 +167,19 @@ public class ConnectionControl extends BaseCommand {
     public void setRebalanceConnection(boolean rebalanceConnection) {
         this.rebalanceConnection = rebalanceConnection;
     }
+
+    /**
+     * @openwire:property version=8
+     * @return the token
+     */
+    public byte[] getToken() {
+        return this.token;
+    }
+
+    /**
+     * @param token the token to set
+     */
+    public void setToken(byte[] token) {
+        this.token = token;
+    }
 }

activemq-core/src/test/java/org/apache/activemq/openwire/v8/ConnectionControlTest.java

@@ -1 +1 @@
-/**
 *
 * 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.v8;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for ConnectionControl
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ConnectionControlTest extends BaseCommandTestSupport {


    public static ConnectionControlTest SINGLETON = new ConnectionControlTest();

    public Object createObject() throws Exception {
        ConnectionControl info = new ConnectionControl();
        populateObject(info);
        return info;
    }

    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        ConnectionControl info = (ConnectionControl) object;

        info.setClose(true);
        info.setExit(false);
        info.setFaultTolerant(true);
        info.setResume(false);
        info.setSuspend(true);
        info.setConnectedBrokers("ConnectedBrokers:1");
        info.setReconnectTo("ReconnectTo:2");
        info.setRebalanceConnection(false);
    }
}
+/**
 *
 * 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.v8;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for ConnectionControl
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate
 *        this file.
 *
 *
 */
public class ConnectionControlTest extends BaseCommandTestSupport {


    public static ConnectionControlTest SINGLETON = new ConnectionControlTest();

    public Object createObject() throws Exception {
        ConnectionControl info = new ConnectionControl();
        populateObject(info);
        return info;
    }

    protected void populateObject(Object object) throws Exception {
        super.populateObject(object);
        ConnectionControl info = (ConnectionControl) object;

        info.setClose(true);
        info.setExit(false);
        info.setFaultTolerant(true);
        info.setResume(false);
        info.setSuspend(true);
        info.setConnectedBrokers("ConnectedBrokers:1");
        info.setReconnectTo("ReconnectTo:2");
        info.setRebalanceConnection(false);
        info.setToken("Token:3".getBytes());
    }
}