January 2010 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r8830 - in branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq: core/server/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 12:05:06 -0500 (Thu, 21 Jan 2010) New Revision: 8830 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompUtils.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java Removed: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * code cleanup Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -85,8 +85,6 @@ void removeSession(String name) throws Exception; - ServerSession getSession(String name); - Set<ServerSession> getSessions(); boolean isStarted(); Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -598,11 +598,6 @@ sessions.remove(name); } - public ServerSession getSession(final String name) - { - return sessions.get(name); - } - public synchronized List<ServerSession> getSessions(final String connectionID) { Set<Entry<String, ServerSession>> sessionEntries = sessions.entrySet(); Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -1,50 +0,0 @@ -/** - * - * 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.hornetq.integration.protocol.stomp; - -import java.io.IOException; - -/** - * @author <a href="http://hiramchirino.com">chirino</a> - */ -class ProtocolException extends IOException { - private static final long serialVersionUID = -2869735532997332242L; - private final boolean fatal; - - public ProtocolException() { - this(null); - } - - public ProtocolException(String s) { - this(s, false); - } - - public ProtocolException(String s, boolean fatal) { - this(s, fatal, null); - } - - public ProtocolException(String s, boolean fatal, Throwable cause) { - super(s); - this.fatal = fatal; - initCause(cause); - } - - public boolean isFatal() { - return fatal; - } -} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -14,6 +14,7 @@ package org.hornetq.integration.protocol.stomp; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.HashMap; @@ -51,7 +52,7 @@ private final Map<RemotingConnection, ServerSession> sessions = new HashMap<RemotingConnection, ServerSession>(); - private ServerHolder serverHandler; + private ServerHolder serverHolder; public StompChannelHandler(ServerHolder serverHolder, final ChannelGroup group, @@ -59,18 +60,18 @@ final ConnectionLifeCycleListener listener) { super(group, listener, acceptor); - this.serverHandler = serverHolder; + this.serverHolder = serverHolder; this.marshaller = new StompMarshaller(); } public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { StompFrame frame = (StompFrame)e.getMessage(); - System.out.println(">>> got frame " + frame); + System.out.println("RECEIVED " + frame); // need to interact with HornetQ server & session - HornetQServer server = serverHandler.getServer(); - RemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); + HornetQServer server = serverHolder.getServer(); + RemotingConnection connection = serverHolder.getRemotingConnection(e.getChannel().getId()); try { @@ -104,11 +105,7 @@ if (response != null) { - System.out.println(">>> will reply " + response); - byte[] bytes = marshaller.marshal(response); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); - System.out.println("ready to send reply: " + buffer); - connection.getTransportConnection().write(buffer, true); + send(connection, response); } } catch (StompException ex) @@ -129,11 +126,7 @@ } StompFrame errorMessage = new StompFrame(Stomp.Responses.ERROR, headers, baos.toByteArray()); - byte[] bytes = marshaller.marshal(errorMessage); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); - System.out.println("ready to send reply: " + buffer); - connection.getTransportConnection().write(buffer, true); - + send(connection, errorMessage); } catch (Exception ex) { @@ -141,21 +134,13 @@ } } - /** - * @param frame - * @param server - * @param connection - * @return - * @throws StompException - * @throws HornetQException - */ private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, StompException, HornetQException { Map<String, Object> headers = frame.getHeaders(); String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); - SimpleString queueName = StompDestinationConverter.toHornetQAddress(queue); + SimpleString queueName = StompUtils.toHornetQAddress(queue); ServerSession session = checkAndGetSession(connection); long consumerID = server.getStorageManager().generateUniqueID(); @@ -215,7 +200,7 @@ boolean durable = false; long expiration = -1; byte priority = 9; - SimpleString address = StompDestinationConverter.toHornetQAddress(queue); + SimpleString address = StompUtils.toHornetQAddress(queue); ServerMessage message = new ServerMessageImpl(server.getStorageManager().generateUniqueID(), 512); message.setType(type); @@ -252,17 +237,16 @@ String requestID = (String)headers.get(Stomp.Headers.Connect.REQUEST_ID); String name = UUIDGenerator.getInstance().generateStringUUID(); - server.createSession(name, - login, - passcode, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - connection, - true, - true, - false, - false, - new StompSessionCallback(marshaller, connection)); - ServerSession session = server.getSession(name); + ServerSession session = server.createSession(name, + login, + passcode, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + connection, + true, + true, + false, + false, + new StompSessionCallback(marshaller, connection)); sessions.put(connection, session); System.out.println(">>> created session " + session); HashMap<String, Object> h = new HashMap<String, Object>(); @@ -270,4 +254,13 @@ h.put(Stomp.Headers.Connected.RESPONSE_ID, requestID); return new StompFrame(Stomp.Responses.CONNECTED, h, new byte[] {}); } + + private void send(RemotingConnection connection, StompFrame frame) throws IOException + { + System.out.println("SENDING >>> " + frame); + byte[] bytes = marshaller.marshal(frame); + HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + System.out.println("ready to send reply: " + buffer); + connection.getTransportConnection().write(buffer, true); + } } \ No newline at end of file Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -1,118 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.protocol.stomp; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTemporaryQueue; -import org.hornetq.jms.client.HornetQTemporaryTopic; -import org.hornetq.jms.client.HornetQTopic; - -/** - * A StompDestinationConverter - * - * @author jmesnil - * - * - */ -class StompDestinationConverter -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - public static SimpleString toHornetQAddress(String stompDestination) throws HornetQException - { - if (stompDestination == null) - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); - } - else if (stompDestination.startsWith("/queue/")) - { - String queueName = stompDestination.substring("/queue/".length(), stompDestination.length()); - return HornetQQueue.createAddressFromName(queueName); - } - else if (stompDestination.startsWith("/topic/")) - { - String topicName = stompDestination.substring("/topic/".length(), stompDestination.length()); - return HornetQTopic.createAddressFromName(topicName); - } - else if (stompDestination.startsWith("/temp-queue/")) - { - String tempName = stompDestination.substring("/temp-queue/".length(), stompDestination.length()); - return HornetQTemporaryQueue.createAddressFromName(tempName); - } - else if (stompDestination.startsWith("/temp-topic/")) - { - String tempName = stompDestination.substring("/temp-topic/".length(), stompDestination.length()); - return HornetQTemporaryTopic.createAddressFromName(tempName); - } - else - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal destination name: [" + stompDestination + - "] -- StompConnect destinations " + - "must begine with one of: /queue/ /topic/ /temp-queue/ /temp-topic/"); - } - } - - public static String toStompDestination(String hornetqAddress) throws HornetQException - { - if (hornetqAddress == null) - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); - } - else if (hornetqAddress.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) - { - return "/queue/" + hornetqAddress.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length(), - hornetqAddress.length()); - } - else if (hornetqAddress.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) - { - return "/temp-queue/" + hornetqAddress.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length(), - hornetqAddress.length()); - } - else if (hornetqAddress.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) - { - return "/topic/" + hornetqAddress.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length(), - hornetqAddress.length()); - } - else if (hornetqAddress.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) - { - return "/temp-topic/" + hornetqAddress.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length(), - hornetqAddress.length()); - } - else - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal address name: [" + hornetqAddress + - "] -- Acceptable address must comply to JMS semantics"); - } - } - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -1,50 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.protocol.stomp; - -/** - * A StompException - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -class StompException extends Exception -{ - - /** - * @param string - */ - public StompException(String string) - { - super(string); - } - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java (from rev 8829, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -0,0 +1,50 @@ +/** + * + * 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.hornetq.integration.protocol.stomp; + +import java.io.IOException; + +/** + * @author <a href="http://hiramchirino.com">chirino</a> + */ +class StompException extends IOException { + private static final long serialVersionUID = -2869735532997332242L; + private final boolean fatal; + + public StompException() { + this(null); + } + + public StompException(String s) { + this(s, false); + } + + public StompException(String s, boolean fatal) { + this(s, fatal, null); + } + + public StompException(String s, boolean fatal, Throwable cause) { + super(s); + this.fatal = fatal; + initCause(cause); + } + + public boolean isFatal() { + return fatal; + } +} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDecoder.java (from rev 8829, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDecoder.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDecoder.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -0,0 +1,51 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.buffers.impl.ChannelBufferWrapper; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelPipelineCoverage; +import org.jboss.netty.channel.Channels; +import org.jboss.netty.channel.MessageEvent; +import org.jboss.netty.channel.SimpleChannelHandler; + +/** + * A StompFrameDecoder + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +@ChannelPipelineCoverage("one") +public class StompFrameDecoder extends SimpleChannelHandler +{ + private final StompMarshaller marshaller; + + // PacketDecoder implementation ---------------------------------- + + public StompFrameDecoder() + { + this.marshaller = new StompMarshaller(); + } + + @Override + public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception + { + ChannelBuffer in = (ChannelBuffer)e.getMessage(); + HornetQBuffer buffer = new ChannelBufferWrapper(in); + StompFrame frame = marshaller.unmarshal(buffer); + + Channels.fireMessageReceived(ctx, frame); + } +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -23,13 +23,13 @@ * @author <a href="http://hiramchirino.com">chirino</a> */ class StompFrameError extends StompFrame { - private final ProtocolException exception; + private final StompException exception; - public StompFrameError(ProtocolException exception) { + public StompFrameError(StompException exception) { this.exception = exception; } - public ProtocolException getException() { + public StompException getException() { return exception; } } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -103,7 +103,7 @@ if (line != null && line.trim().length() > 0) { if (headers.size() > MAX_HEADERS) { - throw new ProtocolException("The maximum number of headers was exceeded", true); + throw new StompException("The maximum number of headers was exceeded", true); } try { @@ -113,7 +113,7 @@ headers.put(name, value); } catch (Exception e) { - throw new ProtocolException("Unable to parser header line [" + line + "]", true); + throw new StompException("Unable to parser header line [" + line + "]", true); } } else { @@ -132,18 +132,18 @@ length = Integer.parseInt(contentLength.trim()); } catch (NumberFormatException e) { - throw new ProtocolException("Specified content-length is not a valid integer", true); + throw new StompException("Specified content-length is not a valid integer", true); } if (length > MAX_DATA_LENGTH) { - throw new ProtocolException("The maximum data length was exceeded", true); + throw new StompException("The maximum data length was exceeded", true); } data = new byte[length]; in.readBytes(data); if (in.readByte() != 0) { - throw new ProtocolException(Stomp.Headers.CONTENT_LENGTH + " bytes were read and " + "there was no trailing null byte", true); + throw new StompException(Stomp.Headers.CONTENT_LENGTH + " bytes were read and " + "there was no trailing null byte", true); } } else { @@ -157,7 +157,7 @@ baos = new ByteArrayOutputStream(); } else if (baos.size() > MAX_DATA_LENGTH) { - throw new ProtocolException("The maximum data length was exceeded", true); + throw new StompException("The maximum data length was exceeded", true); } baos.write(b); @@ -171,7 +171,7 @@ return new StompFrame(action, headers, data); } - catch (ProtocolException e) { + catch (StompException e) { return new StompFrameError(e); } } @@ -181,7 +181,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(maxLength); while ((b = in.readByte()) != '\n') { if (baos.size() > maxLength) { - throw new ProtocolException(errorMessage, true); + throw new StompException(errorMessage, true); } baos.write(b); } Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -1,51 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.protocol.stomp; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelPipelineCoverage; -import org.jboss.netty.channel.Channels; -import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.SimpleChannelHandler; - -/** - * A StompPacketDecoder - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -@ChannelPipelineCoverage("one") -public class StompPacketDecoder extends SimpleChannelHandler -{ - private final StompMarshaller marshaller; - - // PacketDecoder implementation ---------------------------------- - - public StompPacketDecoder() - { - this.marshaller = new StompMarshaller(); - } - - @Override - public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception - { - ChannelBuffer in = (ChannelBuffer)e.getMessage(); - HornetQBuffer buffer = new ChannelBufferWrapper(in); - StompFrame frame = marshaller.unmarshal(buffer); - - Channels.fireMessageReceived(ctx, frame); - } -} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -49,7 +49,7 @@ try { Map<String, Object> headers = new HashMap<String, Object>(); - headers.put(Stomp.Headers.Message.DESTINATION, StompDestinationConverter.toStompDestination(serverMessage.getAddress() + headers.put(Stomp.Headers.Message.DESTINATION, StompUtils.toStompDestination(serverMessage.getAddress() .toString())); byte[] data = new byte[] {}; if (serverMessage.getType() == HornetQTextMessage.TYPE) Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompUtils.java (from rev 8829, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompUtils.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompUtils.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -0,0 +1,118 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTemporaryQueue; +import org.hornetq.jms.client.HornetQTemporaryTopic; +import org.hornetq.jms.client.HornetQTopic; + +/** + * A StompUtils + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +class StompUtils +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + public static SimpleString toHornetQAddress(String stompDestination) throws HornetQException + { + if (stompDestination == null) + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); + } + else if (stompDestination.startsWith("/queue/")) + { + String queueName = stompDestination.substring("/queue/".length(), stompDestination.length()); + return HornetQQueue.createAddressFromName(queueName); + } + else if (stompDestination.startsWith("/topic/")) + { + String topicName = stompDestination.substring("/topic/".length(), stompDestination.length()); + return HornetQTopic.createAddressFromName(topicName); + } + else if (stompDestination.startsWith("/temp-queue/")) + { + String tempName = stompDestination.substring("/temp-queue/".length(), stompDestination.length()); + return HornetQTemporaryQueue.createAddressFromName(tempName); + } + else if (stompDestination.startsWith("/temp-topic/")) + { + String tempName = stompDestination.substring("/temp-topic/".length(), stompDestination.length()); + return HornetQTemporaryTopic.createAddressFromName(tempName); + } + else + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal destination name: [" + stompDestination + + "] -- StompConnect destinations " + + "must begine with one of: /queue/ /topic/ /temp-queue/ /temp-topic/"); + } + } + + public static String toStompDestination(String hornetqAddress) throws HornetQException + { + if (hornetqAddress == null) + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); + } + else if (hornetqAddress.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) + { + return "/queue/" + hornetqAddress.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length(), + hornetqAddress.length()); + } + else if (hornetqAddress.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) + { + return "/temp-queue/" + hornetqAddress.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length(), + hornetqAddress.length()); + } + else if (hornetqAddress.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) + { + return "/topic/" + hornetqAddress.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length(), + hornetqAddress.length()); + } + else if (hornetqAddress.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) + { + return "/temp-topic/" + hornetqAddress.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length(), + hornetqAddress.length()); + } + else + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal address name: [" + hornetqAddress + + "] -- Acceptable address must comply to JMS semantics"); + } + } + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -16,8 +16,6 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import org.hornetq.integration.protocol.stomp.StompFrameDelimiter; -import org.hornetq.integration.protocol.stomp.StompPacketDecoder; import org.hornetq.spi.core.remoting.BufferHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.ssl.SslHandler; @@ -46,13 +44,6 @@ // Public -------------------------------------------------------- - public static void addStompStack(final ChannelPipeline pipeline, final ServerHolder serverHandler) - { - assert pipeline != null; - pipeline.addLast("delimiter", new StompFrameDelimiter()); - pipeline.addLast("codec", new StompPacketDecoder()); - } - public static void addHornetQCodecFilter(final ChannelPipeline pipeline, final BufferHandler handler) { assert pipeline != null; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -37,6 +37,8 @@ import org.hornetq.core.server.management.Notification; import org.hornetq.core.server.management.NotificationService; import org.hornetq.integration.protocol.stomp.StompChannelHandler; +import org.hornetq.integration.protocol.stomp.StompFrameDelimiter; +import org.hornetq.integration.protocol.stomp.StompFrameDecoder; import org.hornetq.spi.core.remoting.Acceptor; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -132,7 +134,7 @@ private VirtualExecutorService bossExecutor; - private ServerHolder serverHandler; + private ServerHolder serverHolder; public NettyAcceptor(final Map<String, Object> configuration, final BufferHandler handler, @@ -143,7 +145,7 @@ { this.handler = handler; - this.serverHandler = serverHandler; + this.serverHolder = serverHandler; this.listener = listener; @@ -291,8 +293,9 @@ } if (protocol.equals(TransportConstants.STOMP_PROTOCOL)) { - ChannelPipelineSupport.addStompStack(pipeline, serverHandler); - pipeline.addLast("handler", new StompChannelHandler(serverHandler, + pipeline.addLast("delimiter", new StompFrameDelimiter()); + pipeline.addLast("codec", new StompFrameDecoder()); + pipeline.addLast("handler", new StompChannelHandler(serverHolder, channelGroup, NettyAcceptor.this, new Listener())); Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 16:46:55 UTC (rev 8829) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -1,31 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.transports.netty; - -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.server.HornetQServer; - -/** - * A ServerHolder - * - * @author jmesnil - * - * - */ -public interface ServerHolder -{ - HornetQServer getServer(); - - RemotingConnection getRemotingConnection(int connectionID); -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java (from rev 8829, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 17:05:06 UTC (rev 8830) @@ -0,0 +1,31 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.transports.netty; + +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.server.HornetQServer; + +/** + * A ServerHolder + * + * @author jmesnil + * + * + */ +public interface ServerHolder +{ + HornetQServer getServer(); + + RemotingConnection getRemotingConnection(int connectionID); +}

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8829 - in branches/HORNETQ-129_STOMP_protocol: src/main/org/hornetq/core/remoting/server and 7 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 11:46:55 -0500 (Thu, 21 Jan 2010) New Revision: 8829 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreSessionCallback.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/AbstractServerChannelHandler.java Removed: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * refactored so that Stomp implementation is all located in o.h.integration.protocol.stomp * modified HornetQServer.createSession to pass the SessionCallback directly Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreSessionCallback.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreSessionCallback.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreSessionCallback.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -0,0 +1,72 @@ +package org.hornetq.core.protocol.core; + +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.remoting.server.ProtocolManager; +import org.hornetq.core.server.ServerMessage; +import org.hornetq.core.server.SessionCallback; + +/** + * A CoreSessionCallback + * + * @author jmesnil + * + * + */ +public final class CoreSessionCallback implements SessionCallback +{ + private final Channel channel; + + private ProtocolManager protocolManager; + + private String name; + + public CoreSessionCallback(String name, ProtocolManager protocolManager, Channel channel) + { + this.name = name; + this.protocolManager = protocolManager; + this.channel = channel; + } + + public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) + { + Packet packet = new SessionReceiveLargeMessage(consumerID, headerBuffer, bodySize, deliveryCount); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) + { + Packet packet = new SessionReceiveContinuationMessage(consumerID, body, continues, requiresResponse); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public int sendMessage(ServerMessage message, long consumerID, int deliveryCount) + { + Packet packet = new SessionReceiveMessage(consumerID, message, deliveryCount); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) + { + Packet packet = new SessionProducerCreditsMessage(credits, address, offset); + + channel.send(packet); + } + + public void closed() + { + protocolManager.removeHandler(name); + } +} \ No newline at end of file Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -148,7 +148,7 @@ "Server will not accept create session requests"); } - Channel channel = connection.getChannel(request.getSessionChannelID(), request.getWindowSize()); + final Channel channel = connection.getChannel(request.getSessionChannelID(), request.getWindowSize()); ServerSession session = server.createSession(request.getName(), request.getUsername(), @@ -158,18 +158,16 @@ request.isAutoCommitSends(), request.isAutoCommitAcks(), request.isPreAcknowledge(), - request.isXA()); + request.isXA(), + new CoreSessionCallback(request.getName(), protocolManager, channel)); - ServerSessionPacketHandler handler = new ServerSessionPacketHandler(protocolManager, - session, + ServerSessionPacketHandler handler = new ServerSessionPacketHandler(session, server.getStorageManager() .newContext(server.getExecutorFactory() .getExecutor()), server.getStorageManager(), channel); - session.setCallback(handler); - channel.setHandler(handler); // TODO - where is this removed? Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -50,7 +50,6 @@ import javax.transaction.xa.Xid; import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; import org.hornetq.core.exception.HornetQXAException; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.logging.Logger; @@ -69,12 +68,8 @@ import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; @@ -98,7 +93,6 @@ import org.hornetq.core.server.QueueQueryResult; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.SessionCallback; /** * A ServerSessionPacketHandler @@ -108,12 +102,10 @@ * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a> * @author <a href="mailto:clebert.suconic@jboss.org>Clebert Suconic</a> */ -public class ServerSessionPacketHandler implements ChannelHandler, CloseListener, FailureListener, SessionCallback +public class ServerSessionPacketHandler implements ChannelHandler, CloseListener, FailureListener { private static final Logger log = Logger.getLogger(ServerSessionPacketHandler.class); - private final CoreProtocolManager protocolManager; - private final ServerSession session; private final OperationContext sessionContext; @@ -125,14 +117,11 @@ private volatile CoreRemotingConnection remotingConnection; - public ServerSessionPacketHandler(final CoreProtocolManager protocolManager, - final ServerSession session, + public ServerSessionPacketHandler(final ServerSession session, final OperationContext sessionContext, final StorageManager storageManager, final Channel channel) { - this.protocolManager = protocolManager; - this.session = session; this.storageManager = storageManager; @@ -565,46 +554,7 @@ channel.close(); } } - - public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) - { - Packet packet = new SessionReceiveLargeMessage(consumerID, headerBuffer, bodySize, deliveryCount); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) - { - Packet packet = new SessionReceiveContinuationMessage(consumerID, body, continues, requiresResponse); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public int sendMessage(ServerMessage message, long consumerID, int deliveryCount) - { - Packet packet = new SessionReceiveMessage(consumerID, message, deliveryCount); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) - { - Packet packet = new SessionProducerCreditsMessage(credits, address, offset); - - channel.send(packet); - } - public void closed() - { - protocolManager.removeHandler(session.getName()); - } - public int transferConnection(final CoreRemotingConnection newConnection, final int lastReceivedCommandID) { // We need to disable delivery on all the consumers while the transfer is occurring- otherwise packets might get Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -26,4 +26,6 @@ { ConnectionEntry createConnectionEntry(Connection connection); + void removeHandler(String name); + } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -29,7 +29,6 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.protocol.core.CoreProtocolManager; -import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.server.ConnectionEntry; @@ -170,14 +169,13 @@ return server; } - public CoreRemotingConnection getRemotingConnection(int connectionID) + public RemotingConnection getRemotingConnection(int connectionID) { ConnectionEntry conn = connections.get(connectionID); if (conn != null) { - // FIXME .... - return (CoreRemotingConnection)conn.connection; + return conn.connection; } else { Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -24,7 +24,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.replication.ReplicationEndpoint; import org.hornetq.core.security.Role; @@ -76,11 +76,12 @@ String username, String password, int minLargeMessageSize, - CoreRemotingConnection remotingConnection, + RemotingConnection remotingConnection, boolean autoCommitSends, boolean autoCommitAcks, boolean preAcknowledge, - boolean xa) throws Exception; + boolean xa, + final SessionCallback callback) throws Exception; void removeSession(String name) throws Exception; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -110,6 +110,4 @@ void setTransferring(boolean transferring); void runConnectionFailureRunners(); - - void setCallback(SessionCallback callback); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -69,7 +69,7 @@ import org.hornetq.core.postoffice.impl.LocalQueueBinding; import org.hornetq.core.postoffice.impl.PostOfficeImpl; import org.hornetq.core.protocol.core.Channel; -import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.replication.ReplicationEndpoint; @@ -87,6 +87,7 @@ import org.hornetq.core.server.Queue; import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.SessionCallback; import org.hornetq.core.server.cluster.ClusterManager; import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.server.cluster.QueueConfiguration; @@ -538,11 +539,12 @@ final String username, final String password, final int minLargeMessageSize, - final CoreRemotingConnection connection, + final RemotingConnection connection, final boolean autoCommitSends, final boolean autoCommitAcks, final boolean preAcknowledge, - final boolean xa) throws Exception + final boolean xa, + final SessionCallback callback) throws Exception { if (securityStore != null) { @@ -565,7 +567,8 @@ securityStore, managementService, this, - configuration.getManagementAddress()); + configuration.getManagementAddress(), + callback); sessions.put(name, session); Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -42,9 +42,9 @@ import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.SecurityStore; import org.hornetq.core.server.BindingQueryResult; @@ -99,7 +99,7 @@ private final boolean strictUpdateDeliveryCount; - private CoreRemotingConnection remotingConnection; + private RemotingConnection remotingConnection; private final Map<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>(); @@ -134,7 +134,7 @@ private final RoutingContext routingContext = new RoutingContextImpl(null); - private SessionCallback callback; + private final SessionCallback callback; // Constructors --------------------------------------------------------------------------------- @@ -147,14 +147,15 @@ final boolean preAcknowledge, final boolean strictUpdateDeliveryCount, final boolean xa, - final CoreRemotingConnection remotingConnection, + final RemotingConnection remotingConnection, final StorageManager storageManager, final PostOffice postOffice, final ResourceManager resourceManager, final SecurityStore securityStore, final ManagementService managementService, final HornetQServer server, - final SimpleString managementAddress) throws Exception + final SimpleString managementAddress, + final SessionCallback callback) throws Exception { this.username = username; @@ -193,6 +194,8 @@ this.managementAddress = managementAddress; + this.callback = callback; + remotingConnection.addFailureListener(this); remotingConnection.addCloseListener(this); @@ -200,11 +203,6 @@ // ServerSession implementation ---------------------------------------------------------------------------- - public void setCallback(final SessionCallback callback) - { - this.callback = callback; - } - public String getUsername() { return username; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -22,7 +22,7 @@ /** * @author <a href="http://hiramchirino.com">chirino</a> */ -public class ProtocolException extends IOException { +class ProtocolException extends IOException { private static final long serialVersionUID = -2869735532997332242L; private final boolean fatal; Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompChannelHandler.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -0,0 +1,273 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Map; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.ServerMessage; +import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.impl.ServerMessageImpl; +import org.hornetq.integration.transports.netty.AbstractServerChannelHandler; +import org.hornetq.integration.transports.netty.NettyAcceptor; +import org.hornetq.integration.transports.netty.ServerHolder; +import org.hornetq.jms.client.HornetQBytesMessage; +import org.hornetq.jms.client.HornetQTextMessage; +import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; +import org.hornetq.utils.UUIDGenerator; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelPipelineCoverage; +import org.jboss.netty.channel.MessageEvent; +import org.jboss.netty.channel.group.ChannelGroup; + +@ChannelPipelineCoverage("one") +public final class StompChannelHandler extends AbstractServerChannelHandler +{ + static final Logger log = Logger.getLogger(StompChannelHandler.class); + + final StompMarshaller marshaller; + + private final Map<RemotingConnection, ServerSession> sessions = new HashMap<RemotingConnection, ServerSession>(); + + private ServerHolder serverHandler; + + public StompChannelHandler(ServerHolder serverHolder, + final ChannelGroup group, + NettyAcceptor acceptor, + final ConnectionLifeCycleListener listener) + { + super(group, listener, acceptor); + this.serverHandler = serverHolder; + this.marshaller = new StompMarshaller(); + } + + public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception + { + StompFrame frame = (StompFrame)e.getMessage(); + System.out.println(">>> got frame " + frame); + + // need to interact with HornetQ server & session + HornetQServer server = serverHandler.getServer(); + RemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); + + try + { + + String command = frame.getCommand(); + + StompFrame response = null; + if (Stomp.Commands.CONNECT.equals(command)) + { + response = onConnect(frame, server, connection); + } + else if (Stomp.Commands.DISCONNECT.equals(command)) + { + response = onDisconnect(frame, server, connection); + } + else if (Stomp.Commands.SEND.equals(command)) + { + response = onSend(frame, server, connection); + } + else if (Stomp.Commands.SUBSCRIBE.equals(command)) + { + response = onSubscribe(frame, server, connection); + } + else + { + log.error("Unsupported Stomp frame: " + frame); + response = new StompFrame(Stomp.Responses.ERROR, + new HashMap<String, Object>(), + ("Unsupported frame: " + command).getBytes()); + } + + if (response != null) + { + System.out.println(">>> will reply " + response); + byte[] bytes = marshaller.marshal(response); + HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + System.out.println("ready to send reply: " + buffer); + connection.getTransportConnection().write(buffer, true); + } + } + catch (StompException ex) + { + // Let the stomp client know about any protocol errors. + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintWriter stream = new PrintWriter(new OutputStreamWriter(baos, "UTF-8")); + ex.printStackTrace(stream); + stream.close(); + + Map<String, Object> headers = new HashMap<String, Object>(); + headers.put(Stomp.Headers.Error.MESSAGE, e.getMessage()); + + final String receiptId = (String)frame.getHeaders().get(Stomp.Headers.RECEIPT_REQUESTED); + if (receiptId != null) + { + headers.put(Stomp.Headers.Response.RECEIPT_ID, receiptId); + } + + StompFrame errorMessage = new StompFrame(Stomp.Responses.ERROR, headers, baos.toByteArray()); + byte[] bytes = marshaller.marshal(errorMessage); + HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + System.out.println("ready to send reply: " + buffer); + connection.getTransportConnection().write(buffer, true); + + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + + /** + * @param frame + * @param server + * @param connection + * @return + * @throws StompException + * @throws HornetQException + */ + private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, + StompException, + HornetQException + { + Map<String, Object> headers = frame.getHeaders(); + String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); + SimpleString queueName = StompDestinationConverter.toHornetQAddress(queue); + + ServerSession session = checkAndGetSession(connection); + long consumerID = server.getStorageManager().generateUniqueID(); + session.createConsumer(consumerID, queueName, null, false); + session.receiveConsumerCredits(consumerID, -1); + session.start(); + + return null; + } + + private ServerSession checkAndGetSession(RemotingConnection connection) throws StompException + { + ServerSession session = sessions.get(connection); + if (session == null) + { + throw new StompException("Not connected"); + } + return session; + } + + private StompFrame onDisconnect(StompFrame frame, HornetQServer server, RemotingConnection connection) throws StompException + { + ServerSession session = checkAndGetSession(connection); + if (session != null) + { + try + { + session.close(); + } + catch (Exception e) + { + throw new StompException(e.getMessage()); + } + sessions.remove(connection); + } + return null; + } + + private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception + { + ServerSession session = checkAndGetSession(connection); + + Map<String, Object> headers = frame.getHeaders(); + String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); + /* + String type = (String)headers.get(Stomp.Headers.Send.TYPE); + long expiration = (Long)headers.get(Stomp.Headers.Send.EXPIRATION_TIME); + byte priority = (Byte)headers.get(Stomp.Headers.Send.PRIORITY); + boolean durable = (Boolean)headers.get(Stomp.Headers.Send.PERSISTENT); + */ + byte type = HornetQTextMessage.TYPE; + if (headers.containsKey(Stomp.Headers.CONTENT_LENGTH)) + { + type = HornetQBytesMessage.TYPE; + } + long timestamp = System.currentTimeMillis(); + boolean durable = false; + long expiration = -1; + byte priority = 9; + SimpleString address = StompDestinationConverter.toHornetQAddress(queue); + + ServerMessage message = new ServerMessageImpl(server.getStorageManager().generateUniqueID(), 512); + message.setType(type); + message.setTimestamp(timestamp); + message.setAddress(address); + byte[] content = frame.getContent(); + if (type == HornetQTextMessage.TYPE) + { + message.getBodyBuffer().writeNullableSimpleString(SimpleString.toSimpleString(new String(content))); + } + else + { + message.getBodyBuffer().writeBytes(content); + } + + session.send(message); + if (headers.containsKey(Stomp.Headers.RECEIPT_REQUESTED)) + { + Map<String, Object> h = new HashMap<String, Object>(); + h.put(Stomp.Headers.Response.RECEIPT_ID, headers.get(Stomp.Headers.RECEIPT_REQUESTED)); + return new StompFrame(Stomp.Responses.RECEIPT, h, new byte[] {}); + } + else + { + return null; + } + } + + private StompFrame onConnect(StompFrame frame, HornetQServer server, final RemotingConnection connection) throws Exception + { + Map<String, Object> headers = frame.getHeaders(); + String login = (String)headers.get(Stomp.Headers.Connect.LOGIN); + String passcode = (String)headers.get(Stomp.Headers.Connect.PASSCODE); + String requestID = (String)headers.get(Stomp.Headers.Connect.REQUEST_ID); + + String name = UUIDGenerator.getInstance().generateStringUUID(); + server.createSession(name, + login, + passcode, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + connection, + true, + true, + false, + false, + new StompSessionCallback(marshaller, connection)); + ServerSession session = server.getSession(name); + sessions.put(connection, session); + System.out.println(">>> created session " + session); + HashMap<String, Object> h = new HashMap<String, Object>(); + h.put(Stomp.Headers.Connected.SESSION, name); + h.put(Stomp.Headers.Connected.RESPONSE_ID, requestID); + return new StompFrame(Stomp.Responses.CONNECTED, h, new byte[] {}); + } +} \ No newline at end of file Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -27,7 +27,7 @@ * * */ -public class StompDestinationConverter +class StompDestinationConverter { // Constants ----------------------------------------------------- @@ -36,65 +36,69 @@ // Static -------------------------------------------------------- - public static SimpleString convertDestination(String name) throws HornetQException + public static SimpleString toHornetQAddress(String stompDestination) throws HornetQException { - if (name == null) + if (stompDestination == null) { throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); } - else if (name.startsWith("/queue/")) + else if (stompDestination.startsWith("/queue/")) { - String queueName = name.substring("/queue/".length(), name.length()); + String queueName = stompDestination.substring("/queue/".length(), stompDestination.length()); return HornetQQueue.createAddressFromName(queueName); } - else if (name.startsWith("/topic/")) + else if (stompDestination.startsWith("/topic/")) { - String topicName = name.substring("/topic/".length(), name.length()); + String topicName = stompDestination.substring("/topic/".length(), stompDestination.length()); return HornetQTopic.createAddressFromName(topicName); } - else if (name.startsWith("/temp-queue/")) + else if (stompDestination.startsWith("/temp-queue/")) { - String tempName = name.substring("/temp-queue/".length(), name.length()); + String tempName = stompDestination.substring("/temp-queue/".length(), stompDestination.length()); return HornetQTemporaryQueue.createAddressFromName(tempName); } - else if (name.startsWith("/temp-topic/")) + else if (stompDestination.startsWith("/temp-topic/")) { - String tempName = name.substring("/temp-topic/".length(), name.length()); + String tempName = stompDestination.substring("/temp-topic/".length(), stompDestination.length()); return HornetQTemporaryTopic.createAddressFromName(tempName); } else { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal destination name: [" + name + + throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal destination name: [" + stompDestination + "] -- StompConnect destinations " + "must begine with one of: /queue/ /topic/ /temp-queue/ /temp-topic/"); } } - public static String toStomp(String address) throws HornetQException + public static String toStompDestination(String hornetqAddress) throws HornetQException { - if (address == null) + if (hornetqAddress == null) { throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); } - else if (address.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) + else if (hornetqAddress.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) { - return "/queue/" + address.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length(), address.length()); + return "/queue/" + hornetqAddress.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length(), + hornetqAddress.length()); } - else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) + else if (hornetqAddress.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) { - return "/temp-queue/" + address.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length(), address.length()); + return "/temp-queue/" + hornetqAddress.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length(), + hornetqAddress.length()); } - else if (address.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) + else if (hornetqAddress.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) { - return "/topic/" + address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length(), address.length()); + return "/topic/" + hornetqAddress.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length(), + hornetqAddress.length()); } - else if (address.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) + else if (hornetqAddress.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) { - return "/temp-topic/" + address.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length(), address.length()); + return "/temp-topic/" + hornetqAddress.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length(), + hornetqAddress.length()); } else { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal address name: [" + address + + throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal address name: [" + hornetqAddress + "] -- Acceptable address must comply to JMS semantics"); } } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -16,11 +16,9 @@ /** * A StompException * - * @author jmesnil - * - * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> */ -public class StompException extends Exception +class StompException extends Exception { /** Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -25,7 +25,7 @@ * * @author <a href="http://hiramchirino.com">chirino</a> */ -public class StompFrame +class StompFrame { private static final byte[] NO_DATA = new byte[] {}; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -22,7 +22,7 @@ * * @author <a href="http://hiramchirino.com">chirino</a> */ -public class StompFrameError extends StompFrame { +class StompFrameError extends StompFrame { private final ProtocolException exception; public StompFrameError(ProtocolException exception) { Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -30,7 +30,7 @@ /** * Implements marshalling and unmarsalling the <a href="http://stomp.codehaus.org/">Stomp</a> protocol. */ -public class StompMarshaller { +class StompMarshaller { private static final byte[] NO_DATA = new byte[]{}; private static final byte[] END_OF_FRAME = new byte[]{0, '\n'}; private static final int MAX_COMMAND_LENGTH = 1024; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -34,9 +34,9 @@ // PacketDecoder implementation ---------------------------------- - public StompPacketDecoder(final StompMarshaller marshaller) + public StompPacketDecoder() { - this.marshaller = marshaller; + this.marshaller = new StompMarshaller(); } @Override Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompSessionCallback.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -0,0 +1,93 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import java.util.HashMap; +import java.util.Map; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.server.ServerMessage; +import org.hornetq.core.server.SessionCallback; +import org.hornetq.jms.client.HornetQTextMessage; + +/** + * A StompSessionCallback + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +class StompSessionCallback implements SessionCallback +{ + private final RemotingConnection connection; + + private final StompMarshaller marshaller; + + StompSessionCallback(final StompMarshaller marshaller, final RemotingConnection connection) + { + this.marshaller = marshaller; + this.connection = connection; + } + + public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) + { + } + + public int sendMessage(ServerMessage serverMessage, long consumerID, int deliveryCount) + { + try + { + Map<String, Object> headers = new HashMap<String, Object>(); + headers.put(Stomp.Headers.Message.DESTINATION, StompDestinationConverter.toStompDestination(serverMessage.getAddress() + .toString())); + byte[] data = new byte[] {}; + if (serverMessage.getType() == HornetQTextMessage.TYPE) + { + SimpleString text = serverMessage.getBodyBuffer().readNullableSimpleString(); + if (text != null) + { + data = text.toString().getBytes(); + } + } + StompFrame msg = new StompFrame(Stomp.Responses.MESSAGE, headers, data); + System.out.println("SENDING : " + msg); + byte[] bytes = marshaller.marshal(msg); + HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + connection.getTransportConnection().write(buffer, true); + + return bytes.length; + + } + catch (Exception e) + { + e.printStackTrace(); + return 0; + } + + } + + public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) + { + return 0; + } + + public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) + { + return 0; + } + + public void closed() + { + } +} \ No newline at end of file Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/AbstractServerChannelHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/AbstractServerChannelHandler.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/AbstractServerChannelHandler.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -0,0 +1,64 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.transports.netty; + +import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; +import org.jboss.netty.channel.ChannelFuture; +import org.jboss.netty.channel.ChannelFutureListener; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelPipelineCoverage; +import org.jboss.netty.channel.ChannelStateEvent; +import org.jboss.netty.channel.group.ChannelGroup; +import org.jboss.netty.handler.ssl.SslHandler; + +@ChannelPipelineCoverage("one") +public abstract class AbstractServerChannelHandler extends HornetQChannelHandler +{ + private NettyAcceptor acceptor; + + protected AbstractServerChannelHandler(final ChannelGroup group, final ConnectionLifeCycleListener listener, NettyAcceptor acceptor) + { + super(group, listener); + this.acceptor = acceptor; + } + + @Override + public void channelConnected(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception + { + new NettyConnection(e.getChannel(), acceptor.newListener()); + + SslHandler sslHandler = ctx.getPipeline().get(SslHandler.class); + if (sslHandler != null) + { + sslHandler.handshake(e.getChannel()).addListener(new ChannelFutureListener() + { + public void operationComplete(final ChannelFuture future) throws Exception + { + if (future.isSuccess()) + { + active = true; + } + else + { + future.getChannel().close(); + } + } + }); + } + else + { + active = true; + } + } +} \ No newline at end of file Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -17,7 +17,6 @@ import javax.net.ssl.SSLEngine; import org.hornetq.integration.protocol.stomp.StompFrameDelimiter; -import org.hornetq.integration.protocol.stomp.StompMarshaller; import org.hornetq.integration.protocol.stomp.StompPacketDecoder; import org.hornetq.spi.core.remoting.BufferHandler; import org.jboss.netty.channel.ChannelPipeline; @@ -50,9 +49,8 @@ public static void addStompStack(final ChannelPipeline pipeline, final ServerHolder serverHandler) { assert pipeline != null; - StompMarshaller marshaller = new StompMarshaller(); pipeline.addLast("delimiter", new StompFrameDelimiter()); - pipeline.addLast("codec", new StompPacketDecoder(marshaller)); + pipeline.addLast("codec", new StompPacketDecoder()); } public static void addHornetQCodecFilter(final ChannelPipeline pipeline, final BufferHandler handler) Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -13,12 +13,8 @@ package org.hornetq.integration.transports.netty; -import java.io.ByteArrayOutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -30,52 +26,31 @@ import javax.net.ssl.SSLContext; -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.ProtocolType; -import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.SessionCallback; -import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.server.management.Notification; import org.hornetq.core.server.management.NotificationService; -import org.hornetq.integration.protocol.stomp.Stomp; -import org.hornetq.integration.protocol.stomp.StompDestinationConverter; -import org.hornetq.integration.protocol.stomp.StompException; -import org.hornetq.integration.protocol.stomp.StompFrame; -import org.hornetq.integration.protocol.stomp.StompMarshaller; -import org.hornetq.jms.client.HornetQBytesMessage; -import org.hornetq.jms.client.HornetQTextMessage; +import org.hornetq.integration.protocol.stomp.StompChannelHandler; import org.hornetq.spi.core.remoting.Acceptor; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; import org.hornetq.utils.ConfigurationHelper; import org.hornetq.utils.TypedProperties; -import org.hornetq.utils.UUIDGenerator; import org.hornetq.utils.VersionLoader; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFactory; -import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.ChannelFutureListener; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.channel.ChannelPipelineCoverage; import org.jboss.netty.channel.ChannelPipelineFactory; -import org.jboss.netty.channel.ChannelStateEvent; import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.group.ChannelGroup; @@ -87,7 +62,6 @@ import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory; import org.jboss.netty.handler.codec.http.HttpRequestDecoder; import org.jboss.netty.handler.codec.http.HttpResponseEncoder; -import org.jboss.netty.handler.ssl.SslHandler; import org.jboss.netty.util.Version; import org.jboss.netty.util.VirtualExecutorService; @@ -102,7 +76,7 @@ */ public class NettyAcceptor implements Acceptor { - private static final Logger log = Logger.getLogger(NettyAcceptor.class); + static final Logger log = Logger.getLogger(NettyAcceptor.class); private ChannelFactory channelFactory; @@ -319,8 +293,8 @@ { ChannelPipelineSupport.addStompStack(pipeline, serverHandler); pipeline.addLast("handler", new StompChannelHandler(serverHandler, - new StompMarshaller(), channelGroup, + NettyAcceptor.this, new Listener())); } else @@ -516,6 +490,11 @@ this.notificationService = notificationService; } + public ConnectionLifeCycleListener newListener() + { + return new Listener(); + } + // Inner classes ----------------------------------------------------------------------------- private final class HornetQServerChannelHandler extends AbstractServerChannelHandler @@ -526,7 +505,7 @@ final BufferHandler handler, final ConnectionLifeCycleListener listener) { - super(group, listener); + super(group, listener, NettyAcceptor.this); this.handler = handler; } @@ -541,329 +520,8 @@ } - @ChannelPipelineCoverage("one") - public final class StompChannelHandler extends AbstractServerChannelHandler + class Listener implements ConnectionLifeCycleListener { - private final StompMarshaller marshaller; - - private final Map<RemotingConnection, ServerSession> sessions = new HashMap<RemotingConnection, ServerSession>(); - - private ServerHolder serverHandler; - - public StompChannelHandler(ServerHolder serverHolder, - StompMarshaller marshaller, - final ChannelGroup group, - final ConnectionLifeCycleListener listener) - { - super(group, listener); - this.serverHandler = serverHolder; - this.marshaller = marshaller; - } - - public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception - { - StompFrame frame = (StompFrame)e.getMessage(); - System.out.println(">>> got frame " + frame); - - // need to interact with HornetQ server & session - HornetQServer server = serverHandler.getServer(); - CoreRemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); - - try - { - - String command = frame.getCommand(); - - StompFrame response = null; - if (Stomp.Commands.CONNECT.equals(command)) - { - response = onConnect(frame, server, connection); - } - else if (Stomp.Commands.DISCONNECT.equals(command)) - { - response = onDisconnect(frame, server, connection); - } - else if (Stomp.Commands.SEND.equals(command)) - { - response = onSend(frame, server, connection); - } - else if (Stomp.Commands.SUBSCRIBE.equals(command)) - { - response = onSubscribe(frame, server, connection); - } - else - { - log.error("Unsupported Stomp frame: " + frame); - response = new StompFrame(Stomp.Responses.ERROR, - new HashMap<String, Object>(), - ("Unsupported frame: " + command).getBytes()); - } - - if (response != null) - { - System.out.println(">>> will reply " + response); - byte[] bytes = marshaller.marshal(response); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); - System.out.println("ready to send reply: " + buffer); - connection.getTransportConnection().write(buffer, true); - } - } - catch (StompException ex) - { - // Let the stomp client know about any protocol errors. - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PrintWriter stream = new PrintWriter(new OutputStreamWriter(baos, "UTF-8")); - ex.printStackTrace(stream); - stream.close(); - - Map<String, Object> headers = new HashMap<String, Object>(); - headers.put(Stomp.Headers.Error.MESSAGE, e.getMessage()); - - final String receiptId = (String)frame.getHeaders().get(Stomp.Headers.RECEIPT_REQUESTED); - if (receiptId != null) - { - headers.put(Stomp.Headers.Response.RECEIPT_ID, receiptId); - } - - StompFrame errorMessage = new StompFrame(Stomp.Responses.ERROR, headers, baos.toByteArray()); - byte[] bytes = marshaller.marshal(errorMessage); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); - System.out.println("ready to send reply: " + buffer); - connection.getTransportConnection().write(buffer, true); - - } - catch (Exception ex) - { - ex.printStackTrace(); - } - } - - /** - * @param frame - * @param server - * @param connection - * @return - * @throws StompException - * @throws HornetQException - */ - private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, - StompException, - HornetQException - { - Map<String, Object> headers = frame.getHeaders(); - String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); - SimpleString queueName = StompDestinationConverter.convertDestination(queue); - - ServerSession session = checkAndGetSession(connection); - long consumerID = server.getStorageManager().generateUniqueID(); - session.createConsumer(consumerID, queueName, null, false); - session.receiveConsumerCredits(consumerID, -1); - session.start(); - - return null; - } - - private ServerSession checkAndGetSession(RemotingConnection connection) throws StompException - { - ServerSession session = sessions.get(connection); - if (session == null) - { - throw new StompException("Not connected"); - } - return session; - } - - private StompFrame onDisconnect(StompFrame frame, HornetQServer server, RemotingConnection connection) throws StompException - { - ServerSession session = checkAndGetSession(connection); - if (session != null) - { - try - { - session.close(); - } - catch (Exception e) - { - throw new StompException(e.getMessage()); - } - sessions.remove(connection); - } - return null; - } - - private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception - { - ServerSession session = checkAndGetSession(connection); - - Map<String, Object> headers = frame.getHeaders(); - String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); - /* - String type = (String)headers.get(Stomp.Headers.Send.TYPE); - long expiration = (Long)headers.get(Stomp.Headers.Send.EXPIRATION_TIME); - byte priority = (Byte)headers.get(Stomp.Headers.Send.PRIORITY); - boolean durable = (Boolean)headers.get(Stomp.Headers.Send.PERSISTENT); - */ - byte type = HornetQTextMessage.TYPE; - if (headers.containsKey(Stomp.Headers.CONTENT_LENGTH)) - { - type = HornetQBytesMessage.TYPE; - } - long timestamp = System.currentTimeMillis(); - boolean durable = false; - long expiration = -1; - byte priority = 9; - SimpleString address = StompDestinationConverter.convertDestination(queue); - - ServerMessage message = new ServerMessageImpl(server.getStorageManager().generateUniqueID(), 512); - message.setType(type); - message.setTimestamp(timestamp); - message.setAddress(address); - byte[] content = frame.getContent(); - if (type == HornetQTextMessage.TYPE) - { - message.getBodyBuffer().writeNullableSimpleString(SimpleString.toSimpleString(new String(content))); - } - else - { - message.getBodyBuffer().writeBytes(content); - } - - session.send(message); - if (headers.containsKey(Stomp.Headers.RECEIPT_REQUESTED)) - { - Map<String, Object> h = new HashMap<String, Object>(); - h.put(Stomp.Headers.Response.RECEIPT_ID, headers.get(Stomp.Headers.RECEIPT_REQUESTED)); - return new StompFrame(Stomp.Responses.RECEIPT, h, new byte[] {}); - } - else - { - return null; - } - } - - private StompFrame onConnect(StompFrame frame, HornetQServer server, final CoreRemotingConnection connection) throws Exception - { - Map<String, Object> headers = frame.getHeaders(); - String login = (String)headers.get(Stomp.Headers.Connect.LOGIN); - String passcode = (String)headers.get(Stomp.Headers.Connect.PASSCODE); - String requestID = (String)headers.get(Stomp.Headers.Connect.REQUEST_ID); - - String name = UUIDGenerator.getInstance().generateStringUUID(); - server.createSession(name, - login, - passcode, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - connection, - true, - true, - false, - false); - ServerSession session = server.getSession(name); - session.setCallback(new SessionCallback() - { - public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) - { - } - - public int sendMessage(ServerMessage serverMessage, long consumerID, int deliveryCount) - { - try - { - Map<String, Object> headers = new HashMap<String, Object>(); - headers.put(Stomp.Headers.Message.DESTINATION, - StompDestinationConverter.toStomp(serverMessage.getAddress().toString())); - byte[] data = new byte[] {}; - if (serverMessage.getType() == HornetQTextMessage.TYPE) - { - SimpleString text = serverMessage.getBodyBuffer().readNullableSimpleString(); - if (text != null) - { - data = text.toString().getBytes(); - } - } - StompFrame msg = new StompFrame(Stomp.Responses.MESSAGE, headers, data); - System.out.println("SENDING : " + msg); - byte[] bytes = marshaller.marshal(msg); - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); - connection.getTransportConnection().write(buffer, true); - - return bytes.length; - - } - catch (Exception e) - { - e.printStackTrace(); - return 0; - } - - } - - public int sendLargeMessageContinuation(long consumerID, - byte[] body, - boolean continues, - boolean requiresResponse) - { - return 0; - } - - public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) - { - return 0; - } - - public void closed() - { - } - }); - sessions.put(connection, session); - System.out.println(">>> created session " + session); - HashMap<String, Object> h = new HashMap<String, Object>(); - h.put(Stomp.Headers.Connected.SESSION, name); - h.put(Stomp.Headers.Connected.RESPONSE_ID, requestID); - return new StompFrame(Stomp.Responses.CONNECTED, h, new byte[] {}); - } - } - - @ChannelPipelineCoverage("one") - public abstract class AbstractServerChannelHandler extends HornetQChannelHandler - { - protected AbstractServerChannelHandler(final ChannelGroup group, final ConnectionLifeCycleListener listener) - { - super(group, listener); - } - - @Override - public void channelConnected(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception - { - new NettyConnection(e.getChannel(), new Listener()); - - SslHandler sslHandler = ctx.getPipeline().get(SslHandler.class); - if (sslHandler != null) - { - sslHandler.handshake(e.getChannel()).addListener(new ChannelFutureListener() - { - public void operationComplete(final ChannelFuture future) throws Exception - { - if (future.isSuccess()) - { - active = true; - } - else - { - future.getChannel().close(); - } - } - }); - } - else - { - active = true; - } - } - } - - private class Listener implements ConnectionLifeCycleListener - { public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent(connection.getID(), connection) != null) @@ -896,4 +554,5 @@ } } + } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -13,7 +13,7 @@ package org.hornetq.integration.transports.netty; -import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQServer; /** @@ -27,6 +27,5 @@ { HornetQServer getServer(); - // FIXME should NOT be CoreRemotingConnection but RemotingConnection - CoreRemotingConnection getRemotingConnection(int connectionID); + RemotingConnection getRemotingConnection(int connectionID); } Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 15:40:24 UTC (rev 8828) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 16:46:55 UTC (rev 8829) @@ -849,6 +849,7 @@ { Configuration config = new ConfigurationImpl(); config.setSecurityEnabled(false); + config.setPersistenceEnabled(false); Map<String, Object> params = new HashMap<String, Object>(); params.put(TransportConstants.PROTOCOL_PROP_NAME, TransportConstants.STOMP_PROTOCOL);

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8828 - in branches/HORNETQ-129_STOMP_protocol: src/main/org/hornetq/integration/transports/netty and 1 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 10:40:24 -0500 (Thu, 21 Jan 2010) New Revision: 8828 Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * pass testSubscribeWithAutoAck Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 14:46:21 UTC (rev 8827) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 15:40:24 UTC (rev 8828) @@ -70,6 +70,35 @@ } } + public static String toStomp(String address) throws HornetQException + { + if (address == null) + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); + } + else if (address.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) + { + return "/queue/" + address.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length(), address.length()); + } + else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) + { + return "/temp-queue/" + address.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length(), address.length()); + } + else if (address.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) + { + return "/topic/" + address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length(), address.length()); + } + else if (address.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) + { + return "/temp-topic/" + address.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length(), address.length()); + } + else + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal address name: [" + address + + "] -- Acceptable address must comply to JMS semantics"); + } + } + // Constructors -------------------------------------------------- // Public -------------------------------------------------------- Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 14:46:21 UTC (rev 8827) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 15:40:24 UTC (rev 8828) @@ -46,6 +46,7 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.SessionCallback; import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.server.management.Notification; import org.hornetq.core.server.management.NotificationService; @@ -325,9 +326,7 @@ else { ChannelPipelineSupport.addHornetQCodecFilter(pipeline, handler); - pipeline.addLast("handler", new HornetQServerChannelHandler(channelGroup, - handler, - new Listener())); + pipeline.addLast("handler", new HornetQServerChannelHandler(channelGroup, handler, new Listener())); } return pipeline; @@ -595,9 +594,11 @@ else { log.error("Unsupported Stomp frame: " + frame); - response = new StompFrame(Stomp.Responses.ERROR, new HashMap<String, Object>(), ("Unsupported frame: " + command).getBytes()); + response = new StompFrame(Stomp.Responses.ERROR, + new HashMap<String, Object>(), + ("Unsupported frame: " + command).getBytes()); } - + if (response != null) { System.out.println(">>> will reply " + response); @@ -613,15 +614,15 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintWriter stream = new PrintWriter(new OutputStreamWriter(baos, "UTF-8")); ex.printStackTrace(stream); - stream.append(Stomp.NULL + Stomp.NEWLINE); stream.close(); Map<String, Object> headers = new HashMap<String, Object>(); headers.put(Stomp.Headers.Error.MESSAGE, e.getMessage()); - final String receiptId = (String) frame.getHeaders().get(Stomp.Headers.RECEIPT_REQUESTED); - if (receiptId != null) { - headers.put(Stomp.Headers.Response.RECEIPT_ID, receiptId); + final String receiptId = (String)frame.getHeaders().get(Stomp.Headers.RECEIPT_REQUESTED); + if (receiptId != null) + { + headers.put(Stomp.Headers.Response.RECEIPT_ID, receiptId); } StompFrame errorMessage = new StompFrame(Stomp.Responses.ERROR, headers, baos.toByteArray()); @@ -645,7 +646,9 @@ * @throws StompException * @throws HornetQException */ - private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, StompException, HornetQException + private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, + StompException, + HornetQException { Map<String, Object> headers = frame.getHeaders(); String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); @@ -669,7 +672,7 @@ } return session; } - + private StompFrame onDisconnect(StompFrame frame, HornetQServer server, RemotingConnection connection) throws StompException { ServerSession session = checkAndGetSession(connection); @@ -691,7 +694,7 @@ private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception { ServerSession session = checkAndGetSession(connection); - + Map<String, Object> headers = frame.getHeaders(); String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); /* @@ -738,7 +741,7 @@ } } - private StompFrame onConnect(StompFrame frame, HornetQServer server, CoreRemotingConnection connection) throws Exception + private StompFrame onConnect(StompFrame frame, HornetQServer server, final CoreRemotingConnection connection) throws Exception { Map<String, Object> headers = frame.getHeaders(); String login = (String)headers.get(Stomp.Headers.Connect.LOGIN); @@ -756,6 +759,62 @@ false, false); ServerSession session = server.getSession(name); + session.setCallback(new SessionCallback() + { + public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) + { + } + + public int sendMessage(ServerMessage serverMessage, long consumerID, int deliveryCount) + { + try + { + Map<String, Object> headers = new HashMap<String, Object>(); + headers.put(Stomp.Headers.Message.DESTINATION, + StompDestinationConverter.toStomp(serverMessage.getAddress().toString())); + byte[] data = new byte[] {}; + if (serverMessage.getType() == HornetQTextMessage.TYPE) + { + SimpleString text = serverMessage.getBodyBuffer().readNullableSimpleString(); + if (text != null) + { + data = text.toString().getBytes(); + } + } + StompFrame msg = new StompFrame(Stomp.Responses.MESSAGE, headers, data); + System.out.println("SENDING : " + msg); + byte[] bytes = marshaller.marshal(msg); + HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(bytes); + connection.getTransportConnection().write(buffer, true); + + return bytes.length; + + } + catch (Exception e) + { + e.printStackTrace(); + return 0; + } + + } + + public int sendLargeMessageContinuation(long consumerID, + byte[] body, + boolean continues, + boolean requiresResponse) + { + return 0; + } + + public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) + { + return 0; + } + + public void closed() + { + } + }); sessions.put(connection, session); System.out.println(">>> created session " + session); HashMap<String, Object> h = new HashMap<String, Object>(); Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 14:46:21 UTC (rev 8827) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 15:40:24 UTC (rev 8828) @@ -341,6 +341,8 @@ frame = receiveFrame(10000); Assert.assertTrue(frame.startsWith("MESSAGE")); + Assert.assertTrue(frame.indexOf("destination:") > 0); + Assert.assertTrue(frame.indexOf(getName()) > 0); frame = "DISCONNECT\n" + @@ -408,7 +410,7 @@ MessageProducer producer = session.createProducer(queue); TextMessage message = session.createTextMessage("Hello World"); - message.setStringProperty("s", "value"); + message.setStringProperty("S", "value"); message.setBooleanProperty("n", false); message.setByteProperty("byte", (byte) 9); message.setDoubleProperty("d", 2.0); @@ -420,6 +422,15 @@ frame = receiveFrame(10000); Assert.assertTrue(frame.startsWith("MESSAGE")); + Assert.assertTrue(frame.indexOf("S:") > 0); + Assert.assertTrue(frame.indexOf("n:") > 0); + Assert.assertTrue(frame.indexOf("byte:") > 0); + Assert.assertTrue(frame.indexOf("d:") > 0); + Assert.assertTrue(frame.indexOf("f:") > 0); + Assert.assertTrue(frame.indexOf("i:") > 0); + Assert.assertTrue(frame.indexOf("l:") > 0); + Assert.assertTrue(frame.indexOf("s:") > 0); + Assert.assertTrue(frame.indexOf("Hello World") > 0); // System.out.println("out: "+frame); @@ -908,6 +919,11 @@ } else if (c == 0) { c = is.read(); + if (c != '\n') + { + byte[] ba = inputBuffer.toByteArray(); + System.out.println(new String(ba, "UTF-8")); + } Assert.assertEquals("Expecting stomp frame to terminate with \0\n", c, '\n'); byte[] ba = inputBuffer.toByteArray(); inputBuffer.reset();

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8827 - in branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server: impl and 1 other directory.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 09:46:21 -0500 (Thu, 21 Jan 2010) New Revision: 8827 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/BindingQueryResult.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/QueueQueryResult.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/SessionCallback.java Removed: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/QueueImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/BindingQueryResult.java (from rev 8819, trunk/src/main/org/hornetq/core/server/BindingQueryResult.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/BindingQueryResult.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/BindingQueryResult.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -0,0 +1,49 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.server; + +import java.util.List; + +import org.hornetq.api.core.SimpleString; + +/** + * + * A BindingQueryResult + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class BindingQueryResult +{ + private boolean exists; + + private List<SimpleString> queueNames; + + public BindingQueryResult(final boolean exists, final List<SimpleString> queueNames) + { + this.exists = exists; + + this.queueNames = queueNames; + } + + public boolean isExists() + { + return exists; + } + + public List<SimpleString> getQueueNames() + { + return queueNames; + } +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -23,10 +23,8 @@ import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.replication.ReplicationEndpoint; import org.hornetq.core.security.Role; @@ -70,24 +68,19 @@ void unregisterActivateCallback(ActivateCallback callback); - ReattachSessionResponseMessage reattachSession(RemotingConnection connection, String name, int lastConfirmedCommandID) throws Exception; - /** The journal at the backup server has to be equivalent as the journal used on the live node. * Or else the backup node is out of sync. */ ReplicationEndpoint connectToReplicationEndpoint(Channel channel) throws Exception; - CreateSessionResponseMessage createSession(String name, - long channelID, - String username, - String password, - int minLargeMessageSize, - int incrementingVersion, - RemotingConnection remotingConnection, - boolean autoCommitSends, - boolean autoCommitAcks, - boolean preAcknowledge, - boolean xa, - int confirmationWindowSize) throws Exception; + ServerSession createSession(String name, + String username, + String password, + int minLargeMessageSize, + CoreRemotingConnection remotingConnection, + boolean autoCommitSends, + boolean autoCommitAcks, + boolean preAcknowledge, + boolean xa) throws Exception; void removeSession(String name) throws Exception; @@ -136,4 +129,6 @@ void setGroupingHandler(GroupingHandler groupingHandler); GroupingHandler getGroupingHandler(); + + boolean checkActivate() throws Exception; } Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/QueueQueryResult.java (from rev 8819, trunk/src/main/org/hornetq/core/server/QueueQueryResult.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/QueueQueryResult.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/QueueQueryResult.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -0,0 +1,125 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.server; + +import org.hornetq.api.core.SimpleString; + +/** + * + * A QueueQueryResult + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class QueueQueryResult +{ + private SimpleString name; + + private boolean exists; + + private boolean durable; + + private int consumerCount; + + private int messageCount; + + private SimpleString filterString; + + private SimpleString address; + + private boolean temporary; + + public QueueQueryResult(final SimpleString name, + final SimpleString address, + final boolean durable, + final boolean temporary, + final SimpleString filterString, + final int consumerCount, + final int messageCount) + { + this(name, address, durable, temporary, filterString, consumerCount, messageCount, true); + } + + public QueueQueryResult() + { + this(null, null, false, false, null, 0, 0, false); + } + + private QueueQueryResult(final SimpleString name, + final SimpleString address, + final boolean durable, + final boolean temporary, + final SimpleString filterString, + final int consumerCount, + final int messageCount, + final boolean exists) + { + this.durable = durable; + + this.temporary = temporary; + + this.consumerCount = consumerCount; + + this.messageCount = messageCount; + + this.filterString = filterString; + + this.address = address; + + this.name = name; + + this.exists = exists; + } + + public boolean isExists() + { + return exists; + } + + public boolean isDurable() + { + return durable; + } + + public int getConsumerCount() + { + return consumerCount; + } + + public int getMessageCount() + { + return messageCount; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public SimpleString getAddress() + { + return address; + } + + public SimpleString getName() + { + return name; + } + + public boolean isTemporary() + { + return temporary; + } + +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/ServerSession.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -13,35 +13,12 @@ package org.hornetq.core.server; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; -import org.hornetq.core.server.impl.ServerSessionPacketHandler; +import java.util.List; +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.SimpleString; + /** * * A ServerSession @@ -54,8 +31,6 @@ { String getName(); - long getID(); - String getUsername(); String getPassword(); @@ -66,75 +41,75 @@ void removeConsumer(ServerConsumer consumer) throws Exception; - void close() throws Exception; + void acknowledge(long consumerID, long messageID) throws Exception; - void handleAcknowledge(final SessionAcknowledgeMessage packet); + void expire(long consumerID, long messageID) throws Exception; - void handleExpired(final SessionExpiredMessage packet); + void rollback(boolean considerLastMessageAsDelivered) throws Exception; - void handleRollback(RollbackMessage packet); + void commit() throws Exception; - void handleCommit(Packet packet); + void xaCommit(Xid xid, boolean onePhase) throws Exception; - void handleXACommit(SessionXACommitMessage packet); + void xaEnd(Xid xid) throws Exception; - void handleXAEnd(SessionXAEndMessage packet); + void xaForget(Xid xid) throws Exception; - void handleXAForget(SessionXAForgetMessage packet); + void xaJoin(Xid xid) throws Exception; - void handleXAJoin(SessionXAJoinMessage packet); + void xaPrepare(Xid xid) throws Exception; - void handleXAPrepare(SessionXAPrepareMessage packet); + void xaResume(Xid xid) throws Exception; - void handleXAResume(SessionXAResumeMessage packet); + void xaRollback(Xid xid) throws Exception; - void handleXARollback(SessionXARollbackMessage packet); + void xaStart(Xid xid) throws Exception; - void handleXAStart(SessionXAStartMessage packet); + void xaSuspend() throws Exception; - void handleXASuspend(Packet packet); + List<Xid> xaGetInDoubtXids(); - void handleGetInDoubtXids(Packet packet); + int xaGetTimeout(); - void handleGetXATimeout(Packet packet); + void xaSetTimeout(int timeout); - void handleSetXATimeout(SessionXASetTimeoutMessage packet); + void start(); - void handleStart(Packet packet); + void stop(); - void handleStop(Packet packet); + void createQueue(SimpleString address, + SimpleString name, + SimpleString filterString, + boolean temporary, + boolean durable) throws Exception; - void handleCreateQueue(CreateQueueMessage packet); + void deleteQueue(SimpleString name) throws Exception; - void handleDeleteQueue(SessionDeleteQueueMessage packet); + void createConsumer(long consumerID, SimpleString name, SimpleString filterString, boolean browseOnly) throws Exception; - void handleCreateConsumer(SessionCreateConsumerMessage packet); + QueueQueryResult executeQueueQuery(SimpleString name) throws Exception; - void handleExecuteQueueQuery(SessionQueueQueryMessage packet); + BindingQueryResult executeBindingQuery(SimpleString address); - void handleExecuteBindingQuery(SessionBindingQueryMessage packet); + void closeConsumer(long consumerID) throws Exception; - void handleCloseConsumer(SessionConsumerCloseMessage packet); + void receiveConsumerCredits(long consumerID, int credits) throws Exception; - void handleReceiveConsumerCredits(SessionConsumerFlowCreditMessage packet); + void sendContinuations(int packetSize, byte[] body, boolean continues) throws Exception; - void handleSendContinuations(SessionSendContinuationMessage packet); + void send(ServerMessage message) throws Exception; - void handleSend(SessionSendMessage packet); + void sendLarge(byte[] largeMessageHeader) throws Exception; - void handleSendLargeMessage(SessionSendLargeMessage packet); + void forceConsumerDelivery(long consumerID, long sequence) throws Exception; - void handleForceConsumerDelivery(SessionForceConsumerDelivery message); + void requestProducerCredits(SimpleString address, int credits) throws Exception; - void handleRequestProducerCredits(SessionRequestProducerCreditsMessage message) throws Exception; + void close() throws Exception; - void handleClose(Packet packet); - - int transferConnection(RemotingConnection newConnection, int lastReceivedCommandID); - - Channel getChannel(); - - ServerSessionPacketHandler getHandler(); - - void setHandler(ServerSessionPacketHandler handler); + void setTransferring(boolean transferring); + + void runConnectionFailureRunners(); + + void setCallback(SessionCallback callback); } Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/SessionCallback.java (from rev 8819, trunk/src/main/org/hornetq/core/server/SessionCallback.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/SessionCallback.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/SessionCallback.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -0,0 +1,36 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.server; + +import org.hornetq.api.core.SimpleString; + +/** + * A SessionCallback + * + * @author Tim Fox + * + * + */ +public interface SessionCallback +{ + void sendProducerCreditsMessage(int credits, SimpleString address, int offset); + + int sendMessage(ServerMessage message, long consumerID, int deliveryCount); + + int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount); + + int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse); + + void closed(); +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -1,234 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.server.impl; - -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATESESSION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_REPLICATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.replication.ReplicationEndpoint; -import org.hornetq.core.server.HornetQServer; - -/** - * A packet handler for all packets that need to be handled at the server level - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> - */ -public class HornetQPacketHandler implements ChannelHandler -{ - private static final Logger log = Logger.getLogger(HornetQPacketHandler.class); - - private final HornetQServer server; - - private final Channel channel1; - - private final RemotingConnection connection; - - public HornetQPacketHandler(final HornetQServer server, final Channel channel1, final RemotingConnection connection) - { - this.server = server; - - this.channel1 = channel1; - - this.connection = connection; - } - - public void handlePacket(final Packet packet) - { - byte type = packet.getType(); - - // All these operations need to be idempotent since they are outside of the session - // reliability replay functionality - switch (type) - { - case CREATESESSION: - { - CreateSessionMessage request = (CreateSessionMessage)packet; - - handleCreateSession(request); - - break; - } - case REATTACH_SESSION: - { - ReattachSessionMessage request = (ReattachSessionMessage)packet; - - handleReattachSession(request); - - break; - } - case CREATE_QUEUE: - { - // Create queue can also be fielded here in the case of a replicated store and forward queue creation - - CreateQueueMessage request = (CreateQueueMessage)packet; - - handleCreateQueue(request); - - break; - } - case CREATE_REPLICATION: - { - // Create queue can also be fielded here in the case of a replicated store and forward queue creation - - CreateReplicationSessionMessage request = (CreateReplicationSessionMessage)packet; - - handleCreateReplication(request); - - break; - } - default: - { - HornetQPacketHandler.log.error("Invalid packet " + packet); - } - } - } - - private void handleCreateSession(final CreateSessionMessage request) - { - boolean incompatibleVersion = false; - Packet response; - try - { - response = server.createSession(request.getName(), - request.getSessionChannelID(), - request.getUsername(), - request.getPassword(), - request.getMinLargeMessageSize(), - request.getVersion(), - connection, - request.isAutoCommitSends(), - request.isAutoCommitAcks(), - request.isPreAcknowledge(), - request.isXA(), - request.getWindowSize()); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - - if (((HornetQException)e).getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) - { - incompatibleVersion = true; - } - } - else - { - HornetQPacketHandler.log.error("Failed to create session", e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - // send the exception to the client and destroy - // the connection if the client and server versions - // are not compatible - if (incompatibleVersion) - { - channel1.sendAndFlush(response); - } - else - { - channel1.send(response); - } - } - - private void handleReattachSession(final ReattachSessionMessage request) - { - Packet response; - - try - { - response = server.reattachSession(connection, request.getName(), request.getLastConfirmedCommandID()); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - HornetQPacketHandler.log.error("Failed to reattach session", e); - - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - channel1.send(response); - } - - private void handleCreateQueue(final CreateQueueMessage request) - { - try - { - server.createQueue(request.getAddress(), - request.getQueueName(), - request.getFilterString(), - request.isDurable(), - request.isTemporary()); - } - catch (Exception e) - { - HornetQPacketHandler.log.error("Failed to handle create queue", e); - } - } - - private void handleCreateReplication(final CreateReplicationSessionMessage request) - { - Packet response; - - try - { - Channel channel = connection.getChannel(request.getSessionChannelID(), -1); - - ReplicationEndpoint endpoint = server.connectToReplicationEndpoint(channel); - - channel.setHandler(endpoint); - - response = new NullResponseMessage(); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - HornetQPacketHandler.log.warn(e.getMessage(), e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - channel1.send(response); - } - -} \ No newline at end of file Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -22,7 +22,6 @@ import java.util.Set; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -69,10 +68,8 @@ import org.hornetq.core.postoffice.impl.DivertBinding; import org.hornetq.core.postoffice.impl.LocalQueueBinding; import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.replication.ReplicationEndpoint; @@ -342,12 +339,12 @@ managementService.removeNotificationListener(groupingHandler); groupingHandler = null; } - // Need to flush all sessions to make sure all confirmations get sent back to client - - for (ServerSession session : sessions.values()) - { - session.getChannel().flushConfirmations(); - } + // // Need to flush all sessions to make sure all confirmations get sent back to client + // + // for (ServerSession session : sessions.values()) + // { + // session.getChannel().flushConfirmations(); + // } } // we stop the remoting service outside a lock @@ -537,102 +534,21 @@ return clusterManager; } - public ReattachSessionResponseMessage reattachSession(final RemotingConnection connection, - final String name, - final int lastConfirmedCommandID) throws Exception + public ServerSession createSession(final String name, + final String username, + final String password, + final int minLargeMessageSize, + final CoreRemotingConnection connection, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final boolean xa) throws Exception { - if (!started) - { - return new ReattachSessionResponseMessage(-1, false); - } - - ServerSession session = sessions.get(name); - - if (!checkActivate()) - { - return new ReattachSessionResponseMessage(-1, false); - } - - if (session == null) - { - return new ReattachSessionResponseMessage(-1, false); - } - else - { - if (session.getChannel().getConfirmationWindowSize() == -1) - { - // Even though session exists, we can't reattach since confi window size == -1, - // i.e. we don't have a resend cache for commands, so we just close the old session - // and let the client recreate - - try - { - session.close(); - } - catch (Exception e) - { - HornetQServerImpl.log.error("Failed to close session", e); - } - - sessions.remove(name); - - return new ReattachSessionResponseMessage(-1, false); - } - else - { - // Reconnect the channel to the new connection - int serverLastConfirmedCommandID = session.transferConnection(connection, lastConfirmedCommandID); - - return new ReattachSessionResponseMessage(serverLastConfirmedCommandID, true); - } - } - } - - public CreateSessionResponseMessage createSession(final String name, - final long channelID, - final String username, - final String password, - final int minLargeMessageSize, - final int incrementingVersion, - final RemotingConnection connection, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final boolean xa, - final int sendWindowSize) throws Exception - { - if (!started) - { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, "Server not started"); - } - - if (version.getIncrementingVersion() != incrementingVersion) - { - HornetQServerImpl.log.warn("Client with version " + incrementingVersion + - " and address " + - connection.getRemoteAddress() + - " is not compatible with server version " + - version.getFullVersion() + - ". " + - "Please ensure all clients and servers are upgraded to the same version for them to " + - "interoperate properly"); - throw new HornetQException(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, - "Server and client versions incompatible"); - } - - if (!checkActivate()) - { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, - "Server will not accept create session requests"); - } - if (securityStore != null) { securityStore.authenticate(username, password); } - Channel channel = connection.getChannel(channelID, sendWindowSize); - final ServerSessionImpl session = new ServerSessionImpl(name, username, password, @@ -647,22 +563,13 @@ postOffice, resourceManager, securityStore, - channel, managementService, this, configuration.getManagementAddress()); sessions.put(name, session); - ServerSessionPacketHandler handler = new ServerSessionPacketHandler(session, - storageManager.newContext(executorFactory.getExecutor()), - storageManager); - - session.setHandler(handler); - - channel.setHandler(handler); - - return new CreateSessionResponseMessage(version.getIncrementingVersion()); + return session; } public synchronized ReplicationEndpoint connectToReplicationEndpoint(final Channel channel) throws Exception @@ -937,7 +844,7 @@ } } - private synchronized boolean checkActivate() throws Exception + public synchronized boolean checkActivate() throws Exception { if (configuration.isBackup()) { @@ -1025,8 +932,7 @@ if (ConfigurationImpl.DEFAULT_CLUSTER_USER.equals(configuration.getClusterUser()) && ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD.equals(configuration.getClusterPassword())) { - log.warn("Security risk! It has been detected that the cluster admin user and password " - + "have not been changed from the installation default. " + log.warn("Security risk! It has been detected that the cluster admin user and password " + "have not been changed from the installation default. " + "Please see the HornetQ user guide, cluster chapter, for instructions on how to do this."); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -245,12 +245,12 @@ executor.execute(deliverRunner); } } - + public Executor getExecutor() { return executor; } - + public synchronized void deliverNow() { deliverRunner.run(); @@ -743,7 +743,7 @@ } return false; } - + public int sendMessagesToDeadLetterAddress(Filter filter) throws Exception { int count = 0; @@ -757,7 +757,7 @@ deliveringCount.incrementAndGet(); sendToDeadLetterAddress(ref); iter.remove(); - count ++; + count++; } } return count; @@ -832,7 +832,7 @@ return false; } - + public int changeReferencesPriority(final Filter filter, final byte newPriority) throws Exception { Iterator<MessageReference> iter = messageReferences.iterator(); @@ -843,7 +843,7 @@ MessageReference ref = iter.next(); if (filter == null || filter.match(ref.getMessage())) { - count ++; + count++; iter.remove(); ref.getMessage().setPriority(newPriority); addLast(ref); @@ -1404,7 +1404,8 @@ } catch (Exception e) { - QueueImpl.log.warn("Unable to remove message id = " + message.getMessageID() + " please remove manually"); + QueueImpl.log.warn("Unable to remove message id = " + message.getMessageID() + " please remove manually", + e); } } } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -23,7 +23,6 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.client.impl.ClientConsumerImpl; @@ -33,10 +32,6 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; import org.hornetq.core.server.HandleStatus; import org.hornetq.core.server.LargeServerMessage; import org.hornetq.core.server.MessageReference; @@ -44,6 +39,7 @@ import org.hornetq.core.server.ServerConsumer; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.SessionCallback; import org.hornetq.core.server.management.ManagementService; import org.hornetq.core.server.management.Notification; import org.hornetq.core.transaction.Transaction; @@ -112,7 +108,7 @@ private final java.util.Queue<MessageReference> deliveringRefs = new ConcurrentLinkedQueue<MessageReference>(); - private final Channel channel; + private final SessionCallback callback; private volatile boolean closed; @@ -133,12 +129,11 @@ final boolean started, final boolean browseOnly, final StorageManager storageManager, - final Channel channel, + final SessionCallback callback, final boolean preAcknowledge, final boolean strictUpdateDeliveryCount, final ManagementService managementService) throws Exception { - this.id = id; this.filter = filter; @@ -157,7 +152,7 @@ this.storageManager = storageManager; - this.channel = channel; + this.callback = callback; this.preAcknowledge = preAcknowledge; @@ -361,9 +356,7 @@ forcedDeliveryMessage.putLongProperty(ClientConsumerImpl.FORCED_DELIVERY_MESSAGE, sequence); forcedDeliveryMessage.setAddress(messageQueue.getName()); - final SessionReceiveMessage packet = new SessionReceiveMessage(id, forcedDeliveryMessage, 0); - - channel.send(packet); + callback.sendMessage(forcedDeliveryMessage, id, 0); } catch (Exception e) { @@ -634,15 +627,12 @@ */ private void deliverStandardMessage(final MessageReference ref, final ServerMessage message) { - final SessionReceiveMessage packet = new SessionReceiveMessage(id, message, ref.getDeliveryCount()); + int packetSize = callback.sendMessage(message, id, ref.getDeliveryCount()); - channel.send(packet); - if (availableCredits != null) { - availableCredits.addAndGet(-packet.getPacketSize()); + availableCredits.addAndGet(-packetSize); } - } // Inner classes @@ -732,21 +722,18 @@ sizePendingLargeMessage = context.getLargeBodySize(); - SessionReceiveLargeMessage initialPacket = new SessionReceiveLargeMessage(id, - headerBuffer.toByteBuffer() - .array(), - context.getLargeBodySize(), - ref.getDeliveryCount()); - context.open(); sentInitialPacket = true; - channel.send(initialPacket); + int packetSize = callback.sendLargeMessage(id, + headerBuffer.toByteBuffer().array(), + context.getLargeBodySize(), + ref.getDeliveryCount()); if (availableCredits != null) { - availableCredits.addAndGet(-initialPacket.getPacketSize()); + availableCredits.addAndGet(-packetSize); } // Execute the rest of the large message on a different thread so as not to tie up the delivery thread @@ -768,22 +755,33 @@ return false; } - SessionReceiveContinuationMessage chunk = createChunkSend(context); + int localChunkLen = 0; - int chunkLen = chunk.getBody().length; + localChunkLen = (int)Math.min(sizePendingLargeMessage - positionPendingLargeMessage, minLargeMessageSize); - channel.send(chunk); + HornetQBuffer bodyBuffer = HornetQBuffers.fixedBuffer(localChunkLen); + context.encode(bodyBuffer, localChunkLen); + + byte[] body = bodyBuffer.toByteBuffer().array(); + + int packetSize = callback.sendLargeMessageContinuation(id, + body, + positionPendingLargeMessage + localChunkLen < sizePendingLargeMessage, + false); + + int chunkLen = body.length; + if (ServerConsumerImpl.trace) { - ServerConsumerImpl.trace("deliverLargeMessage: Sending " + chunk.getPacketSize() + + ServerConsumerImpl.trace("deliverLargeMessage: Sending " + packetSize + " availableCredits now is " + availableCredits); } if (availableCredits != null) { - availableCredits.addAndGet(-chunk.getPacketSize()); + availableCredits.addAndGet(-packetSize); } positionPendingLargeMessage += chunkLen; @@ -846,26 +844,6 @@ lock.unlock(); } } - - private SessionReceiveContinuationMessage createChunkSend(final BodyEncoder context) throws HornetQException - { - SessionReceiveContinuationMessage chunk; - - int localChunkLen = 0; - - localChunkLen = (int)Math.min(sizePendingLargeMessage - positionPendingLargeMessage, minLargeMessageSize); - - HornetQBuffer bodyBuffer = HornetQBuffers.fixedBuffer(localChunkLen); - - context.encode(bodyBuffer, localChunkLen); - - chunk = new SessionReceiveContinuationMessage(id, - bodyBuffer.toByteBuffer().array(), - positionPendingLargeMessage + localChunkLen < sizePendingLargeMessage, - false); - - return chunk; - } } private class BrowserDeliverer implements Runnable Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -21,7 +21,7 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.server.MessageReference; import org.hornetq.core.server.Queue; import org.hornetq.core.server.ServerMessage; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -24,13 +24,13 @@ import java.util.concurrent.ConcurrentHashMap; import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.core.client.impl.ClientMessageImpl; +import org.hornetq.core.exception.HornetQXAException; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.journal.IOAsyncTask; @@ -42,55 +42,22 @@ import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.remoting.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.SecurityStore; +import org.hornetq.core.server.BindingQueryResult; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.LargeServerMessage; import org.hornetq.core.server.MessageReference; import org.hornetq.core.server.Queue; +import org.hornetq.core.server.QueueQueryResult; import org.hornetq.core.server.RoutingContext; import org.hornetq.core.server.ServerConsumer; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.SessionCallback; import org.hornetq.core.server.management.ManagementService; import org.hornetq.core.server.management.Notification; import org.hornetq.core.transaction.ResourceManager; @@ -113,10 +80,10 @@ private static final Logger log = Logger.getLogger(ServerSessionImpl.class); // Static ------------------------------------------------------------------------------- - + // Attributes ---------------------------------------------------------------------------- - private final long id; + // private final long id; private final String username; @@ -132,7 +99,7 @@ private final boolean strictUpdateDeliveryCount; - private RemotingConnection remotingConnection; + private CoreRemotingConnection remotingConnection; private final Map<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>(); @@ -146,8 +113,6 @@ private final SecurityStore securityStore; - private final Channel channel; - private final ManagementService managementService; private volatile boolean started = false; @@ -163,14 +128,14 @@ // The current currentLargeMessage being processed private volatile LargeServerMessage currentLargeMessage; - private ServerSessionPacketHandler handler; - private boolean closed; private final Map<SimpleString, CreditManagerHolder> creditManagerHolders = new HashMap<SimpleString, CreditManagerHolder>(); private final RoutingContext routingContext = new RoutingContextImpl(null); + private SessionCallback callback; + // Constructors --------------------------------------------------------------------------------- public ServerSessionImpl(final String name, @@ -182,18 +147,15 @@ final boolean preAcknowledge, final boolean strictUpdateDeliveryCount, final boolean xa, - final RemotingConnection remotingConnection, + final CoreRemotingConnection remotingConnection, final StorageManager storageManager, final PostOffice postOffice, final ResourceManager resourceManager, final SecurityStore securityStore, - final Channel channel, final ManagementService managementService, final HornetQServer server, final SimpleString managementAddress) throws Exception { - id = channel.getID(); - this.username = username; this.password = password; @@ -223,8 +185,6 @@ this.strictUpdateDeliveryCount = strictUpdateDeliveryCount; - this.channel = channel; - this.managementService = managementService; this.name = name; @@ -240,16 +200,11 @@ // ServerSession implementation ---------------------------------------------------------------------------- - public ServerSessionPacketHandler getHandler() + public void setCallback(final SessionCallback callback) { - return handler; + this.callback = callback; } - public void setHandler(final ServerSessionPacketHandler handler) - { - this.handler = handler; - } - public String getUsername() { return username; @@ -265,11 +220,6 @@ return minLargeMessageSize; } - public long getID() - { - return id; - } - public String getName() { return name; @@ -288,7 +238,7 @@ } } - public synchronized void close() throws Exception + private synchronized void doClose() throws Exception { if (tx != null && tx.getXid() == null) { @@ -330,579 +280,346 @@ { holder.store.returnProducerCredits(holder.outstandingCredits); } + + callback.closed(); } - public void handleCreateConsumer(final SessionCreateConsumerMessage packet) + public void createConsumer(final long consumerID, + final SimpleString name, + final SimpleString filterString, + final boolean browseOnly) throws Exception { - SimpleString name = packet.getQueueName(); - - SimpleString filterString = packet.getFilterString(); + Binding binding = postOffice.getBinding(name); - boolean browseOnly = packet.isBrowseOnly(); - - Packet response = null; - - try + if (binding == null || binding.getType() != BindingType.LOCAL_QUEUE) { - Binding binding = postOffice.getBinding(name); + throw new HornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, "Queue " + name + " does not exist"); + } - if (binding == null || binding.getType() != BindingType.LOCAL_QUEUE) - { - throw new HornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, "Queue " + name + " does not exist"); - } + securityStore.check(binding.getAddress(), CheckType.CONSUME, this); - securityStore.check(binding.getAddress(), CheckType.CONSUME, this); + Filter filter = FilterImpl.createFilter(filterString); - Filter filter = FilterImpl.createFilter(filterString);; + ServerConsumer consumer = new ServerConsumerImpl(consumerID, + this, + (QueueBinding)binding, + filter, + started, + browseOnly, + storageManager, + callback, + preAcknowledge, + strictUpdateDeliveryCount, + managementService); - ServerConsumer consumer = new ServerConsumerImpl(packet.getID(), - this, - (QueueBinding)binding, - filter, - started, - browseOnly, - storageManager, - channel, - preAcknowledge, - strictUpdateDeliveryCount, - managementService); + consumers.put(consumer.getID(), consumer); - consumers.put(consumer.getID(), consumer); + if (!browseOnly) + { + TypedProperties props = new TypedProperties(); - if (!browseOnly) - { - TypedProperties props = new TypedProperties(); + props.putSimpleStringProperty(ManagementHelper.HDR_ADDRESS, binding.getAddress()); - props.putSimpleStringProperty(ManagementHelper.HDR_ADDRESS, binding.getAddress()); + props.putSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME, binding.getClusterName()); - props.putSimpleStringProperty(ManagementHelper.HDR_CLUSTER_NAME, binding.getClusterName()); + props.putSimpleStringProperty(ManagementHelper.HDR_ROUTING_NAME, binding.getRoutingName()); - props.putSimpleStringProperty(ManagementHelper.HDR_ROUTING_NAME, binding.getRoutingName()); + props.putIntProperty(ManagementHelper.HDR_DISTANCE, binding.getDistance()); - props.putIntProperty(ManagementHelper.HDR_DISTANCE, binding.getDistance()); + Queue theQueue = (Queue)binding.getBindable(); - Queue theQueue = (Queue)binding.getBindable(); + props.putIntProperty(ManagementHelper.HDR_CONSUMER_COUNT, theQueue.getConsumerCount()); - props.putIntProperty(ManagementHelper.HDR_CONSUMER_COUNT, theQueue.getConsumerCount()); + if (filterString != null) + { + props.putSimpleStringProperty(ManagementHelper.HDR_FILTERSTRING, filterString); + } - if (filterString != null) - { - props.putSimpleStringProperty(ManagementHelper.HDR_FILTERSTRING, filterString); - } + Notification notification = new Notification(null, CONSUMER_CREATED, props); - Notification notification = new Notification(null, CONSUMER_CREATED, props); + managementService.sendNotification(notification); + } + } - managementService.sendNotification(notification); - } - - //We send back queue information on the queue as a response- this allows the queue to - //be automaticall recreated on failover - - if (packet.isRequiresResponse()) - { - response = doExecuteQueueQuery(name); - } - else - { - response = null; - } + public void createQueue(final SimpleString address, + final SimpleString name, + final SimpleString filterString, + final boolean temporary, + final boolean durable) throws Exception + { + if (durable) + { + // make sure the user has privileges to create this queue + securityStore.check(address, CheckType.CREATE_DURABLE_QUEUE, this); } - catch (Exception e) + else { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - ServerSessionImpl.log.error("Failed to create consumer", e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } + securityStore.check(address, CheckType.CREATE_NON_DURABLE_QUEUE, this); } - - sendResponse(packet, response, false, false); - } - public void handleCreateQueue(final CreateQueueMessage packet) - { - SimpleString address = packet.getAddress(); + server.createQueue(address, name, filterString, durable, temporary); - final SimpleString name = packet.getQueueName(); - - SimpleString filterString = packet.getFilterString(); - - boolean temporary = packet.isTemporary(); - - boolean durable = packet.isDurable(); - - Packet response = null; - - try + if (temporary) { - if (durable) - { - // make sure the user has privileges to create this queue - securityStore.check(address, CheckType.CREATE_DURABLE_QUEUE, this); - } - else - { - securityStore.check(address, CheckType.CREATE_NON_DURABLE_QUEUE, this); - } + // Temporary queue in core simply means the queue will be deleted if + // the remoting connection + // dies. It does not mean it will get deleted automatically when the + // session is closed. + // It is up to the user to delete the queue when finished with it - server.createQueue(address, name, filterString, durable, temporary); - - if (temporary) + failureRunners.put(name, new Runnable() { - // Temporary queue in core simply means the queue will be deleted if - // the remoting connection - // dies. It does not mean it will get deleted automatically when the - // session is closed. - // It is up to the user to delete the queue when finished with it - - failureRunners.put(name, new Runnable() + public void run() { - public void run() + try { - try + if (postOffice.getBinding(name) != null) { - if (postOffice.getBinding(name) != null) + postOffice.removeBinding(name); + + if (postOffice.getBindingsForAddress(name).getBindings().size() == 0) { - postOffice.removeBinding(name); - - if (postOffice.getBindingsForAddress(name).getBindings().size() == 0) - { - creditManagerHolders.remove(name); - } + creditManagerHolders.remove(name); } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to remove temporary queue " + name); - } } - }); - } - - if (packet.isRequiresResponse()) - { - response = new NullResponseMessage(); - } - else - { - response = null; - } + catch (Exception e) + { + ServerSessionImpl.log.error("Failed to remove temporary queue " + name); + } + } + }); } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - ServerSessionImpl.log.error("Failed to create queue", e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, false, false); } - public void handleDeleteQueue(final SessionDeleteQueueMessage packet) + public void deleteQueue(final SimpleString name) throws Exception { - SimpleString name = packet.getQueueName(); + Binding binding = postOffice.getBinding(name); - Packet response = null; - - try + if (binding == null || binding.getType() != BindingType.LOCAL_QUEUE) { - Binding binding = postOffice.getBinding(name); + throw new HornetQException(HornetQException.QUEUE_DOES_NOT_EXIST); + } - if (binding == null || binding.getType() != BindingType.LOCAL_QUEUE) - { - throw new HornetQException(HornetQException.QUEUE_DOES_NOT_EXIST); - } + server.destroyQueue(name, this); - server.destroyQueue(name, this); + failureRunners.remove(name); - failureRunners.remove(name); - - if (postOffice.getBindingsForAddress(name).getBindings().size() == 0) - { - creditManagerHolders.remove(name); - } - - response = new NullResponseMessage(); - } - catch (Exception e) + if (postOffice.getBindingsForAddress(name).getBindings().size() == 0) { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - ServerSessionImpl.log.error("Failed to delete queue", e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } + creditManagerHolders.remove(name); } - - sendResponse(packet, response, false, false); } - - public void handleExecuteQueueQuery(final SessionQueueQueryMessage packet) - { - SimpleString name = packet.getQueueName(); - Packet response = null; - - try + public QueueQueryResult executeQueueQuery(final SimpleString name) throws Exception + { + if (name == null) { - response = doExecuteQueueQuery(name); + throw new IllegalArgumentException("Queue name is null"); } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - ServerSessionImpl.log.error("Failed to execute queue query", e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } + QueueQueryResult response; - sendResponse(packet, response, false, false); - } + Binding binding = postOffice.getBinding(name); - public void handleExecuteBindingQuery(final SessionBindingQueryMessage packet) - { - SimpleString address = packet.getAddress(); - - Packet response = null; - - try + if (binding != null && binding.getType() == BindingType.LOCAL_QUEUE) { - if (address == null) - { - throw new IllegalArgumentException("Address is null"); - } + Queue queue = (Queue)binding.getBindable(); - List<SimpleString> names = new ArrayList<SimpleString>(); + Filter filter = queue.getFilter(); - Bindings bindings = postOffice.getMatchingBindings(address); + SimpleString filterString = filter == null ? null : filter.getFilterString(); - for (Binding binding : bindings.getBindings()) - { - if (binding.getType() == BindingType.LOCAL_QUEUE) - { - names.add(binding.getUniqueName()); - } - } - - response = new SessionBindingQueryResponseMessage(!names.isEmpty(), names); + response = new QueueQueryResult(name, + binding.getAddress(), + queue.isDurable(), + queue.isTemporary(), + filterString, + queue.getConsumerCount(), + queue.getMessageCount()); } - catch (Exception e) + // make an exception for the management address (see HORNETQ-29) + else if (name.equals(managementAddress)) { - ServerSessionImpl.log.error("Failed to execute binding query", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } + response = new QueueQueryResult(name, managementAddress, true, false, null, -1, -1); } + else + { + response = new QueueQueryResult(); + } - sendResponse(packet, response, false, false); + return response; } - public void handleForceConsumerDelivery(final SessionForceConsumerDelivery message) + public BindingQueryResult executeBindingQuery(final SimpleString address) { - try + if (address == null) { - ServerConsumer consumer = consumers.get(message.getConsumerID()); - - consumer.forceDelivery(message.getSequence()); + throw new IllegalArgumentException("Address is null"); } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to query consumer deliveries", e); - } - sendResponse(message, null, false, false); - } + List<SimpleString> names = new ArrayList<SimpleString>(); - public void handleAcknowledge(final SessionAcknowledgeMessage packet) - { - Packet response = null; + Bindings bindings = postOffice.getMatchingBindings(address); - try + for (Binding binding : bindings.getBindings()) { - ServerConsumer consumer = consumers.get(packet.getConsumerID()); - - consumer.acknowledge(autoCommitAcks, tx, packet.getMessageID()); - - if (packet.isRequiresResponse()) + if (binding.getType() == BindingType.LOCAL_QUEUE) { - response = new NullResponseMessage(); + names.add(binding.getUniqueName()); } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to acknowledge", e); - if (packet.isRequiresResponse()) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - } + return new BindingQueryResult(!names.isEmpty(), names); + } - sendResponse(packet, response, false, false); + public void forceConsumerDelivery(final long consumerID, final long sequence) throws Exception + { + ServerConsumer consumer = consumers.get(consumerID); + + consumer.forceDelivery(sequence); } - public void handleExpired(final SessionExpiredMessage packet) + public void acknowledge(final long consumerID, final long messageID) throws Exception { - try - { - MessageReference ref = consumers.get(packet.getConsumerID()).getExpired(packet.getMessageID()); + ServerConsumer consumer = consumers.get(consumerID); - if (ref != null) - { - ref.getQueue().expire(ref); - } - } - catch (Exception e) + consumer.acknowledge(autoCommitAcks, tx, messageID); + } + + public void expire(final long consumerID, final long messageID) throws Exception + { + MessageReference ref = consumers.get(consumerID).getExpired(messageID); + + if (ref != null) { - ServerSessionImpl.log.error("Failed to acknowledge", e); + ref.getQueue().expire(ref); } - - sendResponse(packet, null, false, false); } - public void handleCommit(final Packet packet) + public void commit() throws Exception { - Packet response = null; - try { tx.commit(); - - response = new NullResponseMessage(); } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to commit", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } finally { tx = new TransactionImpl(storageManager); } - - sendResponse(packet, response, false, false); } - public void handleRollback(final RollbackMessage packet) + public void rollback(final boolean considerLastMessageAsDelivered) throws Exception { - Packet response = null; - - try + if (tx == null) { - rollback(packet.isConsiderLastMessageAsDelivered()); + // Might be null if XA - response = new NullResponseMessage(); + tx = new TransactionImpl(storageManager); } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to rollback", e); - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } + doRollback(considerLastMessageAsDelivered, tx); - sendResponse(packet, response, false, false); + tx = new TransactionImpl(storageManager); } - public void handleXACommit(final SessionXACommitMessage packet) + public void xaCommit(final Xid xid, final boolean onePhase) throws Exception { - Packet response = null; + if (tx != null) + { + final String msg = "Cannot commit, session is currently doing work in transaction " + tx.getXid(); - Xid xid = packet.getXid(); - - try + throw new HornetQXAException(XAException.XAER_PROTO, msg); + } + else { - if (tx != null) - { - final String msg = "Cannot commit, session is currently doing work in transaction " + tx.getXid(); + Transaction theTx = resourceManager.removeTransaction(xid); - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); + if (theTx == null) + { + // checked heuristic committed transactions + if (resourceManager.getHeuristicCommittedTransactions().contains(xid)) + { + throw new HornetQXAException(XAException.XA_HEURCOM, + "transaction has been heuristically committed: " + xid); + } + // checked heuristic rolled back transactions + else if (resourceManager.getHeuristicRolledbackTransactions().contains(xid)) + { + throw new HornetQXAException(XAException.XA_HEURRB, + "transaction has been heuristically rolled back: " + xid); + } + else + { + throw new HornetQXAException(XAException.XAER_NOTA, "Cannot find xid in resource manager: " + xid); + } } else { - Transaction theTx = resourceManager.removeTransaction(xid); - - if (theTx == null) + if (theTx.getState() == Transaction.State.SUSPENDED) { - // checked heuristic committed transactions - if (resourceManager.getHeuristicCommittedTransactions().contains(xid)) - { - response = new SessionXAResponseMessage(true, - XAException.XA_HEURCOM, - "transaction has been heuristically committed: " + xid); - } - // checked heuristic rolled back transactions - else if (resourceManager.getHeuristicRolledbackTransactions().contains(xid)) - { - response = new SessionXAResponseMessage(true, - XAException.XA_HEURRB, - "transaction has been heuristically rolled back: " + xid); - } - else - { - response = new SessionXAResponseMessage(true, - XAException.XAER_NOTA, - "Cannot find xid in resource manager: " + xid); - } + // Put it back + resourceManager.putTransaction(xid, tx); + + throw new HornetQXAException(XAException.XAER_PROTO, "Cannot commit transaction, it is suspended " + xid); } else { - if (theTx.getState() == Transaction.State.SUSPENDED) - { - // Put it back - resourceManager.putTransaction(xid, tx); - - response = new SessionXAResponseMessage(true, - XAException.XAER_PROTO, - "Cannot commit transaction, it is suspended " + xid); - } - else - { - theTx.commit(packet.isOnePhase()); - - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } + theTx.commit(onePhase); } } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to xa commit", e); + } - if (e instanceof HornetQException) + public void xaEnd(final Xid xid) throws Exception + { + if (tx != null && tx.getXid().equals(xid)) + { + if (tx.getState() == Transaction.State.SUSPENDED) { - response = new HornetQExceptionMessage((HornetQException)e); + final String msg = "Cannot end, transaction is suspended"; + + throw new HornetQXAException(XAException.XAER_PROTO, msg); } else { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + tx = null; } } - - sendResponse(packet, response, false, false); - } - - public void handleXAEnd(final SessionXAEndMessage packet) - { - Packet response = null; - - Xid xid = packet.getXid(); - - try + else { - if (tx != null && tx.getXid().equals(xid)) + // It's also legal for the TM to call end for a Xid in the suspended + // state + // See JTA 1.1 spec 3.4.4 - state diagram + // Although in practice TMs rarely do this. + Transaction theTx = resourceManager.getTransaction(xid); + + if (theTx == null) { - if (tx.getState() == Transaction.State.SUSPENDED) - { - final String msg = "Cannot end, transaction is suspended"; + final String msg = "Cannot find suspended transaction to end " + xid; - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); - } - else - { - tx = null; - } + throw new HornetQXAException(XAException.XAER_NOTA, msg); } else { - // It's also legal for the TM to call end for a Xid in the suspended - // state - // See JTA 1.1 spec 3.4.4 - state diagram - // Although in practice TMs rarely do this. - Transaction theTx = resourceManager.getTransaction(xid); - - if (theTx == null) + if (theTx.getState() != Transaction.State.SUSPENDED) { - final String msg = "Cannot find suspended transaction to end " + xid; + final String msg = "Transaction is not suspended " + xid; - response = new SessionXAResponseMessage(true, XAException.XAER_NOTA, msg); + throw new HornetQXAException(XAException.XAER_PROTO, msg); } else { - if (theTx.getState() != Transaction.State.SUSPENDED) - { - final String msg = "Transaction is not suspended " + xid; - - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); - } - else - { - theTx.resume(); - } + theTx.resume(); } } - - if (response == null) - { - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to xa end", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, false, false); } - public void handleXAForget(final SessionXAForgetMessage packet) + public void xaForget(final Xid xid) throws Exception { - long id = resourceManager.removeHeuristicCompletion(packet.getXid()); - int code = XAResource.XA_OK; + long id = resourceManager.removeHeuristicCompletion(xid); + if (id != -1) { try @@ -912,402 +629,236 @@ catch (Exception e) { e.printStackTrace(); - code = XAException.XAER_RMERR; + + throw new HornetQXAException(XAException.XAER_RMERR); } } else { - code = XAException.XAER_NOTA; + throw new HornetQXAException(XAException.XAER_NOTA); } - - Packet response = new SessionXAResponseMessage((code != XAResource.XA_OK), code, null); - - sendResponse(packet, response, false, false); } - public void handleXAJoin(final SessionXAJoinMessage packet) + public void xaJoin(final Xid xid) throws Exception { - Packet response = null; + Transaction theTx = resourceManager.getTransaction(xid); - Xid xid = packet.getXid(); - - try + if (theTx == null) { - Transaction theTx = resourceManager.getTransaction(xid); + final String msg = "Cannot find xid in resource manager: " + xid; - if (theTx == null) - { - final String msg = "Cannot find xid in resource manager: " + xid; - - response = new SessionXAResponseMessage(true, XAException.XAER_NOTA, msg); - } - else - { - if (theTx.getState() == Transaction.State.SUSPENDED) - { - response = new SessionXAResponseMessage(true, - XAException.XAER_PROTO, - "Cannot join tx, it is suspended " + xid); - } - else - { - tx = theTx; - - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } - } + throw new HornetQXAException(XAException.XAER_NOTA, msg); } - catch (Exception e) + else { - ServerSessionImpl.log.error("Failed to xa join", e); - - if (e instanceof HornetQException) + if (theTx.getState() == Transaction.State.SUSPENDED) { - response = new HornetQExceptionMessage((HornetQException)e); + throw new HornetQXAException(XAException.XAER_PROTO, "Cannot join tx, it is suspended " + xid); } else { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + tx = theTx; } } - - sendResponse(packet, response, false, false); } - public void handleXAResume(final SessionXAResumeMessage packet) + public void xaResume(final Xid xid) throws Exception { - Packet response = null; + if (tx != null) + { + final String msg = "Cannot resume, session is currently doing work in a transaction " + tx.getXid(); - Xid xid = packet.getXid(); - - try + throw new HornetQXAException(XAException.XAER_PROTO, msg); + } + else { - if (tx != null) + Transaction theTx = resourceManager.getTransaction(xid); + + if (theTx == null) { - final String msg = "Cannot resume, session is currently doing work in a transaction " + tx.getXid(); + final String msg = "Cannot find xid in resource manager: " + xid; - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); + throw new HornetQXAException(XAException.XAER_NOTA, msg); } else { - Transaction theTx = resourceManager.getTransaction(xid); - - if (theTx == null) + if (theTx.getState() != Transaction.State.SUSPENDED) { - final String msg = "Cannot find xid in resource manager: " + xid; - - response = new SessionXAResponseMessage(true, XAException.XAER_NOTA, msg); + throw new HornetQXAException(XAException.XAER_PROTO, + "Cannot resume transaction, it is not suspended " + xid); } else { - if (theTx.getState() != Transaction.State.SUSPENDED) - { - response = new SessionXAResponseMessage(true, - XAException.XAER_PROTO, - "Cannot resume transaction, it is not suspended " + xid); - } - else - { - tx = theTx; + tx = theTx; - tx.resume(); - - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } + tx.resume(); } } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to xa resume", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, false, false); } - public void handleXARollback(final SessionXARollbackMessage packet) + public void xaRollback(final Xid xid) throws Exception { - Packet response = null; + if (tx != null) + { + final String msg = "Cannot roll back, session is currently doing work in a transaction " + tx.getXid(); - Xid xid = packet.getXid(); - - try + throw new HornetQXAException(XAException.XAER_PROTO, msg); + } + else { - if (tx != null) - { - final String msg = "Cannot roll back, session is currently doing work in a transaction " + tx.getXid(); + Transaction theTx = resourceManager.removeTransaction(xid); - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); - } - else + if (theTx == null) { - Transaction theTx = resourceManager.removeTransaction(xid); - - if (theTx == null) + // checked heuristic committed transactions + if (resourceManager.getHeuristicCommittedTransactions().contains(xid)) { - // checked heuristic committed transactions - if (resourceManager.getHeuristicCommittedTransactions().contains(xid)) - { - response = new SessionXAResponseMessage(true, - XAException.XA_HEURCOM, - "transaction has ben heuristically committed: " + xid); - } - // checked heuristic rolled back transactions - else if (resourceManager.getHeuristicRolledbackTransactions().contains(xid)) - { - response = new SessionXAResponseMessage(true, - XAException.XA_HEURRB, - "transaction has ben heuristically rolled back: " + xid); - } - else - { - response = new SessionXAResponseMessage(true, - XAException.XAER_NOTA, - "Cannot find xid in resource manager: " + xid); - } + throw new HornetQXAException(XAException.XA_HEURCOM, + "transaction has ben heuristically committed: " + xid); } + // checked heuristic rolled back transactions + else if (resourceManager.getHeuristicRolledbackTransactions().contains(xid)) + { + throw new HornetQXAException(XAException.XA_HEURRB, + "transaction has ben heuristically rolled back: " + xid); + } else { - if (theTx.getState() == Transaction.State.SUSPENDED) - { - // Put it back - resourceManager.putTransaction(xid, tx); - - response = new SessionXAResponseMessage(true, - XAException.XAER_PROTO, - "Cannot rollback transaction, it is suspended " + xid); - } - else - { - doRollback(false, theTx); - - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } + throw new HornetQXAException(XAException.XAER_NOTA, "Cannot find xid in resource manager: " + xid); } } - } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to xa rollback", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } else { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, false, false); - } - - public void handleXAStart(final SessionXAStartMessage packet) - { - Packet response = null; - - Xid xid = packet.getXid(); - - try - { - if (tx != null) - { - final String msg = "Cannot start, session is already doing work in a transaction " + tx.getXid(); - - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); - } - else - { - tx = new TransactionImpl(xid, storageManager, postOffice); - - boolean added = resourceManager.putTransaction(xid, tx); - - if (!added) + if (theTx.getState() == Transaction.State.SUSPENDED) { - final String msg = "Cannot start, there is already a xid " + tx.getXid(); + // Put it back + resourceManager.putTransaction(xid, tx); - response = new SessionXAResponseMessage(true, XAException.XAER_DUPID, msg); + throw new HornetQXAException(XAException.XAER_PROTO, + "Cannot rollback transaction, it is suspended " + xid); } else { - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + doRollback(false, theTx); } } } - catch (Exception e) + } + + public void xaStart(final Xid xid) throws Exception + { + if (tx != null) { - ServerSessionImpl.log.error("Failed to xa start", e); + final String msg = "Cannot start, session is already doing work in a transaction " + tx.getXid(); - if (e instanceof HornetQException) + throw new HornetQXAException(XAException.XAER_PROTO, msg); + } + else + { + tx = new TransactionImpl(xid, storageManager, postOffice); + + boolean added = resourceManager.putTransaction(xid, tx); + + if (!added) { - response = new HornetQExceptionMessage((HornetQException)e); + final String msg = "Cannot start, there is already a xid " + tx.getXid(); + + throw new HornetQXAException(XAException.XAER_DUPID, msg); } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } } - - sendResponse(packet, response, false, false); } - public void handleXASuspend(final Packet packet) + public void xaSuspend() throws Exception { - Packet response = null; + if (tx == null) + { + final String msg = "Cannot suspend, session is not doing work in a transaction "; - try + throw new HornetQXAException(XAException.XAER_PROTO, msg); + } + else { - if (tx == null) + if (tx.getState() == Transaction.State.SUSPENDED) { - final String msg = "Cannot suspend, session is not doing work in a transaction "; + final String msg = "Cannot suspend, transaction is already suspended " + tx.getXid(); - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); + throw new HornetQXAException(XAException.XAER_PROTO, msg); } else { - if (tx.getState() == Transaction.State.SUSPENDED) - { - final String msg = "Cannot suspend, transaction is already suspended " + tx.getXid(); + tx.suspend(); - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); - } - else - { - tx.suspend(); - - tx = null; - - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } + tx = null; } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to xa suspend", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, false, false); } - public void handleXAPrepare(final SessionXAPrepareMessage packet) + public void xaPrepare(final Xid xid) throws Exception { - Packet response = null; + if (tx != null) + { + final String msg = "Cannot commit, session is currently doing work in a transaction " + tx.getXid(); - Xid xid = packet.getXid(); - - try + throw new HornetQXAException(XAException.XAER_PROTO, msg); + } + else { - if (tx != null) + Transaction theTx = resourceManager.getTransaction(xid); + + if (theTx == null) { - final String msg = "Cannot commit, session is currently doing work in a transaction " + tx.getXid(); + final String msg = "Cannot find xid in resource manager: " + xid; - response = new SessionXAResponseMessage(true, XAException.XAER_PROTO, msg); + throw new HornetQXAException(XAException.XAER_NOTA, msg); } else { - Transaction theTx = resourceManager.getTransaction(xid); - - if (theTx == null) + if (theTx.getState() == Transaction.State.SUSPENDED) { - final String msg = "Cannot find xid in resource manager: " + xid; - - response = new SessionXAResponseMessage(true, XAException.XAER_NOTA, msg); + throw new HornetQXAException(XAException.XAER_PROTO, + "Cannot prepare transaction, it is suspended " + xid); } else { - if (theTx.getState() == Transaction.State.SUSPENDED) - { - response = new SessionXAResponseMessage(true, - XAException.XAER_PROTO, - "Cannot prepare transaction, it is suspended " + xid); - } - else - { - theTx.prepare(); - - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - } + theTx.prepare(); } } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to xa prepare", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, false, false); } - public void handleGetInDoubtXids(final Packet packet) + public List<Xid> xaGetInDoubtXids() { - List<Xid> indoubtsXids = new ArrayList<Xid>(); - indoubtsXids.addAll(resourceManager.getPreparedTransactions()); - indoubtsXids.addAll(resourceManager.getHeuristicCommittedTransactions()); - indoubtsXids.addAll(resourceManager.getHeuristicRolledbackTransactions()); - Packet response = new SessionXAGetInDoubtXidsResponseMessage(indoubtsXids); + List<Xid> xids = new ArrayList<Xid>(); - sendResponse(packet, response, false, false); + xids.addAll(resourceManager.getPreparedTransactions()); + xids.addAll(resourceManager.getHeuristicCommittedTransactions()); + xids.addAll(resourceManager.getHeuristicRolledbackTransactions()); + + return xids; } - public void handleGetXATimeout(final Packet packet) + public int xaGetTimeout() { - Packet response = new SessionXAGetTimeoutResponseMessage(resourceManager.getTimeoutSeconds()); - - sendResponse(packet, response, false, false); + return resourceManager.getTimeoutSeconds(); } - public void handleSetXATimeout(final SessionXASetTimeoutMessage packet) + public void xaSetTimeout(final int timeout) { - Packet response = new SessionXASetTimeoutResponseMessage(resourceManager.setTimeoutSeconds(packet.getTimeoutSeconds())); - - sendResponse(packet, response, false, false); + resourceManager.setTimeoutSeconds(timeout); } - public void handleStart(final Packet packet) + public void start() { setStarted(true); - - sendResponse(packet, null, false, false); } - public void handleStop(final Packet packet) + public void stop() { - final Packet response = new NullResponseMessage(); - setStarted(false); - - sendResponse(packet, response, false, false); } - public void handleClose(final Packet packet) + public void close() { storageManager.afterCompleteOperations(new IOAsyncTask() { @@ -1317,97 +868,63 @@ public void done() { - doClose(packet); + try + { + doClose(); + } + catch (Exception e) + { + log.error("Failed to close session", e); + } } }); } - public void handleCloseConsumer(final SessionConsumerCloseMessage packet) + public void closeConsumer(final long consumerID) throws Exception { - final ServerConsumer consumer = consumers.get(packet.getConsumerID()); + final ServerConsumer consumer = consumers.get(consumerID); - Packet response; - - try + if (consumer != null) { - if (consumer != null) - { - consumer.close(); - } - else - { - ServerSessionImpl.log.error("Cannot find consumer with id " + packet.getConsumerID()); - } - - response = new NullResponseMessage(); + consumer.close(); } - catch (Exception e) + else { - ServerSessionImpl.log.error("Failed to close consumer", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } + ServerSessionImpl.log.error("Cannot find consumer with id " + consumerID); } - - sendResponse(packet, response, false, false); } - public void handleReceiveConsumerCredits(final SessionConsumerFlowCreditMessage packet) + public void receiveConsumerCredits(final long consumerID, final int credits) throws Exception { - ServerConsumer consumer = consumers.get(packet.getConsumerID()); + ServerConsumer consumer = consumers.get(consumerID); if (consumer == null) { - ServerSessionImpl.log.error("There is no consumer with id " + packet.getConsumerID()); - + ServerSessionImpl.log.error("There is no consumer with id " + consumerID); + return; } - try - { - consumer.receiveCredits(packet.getCredits()); - } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to receive credits " + server.getConfiguration().isBackup(), e); - } - - sendResponse(packet, null, false, false); + consumer.receiveCredits(credits); } - public void handleSendLargeMessage(final SessionSendLargeMessage packet) + public void sendLarge(final byte[] largeMessageHeader) throws Exception { - // need to create the LargeMessage before continue long id = storageManager.generateUniqueID(); - LargeServerMessage msg = doCreateLargeMessage(id, packet); + LargeServerMessage msg = storageManager.createLargeMessage(id, largeMessageHeader); - if (msg != null) + if (currentLargeMessage != null) { - if (currentLargeMessage != null) - { - ServerSessionImpl.log.warn("Replacing incomplete LargeMessage with ID=" + currentLargeMessage.getMessageID()); - } - - currentLargeMessage = msg; - - sendResponse(packet, null, false, false); + ServerSessionImpl.log.warn("Replacing incomplete LargeMessage with ID=" + currentLargeMessage.getMessageID()); } + + currentLargeMessage = msg; } - public void handleSend(final SessionSendMessage packet) + public void send(final ServerMessage message) throws Exception { - Packet response = null; - - ServerMessage message = (ServerMessage)packet.getMessage(); - try { long id = storageManager.generateUniqueID(); @@ -1423,30 +940,9 @@ } else { - send(message); + doSend(message); } - - if (packet.isRequiresResponse()) - { - response = new NullResponseMessage(); - } } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to send message", e); - - if (packet.isRequiresResponse()) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - } finally { try @@ -1458,74 +954,40 @@ ServerSessionImpl.log.error("Failed to release outstanding credits", e); } } - - sendResponse(packet, response, false, false); } - public void handleSendContinuations(final SessionSendContinuationMessage packet) + public void sendContinuations(final int packetSize, final byte[] body, final boolean continues) throws Exception { - Packet response = null; - - try + if (currentLargeMessage == null) { - if (currentLargeMessage == null) - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "large-message not initialized on server"); - } + throw new HornetQException(HornetQException.ILLEGAL_STATE, "large-message not initialized on server"); + } - // Immediately release the credits for the continuations- these don't contribute to the in-memory size - // of the message + // Immediately release the credits for the continuations- these don't contribute to the in-memory size + // of the message - releaseOutStanding(currentLargeMessage, packet.getPacketSize()); + releaseOutStanding(currentLargeMessage, packetSize); - currentLargeMessage.addBytes(packet.getBody()); + currentLargeMessage.addBytes(body); - if (!packet.isContinues()) - { - currentLargeMessage.releaseResources(); + if (!continues) + { + currentLargeMessage.releaseResources(); - send(currentLargeMessage); + doSend(currentLargeMessage); - releaseOutStanding(currentLargeMessage, currentLargeMessage.getEncodeSize()); + releaseOutStanding(currentLargeMessage, currentLargeMessage.getEncodeSize()); - currentLargeMessage = null; - } - - if (packet.isRequiresResponse()) - { - response = new NullResponseMessage(); - } + currentLargeMessage = null; } - catch (Exception e) - { - if (packet.isRequiresResponse()) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - ServerSessionImpl.log.error("Failed to send message", e); - - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - } - - sendResponse(packet, response, false, false); } - public void handleRequestProducerCredits(final SessionRequestProducerCreditsMessage packet) throws Exception + public void requestProducerCredits(final SimpleString address, final int credits) throws Exception { - final SimpleString address = packet.getAddress(); - final CreditManagerHolder holder = getCreditManagerHolder(address); - int credits = packet.getCredits(); - - //Requesting -ve credits means returning them - + // Requesting -ve credits means returning them + if (credits < 0) { releaseOutStanding(address, -credits); @@ -1541,7 +1003,7 @@ if (!closed) { sendProducerCredits(holder, credits, address); - + return true; } else @@ -1551,58 +1013,37 @@ } } }); - + if (gotCredits > 0) { sendProducerCredits(holder, gotCredits, address); } } - - sendResponse(packet, null, false, false); } - public int transferConnection(final RemotingConnection newConnection, final int lastReceivedCommandID) - { - //We need to disable delivery on all the consumers while the transfer is occurring- otherwise packets might get delivered - //after the channel has transferred but *before* packets have been replayed - this will give the client the wrong - //sequence of packets. - //It is not sufficient to just stop the session, since right after stopping the session, another session start might be executed - //before we have transferred the connection, leaving it in a started state - setTransferring(true); + public void setTransferring(final boolean transferring) + { + Set<ServerConsumer> consumersClone = new HashSet<ServerConsumer>(consumers.values()); - remotingConnection.removeFailureListener(this); - remotingConnection.removeCloseListener(this); - - // Note. We do not destroy the replicating connection here. In the case the live server has really crashed - // then the connection will get cleaned up anyway when the server ping timeout kicks in. - // In the case the live server is really still up, i.e. a split brain situation (or in tests), then closing - // the replicating connection will cause the outstanding responses to be be replayed on the live server, - // if these reach the client who then subsequently fails over, on reconnection to backup, it will have - // received responses that the backup did not know about. - - channel.transferConnection(newConnection); - - newConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); - - remotingConnection = newConnection; - - remotingConnection.addFailureListener(this); - remotingConnection.addCloseListener(this); - - int serverLastReceivedCommandID = channel.getLastConfirmedCommandID(); - - channel.replayCommands(lastReceivedCommandID, id); - - channel.setTransferring(false); - - setTransferring(false); - - return serverLastReceivedCommandID; + for (ServerConsumer consumer : consumersClone) + { + consumer.setTransferring(transferring); + } } - public Channel getChannel() + public void runConnectionFailureRunners() { - return channel; + for (Runnable runner : failureRunners.values()) + { + try + { + runner.run(); + } + catch (Throwable t) + { + ServerSessionImpl.log.error("Failed to execute failure runner", t); + } + } } // FailureListener implementation @@ -1626,7 +1067,7 @@ } } - handleClose(new PacketImpl(PacketImpl.SESS_CLOSE)); + close(); ServerSessionImpl.log.warn("Cleared up resources for session " + name); } @@ -1654,7 +1095,7 @@ } catch (Throwable t) { - ServerSessionImpl.log.error("Failed fire listeners " + this); + ServerSessionImpl.log.error("Failed to fire listeners " + this); } } @@ -1665,129 +1106,6 @@ // Private // ---------------------------------------------------------------------------- - private SessionQueueQueryResponseMessage doExecuteQueueQuery(final SimpleString name) throws Exception - { - if (name == null) - { - throw new IllegalArgumentException("Queue name is null"); - } - - SessionQueueQueryResponseMessage response; - - Binding binding = postOffice.getBinding(name); - - if (binding != null && binding.getType() == BindingType.LOCAL_QUEUE) - { - Queue queue = (Queue)binding.getBindable(); - - Filter filter = queue.getFilter(); - - SimpleString filterString = filter == null ? null : filter.getFilterString(); - - response = new SessionQueueQueryResponseMessage(name, - binding.getAddress(), - queue.isDurable(), - queue.isTemporary(), - filterString, - queue.getConsumerCount(), - queue.getMessageCount()); - } - // make an exception for the management address (see HORNETQ-29) - else if (name.equals(managementAddress)) - { - response = new SessionQueueQueryResponseMessage(name, managementAddress, true, false, null, -1, -1); - } - else - { - response = new SessionQueueQueryResponseMessage(); - } - - return response; - } - - private void sendResponse(final Packet confirmPacket, - final Packet response, - final boolean flush, - final boolean closeChannel) - { - storageManager.afterCompleteOperations(new IOAsyncTask() - { - public void onError(final int errorCode, final String errorMessage) - { - ServerSessionImpl.log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage); - - HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage(new HornetQException(errorCode, - errorMessage)); - - doConfirmAndResponse(confirmPacket, exceptionMessage, flush, closeChannel); - } - - public void done() - { - doConfirmAndResponse(confirmPacket, response, flush, closeChannel); - } - }); - } - - /** - * @param confirmPacket - * @param response - * @param flush - * @param closeChannel - */ - private void doConfirmAndResponse(final Packet confirmPacket, - final Packet response, - final boolean flush, - final boolean closeChannel) - { - if (confirmPacket != null) - { - channel.confirm(confirmPacket); - - if (flush) - { - channel.flushConfirmations(); - } - } - - if (response != null) - { - channel.send(response); - } - - if (closeChannel) - { - channel.close(); - } - } - - private void doClose(final Packet packet) - { - Packet response = null; - - try - { - close(); - - response = new NullResponseMessage(); - } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to close", e); - - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - sendResponse(packet, response, true, true); - } - private void setStarted(final boolean s) { Set<ServerConsumer> consumersClone = new HashSet<ServerConsumer>(consumers.values()); @@ -1799,45 +1117,7 @@ started = s; } - - private void setTransferring(final boolean transferring) - { - Set<ServerConsumer> consumersClone = new HashSet<ServerConsumer>(consumers.values()); - for (ServerConsumer consumer : consumersClone) - { - consumer.setTransferring(transferring); - } - } - - /** - * We need to create the LargeMessage before replicating the packet, or else we won't know how to extract the destination, - * which is stored on the header - * @param packet - * @throws Exception - */ - private LargeServerMessage doCreateLargeMessage(final long id, final SessionSendLargeMessage packet) - { - try - { - LargeServerMessage msg = createLargeMessageStorage(id, packet.getLargeMessageHeader()); - - return msg; - } - catch (Exception e) - { - ServerSessionImpl.log.error("Failed to create large message", e); - Packet response = null; - - channel.confirm(packet); - if (response != null) - { - channel.send(response); - } - return null; - } - } - private void handleManagementMessage(final ServerMessage message) throws Exception { try @@ -1861,15 +1141,10 @@ { reply.setAddress(replyTo); - send(reply); + doSend(reply); } } - private LargeServerMessage createLargeMessageStorage(final long id, final byte[] header) throws Exception - { - return storageManager.createLargeMessage(id, header); - } - private void doRollback(final boolean lastMessageAsDelived, final Transaction theTx) throws Exception { boolean wasStarted = started; @@ -1902,20 +1177,6 @@ } } - private void rollback(final boolean lastMessageAsDelived) throws Exception - { - if (tx == null) - { - // Might be null if XA - - tx = new TransactionImpl(storageManager); - } - - doRollback(lastMessageAsDelived, tx); - - tx = new TransactionImpl(storageManager); - } - /* * The way flow producer flow control works is as follows: * The client can only send messages as long as it has credits. It requests credits from the server @@ -1931,7 +1192,7 @@ { releaseOutStanding(message.getAddress(), credits); } - + private void releaseOutStanding(final SimpleString address, final int credits) throws Exception { CreditManagerHolder holder = getCreditManagerHolder(address); @@ -1961,12 +1222,10 @@ { holder.outstandingCredits += credits; - Packet packet = new SessionProducerCreditsMessage(credits, address, -1); - - channel.send(packet); + callback.sendProducerCreditsMessage(credits, address, -1); } - private void send(final ServerMessage msg) throws Exception + private void doSend(final ServerMessage msg) throws Exception { // Look up the paging store Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java 2010-01-21 14:41:55 UTC (rev 8826) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java 2010-01-21 14:46:21 UTC (rev 8827) @@ -1,314 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.server.impl; - -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_STOP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_END; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SUSPEND; - -import org.hornetq.core.logging.Logger; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; -import org.hornetq.core.server.ServerSession; - -/** - * A ServerSessionPacketHandler - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a> - * @author <a href="mailto:clebert.suconic@jboss.org>Clebert Suconic</a> - */ -public class ServerSessionPacketHandler implements ChannelHandler -{ - private static final Logger log = Logger.getLogger(ServerSessionPacketHandler.class); - - private final ServerSession session; - - private final OperationContext sessionContext; - - // Storagemanager here is used to set the Context - private final StorageManager storageManager; - - public ServerSessionPacketHandler(final ServerSession session, - final OperationContext sessionContext, - final StorageManager storageManager) - { - this.session = session; - - this.storageManager = storageManager; - - this.sessionContext = sessionContext; - } - - public long getID() - { - return session.getID(); - } - - public void handlePacket(final Packet packet) - { - byte type = packet.getType(); - - storageManager.setContext(sessionContext); - - try - { - switch (type) - { - case SESS_CREATECONSUMER: - { - SessionCreateConsumerMessage request = (SessionCreateConsumerMessage)packet; - session.handleCreateConsumer(request); - break; - } - case CREATE_QUEUE: - { - CreateQueueMessage request = (CreateQueueMessage)packet; - session.handleCreateQueue(request); - break; - } - case DELETE_QUEUE: - { - SessionDeleteQueueMessage request = (SessionDeleteQueueMessage)packet; - session.handleDeleteQueue(request); - break; - } - case SESS_QUEUEQUERY: - { - SessionQueueQueryMessage request = (SessionQueueQueryMessage)packet; - session.handleExecuteQueueQuery(request); - break; - } - case SESS_BINDINGQUERY: - { - SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet; - session.handleExecuteBindingQuery(request); - break; - } - case SESS_ACKNOWLEDGE: - { - SessionAcknowledgeMessage message = (SessionAcknowledgeMessage)packet; - session.handleAcknowledge(message); - break; - } - case SESS_EXPIRED: - { - SessionExpiredMessage message = (SessionExpiredMessage)packet; - session.handleExpired(message); - break; - } - case SESS_COMMIT: - { - session.handleCommit(packet); - break; - } - case SESS_ROLLBACK: - { - session.handleRollback((RollbackMessage)packet); - break; - } - case SESS_XA_COMMIT: - { - SessionXACommitMessage message = (SessionXACommitMessage)packet; - session.handleXACommit(message); - break; - } - case SESS_XA_END: - { - SessionXAEndMessage message = (SessionXAEndMessage)packet; - session.handleXAEnd(message); - break; - } - case SESS_XA_FORGET: - { - SessionXAForgetMessage message = (SessionXAForgetMessage)packet; - session.handleXAForget(message); - break; - } - case SESS_XA_JOIN: - { - SessionXAJoinMessage message = (SessionXAJoinMessage)packet; - session.handleXAJoin(message); - break; - } - case SESS_XA_RESUME: - { - SessionXAResumeMessage message = (SessionXAResumeMessage)packet; - session.handleXAResume(message); - break; - } - case SESS_XA_ROLLBACK: - { - SessionXARollbackMessage message = (SessionXARollbackMessage)packet; - session.handleXARollback(message); - break; - } - case SESS_XA_START: - { - SessionXAStartMessage message = (SessionXAStartMessage)packet; - session.handleXAStart(message); - break; - } - case SESS_XA_SUSPEND: - { - session.handleXASuspend(packet); - break; - } - case SESS_XA_PREPARE: - { - SessionXAPrepareMessage message = (SessionXAPrepareMessage)packet; - session.handleXAPrepare(message); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - session.handleGetInDoubtXids(packet); - break; - } - case SESS_XA_GET_TIMEOUT: - { - session.handleGetXATimeout(packet); - break; - } - case SESS_XA_SET_TIMEOUT: - { - SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage)packet; - session.handleSetXATimeout(message); - break; - } - case SESS_START: - { - session.handleStart(packet); - break; - } - case SESS_STOP: - { - session.handleStop(packet); - break; - } - case SESS_CLOSE: - { - session.handleClose(packet); - break; - } - case SESS_CONSUMER_CLOSE: - { - SessionConsumerCloseMessage message = (SessionConsumerCloseMessage)packet; - session.handleCloseConsumer(message); - break; - } - case SESS_FLOWTOKEN: - { - SessionConsumerFlowCreditMessage message = (SessionConsumerFlowCreditMessage)packet; - session.handleReceiveConsumerCredits(message); - break; - } - case SESS_SEND: - { - SessionSendMessage message = (SessionSendMessage)packet; - session.handleSend(message); - break; - } - case SESS_SEND_LARGE: - { - SessionSendLargeMessage message = (SessionSendLargeMessage)packet; - session.handleSendLargeMessage(message); - break; - } - case SESS_SEND_CONTINUATION: - { - SessionSendContinuationMessage message = (SessionSendContinuationMessage)packet; - session.handleSendContinuations(message); - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - SessionForceConsumerDelivery message = (SessionForceConsumerDelivery)packet; - session.handleForceConsumerDelivery(message); - break; - } - case PacketImpl.SESS_PRODUCER_REQUEST_CREDITS: - { - SessionRequestProducerCreditsMessage message = (SessionRequestProducerCreditsMessage)packet; - session.handleRequestProducerCredits(message); - break; - } - } - } - catch (Throwable t) - { - ServerSessionPacketHandler.log.error("Caught unexpected exception", t); - } - finally - { - storageManager.completeOperations(); - storageManager.clearContext(); - } - } -}

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8826 - in branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration: protocol and 2 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 09:41:55 -0500 (Thu, 21 Jan 2010) New Revision: 8826 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java Removed: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolConverter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ProtocolException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/Stomp.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompDestinationConverter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrame.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameDelimiter.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameError.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompMarshaller.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompPacketDecoder.java Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp (from rev 8807, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp) Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolConverter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ProtocolConverter.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolConverter.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,86 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -import java.util.Map; - -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCloseMessage; -import org.hornetq.utils.UUIDGenerator; -import org.hornetq.utils.VersionLoader; - -/** - * A ProtocolConverter - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * - */ -public class ProtocolConverter -{ - - public Packet toPacket(StompFrame frame) - { - String command = frame.getCommand(); - Map<String, Object> headers = frame.getHeaders(); - if (Stomp.Commands.CONNECT.equals(command)) - { - String login = (String)headers.get("login"); - String password = (String)headers.get("passcode"); - - String name = UUIDGenerator.getInstance().generateStringUUID(); - long sessionChannelID = 12; - return new CreateSessionMessage(name, - sessionChannelID, - VersionLoader.getVersion().getIncrementingVersion(), - login, - password, - HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - false, - true, - true, - false, - HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); - } - if (Stomp.Commands.DISCONNECT.equals(command)) - { - return new SessionCloseMessage(); - } - else - { - throw new RuntimeException("frame not supported: " + frame); - } - } - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ProtocolException.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/ProtocolException.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.integration.stomp; +package org.hornetq.integration.protocol.stomp; import java.io.IOException; Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/Stomp.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,124 +0,0 @@ -/** - * - * 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.hornetq.integration.stomp; - - -/** - * The standard verbs and headers used for the <a href="http://stomp.codehaus.org/">STOMP</a> protocol. - * - * @version $Revision: 57 $ - */ -public interface Stomp { - String NULL = "\u0000"; - String NEWLINE = "\n"; - - public static interface Commands { - String CONNECT = "CONNECT"; - String SEND = "SEND"; - String DISCONNECT = "DISCONNECT"; - String SUBSCRIBE = "SUB"; - String UNSUBSCRIBE = "UNSUB"; - String BEGIN_TRANSACTION = "BEGIN"; - String COMMIT_TRANSACTION = "COMMIT"; - String ABORT_TRANSACTION = "ABORT"; - String BEGIN = "BEGIN"; - String COMMIT = "COMMIT"; - String ABORT = "ABORT"; - String ACK = "ACK"; - } - - public interface Responses { - String CONNECTED = "CONNECTED"; - String ERROR = "ERROR"; - String MESSAGE = "MESSAGE"; - String RECEIPT = "RECEIPT"; - } - - public interface Headers { - String SEPERATOR = ":"; - String RECEIPT_REQUESTED = "receipt"; - String TRANSACTION = "transaction"; - String CONTENT_LENGTH = "content-length"; - - public interface Response { - String RECEIPT_ID = "receipt-id"; - } - - public interface Send { - String DESTINATION = "destination"; - String CORRELATION_ID = "correlation-id"; - String REPLY_TO = "reply-to"; - String EXPIRATION_TIME = "expires"; - String PRIORITY = "priority"; - String TYPE = "type"; - Object PERSISTENT = "persistent"; - } - - public interface Message { - String MESSAGE_ID = "message-id"; - String DESTINATION = "destination"; - String CORRELATION_ID = "correlation-id"; - String EXPIRATION_TIME = "expires"; - String REPLY_TO = "reply-to"; - String PRORITY = "priority"; - String REDELIVERED = "redelivered"; - String TIMESTAMP = "timestamp"; - String TYPE = "type"; - String SUBSCRIPTION = "subscription"; - } - - public interface Subscribe { - String DESTINATION = "destination"; - String ACK_MODE = "ack"; - String ID = "id"; - String SELECTOR = "selector"; - String DURABLE_SUBSCRIPTION_NAME = "durable-subscription-name"; - String NO_LOCAL = "no-local"; - - public interface AckModeValues { - String AUTO = "auto"; - String CLIENT = "client"; - } - } - - public interface Unsubscribe { - String DESTINATION = "destination"; - String ID = "id"; - } - - public interface Connect { - String LOGIN = "login"; - String PASSCODE = "passcode"; - String CLIENT_ID = "client-id"; - String REQUEST_ID = "request-id"; - } - - public interface Error { - String MESSAGE = "message"; - } - - public interface Connected { - String SESSION = "session"; - String RESPONSE_ID = "response-id"; - } - - public interface Ack { - String MESSAGE_ID = "message-id"; - } - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java (from rev 8817, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/Stomp.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/Stomp.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -0,0 +1,124 @@ +/** + * + * 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.hornetq.integration.protocol.stomp; + + +/** + * The standard verbs and headers used for the <a href="http://stomp.codehaus.org/">STOMP</a> protocol. + * + * @version $Revision: 57 $ + */ +public interface Stomp { + String NULL = "\u0000"; + String NEWLINE = "\n"; + + public static interface Commands { + String CONNECT = "CONNECT"; + String SEND = "SEND"; + String DISCONNECT = "DISCONNECT"; + String SUBSCRIBE = "SUBSCRIBE"; + String UNSUBSCRIBE = "UNSUBSCRIBE"; + String BEGIN_TRANSACTION = "BEGIN"; + String COMMIT_TRANSACTION = "COMMIT"; + String ABORT_TRANSACTION = "ABORT"; + String BEGIN = "BEGIN"; + String COMMIT = "COMMIT"; + String ABORT = "ABORT"; + String ACK = "ACK"; + } + + public interface Responses { + String CONNECTED = "CONNECTED"; + String ERROR = "ERROR"; + String MESSAGE = "MESSAGE"; + String RECEIPT = "RECEIPT"; + } + + public interface Headers { + String SEPERATOR = ":"; + String RECEIPT_REQUESTED = "receipt"; + String TRANSACTION = "transaction"; + String CONTENT_LENGTH = "content-length"; + + public interface Response { + String RECEIPT_ID = "receipt-id"; + } + + public interface Send { + String DESTINATION = "destination"; + String CORRELATION_ID = "correlation-id"; + String REPLY_TO = "reply-to"; + String EXPIRATION_TIME = "expires"; + String PRIORITY = "priority"; + String TYPE = "type"; + Object PERSISTENT = "persistent"; + } + + public interface Message { + String MESSAGE_ID = "message-id"; + String DESTINATION = "destination"; + String CORRELATION_ID = "correlation-id"; + String EXPIRATION_TIME = "expires"; + String REPLY_TO = "reply-to"; + String PRORITY = "priority"; + String REDELIVERED = "redelivered"; + String TIMESTAMP = "timestamp"; + String TYPE = "type"; + String SUBSCRIPTION = "subscription"; + } + + public interface Subscribe { + String DESTINATION = "destination"; + String ACK_MODE = "ack"; + String ID = "id"; + String SELECTOR = "selector"; + String DURABLE_SUBSCRIPTION_NAME = "durable-subscription-name"; + String NO_LOCAL = "no-local"; + + public interface AckModeValues { + String AUTO = "auto"; + String CLIENT = "client"; + } + } + + public interface Unsubscribe { + String DESTINATION = "destination"; + String ID = "id"; + } + + public interface Connect { + String LOGIN = "login"; + String PASSCODE = "passcode"; + String CLIENT_ID = "client-id"; + String REQUEST_ID = "request-id"; + } + + public interface Error { + String MESSAGE = "message"; + } + + public interface Connected { + String SESSION = "session"; + String RESPONSE_ID = "response-id"; + } + + public interface Ack { + String MESSAGE_ID = "message-id"; + } + } +} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java (from rev 8810, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompDestinationConverter.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompDestinationConverter.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -0,0 +1,85 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTemporaryQueue; +import org.hornetq.jms.client.HornetQTemporaryTopic; +import org.hornetq.jms.client.HornetQTopic; + +/** + * A StompDestinationConverter + * + * @author jmesnil + * + * + */ +public class StompDestinationConverter +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + public static SimpleString convertDestination(String name) throws HornetQException + { + if (name == null) + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); + } + else if (name.startsWith("/queue/")) + { + String queueName = name.substring("/queue/".length(), name.length()); + return HornetQQueue.createAddressFromName(queueName); + } + else if (name.startsWith("/topic/")) + { + String topicName = name.substring("/topic/".length(), name.length()); + return HornetQTopic.createAddressFromName(topicName); + } + else if (name.startsWith("/temp-queue/")) + { + String tempName = name.substring("/temp-queue/".length(), name.length()); + return HornetQTemporaryQueue.createAddressFromName(tempName); + } + else if (name.startsWith("/temp-topic/")) + { + String tempName = name.substring("/temp-topic/".length(), name.length()); + return HornetQTemporaryTopic.createAddressFromName(tempName); + } + else + { + throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal destination name: [" + name + + "] -- StompConnect destinations " + + "must begine with one of: /queue/ /topic/ /temp-queue/ /temp-topic/"); + } + } + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java (from rev 8812, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompException.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompException.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -0,0 +1,52 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +/** + * A StompException + * + * @author jmesnil + * + * + */ +public class StompException extends Exception +{ + + /** + * @param string + */ + public StompException(String string) + { + super(string); + } + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrame.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrame.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.integration.stomp; +package org.hornetq.integration.protocol.stomp; import java.util.HashMap; import java.util.Map; Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameDelimiter.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,33 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; -import org.jboss.netty.handler.codec.frame.Delimiters; - -/** - * A StompFrameDelimiter - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -public class StompFrameDelimiter extends DelimiterBasedFrameDecoder -{ - - private static final int MAX_DATA_LENGTH = 1024 * 1024 * 100; - - public StompFrameDelimiter() - { - super(MAX_DATA_LENGTH, true, Delimiters.nulDelimiter()); - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java (from rev 8812, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameDelimiter.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameDelimiter.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -0,0 +1,33 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; +import org.jboss.netty.handler.codec.frame.Delimiters; + +/** + * A StompFrameDelimiter + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +public class StompFrameDelimiter extends DelimiterBasedFrameDecoder +{ + + private static final int MAX_DATA_LENGTH = 1024 * 1024 * 100; + + public StompFrameDelimiter() + { + super(MAX_DATA_LENGTH, false, Delimiters.nulDelimiter()); + } +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameError.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompFrameError.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.integration.stomp; +package org.hornetq.integration.protocol.stomp; /** * Command indicating that an invalid Stomp Frame was received. Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompMarshaller.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompMarshaller.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.hornetq.integration.stomp; +package org.hornetq.integration.protocol.stomp; import java.io.ByteArrayOutputStream; import java.io.DataOutput; Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompPacketDecoder.java 2010-01-19 16:04:31 UTC (rev 8807) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,52 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.PacketDecoder; - -/** - * A StompPacketDecoder - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -public class StompPacketDecoder implements PacketDecoder -{ - private final StompMarshaller marshaller = new StompMarshaller(); - - private final ProtocolConverter converter = new ProtocolConverter(); - - // PacketDecoder implementation ---------------------------------- - - public Packet decode(HornetQBuffer in) - { - StompFrame frame; - try - { - frame = marshaller.unmarshal(in); - System.out.println(">>> " + frame); - Packet packet = converter.toPacket(frame); - packet.setChannelID(1); - System.out.println(">>> " + packet); - - return packet; - } - catch (Exception e) - { - e.printStackTrace(); - return null; - } - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java (from rev 8809, branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompPacketDecoder.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/protocol/stomp/StompPacketDecoder.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -0,0 +1,51 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.integration.protocol.stomp; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.buffers.impl.ChannelBufferWrapper; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelPipelineCoverage; +import org.jboss.netty.channel.Channels; +import org.jboss.netty.channel.MessageEvent; +import org.jboss.netty.channel.SimpleChannelHandler; + +/** + * A StompPacketDecoder + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +@ChannelPipelineCoverage("one") +public class StompPacketDecoder extends SimpleChannelHandler +{ + private final StompMarshaller marshaller; + + // PacketDecoder implementation ---------------------------------- + + public StompPacketDecoder(final StompMarshaller marshaller) + { + this.marshaller = marshaller; + } + + @Override + public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception + { + ChannelBuffer in = (ChannelBuffer)e.getMessage(); + HornetQBuffer buffer = new ChannelBufferWrapper(in); + StompFrame frame = marshaller.unmarshal(buffer); + + Channels.fireMessageReceived(ctx, frame); + } +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ProtocolException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ProtocolException.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/ProtocolException.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,50 +0,0 @@ -/** - * - * 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.hornetq.integration.stomp; - -import java.io.IOException; - -/** - * @author <a href="http://hiramchirino.com">chirino</a> - */ -public class ProtocolException extends IOException { - private static final long serialVersionUID = -2869735532997332242L; - private final boolean fatal; - - public ProtocolException() { - this(null); - } - - public ProtocolException(String s) { - this(s, false); - } - - public ProtocolException(String s, boolean fatal) { - this(s, fatal, null); - } - - public ProtocolException(String s, boolean fatal, Throwable cause) { - super(s); - this.fatal = fatal; - initCause(cause); - } - - public boolean isFatal() { - return fatal; - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/Stomp.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/Stomp.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/Stomp.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,124 +0,0 @@ -/** - * - * 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.hornetq.integration.stomp; - - -/** - * The standard verbs and headers used for the <a href="http://stomp.codehaus.org/">STOMP</a> protocol. - * - * @version $Revision: 57 $ - */ -public interface Stomp { - String NULL = "\u0000"; - String NEWLINE = "\n"; - - public static interface Commands { - String CONNECT = "CONNECT"; - String SEND = "SEND"; - String DISCONNECT = "DISCONNECT"; - String SUBSCRIBE = "SUBSCRIBE"; - String UNSUBSCRIBE = "UNSUBSCRIBE"; - String BEGIN_TRANSACTION = "BEGIN"; - String COMMIT_TRANSACTION = "COMMIT"; - String ABORT_TRANSACTION = "ABORT"; - String BEGIN = "BEGIN"; - String COMMIT = "COMMIT"; - String ABORT = "ABORT"; - String ACK = "ACK"; - } - - public interface Responses { - String CONNECTED = "CONNECTED"; - String ERROR = "ERROR"; - String MESSAGE = "MESSAGE"; - String RECEIPT = "RECEIPT"; - } - - public interface Headers { - String SEPERATOR = ":"; - String RECEIPT_REQUESTED = "receipt"; - String TRANSACTION = "transaction"; - String CONTENT_LENGTH = "content-length"; - - public interface Response { - String RECEIPT_ID = "receipt-id"; - } - - public interface Send { - String DESTINATION = "destination"; - String CORRELATION_ID = "correlation-id"; - String REPLY_TO = "reply-to"; - String EXPIRATION_TIME = "expires"; - String PRIORITY = "priority"; - String TYPE = "type"; - Object PERSISTENT = "persistent"; - } - - public interface Message { - String MESSAGE_ID = "message-id"; - String DESTINATION = "destination"; - String CORRELATION_ID = "correlation-id"; - String EXPIRATION_TIME = "expires"; - String REPLY_TO = "reply-to"; - String PRORITY = "priority"; - String REDELIVERED = "redelivered"; - String TIMESTAMP = "timestamp"; - String TYPE = "type"; - String SUBSCRIPTION = "subscription"; - } - - public interface Subscribe { - String DESTINATION = "destination"; - String ACK_MODE = "ack"; - String ID = "id"; - String SELECTOR = "selector"; - String DURABLE_SUBSCRIPTION_NAME = "durable-subscription-name"; - String NO_LOCAL = "no-local"; - - public interface AckModeValues { - String AUTO = "auto"; - String CLIENT = "client"; - } - } - - public interface Unsubscribe { - String DESTINATION = "destination"; - String ID = "id"; - } - - public interface Connect { - String LOGIN = "login"; - String PASSCODE = "passcode"; - String CLIENT_ID = "client-id"; - String REQUEST_ID = "request-id"; - } - - public interface Error { - String MESSAGE = "message"; - } - - public interface Connected { - String SESSION = "session"; - String RESPONSE_ID = "response-id"; - } - - public interface Ack { - String MESSAGE_ID = "message-id"; - } - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompDestinationConverter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompDestinationConverter.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompDestinationConverter.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,85 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.client.HornetQTemporaryQueue; -import org.hornetq.jms.client.HornetQTemporaryTopic; -import org.hornetq.jms.client.HornetQTopic; - -/** - * A StompDestinationConverter - * - * @author jmesnil - * - * - */ -public class StompDestinationConverter -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - public static SimpleString convertDestination(String name) throws HornetQException - { - if (name == null) - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "No destination is specified!"); - } - else if (name.startsWith("/queue/")) - { - String queueName = name.substring("/queue/".length(), name.length()); - return HornetQQueue.createAddressFromName(queueName); - } - else if (name.startsWith("/topic/")) - { - String topicName = name.substring("/topic/".length(), name.length()); - return HornetQTopic.createAddressFromName(topicName); - } - else if (name.startsWith("/temp-queue/")) - { - String tempName = name.substring("/temp-queue/".length(), name.length()); - return HornetQTemporaryQueue.createAddressFromName(tempName); - } - else if (name.startsWith("/temp-topic/")) - { - String tempName = name.substring("/temp-topic/".length(), name.length()); - return HornetQTemporaryTopic.createAddressFromName(tempName); - } - else - { - throw new HornetQException(HornetQException.ILLEGAL_STATE, "Illegal destination name: [" + name + - "] -- StompConnect destinations " + - "must begine with one of: /queue/ /topic/ /temp-queue/ /temp-topic/"); - } - } - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompException.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompException.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompException.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,52 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -/** - * A StompException - * - * @author jmesnil - * - * - */ -public class StompException extends Exception -{ - - /** - * @param string - */ - public StompException(String string) - { - super(string); - } - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrame.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrame.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrame.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,70 +0,0 @@ -/** - * - * 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.hornetq.integration.stomp; - -import java.util.HashMap; -import java.util.Map; - -/** - * Represents all the data in a STOMP frame. - * - * @author <a href="http://hiramchirino.com">chirino</a> - */ -public class StompFrame -{ - private static final byte[] NO_DATA = new byte[] {}; - - private String command; - - private Map<String, Object> headers; - - private byte[] content = StompFrame.NO_DATA; - - public StompFrame() - { - this.headers = new HashMap<String, Object>(); - } - - public StompFrame(String command, Map<String, Object> headers, byte[] data) - { - this.command = command; - this.headers = headers; - this.content = data; - } - - public String getCommand() - { - return command; - } - - public byte[] getContent() - { - return content; - } - - public Map<String, Object> getHeaders() - { - return headers; - } - - @Override - public String toString() - { - return "StompFrame[command=" + command + ", headers=" + headers + ",content-length=" + content.length + "]"; - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameDelimiter.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameDelimiter.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameDelimiter.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,33 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; -import org.jboss.netty.handler.codec.frame.Delimiters; - -/** - * A StompFrameDelimiter - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -public class StompFrameDelimiter extends DelimiterBasedFrameDecoder -{ - - private static final int MAX_DATA_LENGTH = 1024 * 1024 * 100; - - public StompFrameDelimiter() - { - super(MAX_DATA_LENGTH, false, Delimiters.nulDelimiter()); - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameError.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameError.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompFrameError.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,35 +0,0 @@ -/** - * - * 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.hornetq.integration.stomp; - -/** - * Command indicating that an invalid Stomp Frame was received. - * - * @author <a href="http://hiramchirino.com">chirino</a> - */ -public class StompFrameError extends StompFrame { - private final ProtocolException exception; - - public StompFrameError(ProtocolException exception) { - this.exception = exception; - } - - public ProtocolException getException() { - return exception; - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompMarshaller.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompMarshaller.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompMarshaller.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,191 +0,0 @@ -/** - * - * 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.hornetq.integration.stomp; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * Implements marshalling and unmarsalling the <a href="http://stomp.codehaus.org/">Stomp</a> protocol. - */ -public class StompMarshaller { - private static final byte[] NO_DATA = new byte[]{}; - private static final byte[] END_OF_FRAME = new byte[]{0, '\n'}; - private static final int MAX_COMMAND_LENGTH = 1024; - private static final int MAX_HEADER_LENGTH = 1024 * 10; - private static final int MAX_HEADERS = 1000; - private static final int MAX_DATA_LENGTH = 1024 * 1024 * 100; - private int version = 1; - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public byte[] marshal(StompFrame command) throws IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(baos); - marshal(command, dos); - dos.close(); - return baos.toByteArray(); - } - - public void marshal(StompFrame stomp, DataOutput os) throws IOException { - StringBuffer buffer = new StringBuffer(); - buffer.append(stomp.getCommand()); - buffer.append(Stomp.NEWLINE); - - // Output the headers. - for (Iterator iter = stomp.getHeaders().entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Map.Entry) iter.next(); - buffer.append(entry.getKey()); - buffer.append(Stomp.Headers.SEPERATOR); - buffer.append(entry.getValue()); - buffer.append(Stomp.NEWLINE); - } - - // Add a newline to seperate the headers from the content. - buffer.append(Stomp.NEWLINE); - - os.write(buffer.toString().getBytes("UTF-8")); - os.write(stomp.getContent()); - os.write(END_OF_FRAME); - } - - public StompFrame unmarshal(HornetQBuffer in) throws IOException { - - try { - String action = null; - - // skip white space to next real action line - while (true) { - action = readLine(in, MAX_COMMAND_LENGTH, "The maximum command length was exceeded"); - if (action == null) { - throw new IOException("connection was closed"); - } - else { - action = action.trim(); - if (action.length() > 0) { - break; - } - } - } - - // Parse the headers - HashMap headers = new HashMap(25); - while (true) { - String line = readLine(in, MAX_HEADER_LENGTH, "The maximum header length was exceeded"); - if (line != null && line.trim().length() > 0) { - - if (headers.size() > MAX_HEADERS) { - throw new ProtocolException("The maximum number of headers was exceeded", true); - } - - try { - int seperator_index = line.indexOf(Stomp.Headers.SEPERATOR); - String name = line.substring(0, seperator_index).trim(); - String value = line.substring(seperator_index + 1, line.length()).trim(); - headers.put(name, value); - } - catch (Exception e) { - throw new ProtocolException("Unable to parser header line [" + line + "]", true); - } - } - else { - break; - } - } - - // Read in the data part. - byte[] data = NO_DATA; - String contentLength = (String) headers.get(Stomp.Headers.CONTENT_LENGTH); - if (contentLength != null) { - - // Bless the client, he's telling us how much data to read in. - int length; - try { - length = Integer.parseInt(contentLength.trim()); - } - catch (NumberFormatException e) { - throw new ProtocolException("Specified content-length is not a valid integer", true); - } - - if (length > MAX_DATA_LENGTH) { - throw new ProtocolException("The maximum data length was exceeded", true); - } - - data = new byte[length]; - in.readBytes(data); - - if (in.readByte() != 0) { - throw new ProtocolException(Stomp.Headers.CONTENT_LENGTH + " bytes were read and " + "there was no trailing null byte", true); - } - } - else { - - // We don't know how much to read.. data ends when we hit a 0 - byte b; - ByteArrayOutputStream baos = null; - while (in.readableBytes() > 0 && (b = in.readByte()) != 0) { - - if (baos == null) { - baos = new ByteArrayOutputStream(); - } - else if (baos.size() > MAX_DATA_LENGTH) { - throw new ProtocolException("The maximum data length was exceeded", true); - } - - baos.write(b); - } - - if (baos != null) { - baos.close(); - data = baos.toByteArray(); - } - } - - return new StompFrame(action, headers, data); - } - catch (ProtocolException e) { - return new StompFrameError(e); - } - } - - protected String readLine(HornetQBuffer in, int maxLength, String errorMessage) throws IOException { - byte b; - ByteArrayOutputStream baos = new ByteArrayOutputStream(maxLength); - while ((b = in.readByte()) != '\n') { - if (baos.size() > maxLength) { - throw new ProtocolException(errorMessage, true); - } - baos.write(b); - } - byte[] sequence = baos.toByteArray(); - return new String(sequence, "UTF-8"); - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompPacketDecoder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompPacketDecoder.java 2010-01-21 14:40:58 UTC (rev 8825) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/stomp/StompPacketDecoder.java 2010-01-21 14:41:55 UTC (rev 8826) @@ -1,51 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.integration.stomp; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelPipelineCoverage; -import org.jboss.netty.channel.Channels; -import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.SimpleChannelHandler; - -/** - * A StompPacketDecoder - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -@ChannelPipelineCoverage("one") -public class StompPacketDecoder extends SimpleChannelHandler -{ - private final StompMarshaller marshaller; - - // PacketDecoder implementation ---------------------------------- - - public StompPacketDecoder(final StompMarshaller marshaller) - { - this.marshaller = marshaller; - } - - @Override - public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception - { - ChannelBuffer in = (ChannelBuffer)e.getMessage(); - HornetQBuffer buffer = new ChannelBufferWrapper(in); - StompFrame frame = marshaller.unmarshal(buffer); - - Channels.fireMessageReceived(ctx, frame); - } -}

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8825 - in branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core: remoting/server/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 09:40:58 -0500 (Thu, 21 Jan 2010) New Revision: 8825 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ConnectionEntry.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/ReplicationEndpoint.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ConnectionEntry.java (from rev 8819, trunk/src/main/org/hornetq/core/remoting/server/ConnectionEntry.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ConnectionEntry.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ConnectionEntry.java 2010-01-21 14:40:58 UTC (rev 8825) @@ -0,0 +1,41 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.remoting.server; + +import org.hornetq.core.remoting.RemotingConnection; + +/** + * A ConnectionEntry + * + * @author Tim Fox + * + * + */ +public class ConnectionEntry +{ + public final RemotingConnection connection; + + public volatile long lastCheck; + + public volatile long ttl; + + public ConnectionEntry(final RemotingConnection connection, final long lastCheck, final long ttl) + { + this.connection = connection; + + this.lastCheck = lastCheck; + + this.ttl = ttl; + } +} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java (from rev 8819, trunk/src/main/org/hornetq/core/remoting/server/ProtocolManager.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/ProtocolManager.java 2010-01-21 14:40:58 UTC (rev 8825) @@ -0,0 +1,29 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.remoting.server; + +import org.hornetq.spi.core.remoting.Connection; + +/** + * A ProtocolManager + * + * @author Tim Fox + * + * + */ +public interface ProtocolManager +{ + ConnectionEntry createConnectionEntry(Connection connection); + +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-21 14:39:29 UTC (rev 8824) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-21 14:40:58 UTC (rev 8825) @@ -26,20 +26,16 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.protocol.core.CoreProtocolManager; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.Ping; +import org.hornetq.core.remoting.server.ConnectionEntry; +import org.hornetq.core.remoting.server.ProtocolManager; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQPacketHandler; import org.hornetq.core.server.management.ManagementService; import org.hornetq.integration.transports.netty.ServerHolder; import org.hornetq.spi.core.remoting.Acceptor; @@ -90,7 +86,10 @@ private final ScheduledExecutorService scheduledThreadPool; private FailureCheckAndFlushThread failureCheckAndFlushThread; - + + private Map<ProtocolType, ProtocolManager> protocolMap = + new ConcurrentHashMap<ProtocolType, ProtocolManager>(); + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -123,6 +122,8 @@ this.managementService = managementService; this.threadPool = threadPool; this.scheduledThreadPool = scheduledThreadPool; + + this.protocolMap.put(ProtocolType.CORE, new CoreProtocolManager(server, interceptors)); } // RemotingService implementation ------------------------------- @@ -169,13 +170,14 @@ return server; } - public RemotingConnection getRemotingConnection(int connectionID) + public CoreRemotingConnection getRemotingConnection(int connectionID) { ConnectionEntry conn = connections.get(connectionID); if (conn != null) { - return conn.connection; + // FIXME .... + return (CoreRemotingConnection)conn.connection; } else { @@ -192,6 +194,7 @@ if (managementService != null) { acceptor.setNotificationService(managementService); + managementService.registerAcceptor(acceptor, info); } } @@ -257,17 +260,7 @@ { RemotingConnection conn = entry.connection; - Channel channel0 = conn.getChannel(0, -1); - - // And we remove all channels from the connection, this ensures no more packets will be processed after this - // method is - // complete - - conn.removeAllChannels(); - - // Now we are 100% sure that no more packets will be processed we can send the disconnect - - channel0.sendAndFlush(new PacketImpl(PacketImpl.DISCONNECT)); + conn.disconnect(); } for (Acceptor acceptor : acceptors) @@ -326,61 +319,32 @@ // ConnectionLifeCycleListener implementation ----------------------------------- - public void connectionCreated(final Connection connection) + private ProtocolManager getProtocolManager(ProtocolType protocol) { + return protocolMap.get(protocol); + } + + public void connectionCreated(final Connection connection, final ProtocolType protocol) + { if (server == null) { throw new IllegalStateException("Unable to create connection, server hasn't finished starting up"); } - - RemotingConnection rc = new RemotingConnectionImpl(connection, - interceptors, - config.isAsyncConnectionExecutionEnabled() ? server.getExecutorFactory() - .getExecutor() - : null); - - Channel channel1 = rc.getChannel(1, -1); - - ChannelHandler handler = createHandler(rc, channel1); - - channel1.setHandler(handler); - - long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; - - if (config.getConnectionTTLOverride() != -1) + + ProtocolManager pmgr = this.getProtocolManager(protocol); + + if (pmgr == null) { - ttl = config.getConnectionTTLOverride(); + throw new IllegalArgumentException("Unknown protocol " + protocol); } - final ConnectionEntry entry = new ConnectionEntry(rc, System.currentTimeMillis(), ttl); - + ConnectionEntry entry = pmgr.createConnectionEntry(connection); + connections.put(connection.getID(), entry); - final Channel channel0 = rc.getChannel(0, -1); - - channel0.setHandler(new ChannelHandler() - { - public void handlePacket(final Packet packet) - { - if (packet.getType() == PacketImpl.PING) - { - Ping ping = (Ping)packet; - - if (config.getConnectionTTLOverride() == -1) - { - // Allow clients to specify connection ttl - entry.ttl = ping.getConnectionTTL(); - } - - // Just send a ping back - channel0.send(packet); - } - } - }); - if (config.isBackup()) { - serverSideReplicatingConnection = rc; + serverSideReplicatingConnection = entry.connection; } } @@ -431,49 +395,23 @@ // Protected ----------------------------------------------------- - /** - * Subclasses (on tests) may use this to create a different channel. - */ - protected ChannelHandler createHandler(final RemotingConnection rc, final Channel channel) - { - return new HornetQPacketHandler(server, channel, rc); - } - // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- private final class DelegatingBufferHandler implements BufferHandler { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { ConnectionEntry conn = connections.get(connectionID); if (conn != null) { - conn.connection.bufferReceived(connectionID, buffer, decoder); + conn.connection.bufferReceived(connectionID, buffer); } } } - private static final class ConnectionEntry - { - final RemotingConnection connection; - - volatile long lastCheck; - - volatile long ttl; - - ConnectionEntry(final RemotingConnection connection, final long lastCheck, final long ttl) - { - this.connection = connection; - - this.lastCheck = lastCheck; - - this.ttl = ttl; - } - } - private final class FailureCheckAndFlushThread extends Thread { private final long pauseInterval; @@ -538,11 +476,8 @@ } if (flush) - { - // We flush any confirmations on the connection - this prevents idle bridges for example - // sitting there with many unacked messages - - conn.flushConfirmations(); + { + conn.flush(); } } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/ReplicationEndpoint.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/ReplicationEndpoint.java 2010-01-21 14:39:29 UTC (rev 8824) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/ReplicationEndpoint.java 2010-01-21 14:40:58 UTC (rev 8825) @@ -15,8 +15,8 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; import org.hornetq.core.server.HornetQComponent; /** Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-21 14:39:29 UTC (rev 8824) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-21 14:40:58 UTC (rev 8825) @@ -28,24 +28,24 @@ import org.hornetq.core.paging.impl.PagingManagerImpl; import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationResponseMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationResponseMessage; import org.hornetq.core.replication.ReplicationEndpoint; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.LargeServerMessage; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-21 14:39:29 UTC (rev 8824) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-21 14:40:58 UTC (rev 8825) @@ -29,24 +29,24 @@ import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.persistence.OperationContext; import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; import org.hornetq.core.replication.ReplicationManager; import org.hornetq.utils.ExecutorFactory; @@ -69,7 +69,7 @@ private final FailoverManager failoverManager; - private RemotingConnection replicatingConnection; + private CoreRemotingConnection replicatingConnection; private Channel replicatingChannel;

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8824 - in branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting: impl and 2 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 09:39:29 -0500 (Thu, 21 Jan 2010) New Revision: 8824 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ProtocolType.java Removed: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Channel.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ChannelHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Packet.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/PacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/CorePacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/RemotingConnection.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Channel.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Channel.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Channel.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,179 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -import java.util.concurrent.locks.Lock; - -import org.hornetq.api.core.HornetQException; - -/** - * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.remoting.RemotingConnection}. - * - * Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel - * when received by the {@link org.hornetq.core.remoting.RemotingConnection}. see {@link org.hornetq.core.remoting.Packet#setChannelID(long)}. - * - * Each Channel should will forward any packets received to its {@link org.hornetq.core.remoting.ChannelHandler}. - * - * A Channel *does not* support concurrent access by more than one thread! - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Channel -{ - /** - * returns the id of this channel. - * - * @return the id - */ - long getID(); - - /** - * sends a packet on this channel. - * - * @param packet the packet to send - */ - void send(Packet packet); - - /** - * sends a packet on this channel and then blocks until it has been written to the connection. - * - * @param packet the packet to send - */ - void sendAndFlush(Packet packet); - - /** - * sends a packet on this channel and then blocks until a response is received or a timeout occurs. - * - * @param packet the packet to send - * @return the response - * @throws HornetQException if an error occurs during the send - */ - Packet sendBlocking(Packet packet) throws HornetQException; - - /** - * sets the {@link org.hornetq.core.remoting.ChannelHandler} that this channel should forward received packets to. - * - * @param handler the handler - */ - void setHandler(ChannelHandler handler); - - /** - * closes this channel. - * - * once closed no packets can be sent. - */ - void close(); - - /** - * transfers the connection used by this channel to the one specified. - * - * All new packets will be sent via this connection. - * - * @param newConnection the new connection - */ - void transferConnection(RemotingConnection newConnection); - - /** - * resends any packets that have not received confirmations yet. - * - * Typically called after a connection has been transferred. - * - * @param lastConfirmedCommandID the last confirmed packet - * @param newID the new id to use - */ - void replayCommands(int lastConfirmedCommandID, final long newID); - - /** - * returns the last confirmed packet command id - * - * @return the id - */ - int getLastConfirmedCommandID(); - - /** - * locks the channel. - * - * While locked no packets can be sent or received - */ - void lock(); - - /** - * unlocks the channel. - */ - void unlock(); - - /** - * forces any {@link org.hornetq.core.remoting.Channel#sendBlocking(Packet)} request to return with an exception. - */ - void returnBlocking(); - - /** - * returns the channel lock - * - * @return the lock - */ - Lock getLock(); - - /** - * returns the Remoting Connection being used by the channel - */ - RemotingConnection getConnection(); - - /** - * sends a confirmation of a packet being received. - * - * @param packet the packet to confirm - */ - void confirm(Packet packet); - - /** - * sets the handler to use when a confirmation is received. - * - * @param handler the handler to call - */ - void setCommandConfirmationHandler(CommandConfirmationHandler handler); - - /** - * flushes any confirmations on to the connection. - */ - void flushConfirmations(); - - /** - * Called by {@link org.hornetq.core.remoting.RemotingConnection} when a packet is received. - * - * This method should then call its {@link org.hornetq.core.remoting.ChannelHandler} after appropriate processing of - * the packet - * - * @param packet the packet to process. - */ - void handlePacket(Packet packet); - - /** - * clears any commands from the cache that are yet to be confirmed. - */ - void clearCommands(); - - /** - * returns the confirmation window size this channel is using. - * - * @return the window size - */ - int getConfirmationWindowSize(); - - /** - * notifies the channel if it is transferring its connection. When true it is illegal to send messages. - * - * @param transferring whether the channel is transferring - */ - void setTransferring(boolean transferring); -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ChannelHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ChannelHandler.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ChannelHandler.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,29 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -/** - * A ChannelHandler is used by {@link Channel}. When a channel receives a packet it will call its handler to deal with the - * packet. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface ChannelHandler -{ - /** - * called by the channel when a packet is received.. - * - * @param packet the packet received - */ - void handlePacket(Packet packet); -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,31 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -/** - * A CommandConfirmationHandler is used by the channel to confirm confirmations of packets. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 9 Feb 2009 12:39:11 - */ -public interface CommandConfirmationHandler -{ - /** - * called by channel after a confirmation has been received. - * - * @param packet the packet confirmed - */ - void commandConfirmed(Packet packet); -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Packet.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Packet.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/Packet.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,85 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A Packet represents a pcaket of data transmitted over a connection. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Packet -{ - /** - * This sets the channel id that should be used once the packet has been successfully decoded it is sent to the correct channel. - * - * @param channelID the id of the channel to handle the packet - */ - void setChannelID(long channelID); - - /** - * returns the channel id of the channel that should handle this pcaket - * - * @return the id of the channel - */ - long getChannelID(); - - /** - * returns true if this packet is being sent in response to a previously received packet - * - * @return true if a response - */ - boolean isResponse(); - - /** - * returns the type of the packet. - * - * This is needed when decoding the packet - * - * @return the packet type - */ - byte getType(); - - /** - * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data - * - * @param connection the connection - * @return the buffer to encode to - */ - HornetQBuffer encode(RemotingConnection connection); - - /** - * decodes the buffer into this packet - * - * @param buffer the buffer to decode from - */ - void decode(HornetQBuffer buffer); - - /** - * returns the size needed to encode this packet. - * - * @return The size of the entire packet including headers, and extra data - */ - int getPacketSize(); - - /** - * returns true if a confirmation should be sent on receipt of this packet. - * - * @return true if confirmation is required - */ - boolean isRequiresConfirmations(); - - boolean isAsyncExec(); -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/PacketDecoder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/PacketDecoder.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/PacketDecoder.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,30 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A PacketDecoder - * - * @author jmesnil - * - * - */ -public interface PacketDecoder -{ - - public abstract Packet decode(final HornetQBuffer in); - -} \ No newline at end of file Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ProtocolType.java (from rev 8819, trunk/src/main/org/hornetq/core/remoting/ProtocolType.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ProtocolType.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/ProtocolType.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.remoting; + +/** + * A ProtocolType + * + * @author Tim Fox + * + * + */ +public enum ProtocolType +{ + CORE, STOMP, AMQP; +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/RemotingConnection.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/RemotingConnection.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/RemotingConnection.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -23,7 +23,7 @@ /** * A RemotingConnection is a connection between a client and a server. * - * It allows multiple {@link org.hornetq.core.remoting.Channel}'s to be created and data multiplexed over them. It uses + * It allows multiple {@link org.hornetq.core.protocol.core.Channel}'s to be created and data multiplexed over them. It uses * and a {@link Connection} implementation and takes care of failures etc. * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> @@ -46,40 +46,6 @@ String getRemoteAddress(); /** - * return the channel with the channel id specified. - * - * If it does not exist create it with the confirmation window size. - * - * @param channelID the channel id - * @param confWindowSize the confirmation window size - * @return the channel - */ - Channel getChannel(long channelID, int confWindowSize); - - /** - * add the channel with the specified channel id - * - * @param channelID the channel id - * @param channel the channel - */ - void putChannel(long channelID, Channel channel); - - /** - * remove the channel with the specified channel id - * - * @param channelID the channel id - * @return true if removed - */ - boolean removeChannel(long channelID); - - /** - * generate a unique (within this connection) channel id - * - * @return the id - */ - long generateChannelID(); - - /** * add a failure listener. * * The listener will be called in the event of connection failure. @@ -150,20 +116,6 @@ void destroy(); /** - * resets the id generator used to when generating id's - * - * @param id the first id to set it to - */ - void syncIDGeneratorSequence(long id); - - /** - * return the next id that will be chosen. - * - * @return the id - */ - long getIDGeneratorSequence(); - - /** * return the underlying Connection. * * @return the connection @@ -182,36 +134,23 @@ * * @return true if destroyed, otherwise false */ - boolean isDestroyed(); - + boolean isDestroyed(); + /** - * return the current tomeout for blocking calls - * - * @return the timeout in milliseconds + * Disconnect the connection, closing all channels */ - long getBlockingCallTimeout(); - + void disconnect(); + /** - * return the transfer lock used when transferring connections. - * - * @return the lock - */ - Object getTransferLock(); - - /** * returns true if any data has been received since the last time this method was called. * * @return true if data has been received. */ boolean checkDataReceived(); - + /** - * remove all channels from the remoting connection + * flush all outstanding data from the connection. */ - void removeAllChannels(); + void flush(); - /** - * flush all outstanding confirmations onto the connection. - */ - void flushConfirmations(); } Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,515 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl; - -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CommandConfirmationHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.PacketsConfirmedMessage; - -/** - * A ChannelImpl - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public class ChannelImpl implements Channel -{ - private static final Logger log = Logger.getLogger(ChannelImpl.class); - - private volatile long id; - - private ChannelHandler handler; - - private Packet response; - - private final java.util.Queue<Packet> resendCache; - - private volatile int firstStoredCommandID; - - private volatile int lastConfirmedCommandID = -1; - - private volatile RemotingConnection connection; - - private volatile boolean closed; - - private final Lock lock = new ReentrantLock(); - - private final Condition sendCondition = lock.newCondition(); - - private final Condition failoverCondition = lock.newCondition(); - - private final Object sendLock = new Object(); - - private final Object sendBlockingLock = new Object(); - - private boolean failingOver; - - private final int confWindowSize; - - private int receivedBytes; - - private CommandConfirmationHandler commandConfirmationHandler; - - private volatile boolean transferring; - - public ChannelImpl(final RemotingConnection connection, final long id, final int confWindowSize) - { - this.connection = connection; - - this.id = id; - - this.confWindowSize = confWindowSize; - - if (confWindowSize != -1) - { - resendCache = new ConcurrentLinkedQueue<Packet>(); - } - else - { - resendCache = null; - } - } - - public long getID() - { - return id; - } - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - public Lock getLock() - { - return lock; - } - - public int getConfirmationWindowSize() - { - return confWindowSize; - } - - public void returnBlocking() - { - lock.lock(); - - try - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.UNBLOCKED, - "Connection failure detected. Unblocking a blocking call that will never get a response" - - )); - - sendCondition.signal(); - } - finally - { - lock.unlock(); - } - } - - public void sendAndFlush(final Packet packet) - { - send(packet, true); - } - - public void send(final Packet packet) - { - send(packet, false); - } - - public void setTransferring(boolean transferring) - { - this.transferring = transferring; - } - - // This must never called by more than one thread concurrently - public void send(final Packet packet, final boolean flush) - { - synchronized (sendLock) - { - packet.setChannelID(id); - - final HornetQBuffer buffer = packet.encode(connection); - - lock.lock(); - - try - { - while (failingOver) - { - // TODO - don't hardcode this timeout - try - { - failoverCondition.await(10000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - } - - //Sanity check - if (transferring) - { - throw new IllegalStateException("Cannot send a packet while channel is doing failover"); - } - - - if (resendCache != null && packet.isRequiresConfirmations()) - { - resendCache.add(packet); - } - - connection.getTransportConnection().write(buffer, flush); - } - finally - { - lock.unlock(); - } - } - } - - public Packet sendBlocking(final Packet packet) throws HornetQException - { - if (closed) - { - throw new HornetQException(HornetQException.NOT_CONNECTED, "Connection is destroyed"); - } - - if (connection.getBlockingCallTimeout() == -1) - { - throw new IllegalStateException("Cannot do a blocking call timeout on a server side connection"); - } - - // Synchronized since can't be called concurrently by more than one thread and this can occur - // E.g. blocking acknowledge() from inside a message handler at some time as other operation on main thread - synchronized (sendBlockingLock) - { - packet.setChannelID(id); - - final HornetQBuffer buffer = packet.encode(connection); - - lock.lock(); - - try - { - while (failingOver) - { - // TODO - don't hardcode this timeout - try - { - failoverCondition.await(10000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - } - - response = null; - - if (resendCache != null && packet.isRequiresConfirmations()) - { - resendCache.add(packet); - } - - connection.getTransportConnection().write(buffer); - - long toWait = connection.getBlockingCallTimeout(); - - long start = System.currentTimeMillis(); - - while (response == null && toWait > 0) - { - try - { - sendCondition.await(toWait, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - - if (closed) - { - break; - } - - final long now = System.currentTimeMillis(); - - toWait -= now - start; - - start = now; - } - - if (response == null) - { - throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, - "Timed out waiting for response when sending packet " + packet.getType()); - } - - if (response.getType() == PacketImpl.EXCEPTION) - { - final HornetQExceptionMessage mem = (HornetQExceptionMessage)response; - - HornetQException e = mem.getException(); - - e.fillInStackTrace(); - - throw e; - } - } - finally - { - lock.unlock(); - } - - return response; - } - } - - public void setCommandConfirmationHandler(final CommandConfirmationHandler handler) - { - commandConfirmationHandler = handler; - } - - public void setHandler(final ChannelHandler handler) - { - this.handler = handler; - } - - public void close() - { - if (closed) - { - return; - } - - if (!connection.isDestroyed() && !connection.removeChannel(id)) - { - throw new IllegalArgumentException("Cannot find channel with id " + id + " to close"); - } - - closed = true; - } - - public void transferConnection(final RemotingConnection newConnection) - { - // Needs to synchronize on the connection to make sure no packets from - // the old connection get processed after transfer has occurred - synchronized (connection.getTransferLock()) - { - connection.removeChannel(id); - - // And switch it - - final RemotingConnectionImpl rnewConnection = (RemotingConnectionImpl)newConnection; - - rnewConnection.putChannel(id, this); - - connection = rnewConnection; - - transferring = true; - } - } - - public void replayCommands(final int otherLastConfirmedCommandID, final long newChannelID) - { - if (resendCache != null) - { - clearUpTo(otherLastConfirmedCommandID); - - for (final Packet packet : resendCache) - { - packet.setChannelID(newChannelID); - - doWrite(packet); - } - } - } - - public void lock() - { - lock.lock(); - - failingOver = true; - - lock.unlock(); - } - - public void unlock() - { - lock.lock(); - - failingOver = false; - - failoverCondition.signalAll(); - - lock.unlock(); - } - - public RemotingConnection getConnection() - { - return connection; - } - - //Needs to be synchronized since can be called by remoting service timer thread too for timeout flush - public synchronized void flushConfirmations() - { - if (resendCache != null && receivedBytes != 0) - { - receivedBytes = 0; - - final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); - - confirmed.setChannelID(id); - - doWrite(confirmed); - } - } - - public void confirm(final Packet packet) - { - if (resendCache != null && packet.isRequiresConfirmations()) - { - lastConfirmedCommandID++; - - receivedBytes += packet.getPacketSize(); - - if (receivedBytes >= confWindowSize) - { - receivedBytes = 0; - - final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); - - confirmed.setChannelID(id); - - doWrite(confirmed); - } - } - } - - public void clearCommands() - { - if (resendCache != null) - { - lastConfirmedCommandID = -1; - - firstStoredCommandID = 0; - - resendCache.clear(); - } - } - - public void handlePacket(final Packet packet) - { - if (packet.getType() == PacketImpl.PACKETS_CONFIRMED) - { - if (resendCache != null) - { - final PacketsConfirmedMessage msg = (PacketsConfirmedMessage)packet; - - clearUpTo(msg.getCommandID()); - } - - if (!connection.isClient()) - { - handler.handlePacket(packet); - } - - return; - } - else - { - if (packet.isResponse()) - { - confirm(packet); - - lock.lock(); - - response = packet; - - try - { - sendCondition.signal(); - } - finally - { - lock.unlock(); - } - } - else if (handler != null) - { - handler.handlePacket(packet); - } - } - } - - private void doWrite(final Packet packet) - { - final HornetQBuffer buffer = packet.encode(connection); - - connection.getTransportConnection().write(buffer); - } - - private void clearUpTo(final int lastReceivedCommandID) - { - final int numberToClear = 1 + lastReceivedCommandID - firstStoredCommandID; - - if (numberToClear == -1) - { - throw new IllegalArgumentException("Invalid lastReceivedCommandID: " + lastReceivedCommandID); - } - - int sizeToFree = 0; - - for (int i = 0; i < numberToClear; i++) - { - final Packet packet = resendCache.poll(); - - if (packet == null) - { - ChannelImpl.log.warn("Can't find packet to clear: " + " last received command id " + - lastReceivedCommandID + - " first stored command id " + - firstStoredCommandID); - return; - } - - if (packet.getType() != PacketImpl.PACKETS_CONFIRMED) - { - sizeToFree += packet.getPacketSize(); - } - - if (commandConfirmationHandler != null) - { - commandConfirmationHandler.commandConfirmed(packet); - } - } - - firstStoredCommandID += numberToClear; - } -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/CorePacketDecoder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/CorePacketDecoder.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/CorePacketDecoder.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,495 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl; - -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATESESSION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATESESSION_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_REPLICATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.DISCONNECT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.EXCEPTION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.NULL_RESPONSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.PACKETS_CONFIRMED; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.PING; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_APPEND; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_APPEND_TX; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_COMMIT_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_COMPARE_DATA; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_DELETE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_DELETE_TX; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_LARGE_MESSAGE_END; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_PAGE_EVENT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_PAGE_WRITE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_PREPARE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_RESPONSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_BINDINGQUERY_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_PRODUCER_CREDITS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_QUEUEQUERY_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_MSG; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_STOP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_END; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SUSPEND; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.PacketDecoder; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.PacketsConfirmedMessage; -import org.hornetq.core.remoting.impl.wireformat.Ping; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; - -/** - * A CorePacketDecoder - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * - */ -public class CorePacketDecoder implements PacketDecoder -{ - private static final Logger log = Logger.getLogger(CorePacketDecoder.class); - - public Packet decode(final HornetQBuffer in) - { - final byte packetType = in.readByte(); - - Packet packet; - - switch (packetType) - { - case PING: - { - packet = new Ping(); - break; - } - case DISCONNECT: - { - packet = new PacketImpl(PacketImpl.DISCONNECT); - break; - } - case EXCEPTION: - { - packet = new HornetQExceptionMessage(); - break; - } - case PACKETS_CONFIRMED: - { - packet = new PacketsConfirmedMessage(); - break; - } - case CREATESESSION: - { - packet = new CreateSessionMessage(); - break; - } - case CREATESESSION_RESP: - { - packet = new CreateSessionResponseMessage(); - break; - } - case REATTACH_SESSION: - { - packet = new ReattachSessionMessage(); - break; - } - case REATTACH_SESSION_RESP: - { - packet = new ReattachSessionResponseMessage(); - break; - } - case SESS_CLOSE: - { - packet = new SessionCloseMessage(); - break; - } - case SESS_CREATECONSUMER: - { - packet = new SessionCreateConsumerMessage(); - break; - } - case SESS_ACKNOWLEDGE: - { - packet = new SessionAcknowledgeMessage(); - break; - } - case SESS_EXPIRED: - { - packet = new SessionExpiredMessage(); - break; - } - case SESS_COMMIT: - { - packet = new SessionCommitMessage(); - break; - } - case SESS_ROLLBACK: - { - packet = new RollbackMessage(); - break; - } - case SESS_QUEUEQUERY: - { - packet = new SessionQueueQueryMessage(); - break; - } - case SESS_QUEUEQUERY_RESP: - { - packet = new SessionQueueQueryResponseMessage(); - break; - } - case CREATE_QUEUE: - { - packet = new CreateQueueMessage(); - break; - } - case DELETE_QUEUE: - { - packet = new SessionDeleteQueueMessage(); - break; - } - case SESS_BINDINGQUERY: - { - packet = new SessionBindingQueryMessage(); - break; - } - case SESS_BINDINGQUERY_RESP: - { - packet = new SessionBindingQueryResponseMessage(); - break; - } - case SESS_XA_START: - { - packet = new SessionXAStartMessage(); - break; - } - case SESS_XA_END: - { - packet = new SessionXAEndMessage(); - break; - } - case SESS_XA_COMMIT: - { - packet = new SessionXACommitMessage(); - break; - } - case SESS_XA_PREPARE: - { - packet = new SessionXAPrepareMessage(); - break; - } - case SESS_XA_RESP: - { - packet = new SessionXAResponseMessage(); - break; - } - case SESS_XA_ROLLBACK: - { - packet = new SessionXARollbackMessage(); - break; - } - case SESS_XA_JOIN: - { - packet = new SessionXAJoinMessage(); - break; - } - case SESS_XA_SUSPEND: - { - packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); - break; - } - case SESS_XA_RESUME: - { - packet = new SessionXAResumeMessage(); - break; - } - case SESS_XA_FORGET: - { - packet = new SessionXAForgetMessage(); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); - break; - } - case SESS_XA_INDOUBT_XIDS_RESP: - { - packet = new SessionXAGetInDoubtXidsResponseMessage(); - break; - } - case SESS_XA_SET_TIMEOUT: - { - packet = new SessionXASetTimeoutMessage(); - break; - } - case SESS_XA_SET_TIMEOUT_RESP: - { - packet = new SessionXASetTimeoutResponseMessage(); - break; - } - case SESS_XA_GET_TIMEOUT: - { - packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); - break; - } - case SESS_XA_GET_TIMEOUT_RESP: - { - packet = new SessionXAGetTimeoutResponseMessage(); - break; - } - case SESS_START: - { - packet = new PacketImpl(PacketImpl.SESS_START); - break; - } - case SESS_STOP: - { - packet = new PacketImpl(PacketImpl.SESS_STOP); - break; - } - case SESS_FLOWTOKEN: - { - packet = new SessionConsumerFlowCreditMessage(); - break; - } - case SESS_SEND: - { - packet = new SessionSendMessage(); - break; - } - case SESS_SEND_LARGE: - { - packet = new SessionSendLargeMessage(); - break; - } - case SESS_RECEIVE_MSG: - { - packet = new SessionReceiveMessage(); - break; - } - case SESS_RECEIVE_LARGE_MSG: - { - packet = new SessionReceiveLargeMessage(); - break; - } - case SESS_CONSUMER_CLOSE: - { - packet = new SessionConsumerCloseMessage(); - break; - } - case NULL_RESPONSE: - { - packet = new NullResponseMessage(); - break; - } - case SESS_RECEIVE_CONTINUATION: - { - packet = new SessionReceiveContinuationMessage(); - break; - } - case SESS_SEND_CONTINUATION: - { - packet = new SessionSendContinuationMessage(); - break; - } - case SESS_PRODUCER_REQUEST_CREDITS: - { - packet = new SessionRequestProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_CREDITS: - { - packet = new SessionProducerCreditsMessage(); - break; - } - case CREATE_REPLICATION: - { - packet = new CreateReplicationSessionMessage(); - break; - } - case REPLICATION_APPEND: - { - packet = new ReplicationAddMessage(); - break; - } - case REPLICATION_APPEND_TX: - { - packet = new ReplicationAddTXMessage(); - break; - } - case REPLICATION_DELETE: - { - packet = new ReplicationDeleteMessage(); - break; - } - case REPLICATION_DELETE_TX: - { - packet = new ReplicationDeleteTXMessage(); - break; - } - case REPLICATION_PREPARE: - { - packet = new ReplicationPrepareMessage(); - break; - } - case REPLICATION_COMMIT_ROLLBACK: - { - packet = new ReplicationCommitMessage(); - break; - } - case REPLICATION_RESPONSE: - { - packet = new ReplicationResponseMessage(); - break; - } - case REPLICATION_PAGE_WRITE: - { - packet = new ReplicationPageWriteMessage(); - break; - } - case REPLICATION_PAGE_EVENT: - { - packet = new ReplicationPageEventMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_BEGIN: - { - packet = new ReplicationLargeMessageBeingMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_END: - { - packet = new ReplicationLargemessageEndMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_WRITE: - { - packet = new ReplicationLargeMessageWriteMessage(); - break; - } - case REPLICATION_COMPARE_DATA: - { - packet = new ReplicationCompareDataMessage(); - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - packet = new SessionForceConsumerDelivery(); - break; - } - default: - { - throw new IllegalArgumentException("Invalid type: " + packetType); - } - } - - packet.decode(in); - - return packet; - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,525 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.Executor; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.PacketDecoder; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.spi.core.remoting.BufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.SimpleIDGenerator; - -/** - * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @version <tt>$Revision$</tt> $Id$ - */ -public class RemotingConnectionImpl implements RemotingConnection, BufferHandler -{ - // Constants - // ------------------------------------------------------------------------------------ - - private static final Logger log = Logger.getLogger(RemotingConnectionImpl.class); - - // Static - // --------------------------------------------------------------------------------------- - - // Attributes - // ----------------------------------------------------------------------------------- - - private final Connection transportConnection; - - private final Map<Long, Channel> channels = new ConcurrentHashMap<Long, Channel>(); - - private final List<FailureListener> failureListeners = new CopyOnWriteArrayList<FailureListener>(); - - private final List<CloseListener> closeListeners = new CopyOnWriteArrayList<CloseListener>(); - - private final long blockingCallTimeout; - - private final List<Interceptor> interceptors; - - private volatile boolean destroyed; - - private final boolean client; - - // Channels 0-9 are reserved for the system - // 0 is for pinging - // 1 is for session creation and attachment - // 2 is for replication - private volatile SimpleIDGenerator idGenerator = new SimpleIDGenerator(10); - - private boolean idGeneratorSynced = false; - - private final Object transferLock = new Object(); - - private final Object failLock = new Object(); - - private volatile boolean dataReceived; - - private final Executor executor; - - // Constructors - // --------------------------------------------------------------------------------- - - /* - * Create a client side connection - */ - public RemotingConnectionImpl(final Connection transportConnection, - final long blockingCallTimeout, - final List<Interceptor> interceptors) - { - this(transportConnection, blockingCallTimeout, interceptors, true, null); - } - - /* - * Create a server side connection - */ - public RemotingConnectionImpl(final Connection transportConnection, - final List<Interceptor> interceptors, - final Executor executor) - - { - this(transportConnection, -1, interceptors, false, executor); - } - - private RemotingConnectionImpl(final Connection transportConnection, - final long blockingCallTimeout, - final List<Interceptor> interceptors, - final boolean client, - final Executor executor) - - { - this.transportConnection = transportConnection; - - this.blockingCallTimeout = blockingCallTimeout; - - this.interceptors = interceptors; - - this.client = client; - - this.executor = executor; - } - - // RemotingConnection implementation - // ------------------------------------------------------------ - - public Connection getTransportConnection() - { - return transportConnection; - } - - public List<FailureListener> getFailureListeners() - { - return new ArrayList<FailureListener>(failureListeners); - } - - public void setFailureListeners(final List<FailureListener> listeners) - { - failureListeners.clear(); - - failureListeners.addAll(listeners); - } - - public Object getID() - { - return transportConnection.getID(); - } - - public String getRemoteAddress() - { - return transportConnection.getRemoteAddress(); - } - - public synchronized Channel getChannel(final long channelID, final int confWindowSize) - { - Channel channel = channels.get(channelID); - - if (channel == null) - { - channel = new ChannelImpl(this, channelID, confWindowSize); - - channels.put(channelID, channel); - } - - return channel; - } - - public synchronized boolean removeChannel(final long channelID) - { - return channels.remove(channelID) != null; - } - - public synchronized void putChannel(final long channelID, final Channel channel) - { - channels.put(channelID, channel); - } - - public void addFailureListener(final FailureListener listener) - { - if (listener == null) - { - throw new IllegalStateException("FailureListener cannot be null"); - } - - failureListeners.add(listener); - } - - public boolean removeFailureListener(final FailureListener listener) - { - if (listener == null) - { - throw new IllegalStateException("FailureListener cannot be null"); - } - - return failureListeners.remove(listener); - } - - public void addCloseListener(final CloseListener listener) - { - if (listener == null) - { - throw new IllegalStateException("CloseListener cannot be null"); - } - - closeListeners.add(listener); - } - - public boolean removeCloseListener(final CloseListener listener) - { - if (listener == null) - { - throw new IllegalStateException("CloseListener cannot be null"); - } - - return closeListeners.remove(listener); - } - - public HornetQBuffer createBuffer(final int size) - { - return transportConnection.createBuffer(size); - } - - /* - * This can be called concurrently by more than one thread so needs to be locked - */ - public void fail(final HornetQException me) - { - synchronized (failLock) - { - if (destroyed) - { - return; - } - - destroyed = true; - } - - RemotingConnectionImpl.log.warn("Connection failure has been detected: " + me.getMessage() + - " [code=" + - me.getCode() + - "]"); - - // Then call the listeners - callFailureListeners(me); - - callClosingListeners(); - - internalClose(); - - for (Channel channel : channels.values()) - { - channel.returnBlocking(); - } - } - - public void destroy() - { - synchronized (failLock) - { - if (destroyed) - { - return; - } - - destroyed = true; - } - - internalClose(); - - callClosingListeners(); - } - - public long generateChannelID() - { - return idGenerator.generateID(); - } - - public synchronized void syncIDGeneratorSequence(final long id) - { - if (!idGeneratorSynced) - { - idGenerator = new SimpleIDGenerator(id); - - idGeneratorSynced = true; - } - } - - public long getIDGeneratorSequence() - { - return idGenerator.getCurrentID(); - } - - public Object getTransferLock() - { - return transferLock; - } - - public boolean isClient() - { - return client; - } - - public boolean isDestroyed() - { - return destroyed; - } - - public long getBlockingCallTimeout() - { - return blockingCallTimeout; - } - - public boolean checkDataReceived() - { - boolean res = dataReceived; - - dataReceived = false; - - return res; - } - - public void removeAllChannels() - { - // We get the transfer lock first - this ensures no packets are being processed AND - // it's guaranteed no more packets will be processed once this method is complete - synchronized (transferLock) - { - channels.clear(); - } - } - - public void flushConfirmations() - { - synchronized (transferLock) - { - for (Channel channel : channels.values()) - { - channel.flushConfirmations(); - } - } - } - - // Buffer Handler implementation - // ---------------------------------------------------- - - private volatile boolean executing; - - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) - { - final Packet packet = decoder.decode(buffer); - - if (packet.isAsyncExec() && executor != null) - { - executing = true; - - executor.execute(new Runnable() - { - public void run() - { - try - { - doBufferReceived(packet); - } - catch (Throwable t) - { - RemotingConnectionImpl.log.error("Unexpected error", t); - } - - executing = false; - } - }); - } - else - { - //To prevent out of order execution if interleaving sync and async operations on same connection - while (executing) - { - Thread.yield(); - } - - // Pings must always be handled out of band so we can send pings back to the client quickly - // otherwise they would get in the queue with everything else which might give an intolerable delay - doBufferReceived(packet); - } - - dataReceived = true; - } - - public void packetReceived(final Object connectionID, final Packet packet) - { - if (packet.isAsyncExec() && executor != null) - { - executing = true; - - executor.execute(new Runnable() - { - public void run() - { - try - { - doBufferReceived(packet); - } - catch (Throwable t) - { - RemotingConnectionImpl.log.error("Unexpected error", t); - } - - executing = false; - } - }); - } - else - { - //To prevent out of order execution if interleaving sync and async operations on same connection - while (executing) - { - Thread.yield(); - } - - // Pings must always be handled out of band so we can send pings back to the client quickly - // otherwise they would get in the queue with everything else which might give an intolerable delay - doBufferReceived(packet); - } - - dataReceived = true; - } - - private void doBufferReceived(final Packet packet) - { - if (interceptors != null) - { - for (final Interceptor interceptor : interceptors) - { - try - { - boolean callNext = interceptor.intercept(packet, this); - - if (!callNext) - { - return; - } - } - catch (final Throwable e) - { - RemotingConnectionImpl.log.warn("Failure in calling interceptor: " + interceptor, e); - } - } - } - - synchronized (transferLock) - { - final Channel channel = channels.get(packet.getChannelID()); - - if (channel != null) - { - channel.handlePacket(packet); - } - } - } - - // Package protected - // ---------------------------------------------------------------------------- - - // Protected - // ------------------------------------------------------------------------------------ - - // Private - // -------------------------------------------------------------------------------------- - - private void callFailureListeners(final HornetQException me) - { - final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners); - - for (final FailureListener listener : listenersClone) - { - try - { - listener.connectionFailed(me); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - RemotingConnectionImpl.log.error("Failed to execute failure listener", t); - } - } - } - - private void callClosingListeners() - { - final List<CloseListener> listenersClone = new ArrayList<CloseListener>(closeListeners); - - for (final CloseListener listener : listenersClone) - { - try - { - listener.connectionClosed(); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - RemotingConnectionImpl.log.error("Failed to execute failure listener", t); - } - } - } - - private void internalClose() - { - // We close the underlying transport connection - transportConnection.close(); - - for (Channel channel : channels.values()) - { - channel.close(); - } - } -} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -21,6 +21,7 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.server.management.Notification; import org.hornetq.core.server.management.NotificationService; import org.hornetq.integration.transports.netty.ServerHolder; @@ -217,14 +218,14 @@ this.connector = connector; } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent((String)connection.getID(), connection) != null) { throw new IllegalArgumentException("Connection already exists with id " + connection.getID()); } - listener.connectionCreated(connection); + listener.connectionCreated(connection, protocol); } public void connectionDestroyed(final Object connectionID) Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -17,10 +17,9 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; -import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.PacketDecoder; -import org.hornetq.core.remoting.impl.CorePacketDecoder; +import org.hornetq.core.protocol.core.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; @@ -38,7 +37,7 @@ private final BufferHandler handler; - private final PacketDecoder decoder = new CorePacketDecoder(); + private final PacketDecoder decoder = new PacketDecoder(); private final ConnectionLifeCycleListener listener; @@ -74,7 +73,7 @@ this.executor = executor; - listener.connectionCreated(this); + listener.connectionCreated(this, ProtocolType.CORE); } private volatile boolean closing; @@ -132,7 +131,7 @@ { copied.readInt(); // read and discard - handler.bufferReceived(id, copied, decoder); + handler.bufferReceived(id, copied); } } catch (Exception e) Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -19,6 +19,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.spi.core.remoting.Acceptor; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -174,14 +175,14 @@ private class Listener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent((String)connection.getID(), connection) != null) { throw new IllegalArgumentException("Connection already exists with id " + connection.getID()); } - listener.connectionCreated(connection); + listener.connectionCreated(connection, protocol); } public void connectionDestroyed(final Object connectionID) Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,162 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.logging.Logger; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - - * @version <tt>$Revision$</tt> - */ -public class CreateQueueMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(CreateQueueMessage.class); - - // Attributes ---------------------------------------------------- - - private SimpleString address; - - private SimpleString queueName; - - private SimpleString filterString; - - private boolean durable; - - private boolean temporary; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateQueueMessage(final SimpleString address, - final SimpleString queueName, - final SimpleString filterString, - final boolean durable, - final boolean temporary, - final boolean requiresResponse) - { - super(PacketImpl.CREATE_QUEUE); - - this.address = address; - this.queueName = queueName; - this.filterString = filterString; - this.durable = durable; - this.temporary = temporary; - this.requiresResponse = requiresResponse; - } - - public CreateQueueMessage() - { - super(PacketImpl.CREATE_QUEUE); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", address=" + address); - buff.append(", queueName=" + queueName); - buff.append(", filterString=" + filterString); - buff.append(", durable=" + durable); - buff.append(", temporary=" + temporary); - buff.append("]"); - return buff.toString(); - } - - public SimpleString getAddress() - { - return address; - } - - public SimpleString getQueueName() - { - return queueName; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public boolean isDurable() - { - return durable; - } - - public boolean isTemporary() - { - return temporary; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(address); - buffer.writeSimpleString(queueName); - buffer.writeNullableSimpleString(filterString); - buffer.writeBoolean(durable); - buffer.writeBoolean(temporary); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - address = buffer.readSimpleString(); - queueName = buffer.readSimpleString(); - filterString = buffer.readNullableSimpleString(); - durable = buffer.readBoolean(); - temporary = buffer.readBoolean(); - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateQueueMessage == false) - { - return false; - } - - CreateQueueMessage r = (CreateQueueMessage)other; - - return super.equals(other) && r.address.equals(address) && - r.queueName.equals(queueName) && - (r.filterString == null ? filterString == null : r.filterString.equals(filterString)) && - r.durable == durable && - r.temporary == temporary; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,74 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> - */ -public class CreateReplicationSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long sessionChannelID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateReplicationSessionMessage(final long sessionChannelID) - { - super(PacketImpl.CREATE_REPLICATION); - - this.sessionChannelID = sessionChannelID; - } - - public CreateReplicationSessionMessage() - { - super(PacketImpl.CREATE_REPLICATION); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(sessionChannelID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - sessionChannelID = buffer.readLong(); - } - - /** - * @return the sessionChannelID - */ - public long getSessionChannelID() - { - return sessionChannelID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,222 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class CreateSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private String name; - - private long sessionChannelID; - - private int version; - - private String username; - - private String password; - - private int minLargeMessageSize; - - private boolean xa; - - private boolean autoCommitSends; - - private boolean autoCommitAcks; - - private boolean preAcknowledge; - - private int windowSize; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateSessionMessage(final String name, - final long sessionChannelID, - final int version, - final String username, - final String password, - final int minLargeMessageSize, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int windowSize) - { - super(PacketImpl.CREATESESSION); - - this.name = name; - - this.sessionChannelID = sessionChannelID; - - this.version = version; - - this.username = username; - - this.password = password; - - this.minLargeMessageSize = minLargeMessageSize; - - this.xa = xa; - - this.autoCommitSends = autoCommitSends; - - this.autoCommitAcks = autoCommitAcks; - - this.windowSize = windowSize; - - this.preAcknowledge = preAcknowledge; - } - - public CreateSessionMessage() - { - super(PacketImpl.CREATESESSION); - } - - // Public -------------------------------------------------------- - - public String getName() - { - return name; - } - - public long getSessionChannelID() - { - return sessionChannelID; - } - - public int getVersion() - { - return version; - } - - public String getUsername() - { - return username; - } - - public String getPassword() - { - return password; - } - - public boolean isXA() - { - return xa; - } - - public boolean isAutoCommitSends() - { - return autoCommitSends; - } - - public boolean isAutoCommitAcks() - { - return autoCommitAcks; - } - - public boolean isPreAcknowledge() - { - return preAcknowledge; - } - - public int getWindowSize() - { - return windowSize; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeLong(sessionChannelID); - buffer.writeInt(version); - buffer.writeNullableString(username); - buffer.writeNullableString(password); - buffer.writeInt(minLargeMessageSize); - buffer.writeBoolean(xa); - buffer.writeBoolean(autoCommitSends); - buffer.writeBoolean(autoCommitAcks); - buffer.writeInt(windowSize); - buffer.writeBoolean(preAcknowledge); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - name = buffer.readString(); - sessionChannelID = buffer.readLong(); - version = buffer.readInt(); - username = buffer.readNullableString(); - password = buffer.readNullableString(); - minLargeMessageSize = buffer.readInt(); - xa = buffer.readBoolean(); - autoCommitSends = buffer.readBoolean(); - autoCommitAcks = buffer.readBoolean(); - windowSize = buffer.readInt(); - preAcknowledge = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateSessionMessage == false) - { - return false; - } - - CreateSessionMessage r = (CreateSessionMessage)other; - - boolean matches = super.equals(other) && name.equals(r.name) && - sessionChannelID == r.sessionChannelID && - version == r.version && - xa == r.xa && - autoCommitSends == r.autoCommitSends && - autoCommitAcks == r.autoCommitAcks && - (username == null ? r.username == null : username.equals(r.username)) && - (password == null ? r.password == null : password.equals(r.password)); - - return matches; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - public int getMinLargeMessageSize() - { - return minLargeMessageSize; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class CreateSessionResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int serverVersion; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateSessionResponseMessage(final int serverVersion) - { - super(PacketImpl.CREATESESSION_RESP); - - this.serverVersion = serverVersion; - } - - public CreateSessionResponseMessage() - { - super(PacketImpl.CREATESESSION_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public int getServerVersion() - { - return serverVersion; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(serverVersion); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - serverVersion = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateSessionResponseMessage == false) - { - return false; - } - - CreateSessionResponseMessage r = (CreateSessionResponseMessage)other; - - boolean matches = super.equals(other) && serverVersion == r.serverVersion; - - return matches; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,108 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - * - */ -public class HornetQExceptionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(HornetQExceptionMessage.class); - - // Attributes ---------------------------------------------------- - - private HornetQException exception; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQExceptionMessage(final HornetQException exception) - { - super(PacketImpl.EXCEPTION); - - this.exception = exception; - } - - public HornetQExceptionMessage() - { - super(PacketImpl.EXCEPTION); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public HornetQException getException() - { - return exception; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(exception.getCode()); - buffer.writeNullableString(exception.getMessage()); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int code = buffer.readInt(); - String msg = buffer.readNullableString(); - - exception = new HornetQException(code, msg); - } - - @Override - public String toString() - { - return getParentString() + ", exception= " + exception + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof HornetQExceptionMessage == false) - { - return false; - } - - HornetQExceptionMessage r = (HornetQExceptionMessage)other; - - return super.equals(other) && exception.equals(r.exception); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,45 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.Message; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; - -/** - * A MessagePacket - * - * @author Tim Fox - * - * - */ -public abstract class MessagePacket extends PacketImpl -{ - private static final Logger log = Logger.getLogger(MessagePacket.class); - - protected MessageInternal message; - - public MessagePacket(final byte type, final MessageInternal message) - { - super(type); - - this.message = message; - } - - public Message getMessage() - { - return message; - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,50 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class NullResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public NullResponseMessage() - { - super(PacketImpl.NULL_RESPONSE); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,311 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class PacketImpl implements Packet -{ - // Constants ------------------------------------------------------------------------- - - private static final Logger log = Logger.getLogger(PacketImpl.class); - - // The minimal size for all the packets, Common data for all the packets (look at PacketImpl.encode) - public static final int PACKET_HEADERS_SIZE = DataConstants.SIZE_INT + DataConstants.SIZE_BYTE + - DataConstants.SIZE_LONG; - - private static final int INITIAL_PACKET_SIZE = 1500; - - protected long channelID; - - protected final byte type; - - protected int size = -1; - - // The packet types - // ----------------------------------------------------------------------------------- - - public static final byte PING = 10; - - public static final byte DISCONNECT = 11; - - // Miscellaneous - public static final byte EXCEPTION = 20; - - public static final byte NULL_RESPONSE = 21; - - public static final byte PACKETS_CONFIRMED = 22; - - // Server - public static final byte CREATESESSION = 30; - - public static final byte CREATESESSION_RESP = 31; - - public static final byte REATTACH_SESSION = 32; - - public static final byte REATTACH_SESSION_RESP = 33; - - public static final byte CREATE_QUEUE = 34; - - public static final byte DELETE_QUEUE = 35; - - public static final byte CREATE_REPLICATION = 36; - - // Session - public static final byte SESS_CREATECONSUMER = 40; - - public static final byte SESS_ACKNOWLEDGE = 41; - - public static final byte SESS_EXPIRED = 42; - - public static final byte SESS_COMMIT = 43; - - public static final byte SESS_ROLLBACK = 44; - - public static final byte SESS_QUEUEQUERY = 45; - - public static final byte SESS_QUEUEQUERY_RESP = 46; - - public static final byte SESS_BINDINGQUERY = 49; - - public static final byte SESS_BINDINGQUERY_RESP = 50; - - public static final byte SESS_XA_START = 51; - - public static final byte SESS_XA_END = 52; - - public static final byte SESS_XA_COMMIT = 53; - - public static final byte SESS_XA_PREPARE = 54; - - public static final byte SESS_XA_RESP = 55; - - public static final byte SESS_XA_ROLLBACK = 56; - - public static final byte SESS_XA_JOIN = 57; - - public static final byte SESS_XA_SUSPEND = 58; - - public static final byte SESS_XA_RESUME = 59; - - public static final byte SESS_XA_FORGET = 60; - - public static final byte SESS_XA_INDOUBT_XIDS = 61; - - public static final byte SESS_XA_INDOUBT_XIDS_RESP = 62; - - public static final byte SESS_XA_SET_TIMEOUT = 63; - - public static final byte SESS_XA_SET_TIMEOUT_RESP = 64; - - public static final byte SESS_XA_GET_TIMEOUT = 65; - - public static final byte SESS_XA_GET_TIMEOUT_RESP = 66; - - public static final byte SESS_START = 67; - - public static final byte SESS_STOP = 68; - - public static final byte SESS_CLOSE = 69; - - public static final byte SESS_FLOWTOKEN = 70; - - public static final byte SESS_SEND = 71; - - public static final byte SESS_SEND_LARGE = 72; - - public static final byte SESS_SEND_CONTINUATION = 73; - - public static final byte SESS_CONSUMER_CLOSE = 74; - - public static final byte SESS_RECEIVE_MSG = 75; - - public static final byte SESS_RECEIVE_LARGE_MSG = 76; - - public static final byte SESS_RECEIVE_CONTINUATION = 77; - - public static final byte SESS_FORCE_CONSUMER_DELIVERY = 78; - - public static final byte SESS_PRODUCER_REQUEST_CREDITS = 79; - - public static final byte SESS_PRODUCER_CREDITS = 80; - - // Replication - - public static final byte REPLICATION_RESPONSE = 90; - - public static final byte REPLICATION_APPEND = 91; - - public static final byte REPLICATION_APPEND_TX = 92; - - public static final byte REPLICATION_DELETE = 93; - - public static final byte REPLICATION_DELETE_TX = 94; - - public static final byte REPLICATION_PREPARE = 95; - - public static final byte REPLICATION_COMMIT_ROLLBACK = 96; - - public static final byte REPLICATION_PAGE_WRITE = 97; - - public static final byte REPLICATION_PAGE_EVENT = 98; - - public static final byte REPLICATION_LARGE_MESSAGE_BEGIN = 99; - - public static final byte REPLICATION_LARGE_MESSAGE_END = 100; - - public static final byte REPLICATION_LARGE_MESSAGE_WRITE = 101; - - public static final byte REPLICATION_COMPARE_DATA = 102; - - public static final byte REPLICATION_SYNC = 103; - - // Static -------------------------------------------------------- - - public PacketImpl(final byte type) - { - this.type = type; - } - - // Public -------------------------------------------------------- - - public byte getType() - { - return type; - } - - public long getChannelID() - { - return channelID; - } - - public void setChannelID(final long channelID) - { - this.channelID = channelID; - } - - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = connection.createBuffer(PacketImpl.INITIAL_PACKET_SIZE); - - // The standard header fields - - buffer.writeInt(0); // The length gets filled in at the end - buffer.writeByte(type); - buffer.writeLong(channelID); - - encodeRest(buffer); - - size = buffer.writerIndex(); - - // The length doesn't include the actual length byte - int len = size - DataConstants.SIZE_INT; - - buffer.setInt(0, len); - - return buffer; - } - - public void decode(final HornetQBuffer buffer) - { - channelID = buffer.readLong(); - - decodeRest(buffer); - - size = buffer.readerIndex(); - } - - public int getPacketSize() - { - if (size == -1) - { - throw new IllegalStateException("Packet hasn't been encoded/decoded yet"); - } - - return size; - } - - public boolean isResponse() - { - return false; - } - - public void encodeRest(final HornetQBuffer buffer) - { - } - - public void decodeRest(final HornetQBuffer buffer) - { - } - - public boolean isRequiresConfirmations() - { - return true; - } - - public boolean isAsyncExec() - { - return false; - } - - @Override - public String toString() - { - return getParentString() + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof PacketImpl == false) - { - return false; - } - - PacketImpl r = (PacketImpl)other; - - return r.type == type && r.channelID == channelID; - } - - // Package protected --------------------------------------------- - - protected String getParentString() - { - return "PACKET[type=" + type + ", channelID=" + channelID + "]"; - } - - // Protected ----------------------------------------------------- - - protected int stringEncodeSize(final String str) - { - return DataConstants.SIZE_INT + str.length() * 2; - } - - protected int nullableStringEncodeSize(final String str) - { - return DataConstants.SIZE_BOOLEAN + (str != null ? stringEncodeSize(str) : 0); - } - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,100 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A PacketsConfirmedMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class PacketsConfirmedMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int commandID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public PacketsConfirmedMessage(final int commandID) - { - super(PacketImpl.PACKETS_CONFIRMED); - - this.commandID = commandID; - } - - public PacketsConfirmedMessage() - { - super(PacketImpl.PACKETS_CONFIRMED); - } - - // Public -------------------------------------------------------- - - public int getCommandID() - { - return commandID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(commandID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - commandID = buffer.readInt(); - } - - @Override - public String toString() - { - return getParentString() + ", commandID=" + commandID + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof PacketsConfirmedMessage == false) - { - return false; - } - - PacketsConfirmedMessage r = (PacketsConfirmedMessage)other; - - return super.equals(other) && commandID == r.commandID; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,103 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A Ping - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class Ping extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long connectionTTL; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public Ping(final long connectionTTL) - { - super(PacketImpl.PING); - - this.connectionTTL = connectionTTL; - } - - public Ping() - { - super(PacketImpl.PING); - } - - // Public -------------------------------------------------------- - - public long getConnectionTTL() - { - return connectionTTL; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(connectionTTL); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - connectionTTL = buffer.readLong(); - } - - @Override - public String toString() - { - StringBuffer buf = new StringBuffer(getParentString()); - buf.append(", connectionTTL=" + connectionTTL); - buf.append("]"); - return buf.toString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof Ping == false) - { - return false; - } - - Ping r = (Ping)other; - - return super.equals(other) && connectionTTL == r.connectionTTL; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,105 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A ReattachSessionMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class ReattachSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private String name; - - private int lastConfirmedCommandID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) - { - super(PacketImpl.REATTACH_SESSION); - - this.name = name; - - this.lastConfirmedCommandID = lastConfirmedCommandID; - } - - public ReattachSessionMessage() - { - super(PacketImpl.REATTACH_SESSION); - } - - // Public -------------------------------------------------------- - - public String getName() - { - return name; - } - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeInt(lastConfirmedCommandID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - name = buffer.readString(); - lastConfirmedCommandID = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof ReattachSessionMessage == false) - { - return false; - } - - ReattachSessionMessage r = (ReattachSessionMessage)other; - - return super.equals(other) && name.equals(r.name); - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,111 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A ReattachSessionResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class ReattachSessionResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int lastConfirmedCommandID; - - private boolean reattached; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) - { - super(PacketImpl.REATTACH_SESSION_RESP); - - this.lastConfirmedCommandID = lastConfirmedCommandID; - - this.reattached = reattached; - } - - public ReattachSessionResponseMessage() - { - super(PacketImpl.REATTACH_SESSION_RESP); - } - - // Public -------------------------------------------------------- - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - public boolean isReattached() - { - return reattached; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(lastConfirmedCommandID); - buffer.writeBoolean(reattached); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - lastConfirmedCommandID = buffer.readInt(); - reattached = buffer.readBoolean(); - } - - @Override - public boolean isResponse() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof ReattachSessionResponseMessage == false) - { - return false; - } - - ReattachSessionResponseMessage r = (ReattachSessionResponseMessage)other; - - return super.equals(other) && lastConfirmedCommandID == r.lastConfirmedCommandID; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,142 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.logging.Logger; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationAddMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(ReplicationAddMessage.class); - - // Attributes ---------------------------------------------------- - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean isUpdate; - - private byte recordType; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationAddMessage() - { - super(PacketImpl.REPLICATION_APPEND); - } - - public ReplicationAddMessage(final byte journalID, - final boolean isUpdate, - final long id, - final byte recordType, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.isUpdate = isUpdate; - this.id = id; - this.recordType = recordType; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(isUpdate); - buffer.writeLong(id); - buffer.writeByte(recordType); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - isUpdate = buffer.readBoolean(); - id = buffer.readLong(); - recordType = buffer.readByte(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - public boolean isUpdate() - { - return isUpdate; - } - - /** - * @return the recordType - */ - public byte getRecordType() - { - return recordType; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,150 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationAddTXMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean isUpdate; - - private byte recordType; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationAddTXMessage() - { - super(PacketImpl.REPLICATION_APPEND_TX); - } - - public ReplicationAddTXMessage(final byte journalID, - final boolean isUpdate, - final long txId, - final long id, - final byte recordType, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.isUpdate = isUpdate; - this.txId = txId; - this.id = id; - this.recordType = recordType; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(isUpdate); - buffer.writeLong(txId); - buffer.writeLong(id); - buffer.writeByte(recordType); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - isUpdate = buffer.readBoolean(); - txId = buffer.readLong(); - id = buffer.readLong(); - recordType = buffer.readByte(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - public boolean isUpdate() - { - return isUpdate; - } - - /** - * @return the recordType - */ - public byte getRecordType() - { - return recordType; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,100 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationCommitMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean rollback; - - private long txId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationCommitMessage() - { - super(PacketImpl.REPLICATION_COMMIT_ROLLBACK); - } - - public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId) - { - this(); - this.journalID = journalID; - this.rollback = rollback; - this.txId = txId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(rollback); - buffer.writeLong(txId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - rollback = buffer.readBoolean(); - txId = buffer.readLong(); - } - - public boolean isRollback() - { - return rollback; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.JournalLoadInformation; - -/** - * Message used to compare if the Journals between the live and - * backup nodes are equivalent and can be used over replication. - * The backup journal needs to be an exact copy of the live node before it starts. - * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> - */ -public class ReplicationCompareDataMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private JournalLoadInformation[] journalInformation; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationCompareDataMessage(final JournalLoadInformation[] journalInformation) - { - super(PacketImpl.REPLICATION_COMPARE_DATA); - - this.journalInformation = journalInformation; - } - - public ReplicationCompareDataMessage() - { - super(PacketImpl.REPLICATION_COMPARE_DATA); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(journalInformation.length); - for (JournalLoadInformation info : journalInformation) - { - buffer.writeInt(info.getNumberOfRecords()); - buffer.writeLong(info.getMaxID()); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int numberOfJournals = buffer.readInt(); - - journalInformation = new JournalLoadInformation[numberOfJournals]; - - for (int i = 0; i < numberOfJournals; i++) - { - journalInformation[i] = new JournalLoadInformation(); - journalInformation[i].setNumberOfRecords(buffer.readInt()); - journalInformation[i].setMaxID(buffer.readLong()); - } - } - - /** - * @return the journalInformation - */ - public JournalLoadInformation[] getJournalInformation() - { - return journalInformation; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationDeleteMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationDeleteMessage() - { - super(PacketImpl.REPLICATION_DELETE); - } - - public ReplicationDeleteMessage(final byte journalID, final long id) - { - this(); - this.journalID = journalID; - this.id = id; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(id); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - id = buffer.readLong(); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,125 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationDeleteTXMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationDeleteTXMessage() - { - super(PacketImpl.REPLICATION_DELETE_TX); - } - - public ReplicationDeleteTXMessage(final byte journalID, - final long txId, - final long id, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.txId = txId; - this.id = id; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(txId); - buffer.writeLong(id); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - txId = buffer.readLong(); - id = buffer.readLong(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,79 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationLargeMessageBeingMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargeMessageBeingMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargeMessageBeingMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - public ReplicationLargeMessageBeingMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,99 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationLargeMessageWriteMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargeMessageWriteMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long messageId; - - private byte body[]; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - public ReplicationLargeMessageWriteMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE); - } - - /** - * @param messageId - * @param body - */ - public ReplicationLargeMessageWriteMessage(final long messageId, final byte[] body) - { - this(); - - this.messageId = messageId; - this.body = body; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - buffer.writeInt(body.length); - buffer.writeBytes(body); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - int size = buffer.readInt(); - body = new byte[size]; - buffer.readBytes(body); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - /** - * @return the body - */ - public byte[] getBody() - { - return body; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,78 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationLargemessageEndMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargemessageEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargemessageEndMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); - } - - public ReplicationLargemessageEndMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,109 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * A ReplicationPageWrite - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPageEventMessage extends PacketImpl -{ - - private int pageNumber; - - private SimpleString storeName; - - /** - * True = delete page, False = close page - */ - private boolean isDelete; - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPageEventMessage() - { - super(PacketImpl.REPLICATION_PAGE_EVENT); - } - - public ReplicationPageEventMessage(final SimpleString storeName, final int pageNumber, final boolean isDelete) - { - this(); - this.pageNumber = pageNumber; - this.isDelete = isDelete; - this.storeName = storeName; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(storeName); - buffer.writeInt(pageNumber); - buffer.writeBoolean(isDelete); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - storeName = buffer.readSimpleString(); - pageNumber = buffer.readInt(); - isDelete = buffer.readBoolean(); - } - - /** - * @return the pageNumber - */ - public int getPageNumber() - { - return pageNumber; - } - - /** - * @return the storeName - */ - public SimpleString getStoreName() - { - return storeName; - } - - /** - * @return the isDelete - */ - public boolean isDelete() - { - return isDelete; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.impl.PagedMessageImpl; - -/** - * A ReplicationPageWrite - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPageWriteMessage extends PacketImpl -{ - - int pageNumber; - - PagedMessage pagedMessage; - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPageWriteMessage() - { - super(PacketImpl.REPLICATION_PAGE_WRITE); - } - - public ReplicationPageWriteMessage(final PagedMessage pagedMessage, final int pageNumber) - { - this(); - this.pageNumber = pageNumber; - this.pagedMessage = pagedMessage; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(pageNumber); - pagedMessage.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - pageNumber = buffer.readInt(); - pagedMessage = new PagedMessageImpl(); - pagedMessage.decode(buffer); - } - - /** - * @return the pageNumber - */ - public int getPageNumber() - { - return pageNumber; - } - - /** - * @return the pagedMessage - */ - public PagedMessage getPagedMessage() - { - return pagedMessage; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,109 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPrepareMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPrepareMessage() - { - super(PacketImpl.REPLICATION_PREPARE); - } - - public ReplicationPrepareMessage(final byte journalID, final long txId, final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.txId = txId; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(txId); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - txId = buffer.readLong(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,44 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class ReplicationResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationResponseMessage() - { - super(PacketImpl.REPLICATION_RESPONSE); - } - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A RollbackMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Feb 18, 2009 2:11:17 PM - * - * - */ -public class RollbackMessage extends PacketImpl -{ - - public RollbackMessage() - { - super(PacketImpl.SESS_ROLLBACK); - } - - public RollbackMessage(final boolean considerLastMessageAsDelivered) - { - super(PacketImpl.SESS_ROLLBACK); - - this.considerLastMessageAsDelivered = considerLastMessageAsDelivered; - } - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean considerLastMessageAsDelivered; - - /** - * @return the considerLastMessageAsDelivered - */ - public boolean isConsiderLastMessageAsDelivered() - { - return considerLastMessageAsDelivered; - } - - /** - * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set - */ - public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) - { - considerLastMessageAsDelivered = isLastMessageAsDelivered; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(considerLastMessageAsDelivered); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - considerLastMessageAsDelivered = buffer.readBoolean(); - } - - public boolean isAsyncExec() - { - return true; - } - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,112 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionAcknowledgeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long messageID; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) - { - super(PacketImpl.SESS_ACKNOWLEDGE); - - this.consumerID = consumerID; - - this.messageID = messageID; - - this.requiresResponse = requiresResponse; - } - - public SessionAcknowledgeMessage() - { - super(PacketImpl.SESS_ACKNOWLEDGE); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getMessageID() - { - return messageID; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - - buffer.writeLong(messageID); - - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - - messageID = buffer.readLong(); - - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionAcknowledgeMessage == false) - { - return false; - } - - SessionAcknowledgeMessage r = (SessionAcknowledgeMessage)other; - - return super.equals(other) && consumerID == r.consumerID && - messageID == r.messageID && - requiresResponse == r.requiresResponse; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,72 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionQueueQueryMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionBindingQueryMessage extends PacketImpl -{ - private SimpleString address; - - public SessionBindingQueryMessage(final SimpleString address) - { - super(PacketImpl.SESS_BINDINGQUERY); - - this.address = address; - } - - public SessionBindingQueryMessage() - { - super(PacketImpl.SESS_BINDINGQUERY); - } - - public SimpleString getAddress() - { - return address; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(address); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - address = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionBindingQueryMessage == false) - { - return false; - } - - SessionBindingQueryMessage r = (SessionBindingQueryMessage)other; - - return super.equals(other) && address.equals(r.address); - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,123 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import java.util.ArrayList; -import java.util.List; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionBindingQueryResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionBindingQueryResponseMessage extends PacketImpl -{ - private boolean exists; - - private List<SimpleString> queueNames; - - public SessionBindingQueryResponseMessage(final boolean exists, final List<SimpleString> queueNames) - { - super(PacketImpl.SESS_BINDINGQUERY_RESP); - - this.exists = exists; - - this.queueNames = queueNames; - } - - public SessionBindingQueryResponseMessage() - { - super(PacketImpl.SESS_BINDINGQUERY_RESP); - } - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isExists() - { - return exists; - } - - public List<SimpleString> getQueueNames() - { - return queueNames; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(exists); - buffer.writeInt(queueNames.size()); - for (SimpleString queueName : queueNames) - { - buffer.writeSimpleString(queueName); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - exists = buffer.readBoolean(); - int numQueues = buffer.readInt(); - queueNames = new ArrayList<SimpleString>(numQueues); - for (int i = 0; i < numQueues; i++) - { - queueNames.add(buffer.readSimpleString()); - } - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionBindingQueryResponseMessage == false) - { - return false; - } - - SessionBindingQueryResponseMessage r = (SessionBindingQueryResponseMessage)other; - - if (super.equals(other) && exists == r.exists) - { - if (queueNames.size() == r.queueNames.size()) - { - for (int i = 0; i < queueNames.size(); i++) - { - if (!queueNames.get(i).equals(r.queueNames.get(i))) - { - return false; - } - } - } - else - { - return false; - } - } - else - { - return false; - } - - return true; - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,61 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionCloseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionCloseMessage() - { - super(PacketImpl.SESS_CLOSE); - } - - // Public -------------------------------------------------------- - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCloseMessage == false) - { - return false; - } - - return super.equals(other); - } - - @Override - public boolean isAsyncExec() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,57 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * A SessionCommitMessage - * - * @author tim - * - * - */ -public class SessionCommitMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - /** - * @param type - */ - public SessionCommitMessage() - { - super(PacketImpl.SESS_COMMIT); - } - - public boolean isAsyncExec() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,91 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionConsumerCloseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionConsumerCloseMessage(final long objectID) - { - super(PacketImpl.SESS_CONSUMER_CLOSE); - - consumerID = objectID; - } - - public SessionConsumerCloseMessage() - { - super(PacketImpl.SESS_CONSUMER_CLOSE); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - } - - @Override - public String toString() - { - return getParentString() + ", consumerID=" + consumerID + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionConsumerCloseMessage == false) - { - return false; - } - - SessionConsumerCloseMessage r = (SessionConsumerCloseMessage)other; - - return super.equals(other) && consumerID == r.consumerID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,103 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class SessionConsumerFlowCreditMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private int credits; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) - { - super(PacketImpl.SESS_FLOWTOKEN); - - this.consumerID = consumerID; - - this.credits = credits; - } - - public SessionConsumerFlowCreditMessage() - { - super(PacketImpl.SESS_FLOWTOKEN); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public int getCredits() - { - return credits; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeInt(credits); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - credits = buffer.readInt(); - } - - @Override - public String toString() - { - return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionConsumerFlowCreditMessage == false) - { - return false; - } - - SessionConsumerFlowCreditMessage r = (SessionConsumerFlowCreditMessage)other; - - return super.equals(other) && credits == r.credits && consumerID == r.consumerID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.utils.DataConstants; - -/** - * A SessionContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 5, 2008 10:08:40 AM - * - * - */ -public abstract class SessionContinuationMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - public static final int SESSION_CONTINUATION_BASE_SIZE = PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT + - DataConstants.SIZE_BOOLEAN; - - // Attributes ---------------------------------------------------- - - protected byte[] body; - - protected boolean continues; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) - { - super(type); - this.body = body; - this.continues = continues; - } - - public SessionContinuationMessage(final byte type) - { - super(type); - } - - // Public -------------------------------------------------------- - - /** - * @return the body - */ - public byte[] getBody() - { - return body; - } - - /** - * @return the continues - */ - public boolean isContinues() - { - return continues; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(body.length); - buffer.writeBytes(body); - buffer.writeBoolean(continues); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int size = buffer.readInt(); - body = new byte[size]; - buffer.readBytes(body); - continues = buffer.readBoolean(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,142 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionCreateConsumerMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long id; - - private SimpleString queueName; - - private SimpleString filterString; - - private boolean browseOnly; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionCreateConsumerMessage(final long id, - final SimpleString queueName, - final SimpleString filterString, - final boolean browseOnly, - final boolean requiresResponse) - { - super(PacketImpl.SESS_CREATECONSUMER); - - this.id = id; - this.queueName = queueName; - this.filterString = filterString; - this.browseOnly = browseOnly; - this.requiresResponse = requiresResponse; - } - - public SessionCreateConsumerMessage() - { - super(PacketImpl.SESS_CREATECONSUMER); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", queueName=" + queueName); - buff.append(", filterString=" + filterString); - buff.append("]"); - return buff.toString(); - } - - public long getID() - { - return id; - } - - public SimpleString getQueueName() - { - return queueName; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public boolean isBrowseOnly() - { - return browseOnly; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(id); - buffer.writeSimpleString(queueName); - buffer.writeNullableSimpleString(filterString); - buffer.writeBoolean(browseOnly); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - id = buffer.readLong(); - queueName = buffer.readSimpleString(); - filterString = buffer.readNullableSimpleString(); - browseOnly = buffer.readBoolean(); - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCreateConsumerMessage == false) - { - return false; - } - - SessionCreateConsumerMessage r = (SessionCreateConsumerMessage)other; - - return super.equals(other) && queueName.equals(r.queueName) && filterString == null ? r.filterString == null - : filterString.equals(r.filterString); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,96 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - - * @version <tt>$Revision$</tt> - */ -public class SessionDeleteQueueMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private SimpleString queueName; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionDeleteQueueMessage(final SimpleString queueName) - { - super(PacketImpl.DELETE_QUEUE); - - this.queueName = queueName; - } - - public SessionDeleteQueueMessage() - { - super(PacketImpl.DELETE_QUEUE); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", queueName=" + queueName); - buff.append("]"); - return buff.toString(); - } - - public SimpleString getQueueName() - { - return queueName; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(queueName); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - queueName = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionDeleteQueueMessage == false) - { - return false; - } - - SessionDeleteQueueMessage r = (SessionDeleteQueueMessage)other; - - return super.equals(other) && r.queueName.equals(queueName); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,97 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionExpiredMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long messageID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionExpiredMessage(final long consumerID, final long messageID) - { - super(PacketImpl.SESS_EXPIRED); - - this.consumerID = consumerID; - - this.messageID = messageID; - } - - public SessionExpiredMessage() - { - super(PacketImpl.SESS_EXPIRED); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getMessageID() - { - return messageID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - - buffer.writeLong(messageID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - - messageID = buffer.readLong(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionExpiredMessage == false) - { - return false; - } - - SessionExpiredMessage r = (SessionExpiredMessage)other; - - return super.equals(other) && consumerID == r.consumerID && messageID == r.messageID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,108 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A SessionConsumerForceDelivery - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - */ -public class SessionForceConsumerDelivery extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long sequence; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionForceConsumerDelivery(final long consumerID, final long sequence) - { - super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); - - this.consumerID = consumerID; - this.sequence = sequence; - } - - public SessionForceConsumerDelivery() - { - super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getSequence() - { - return sequence; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeLong(sequence); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - sequence = buffer.readLong(); - } - - @Override - public String toString() - { - StringBuffer buf = new StringBuffer(getParentString()); - buf.append(", consumerID=" + consumerID); - buf.append(", sequence=" + sequence); - buf.append("]"); - return buf.toString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionForceConsumerDelivery == false) - { - return false; - } - - SessionForceConsumerDelivery r = (SessionForceConsumerDelivery)other; - - return super.equals(other) && consumerID == r.consumerID && sequence == r.sequence; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionProducerCreditsMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int credits; - - private SimpleString address; - - private int offset; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionProducerCreditsMessage(final int credits, final SimpleString address, final int offset) - { - super(PacketImpl.SESS_PRODUCER_CREDITS); - - this.credits = credits; - - this.address = address; - - this.offset = offset; - } - - public SessionProducerCreditsMessage() - { - super(PacketImpl.SESS_PRODUCER_CREDITS); - } - - // Public -------------------------------------------------------- - - public int getCredits() - { - return credits; - } - - public SimpleString getAddress() - { - return address; - } - - public int getOffset() - { - return offset; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(credits); - buffer.writeSimpleString(address); - buffer.writeInt(offset); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - credits = buffer.readInt(); - address = buffer.readSimpleString(); - offset = buffer.readInt(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,72 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionQueueQueryMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionQueueQueryMessage extends PacketImpl -{ - private SimpleString queueName; - - public SessionQueueQueryMessage(final SimpleString queueName) - { - super(PacketImpl.SESS_QUEUEQUERY); - - this.queueName = queueName; - } - - public SessionQueueQueryMessage() - { - super(PacketImpl.SESS_QUEUEQUERY); - } - - public SimpleString getQueueName() - { - return queueName; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(queueName); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - queueName = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionQueueQueryMessage == false) - { - return false; - } - - SessionQueueQueryMessage r = (SessionQueueQueryMessage)other; - - return super.equals(other) && r.queueName.equals(queueName); - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,179 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionQueueQueryResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionQueueQueryResponseMessage extends PacketImpl -{ - private SimpleString name; - - private boolean exists; - - private boolean durable; - - private int consumerCount; - - private int messageCount; - - private SimpleString filterString; - - private SimpleString address; - - private boolean temporary; - - public SessionQueueQueryResponseMessage(final SimpleString name, - final SimpleString address, - final boolean durable, - final boolean temporary, - final SimpleString filterString, - final int consumerCount, - final int messageCount) - { - this(name, address, durable, temporary, filterString, consumerCount, messageCount, true); - } - - public SessionQueueQueryResponseMessage() - { - this(null, null, false, false, null, 0, 0, false); - } - - private SessionQueueQueryResponseMessage(final SimpleString name, - final SimpleString address, - final boolean durable, - final boolean temporary, - final SimpleString filterString, - final int consumerCount, - final int messageCount, - final boolean exists) - { - super(PacketImpl.SESS_QUEUEQUERY_RESP); - - this.durable = durable; - - this.temporary = temporary; - - this.consumerCount = consumerCount; - - this.messageCount = messageCount; - - this.filterString = filterString; - - this.address = address; - - this.name = name; - - this.exists = exists; - } - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isExists() - { - return exists; - } - - public boolean isDurable() - { - return durable; - } - - public int getConsumerCount() - { - return consumerCount; - } - - public int getMessageCount() - { - return messageCount; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public SimpleString getAddress() - { - return address; - } - - public SimpleString getName() - { - return name; - } - - public boolean isTemporary() - { - return temporary; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(exists); - buffer.writeBoolean(durable); - buffer.writeBoolean(temporary); - buffer.writeInt(consumerCount); - buffer.writeInt(messageCount); - buffer.writeNullableSimpleString(filterString); - buffer.writeNullableSimpleString(address); - buffer.writeNullableSimpleString(name); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - exists = buffer.readBoolean(); - durable = buffer.readBoolean(); - temporary = buffer.readBoolean(); - consumerCount = buffer.readInt(); - messageCount = buffer.readInt(); - filterString = buffer.readNullableSimpleString(); - address = buffer.readNullableSimpleString(); - name = buffer.readNullableSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionQueueQueryResponseMessage == false) - { - return false; - } - - SessionQueueQueryResponseMessage r = (SessionQueueQueryResponseMessage)other; - - return super.equals(other) && exists == r.exists && - durable == r.durable && - consumerCount == r.consumerCount && - messageCount == r.messageCount && - filterString == null ? r.filterString == null - : filterString.equals(r.filterString) && address == null ? r.address == null - : address.equals(r.address); - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.utils.DataConstants; - -/** - * A SessionSendContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 4, 2008 12:25:14 PM - * - * - */ -public class SessionReceiveContinuationMessage extends SessionContinuationMessage -{ - - // Constants ----------------------------------------------------- - - public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SessionContinuationMessage.SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG; - - // Attributes ---------------------------------------------------- - - private long consumerID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionReceiveContinuationMessage() - { - super(PacketImpl.SESS_RECEIVE_CONTINUATION); - } - - /** - * @param consumerID - * @param body - * @param continues - * @param requiresResponse - */ - public SessionReceiveContinuationMessage(final long consumerID, - final byte[] body, - final boolean continues, - final boolean requiresResponse) - { - super(PacketImpl.SESS_RECEIVE_CONTINUATION, body, continues); - this.consumerID = consumerID; - } - - /** - * @return the consumerID - */ - public long getConsumerID() - { - return consumerID; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - super.encodeRest(buffer); - buffer.writeLong(consumerID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - super.decodeRest(buffer); - consumerID = buffer.readLong(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A SessionReceiveLargeMessage - * - * @author Clebert Suconic - * - * - */ -public class SessionReceiveLargeMessage extends PacketImpl -{ - private byte[] largeMessageHeader; - - /** Since we receive the message before the entire message was received, */ - private long largeMessageSize; - - private long consumerID; - - private int deliveryCount; - - public SessionReceiveLargeMessage() - { - super(PacketImpl.SESS_RECEIVE_LARGE_MSG); - } - - public SessionReceiveLargeMessage(final long consumerID, - final byte[] largeMessageHeader, - final long largeMessageSize, - final int deliveryCount) - { - super(PacketImpl.SESS_RECEIVE_LARGE_MSG); - - this.consumerID = consumerID; - - this.largeMessageHeader = largeMessageHeader; - - this.deliveryCount = deliveryCount; - - this.largeMessageSize = largeMessageSize; - } - - public byte[] getLargeMessageHeader() - { - return largeMessageHeader; - } - - public long getConsumerID() - { - return consumerID; - } - - public int getDeliveryCount() - { - return deliveryCount; - } - - /** - * @return the largeMessageSize - */ - public long getLargeMessageSize() - { - return largeMessageSize; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeInt(deliveryCount); - buffer.writeLong(largeMessageSize); - buffer.writeInt(largeMessageHeader.length); - buffer.writeBytes(largeMessageHeader); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - deliveryCount = buffer.readInt(); - largeMessageSize = buffer.readLong(); - int size = buffer.readInt(); - largeMessageHeader = new byte[size]; - buffer.readBytes(largeMessageHeader); - } - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,119 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionReceiveMessage extends MessagePacket -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(SessionReceiveMessage.class); - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private int deliveryCount; - - public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) - { - super(PacketImpl.SESS_RECEIVE_MSG, message); - - this.consumerID = consumerID; - - this.deliveryCount = deliveryCount; - } - - public SessionReceiveMessage() - { - super(PacketImpl.SESS_RECEIVE_MSG, new ClientMessageImpl()); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public int getDeliveryCount() - { - return deliveryCount; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = message.getEncodedBuffer(); - - // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { - throw new IllegalStateException("Wrong encode position"); - } - - buffer.writeLong(consumerID); - buffer.writeInt(deliveryCount); - - size = buffer.writerIndex(); - - // Write standard headers - - int len = size - DataConstants.SIZE_INT; - buffer.setInt(0, len); - buffer.setByte(DataConstants.SIZE_INT, type); - buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); - - // Position reader for reading by Netty - buffer.setIndex(0, size); - - return buffer; - } - - @Override - public void decode(final HornetQBuffer buffer) - { - channelID = buffer.readLong(); - - message.decodeFromBuffer(buffer); - - consumerID = buffer.readLong(); - - deliveryCount = buffer.readInt(); - - size = buffer.readerIndex(); - - // Need to position buffer for reading - - buffer.setIndex(PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT, message.getEndOfBodyPosition()); - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionRequestProducerCreditsMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int credits; - - private SimpleString address; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) - { - super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); - - this.credits = credits; - - this.address = address; - } - - public SessionRequestProducerCreditsMessage() - { - super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); - } - - // Public -------------------------------------------------------- - - public int getCredits() - { - return credits; - } - - public SimpleString getAddress() - { - return address; - } - - // public boolean isRequiresConfirmations() - // { - // return false; - // } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(credits); - buffer.writeSimpleString(address); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - credits = buffer.readInt(); - address = buffer.readSimpleString(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A SessionSendContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 4, 2008 12:25:14 PM - * - * - */ -public class SessionSendContinuationMessage extends SessionContinuationMessage -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendContinuationMessage() - { - super(PacketImpl.SESS_SEND_CONTINUATION); - } - - /** - * @param body - * @param continues - * @param requiresResponse - */ - public SessionSendContinuationMessage(final byte[] body, final boolean continues, final boolean requiresResponse) - { - super(PacketImpl.SESS_SEND_CONTINUATION, body, continues); - this.requiresResponse = requiresResponse; - } - - // Public -------------------------------------------------------- - - /** - * @return the requiresResponse - */ - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - super.encodeRest(buffer); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - super.decodeRest(buffer); - requiresResponse = buffer.readBoolean(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,81 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:csuconic@redhat.com">Clebert Suconic</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionSendLargeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** Used only if largeMessage */ - private byte[] largeMessageHeader; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendLargeMessage(final byte[] largeMessageHeader) - { - super(PacketImpl.SESS_SEND_LARGE); - - this.largeMessageHeader = largeMessageHeader; - } - - public SessionSendLargeMessage() - { - super(PacketImpl.SESS_SEND_LARGE); - } - - // Public -------------------------------------------------------- - - public byte[] getLargeMessageHeader() - { - return largeMessageHeader; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(largeMessageHeader.length); - buffer.writeBytes(largeMessageHeader); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int largeMessageLength = buffer.readInt(); - - largeMessageHeader = new byte[largeMessageLength]; - - buffer.readBytes(largeMessageHeader); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,114 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionSendMessage extends MessagePacket -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(SessionSendMessage.class); - - // Attributes ---------------------------------------------------- - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendMessage(final MessageInternal message, final boolean requiresResponse) - { - super(PacketImpl.SESS_SEND, message); - - this.requiresResponse = requiresResponse; - } - - public SessionSendMessage() - { - super(PacketImpl.SESS_SEND, new ServerMessageImpl()); - } - - // Public -------------------------------------------------------- - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = message.getEncodedBuffer(); - - // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { - throw new IllegalStateException("Wrong encode position"); - } - - buffer.writeBoolean(requiresResponse); - - size = buffer.writerIndex(); - - // Write standard headers - - int len = size - DataConstants.SIZE_INT; - buffer.setInt(0, len); - buffer.setByte(DataConstants.SIZE_INT, type); - buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); - - // Position reader for reading by Netty - buffer.readerIndex(0); - - message.resetCopied(); - - return buffer; - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - // Buffer comes in after having read standard headers and positioned at Beginning of body part - - message.decodeFromBuffer(buffer); - - int ri = buffer.readerIndex(); - - requiresResponse = buffer.readBoolean(); - - buffer.readerIndex(ri); - - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,110 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXACommitMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean onePhase; - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXACommitMessage(final Xid xid, final boolean onePhase) - { - super(PacketImpl.SESS_XA_COMMIT); - - this.xid = xid; - this.onePhase = onePhase; - } - - public SessionXACommitMessage() - { - super(PacketImpl.SESS_XA_COMMIT); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - public boolean isOnePhase() - { - return onePhase; - } - - @Override - public boolean isAsyncExec() - { - return true; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - buffer.writeBoolean(onePhase); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - onePhase = buffer.readBoolean(); - } - - @Override - public String toString() - { - return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXACommitMessage == false) - { - return false; - } - - SessionXACommitMessage r = (SessionXACommitMessage)other; - - return super.equals(other) && xid.equals(r.xid) && onePhase == r.onePhase; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,105 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - private boolean failed; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAEndMessage(final Xid xid, final boolean failed) - { - super(PacketImpl.SESS_XA_END); - - this.xid = xid; - - this.failed = failed; - } - - public SessionXAEndMessage() - { - super(PacketImpl.SESS_XA_END); - } - - // Public -------------------------------------------------------- - - public boolean isFailed() - { - return failed; - } - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - buffer.writeBoolean(failed); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - failed = buffer.readBoolean(); - } - - @Override - public String toString() - { - return getParentString() + ", xid=" + xid + ", failed=" + failed + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAEndMessage == false) - { - return false; - } - - SessionXAEndMessage r = (SessionXAEndMessage)other; - - return super.equals(other) && xid.equals(r.xid) && failed == r.failed; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAForgetMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAForgetMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_FORGET); - - this.xid = xid; - } - - public SessionXAForgetMessage() - { - super(PacketImpl.SESS_XA_FORGET); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAForgetMessage == false) - { - return false; - } - - SessionXAForgetMessage r = (SessionXAForgetMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,126 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import java.util.ArrayList; -import java.util.List; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private List<Xid> xids; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAGetInDoubtXidsResponseMessage(final List<Xid> xids) - { - super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); - - this.xids = xids; - } - - public SessionXAGetInDoubtXidsResponseMessage() - { - super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public List<Xid> getXids() - { - return xids; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(xids.size()); - - for (Xid xid : xids) - { - XidCodecSupport.encodeXid(xid, buffer); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int len = buffer.readInt(); - xids = new ArrayList<Xid>(len); - for (int i = 0; i < len; i++) - { - Xid xid = XidCodecSupport.decodeXid(buffer); - - xids.add(xid); - } - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAGetInDoubtXidsResponseMessage == false) - { - return false; - } - - SessionXAGetInDoubtXidsResponseMessage r = (SessionXAGetInDoubtXidsResponseMessage)other; - - if (super.equals(other)) - { - if (xids.size() == r.xids.size()) - { - for (int i = 0; i < xids.size(); i++) - { - if (!xids.get(i).equals(r.xids.get(i))) - { - return false; - } - } - } - } - else - { - return false; - } - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAGetTimeoutResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int timeoutSeconds; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) - { - super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); - - this.timeoutSeconds = timeoutSeconds; - } - - public SessionXAGetTimeoutResponseMessage() - { - super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public int getTimeoutSeconds() - { - return timeoutSeconds; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(timeoutSeconds); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - timeoutSeconds = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAGetTimeoutResponseMessage == false) - { - return false; - } - - SessionXAGetTimeoutResponseMessage r = (SessionXAGetTimeoutResponseMessage)other; - - return super.equals(other) && timeoutSeconds == r.timeoutSeconds; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAJoinMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAJoinMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_JOIN); - - this.xid = xid; - } - - public SessionXAJoinMessage() - { - super(PacketImpl.SESS_XA_JOIN); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAJoinMessage == false) - { - return false; - } - - SessionXAJoinMessage r = (SessionXAJoinMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAPrepareMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAPrepareMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_PREPARE); - - this.xid = xid; - } - - public SessionXAPrepareMessage() - { - super(PacketImpl.SESS_XA_PREPARE); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - public boolean isAsyncExec() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAPrepareMessage == false) - { - return false; - } - - SessionXAPrepareMessage r = (SessionXAPrepareMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,114 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean error; - - private int responseCode; - - private String message; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAResponseMessage(final boolean isError, final int responseCode, final String message) - { - super(PacketImpl.SESS_XA_RESP); - - error = isError; - - this.responseCode = responseCode; - - this.message = message; - } - - public SessionXAResponseMessage() - { - super(PacketImpl.SESS_XA_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isError() - { - return error; - } - - public int getResponseCode() - { - return responseCode; - } - - public String getMessage() - { - return message; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(error); - buffer.writeInt(responseCode); - buffer.writeNullableString(message); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - error = buffer.readBoolean(); - responseCode = buffer.readInt(); - message = buffer.readNullableString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAResponseMessage == false) - { - return false; - } - - SessionXAResponseMessage r = (SessionXAResponseMessage)other; - - return super.equals(other) && error == r.error && responseCode == r.responseCode && message.equals(r.message); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAResumeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAResumeMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_RESUME); - - this.xid = xid; - } - - public SessionXAResumeMessage() - { - super(PacketImpl.SESS_XA_RESUME); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAResumeMessage == false) - { - return false; - } - - SessionXAResumeMessage r = (SessionXAResumeMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,94 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXARollbackMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXARollbackMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_ROLLBACK); - - this.xid = xid; - } - - public SessionXARollbackMessage() - { - super(PacketImpl.SESS_XA_ROLLBACK); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - public boolean isAsyncExec() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXARollbackMessage == false) - { - return false; - } - - SessionXARollbackMessage r = (SessionXARollbackMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,86 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXASetTimeoutMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int timeoutSeconds; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXASetTimeoutMessage(final int timeoutSeconds) - { - super(PacketImpl.SESS_XA_SET_TIMEOUT); - - this.timeoutSeconds = timeoutSeconds; - } - - public SessionXASetTimeoutMessage() - { - super(PacketImpl.SESS_XA_SET_TIMEOUT); - } - - // Public -------------------------------------------------------- - - public int getTimeoutSeconds() - { - return timeoutSeconds; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(timeoutSeconds); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - timeoutSeconds = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXASetTimeoutMessage == false) - { - return false; - } - - SessionXASetTimeoutMessage r = (SessionXASetTimeoutMessage)other; - - return super.equals(other) && timeoutSeconds == r.timeoutSeconds; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXASetTimeoutResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean ok; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXASetTimeoutResponseMessage(final boolean ok) - { - super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); - - this.ok = ok; - } - - public SessionXASetTimeoutResponseMessage() - { - super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isOK() - { - return ok; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(ok); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - ok = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXASetTimeoutResponseMessage == false) - { - return false; - } - - SessionXASetTimeoutResponseMessage r = (SessionXASetTimeoutResponseMessage)other; - - return super.equals(other) && ok == r.ok; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAStartMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAStartMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_START); - - this.xid = xid; - } - - public SessionXAStartMessage() - { - super(PacketImpl.SESS_XA_START); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAStartMessage == false) - { - return false; - } - - SessionXAStartMessage r = (SessionXAStartMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java 2010-01-21 14:37:33 UTC (rev 8823) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java 2010-01-21 14:39:29 UTC (rev 8824) @@ -1,73 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -public class XidCodecSupport -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - public static void encodeXid(final Xid xid, final HornetQBuffer out) - { - out.writeInt(xid.getFormatId()); - out.writeInt(xid.getBranchQualifier().length); - out.writeBytes(xid.getBranchQualifier()); - out.writeInt(xid.getGlobalTransactionId().length); - out.writeBytes(xid.getGlobalTransactionId()); - } - - public static Xid decodeXid(final HornetQBuffer in) - { - int formatID = in.readInt(); - byte[] bq = new byte[in.readInt()]; - in.readBytes(bq); - byte[] gtxid = new byte[in.readInt()]; - in.readBytes(gtxid); - Xid xid = new XidImpl(bq, formatID, gtxid); - return xid; - } - - public static int getXidEncodeLength(final Xid xid) - { - return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length; - } - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -}

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8823 - in branches/HORNETQ-129_STOMP_protocol: src/main/org/hornetq/spi/core/remoting and 14 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 09:37:33 -0500 (Thu, 21 Jan 2010) New Revision: 8823 Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/DummyServerHolder.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,9 +16,9 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import org.hornetq.integration.stomp.StompFrameDelimiter; -import org.hornetq.integration.stomp.StompMarshaller; -import org.hornetq.integration.stomp.StompPacketDecoder; +import org.hornetq.integration.protocol.stomp.StompFrameDelimiter; +import org.hornetq.integration.protocol.stomp.StompMarshaller; +import org.hornetq.integration.protocol.stomp.StompPacketDecoder; import org.hornetq.spi.core.remoting.BufferHandler; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.handler.ssl.SslHandler; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -39,25 +39,21 @@ import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.CorePacketDecoder; import org.hornetq.core.remoting.impl.ssl.SSLSupport; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.ServerSession; import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.server.management.Notification; import org.hornetq.core.server.management.NotificationService; -import org.hornetq.integration.stomp.Stomp; -import org.hornetq.integration.stomp.StompDestinationConverter; -import org.hornetq.integration.stomp.StompException; -import org.hornetq.integration.stomp.StompFrame; -import org.hornetq.integration.stomp.StompMarshaller; +import org.hornetq.integration.protocol.stomp.Stomp; +import org.hornetq.integration.protocol.stomp.StompDestinationConverter; +import org.hornetq.integration.protocol.stomp.StompException; +import org.hornetq.integration.protocol.stomp.StompFrame; +import org.hornetq.integration.protocol.stomp.StompMarshaller; import org.hornetq.jms.client.HornetQBytesMessage; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.spi.core.remoting.Acceptor; @@ -329,9 +325,7 @@ else { ChannelPipelineSupport.addHornetQCodecFilter(pipeline, handler); - PacketDecoder decoder = new CorePacketDecoder(); pipeline.addLast("handler", new HornetQServerChannelHandler(channelGroup, - decoder, handler, new Listener())); } @@ -527,18 +521,14 @@ private final class HornetQServerChannelHandler extends AbstractServerChannelHandler { - private PacketDecoder decoder; - private BufferHandler handler; HornetQServerChannelHandler(final ChannelGroup group, - final PacketDecoder decoder, final BufferHandler handler, final ConnectionLifeCycleListener listener) { super(group, listener); - this.decoder = decoder; this.handler = handler; } @@ -547,7 +537,7 @@ { ChannelBuffer buffer = (ChannelBuffer)e.getMessage(); - handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer), decoder); + handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer)); } } @@ -578,7 +568,7 @@ // need to interact with HornetQ server & session HornetQServer server = serverHandler.getServer(); - RemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); + CoreRemotingConnection connection = serverHandler.getRemotingConnection(e.getChannel().getId()); try { @@ -655,19 +645,17 @@ * @throws StompException * @throws HornetQException */ - private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws StompException, HornetQException + private StompFrame onSubscribe(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception, StompException, HornetQException { Map<String, Object> headers = frame.getHeaders(); String queue = (String)headers.get(Stomp.Headers.Send.DESTINATION); SimpleString queueName = StompDestinationConverter.convertDestination(queue); ServerSession session = checkAndGetSession(connection); - long id = server.getStorageManager().generateUniqueID(); - SessionCreateConsumerMessage packet = new SessionCreateConsumerMessage(id , queueName, null, false, false); - session.handleCreateConsumer(packet); - SessionConsumerFlowCreditMessage credits = new SessionConsumerFlowCreditMessage(id, -1); - session.handleReceiveConsumerCredits(credits ); - session.handleStart(new PacketImpl(PacketImpl.SESS_START)); + long consumerID = server.getStorageManager().generateUniqueID(); + session.createConsumer(consumerID, queueName, null, false); + session.receiveConsumerCredits(consumerID, -1); + session.start(); return null; } @@ -700,7 +688,7 @@ return null; } - private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws HornetQException, StompException + private StompFrame onSend(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception { ServerSession session = checkAndGetSession(connection); @@ -737,8 +725,7 @@ message.getBodyBuffer().writeBytes(content); } - SessionSendMessage packet = new SessionSendMessage(message, false); - session.handleSend(packet); + session.send(message); if (headers.containsKey(Stomp.Headers.RECEIPT_REQUESTED)) { Map<String, Object> h = new HashMap<String, Object>(); @@ -751,7 +738,7 @@ } } - private StompFrame onConnect(StompFrame frame, HornetQServer server, RemotingConnection connection) throws Exception + private StompFrame onConnect(StompFrame frame, HornetQServer server, CoreRemotingConnection connection) throws Exception { Map<String, Object> headers = frame.getHeaders(); String login = (String)headers.get(Stomp.Headers.Connect.LOGIN); @@ -760,17 +747,14 @@ String name = UUIDGenerator.getInstance().generateStringUUID(); server.createSession(name, - 1, login, passcode, HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - VersionLoader.getVersion().getIncrementingVersion(), connection, true, true, false, - false, - -1); + false); ServerSession session = server.getSession(name); sessions.put(connection, session); System.out.println(">>> created session " + session); @@ -821,14 +805,14 @@ private class Listener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent(connection.getID(), connection) != null) { throw new IllegalArgumentException("Connection already exists with id " + connection.getID()); } - listener.connectionCreated(connection); + listener.connectionCreated(connection, protocol); } public void connectionDestroyed(final Object connectionID) Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,6 +16,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; import org.jboss.netty.buffer.ChannelBuffers; @@ -54,7 +55,7 @@ this.listener = listener; - listener.connectionCreated(this); + listener.connectionCreated(this, ProtocolType.CORE); } // Public -------------------------------------------------------- Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -31,8 +31,8 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.PacketDecoder; -import org.hornetq.core.remoting.impl.CorePacketDecoder; +import org.hornetq.core.protocol.core.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.impl.ssl.SSLSupport; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -97,7 +97,7 @@ private final BufferHandler handler; - private final PacketDecoder decoder = new CorePacketDecoder(); + private final PacketDecoder decoder = new PacketDecoder(); private final ConnectionLifeCycleListener listener; @@ -457,7 +457,7 @@ { ChannelBuffer buffer = (ChannelBuffer)e.getMessage(); - handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer), decoder); + handler.bufferReceived(e.getChannel().getId(), new ChannelBufferWrapper(buffer)); } } @@ -614,7 +614,7 @@ private class Listener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent(connection.getID(), connection) != null) { Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/integration/transports/netty/ServerHolder.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,7 +13,7 @@ package org.hornetq.integration.transports.netty; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.server.HornetQServer; /** @@ -27,5 +27,6 @@ { HornetQServer getServer(); - RemotingConnection getRemotingConnection(int connectionID); + // FIXME should NOT be CoreRemotingConnection but RemotingConnection + CoreRemotingConnection getRemotingConnection(int connectionID); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/BufferHandler.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,7 +13,6 @@ package org.hornetq.spi.core.remoting; import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.remoting.PacketDecoder; /** * A BufferHandler that will handle buffers received by an acceptor. @@ -30,5 +29,5 @@ * @param connectionID the connection the buffer was received on * @param buffer the buffer to decode */ - void bufferReceived(Object connectionID, HornetQBuffer buffer, PacketDecoder decoder); + void bufferReceived(Object connectionID, HornetQBuffer buffer); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,6 +13,7 @@ package org.hornetq.spi.core.remoting; import org.hornetq.api.core.HornetQException; +import org.hornetq.core.remoting.ProtocolType; /** * A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events. @@ -26,7 +27,7 @@ * * @param connection the connection that has been created */ - void connectionCreated(Connection connection); + void connectionCreated(Connection connection, ProtocolType protocol); /** * called when a connection is destroyed. Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -24,11 +24,11 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -27,9 +27,9 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -11,11 +11,11 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -20,7 +20,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -24,12 +24,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.FailoverManagerImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -51,7 +51,7 @@ private HornetQServer server; - private RemotingConnection connection; + private CoreRemotingConnection connection; // Static -------------------------------------------------------- Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -25,9 +25,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -27,12 +27,12 @@ import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -19,9 +19,9 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; /** * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -18,7 +18,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; /** Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -15,9 +15,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,9 +16,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor2 Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -16,9 +16,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor3 Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -26,7 +26,7 @@ import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -31,7 +31,7 @@ import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.ServiceTestBase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -25,7 +25,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.protocol.core.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.NettyConnector; import org.hornetq.integration.transports.netty.TransportConstants; @@ -482,7 +483,7 @@ this.latch = latch; } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { int i = buffer.readInt(); messages.add(i); @@ -504,7 +505,7 @@ this.latch = latch; } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { int i = buffer.readInt(); @@ -537,7 +538,7 @@ return 0; } - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { int i = buffer.readInt(); messages.add(i); @@ -557,7 +558,7 @@ latch = connCreatedLatch; } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { this.connection = connection; if (latch != null) Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -152,8 +152,7 @@ ClientSessionFactory sf = createInVMFactory(); if (sendingBlocking) - { - sf.setBlockOnNonDurableSend(true); + { sf.setBlockOnNonDurableSend(true); sf.setBlockOnDurableSend(true); sf.setBlockOnAcknowledge(true); } @@ -523,7 +522,7 @@ } session.close(); - + long globalSize = server.getPostOffice().getPagingManager().getTotalMemory(); Assert.assertEquals(0l, globalSize); Assert.assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount()); Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -22,16 +22,20 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -345,14 +349,14 @@ session.addFailureListener(clientListener); - RemotingConnection serverConn = null; + CoreRemotingConnection serverConn = null; while (serverConn == null) { Set<RemotingConnection> conns = server.getRemotingService().getConnections(); if (!conns.isEmpty()) { - serverConn = server.getRemotingService().getConnections().iterator().next(); + serverConn = (CoreRemotingConnection)server.getRemotingService().getConnections().iterator().next(); } else { Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -58,7 +58,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.replication.impl.ReplicatedJournal; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/stomp/StompTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -49,7 +49,7 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.integration.stomp.Stomp; +import org.hornetq.integration.protocol.stomp.Stomp; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQConnectionFactory; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -160,6 +160,8 @@ clientSession = sessionFactory.createSession(true, false, false); + log.info("committing"); + clientSession.commit(xid, false); clientSession.start(); ClientConsumer clientConsumer = clientSession.createConsumer(atestq); Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -24,9 +24,9 @@ import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.integration.remoting.PingTest; import org.hornetq.tests.util.RandomUtil; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -36,9 +36,9 @@ import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.client.impl.ClientMessageInternal; import org.hornetq.core.client.impl.LargeMessageBufferImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/DummyServerHolder.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/DummyServerHolder.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/DummyServerHolder.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -13,7 +13,7 @@ package org.hornetq.tests.unit.core.remoting.impl.netty; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.ServerHolder; @@ -31,7 +31,7 @@ return null; } - public RemotingConnection getRemotingConnection(int connectionID) + public CoreRemotingConnection getRemotingConnection(int connectionID) { return null; } Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -21,7 +21,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.ServerHolder; @@ -48,7 +48,7 @@ BufferHandler handler = new BufferHandler() { - public void bufferReceived(Object connectionID, HornetQBuffer buffer, PacketDecoder decoder) + public void bufferReceived(Object connectionID, HornetQBuffer buffer) { } }; @@ -64,7 +64,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } }; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -22,7 +22,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.ServerHolder; import org.hornetq.integration.transports.netty.TransportConstants; @@ -61,7 +61,7 @@ BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { } }; @@ -78,7 +78,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } }; Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -22,6 +22,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyConnection; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; @@ -219,7 +220,7 @@ class MyListener implements ConnectionLifeCycleListener { - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } Modified: branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-21 14:33:41 UTC (rev 8822) +++ branches/HORNETQ-129_STOMP_protocol/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-21 14:37:33 UTC (rev 8823) @@ -21,7 +21,7 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; -import org.hornetq.core.remoting.PacketDecoder; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.integration.transports.netty.NettyConnector; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -51,7 +51,7 @@ { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { } }; @@ -66,7 +66,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } }; @@ -88,7 +88,7 @@ { BufferHandler handler = new BufferHandler() { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { } }; @@ -103,7 +103,7 @@ { } - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } };

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8822 - in branches/HORNETQ-129_STOMP_protocol: src/main/org/hornetq/api/core and 9 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-21 09:33:41 -0500 (Thu, 21 Jan 2010) New Revision: 8822 Added: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java Removed: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java Modified: branches/HORNETQ-129_STOMP_protocol/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/Interceptor.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/client/ClientSession.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/DelegatingSession.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManager.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/message/impl/MessageImpl.java branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java Log: https://jira.jboss.org/jira/browse/HORNETQ-129: Implement STOMP v1.0 * sync with the trunk: svn merge -r 8806:8821 https://svn.jboss.org/repos/hornetq/trunk Modified: branches/HORNETQ-129_STOMP_protocol/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -17,9 +17,9 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; /** * A simple Interceptor implementation Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/Interceptor.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/Interceptor.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/Interceptor.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -14,7 +14,7 @@ package org.hornetq.api.core; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; /** Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/client/ClientSession.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -455,6 +455,7 @@ /** * Creates a ClientMessage. * + * @param type type of the message * @param durable whether the created message is durable or not * @param expiration the message expiration * @param timestamp the message timestamp Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -25,12 +25,12 @@ import org.hornetq.core.list.PriorityLinkedList; import org.hornetq.core.list.impl.PriorityLinkedListImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; import org.hornetq.utils.Future; import org.hornetq.utils.TokenBucketLimiter; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -17,9 +17,9 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; /** * Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -24,10 +24,10 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; import org.hornetq.utils.TokenBucketLimiter; import org.hornetq.utils.UUIDGenerator; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -33,46 +33,47 @@ import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CommandConfirmationHandler; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CommandConfirmationHandler; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.RollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; +import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; +import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; +import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.utils.ConcurrentHashSet; import org.hornetq.utils.IDGenerator; @@ -117,7 +118,7 @@ private final Executor executor; - private volatile RemotingConnection remotingConnection; + private volatile CoreRemotingConnection remotingConnection; private final Set<ClientProducerInternal> producers = new ConcurrentHashSet<ClientProducerInternal>(); @@ -203,7 +204,7 @@ final int minLargeMessageSize, final int initialMessagePacketSize, final String groupID, - final RemotingConnection remotingConnection, + final CoreRemotingConnection remotingConnection, final int version, final Channel channel, final Executor executor) throws HornetQException @@ -834,7 +835,7 @@ // Needs to be synchronized to prevent issues with occurring concurrently with close() - public synchronized void handleFailover(final RemotingConnection backupConnection) + public synchronized void handleFailover(final CoreRemotingConnection backupConnection) { if (closed) { @@ -866,7 +867,7 @@ { // The session was found on the server - we reattached transparently ok - channel.replayCommands(response.getLastConfirmedCommandID(), channel.getID()); + channel.replayCommands(response.getLastConfirmedCommandID()); } else { Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -16,10 +16,11 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; /** * A ClientSessionInternal @@ -52,7 +53,7 @@ void handleReceiveContinuation(long consumerID, SessionReceiveContinuationMessage continuation) throws Exception; - void handleFailover(RemotingConnection backupConnection); + void handleFailover(CoreRemotingConnection backupConnection); RemotingConnection getConnection(); Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -13,21 +13,21 @@ package org.hornetq.core.client.impl; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.EXCEPTION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.EXCEPTION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_MSG; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; /** * Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/DelegatingSession.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -27,10 +27,11 @@ import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; import org.hornetq.utils.ConcurrentHashSet; /** @@ -364,7 +365,7 @@ return session.getXAResource(); } - public void handleFailover(final RemotingConnection backupConnection) + public void handleFailover(final CoreRemotingConnection backupConnection) { session.handleFailover(backupConnection); } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManager.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -16,7 +16,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; /** * A ConnectionManager @@ -52,7 +52,7 @@ void removeSession(final ClientSessionInternal session); - public RemotingConnection getConnection(); + public CoreRemotingConnection getConnection(); int numConnections(); Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -35,18 +35,18 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketDecoder; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.Ping; import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.PacketDecoder; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.CorePacketDecoder; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.Ping; +import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.version.Version; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; @@ -79,7 +79,7 @@ // debug - private static Map<TransportConfiguration, Set<RemotingConnection>> debugConns; + private static Map<TransportConfiguration, Set<CoreRemotingConnection>> debugConns; private static boolean debug = false; @@ -87,7 +87,7 @@ { FailoverManagerImpl.debug = true; - FailoverManagerImpl.debugConns = new ConcurrentHashMap<TransportConfiguration, Set<RemotingConnection>>(); + FailoverManagerImpl.debugConns = new ConcurrentHashMap<TransportConfiguration, Set<CoreRemotingConnection>>(); } public static void disableDebug() @@ -98,9 +98,9 @@ FailoverManagerImpl.debugConns = null; } - private void checkAddDebug(final RemotingConnection conn) + private void checkAddDebug(final CoreRemotingConnection conn) { - Set<RemotingConnection> conns; + Set<CoreRemotingConnection> conns; synchronized (FailoverManagerImpl.debugConns) { @@ -108,7 +108,7 @@ if (conns == null) { - conns = new HashSet<RemotingConnection>(); + conns = new HashSet<CoreRemotingConnection>(); FailoverManagerImpl.debugConns.put(connectorConfig, conns); } @@ -119,7 +119,7 @@ public static void failAllConnectionsForConnector(final TransportConfiguration config) { - Set<RemotingConnection> conns; + Set<CoreRemotingConnection> conns; synchronized (FailoverManagerImpl.debugConns) { @@ -127,13 +127,13 @@ if (conns != null) { - conns = new HashSet<RemotingConnection>(FailoverManagerImpl.debugConns.get(config)); + conns = new HashSet<CoreRemotingConnection>(FailoverManagerImpl.debugConns.get(config)); } } if (conns != null) { - for (RemotingConnection conn : conns) + for (CoreRemotingConnection conn : conns) { conn.fail(new HornetQException(HornetQException.INTERNAL_ERROR, "simulated connection failure")); } @@ -177,7 +177,7 @@ private final Executor closeExecutor; - private RemotingConnection connection; + private CoreRemotingConnection connection; private final long retryInterval; @@ -274,7 +274,7 @@ // ConnectionLifeCycleListener implementation -------------------------------------------------- - public void connectionCreated(final Connection connection) + public void connectionCreated(final Connection connection, final ProtocolType protocol) { } @@ -321,7 +321,7 @@ { Version clientVersion = VersionLoader.getVersion(); - RemotingConnection theConnection = null; + CoreRemotingConnection theConnection = null; Lock lock = null; @@ -531,7 +531,7 @@ private volatile boolean stopPingingAfterOne; - private final PacketDecoder decoder = new CorePacketDecoder(); + private final PacketDecoder decoder = new PacketDecoder(); public void stopPingingAfterOne() { @@ -655,7 +655,7 @@ // So.. do failover / reconnection - RemotingConnection oldConnection = connection; + CoreRemotingConnection oldConnection = connection; connection = null; @@ -757,9 +757,9 @@ /* * Re-attach sessions all pre-existing sessions to the new remoting connection */ - private void reconnectSessions(final RemotingConnection oldConnection, final int reconnectAttempts) + private void reconnectSessions(final CoreRemotingConnection oldConnection, final int reconnectAttempts) { - RemotingConnection newConnection = getConnectionWithRetry(reconnectAttempts); + CoreRemotingConnection newConnection = getConnectionWithRetry(reconnectAttempts); if (newConnection == null) { @@ -790,7 +790,7 @@ } } - private RemotingConnection getConnectionWithRetry(final int reconnectAttempts) + private CoreRemotingConnection getConnectionWithRetry(final int reconnectAttempts) { long interval = retryInterval; @@ -803,7 +803,7 @@ return null; } - RemotingConnection theConnection = getConnection(); + CoreRemotingConnection theConnection = getConnection(); if (theConnection == null) { @@ -901,7 +901,7 @@ } } - public RemotingConnection getConnection() + public CoreRemotingConnection getConnection() { if (connection == null) { @@ -1061,9 +1061,9 @@ private class Channel0Handler implements ChannelHandler { - private final RemotingConnection conn; + private final CoreRemotingConnection conn; - private Channel0Handler(final RemotingConnection conn) + private Channel0Handler(final CoreRemotingConnection conn) { this.conn = conn; } @@ -1090,13 +1090,13 @@ private class DelegatingBufferHandler implements BufferHandler { - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer, final PacketDecoder decoder) + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) { - RemotingConnection theConn = connection; + CoreRemotingConnection theConn = connection; if (theConn != null && connectionID == theConn.getID()) { - theConn.bufferReceived(connectionID, buffer, decoder ); + theConn.bufferReceived(connectionID, buffer); } } } Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -30,7 +30,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; import org.hornetq.utils.DataConstants; import org.hornetq.utils.UTF8Util; import org.jboss.netty.buffer.ChannelBuffer; Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception (from rev 8819, trunk/src/main/org/hornetq/core/exception) Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java =================================================================== --- trunk/src/main/org/hornetq/core/exception/HornetQXAException.java 2010-01-21 09:02:52 UTC (rev 8819) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,40 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.exception; - -import javax.transaction.xa.XAException; - -/** - * A HornetQXAException - * - * @author Tim Fox - * - * - */ -public class HornetQXAException extends XAException -{ - private static final long serialVersionUID = 6535914602965015803L; - - public HornetQXAException(final int errorCode, final String message) - { - super(message); - - this.errorCode = errorCode; - } - - public HornetQXAException(final int errorCode) - { - super(errorCode); - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java (from rev 8819, trunk/src/main/org/hornetq/core/exception/HornetQXAException.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/exception/HornetQXAException.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,40 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.exception; + +import javax.transaction.xa.XAException; + +/** + * A HornetQXAException + * + * @author Tim Fox + * + * + */ +public class HornetQXAException extends XAException +{ + private static final long serialVersionUID = 6535914602965015803L; + + public HornetQXAException(final int errorCode, final String message) + { + super(message); + + this.errorCode = errorCode; + } + + public HornetQXAException(final int errorCode) + { + super(errorCode); + } +} Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/message/impl/MessageImpl.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -27,7 +27,7 @@ import org.hornetq.core.client.impl.LargeMessageBufferInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.utils.DataConstants; import org.hornetq.utils.TypedProperties; Modified: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -55,7 +55,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.impl.wireformat.XidCodecSupport; +import org.hornetq.core.protocol.core.wireformat.XidCodecSupport; import org.hornetq.core.replication.ReplicationManager; import org.hornetq.core.replication.impl.ReplicatedJournal; import org.hornetq.core.server.JournalType; Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol (from rev 8821, trunk/src/main/org/hornetq/core/protocol) Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core) Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/Channel.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,178 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import java.util.concurrent.locks.Lock; - -import org.hornetq.api.core.HornetQException; - -/** - * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. - * - * Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel - * when received by the {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. see {@link org.hornetq.core.protocol.core.Packet#setChannelID(long)}. - * - * Each Channel should will forward any packets received to its {@link org.hornetq.core.protocol.core.ChannelHandler}. - * - * A Channel *does not* support concurrent access by more than one thread! - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Channel -{ - /** - * returns the id of this channel. - * - * @return the id - */ - long getID(); - - /** - * sends a packet on this channel. - * - * @param packet the packet to send - */ - void send(Packet packet); - - /** - * sends a packet on this channel and then blocks until it has been written to the connection. - * - * @param packet the packet to send - */ - void sendAndFlush(Packet packet); - - /** - * sends a packet on this channel and then blocks until a response is received or a timeout occurs. - * - * @param packet the packet to send - * @return the response - * @throws HornetQException if an error occurs during the send - */ - Packet sendBlocking(Packet packet) throws HornetQException; - - /** - * sets the {@link org.hornetq.core.protocol.core.ChannelHandler} that this channel should forward received packets to. - * - * @param handler the handler - */ - void setHandler(ChannelHandler handler); - - /** - * closes this channel. - * - * once closed no packets can be sent. - */ - void close(); - - /** - * transfers the connection used by this channel to the one specified. - * - * All new packets will be sent via this connection. - * - * @param newConnection the new connection - */ - void transferConnection(CoreRemotingConnection newConnection); - - /** - * resends any packets that have not received confirmations yet. - * - * Typically called after a connection has been transferred. - * - * @param lastConfirmedCommandID the last confirmed packet - */ - void replayCommands(int lastConfirmedCommandID); - - /** - * returns the last confirmed packet command id - * - * @return the id - */ - int getLastConfirmedCommandID(); - - /** - * locks the channel. - * - * While locked no packets can be sent or received - */ - void lock(); - - /** - * unlocks the channel. - */ - void unlock(); - - /** - * forces any {@link org.hornetq.core.protocol.core.Channel#sendBlocking(Packet)} request to return with an exception. - */ - void returnBlocking(); - - /** - * returns the channel lock - * - * @return the lock - */ - Lock getLock(); - - /** - * returns the Remoting Connection being used by the channel - */ - CoreRemotingConnection getConnection(); - - /** - * sends a confirmation of a packet being received. - * - * @param packet the packet to confirm - */ - void confirm(Packet packet); - - /** - * sets the handler to use when a confirmation is received. - * - * @param handler the handler to call - */ - void setCommandConfirmationHandler(CommandConfirmationHandler handler); - - /** - * flushes any confirmations on to the connection. - */ - void flushConfirmations(); - - /** - * Called by {@link org.hornetq.core.protocol.core.CoreRemotingConnection} when a packet is received. - * - * This method should then call its {@link org.hornetq.core.protocol.core.ChannelHandler} after appropriate processing of - * the packet - * - * @param packet the packet to process. - */ - void handlePacket(Packet packet); - - /** - * clears any commands from the cache that are yet to be confirmed. - */ - void clearCommands(); - - /** - * returns the confirmation window size this channel is using. - * - * @return the window size - */ - int getConfirmationWindowSize(); - - /** - * notifies the channel if it is transferring its connection. When true it is illegal to send messages. - * - * @param transferring whether the channel is transferring - */ - void setTransferring(boolean transferring); -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/Channel.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Channel.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,178 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.concurrent.locks.Lock; + +import org.hornetq.api.core.HornetQException; + +/** + * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. + * + * Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel + * when received by the {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. see {@link org.hornetq.core.protocol.core.Packet#setChannelID(long)}. + * + * Each Channel should will forward any packets received to its {@link org.hornetq.core.protocol.core.ChannelHandler}. + * + * A Channel *does not* support concurrent access by more than one thread! + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface Channel +{ + /** + * returns the id of this channel. + * + * @return the id + */ + long getID(); + + /** + * sends a packet on this channel. + * + * @param packet the packet to send + */ + void send(Packet packet); + + /** + * sends a packet on this channel and then blocks until it has been written to the connection. + * + * @param packet the packet to send + */ + void sendAndFlush(Packet packet); + + /** + * sends a packet on this channel and then blocks until a response is received or a timeout occurs. + * + * @param packet the packet to send + * @return the response + * @throws HornetQException if an error occurs during the send + */ + Packet sendBlocking(Packet packet) throws HornetQException; + + /** + * sets the {@link org.hornetq.core.protocol.core.ChannelHandler} that this channel should forward received packets to. + * + * @param handler the handler + */ + void setHandler(ChannelHandler handler); + + /** + * closes this channel. + * + * once closed no packets can be sent. + */ + void close(); + + /** + * transfers the connection used by this channel to the one specified. + * + * All new packets will be sent via this connection. + * + * @param newConnection the new connection + */ + void transferConnection(CoreRemotingConnection newConnection); + + /** + * resends any packets that have not received confirmations yet. + * + * Typically called after a connection has been transferred. + * + * @param lastConfirmedCommandID the last confirmed packet + */ + void replayCommands(int lastConfirmedCommandID); + + /** + * returns the last confirmed packet command id + * + * @return the id + */ + int getLastConfirmedCommandID(); + + /** + * locks the channel. + * + * While locked no packets can be sent or received + */ + void lock(); + + /** + * unlocks the channel. + */ + void unlock(); + + /** + * forces any {@link org.hornetq.core.protocol.core.Channel#sendBlocking(Packet)} request to return with an exception. + */ + void returnBlocking(); + + /** + * returns the channel lock + * + * @return the lock + */ + Lock getLock(); + + /** + * returns the Remoting Connection being used by the channel + */ + CoreRemotingConnection getConnection(); + + /** + * sends a confirmation of a packet being received. + * + * @param packet the packet to confirm + */ + void confirm(Packet packet); + + /** + * sets the handler to use when a confirmation is received. + * + * @param handler the handler to call + */ + void setCommandConfirmationHandler(CommandConfirmationHandler handler); + + /** + * flushes any confirmations on to the connection. + */ + void flushConfirmations(); + + /** + * Called by {@link org.hornetq.core.protocol.core.CoreRemotingConnection} when a packet is received. + * + * This method should then call its {@link org.hornetq.core.protocol.core.ChannelHandler} after appropriate processing of + * the packet + * + * @param packet the packet to process. + */ + void handlePacket(Packet packet); + + /** + * clears any commands from the cache that are yet to be confirmed. + */ + void clearCommands(); + + /** + * returns the confirmation window size this channel is using. + * + * @return the window size + */ + int getConfirmationWindowSize(); + + /** + * notifies the channel if it is transferring its connection. When true it is illegal to send messages. + * + * @param transferring whether the channel is transferring + */ + void setTransferring(boolean transferring); +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ChannelHandler.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,30 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - - -/** - * A ChannelHandler is used by {@link Channel}. When a channel receives a packet it will call its handler to deal with the - * packet. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface ChannelHandler -{ - /** - * called by the channel when a packet is received.. - * - * @param packet the packet received - */ - void handlePacket(Packet packet); -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/ChannelHandler.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + + +/** + * A ChannelHandler is used by {@link Channel}. When a channel receives a packet it will call its handler to deal with the + * packet. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface ChannelHandler +{ + /** + * called by the channel when a packet is received.. + * + * @param packet the packet received + */ + void handlePacket(Packet packet); +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ChannelImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,508 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.wireformat.PacketsConfirmedMessage; -import org.hornetq.core.remoting.RemotingConnection; - -/** - * A ChannelImpl - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public class ChannelImpl implements Channel -{ - private static final Logger log = Logger.getLogger(ChannelImpl.class); - - private volatile long id; - - private ChannelHandler handler; - - private Packet response; - - private final java.util.Queue<Packet> resendCache; - - private volatile int firstStoredCommandID; - - private volatile int lastConfirmedCommandID = -1; - - private volatile CoreRemotingConnection connection; - - private volatile boolean closed; - - private final Lock lock = new ReentrantLock(); - - private final Condition sendCondition = lock.newCondition(); - - private final Condition failoverCondition = lock.newCondition(); - - private final Object sendLock = new Object(); - - private final Object sendBlockingLock = new Object(); - - private boolean failingOver; - - private final int confWindowSize; - - private int receivedBytes; - - private CommandConfirmationHandler commandConfirmationHandler; - - private volatile boolean transferring; - - public ChannelImpl(final CoreRemotingConnection connection, final long id, final int confWindowSize) - { - this.connection = connection; - - this.id = id; - - this.confWindowSize = confWindowSize; - - if (confWindowSize != -1) - { - resendCache = new ConcurrentLinkedQueue<Packet>(); - } - else - { - resendCache = null; - } - } - - public long getID() - { - return id; - } - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - public Lock getLock() - { - return lock; - } - - public int getConfirmationWindowSize() - { - return confWindowSize; - } - - public void returnBlocking() - { - lock.lock(); - - try - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.UNBLOCKED, - "Connection failure detected. Unblocking a blocking call that will never get a response" - - )); - - sendCondition.signal(); - } - finally - { - lock.unlock(); - } - } - - public void sendAndFlush(final Packet packet) - { - send(packet, true); - } - - public void send(final Packet packet) - { - send(packet, false); - } - - public void setTransferring(boolean transferring) - { - this.transferring = transferring; - } - - // This must never called by more than one thread concurrently - public void send(final Packet packet, final boolean flush) - { - synchronized (sendLock) - { - packet.setChannelID(id); - - final HornetQBuffer buffer = packet.encode(connection); - - lock.lock(); - - try - { - while (failingOver) - { - // TODO - don't hardcode this timeout - try - { - failoverCondition.await(10000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - } - - //Sanity check - if (transferring) - { - throw new IllegalStateException("Cannot send a packet while channel is doing failover"); - } - - - if (resendCache != null && packet.isRequiresConfirmations()) - { - resendCache.add(packet); - } - - connection.getTransportConnection().write(buffer, flush); - } - finally - { - lock.unlock(); - } - } - } - - public Packet sendBlocking(final Packet packet) throws HornetQException - { - if (closed) - { - throw new HornetQException(HornetQException.NOT_CONNECTED, "Connection is destroyed"); - } - - if (connection.getBlockingCallTimeout() == -1) - { - throw new IllegalStateException("Cannot do a blocking call timeout on a server side connection"); - } - - // Synchronized since can't be called concurrently by more than one thread and this can occur - // E.g. blocking acknowledge() from inside a message handler at some time as other operation on main thread - synchronized (sendBlockingLock) - { - packet.setChannelID(id); - - final HornetQBuffer buffer = packet.encode(connection); - - lock.lock(); - - try - { - while (failingOver) - { - // TODO - don't hardcode this timeout - try - { - failoverCondition.await(10000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - } - - response = null; - - if (resendCache != null && packet.isRequiresConfirmations()) - { - resendCache.add(packet); - } - - connection.getTransportConnection().write(buffer); - - long toWait = connection.getBlockingCallTimeout(); - - long start = System.currentTimeMillis(); - - while (response == null && toWait > 0) - { - try - { - sendCondition.await(toWait, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - - if (closed) - { - break; - } - - final long now = System.currentTimeMillis(); - - toWait -= now - start; - - start = now; - } - - if (response == null) - { - throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, - "Timed out waiting for response when sending packet " + packet.getType()); - } - - if (response.getType() == PacketImpl.EXCEPTION) - { - final HornetQExceptionMessage mem = (HornetQExceptionMessage)response; - - HornetQException e = mem.getException(); - - e.fillInStackTrace(); - - throw e; - } - } - finally - { - lock.unlock(); - } - - return response; - } - } - - public void setCommandConfirmationHandler(final CommandConfirmationHandler handler) - { - commandConfirmationHandler = handler; - } - - public void setHandler(final ChannelHandler handler) - { - this.handler = handler; - } - - public void close() - { - if (closed) - { - return; - } - - if (!connection.isDestroyed() && !connection.removeChannel(id)) - { - throw new IllegalArgumentException("Cannot find channel with id " + id + " to close"); - } - - closed = true; - } - - public void transferConnection(final CoreRemotingConnection newConnection) - { - // Needs to synchronize on the connection to make sure no packets from - // the old connection get processed after transfer has occurred - synchronized (connection.getTransferLock()) - { - connection.removeChannel(id); - - // And switch it - - final CoreRemotingConnection rnewConnection = (CoreRemotingConnection)newConnection; - - rnewConnection.putChannel(id, this); - - connection = rnewConnection; - - transferring = true; - } - } - - public void replayCommands(final int otherLastConfirmedCommandID) - { - if (resendCache != null) - { - clearUpTo(otherLastConfirmedCommandID); - - for (final Packet packet : resendCache) - { - doWrite(packet); - } - } - } - - public void lock() - { - lock.lock(); - - failingOver = true; - - lock.unlock(); - } - - public void unlock() - { - lock.lock(); - - failingOver = false; - - failoverCondition.signalAll(); - - lock.unlock(); - } - - public CoreRemotingConnection getConnection() - { - return connection; - } - - //Needs to be synchronized since can be called by remoting service timer thread too for timeout flush - public synchronized void flushConfirmations() - { - if (resendCache != null && receivedBytes != 0) - { - receivedBytes = 0; - - final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); - - confirmed.setChannelID(id); - - doWrite(confirmed); - } - } - - public void confirm(final Packet packet) - { - if (resendCache != null && packet.isRequiresConfirmations()) - { - lastConfirmedCommandID++; - - receivedBytes += packet.getPacketSize(); - - if (receivedBytes >= confWindowSize) - { - receivedBytes = 0; - - final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); - - confirmed.setChannelID(id); - - doWrite(confirmed); - } - } - } - - public void clearCommands() - { - if (resendCache != null) - { - lastConfirmedCommandID = -1; - - firstStoredCommandID = 0; - - resendCache.clear(); - } - } - - public void handlePacket(final Packet packet) - { - if (packet.getType() == PacketImpl.PACKETS_CONFIRMED) - { - if (resendCache != null) - { - final PacketsConfirmedMessage msg = (PacketsConfirmedMessage)packet; - - clearUpTo(msg.getCommandID()); - } - - if (!connection.isClient()) - { - handler.handlePacket(packet); - } - - return; - } - else - { - if (packet.isResponse()) - { - confirm(packet); - - lock.lock(); - - response = packet; - - try - { - sendCondition.signal(); - } - finally - { - lock.unlock(); - } - } - else if (handler != null) - { - handler.handlePacket(packet); - } - } - } - - private void doWrite(final Packet packet) - { - final HornetQBuffer buffer = packet.encode(connection); - - connection.getTransportConnection().write(buffer); - } - - private void clearUpTo(final int lastReceivedCommandID) - { - final int numberToClear = 1 + lastReceivedCommandID - firstStoredCommandID; - - if (numberToClear == -1) - { - throw new IllegalArgumentException("Invalid lastReceivedCommandID: " + lastReceivedCommandID); - } - - int sizeToFree = 0; - - for (int i = 0; i < numberToClear; i++) - { - final Packet packet = resendCache.poll(); - - if (packet == null) - { - ChannelImpl.log.warn("Can't find packet to clear: " + " last received command id " + - lastReceivedCommandID + - " first stored command id " + - firstStoredCommandID); - return; - } - - if (packet.getType() != PacketImpl.PACKETS_CONFIRMED) - { - sizeToFree += packet.getPacketSize(); - } - - if (commandConfirmationHandler != null) - { - commandConfirmationHandler.commandConfirmed(packet); - } - } - - firstStoredCommandID += numberToClear; - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/ChannelImpl.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ChannelImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,508 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.PacketsConfirmedMessage; +import org.hornetq.core.remoting.RemotingConnection; + +/** + * A ChannelImpl + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public class ChannelImpl implements Channel +{ + private static final Logger log = Logger.getLogger(ChannelImpl.class); + + private volatile long id; + + private ChannelHandler handler; + + private Packet response; + + private final java.util.Queue<Packet> resendCache; + + private volatile int firstStoredCommandID; + + private volatile int lastConfirmedCommandID = -1; + + private volatile CoreRemotingConnection connection; + + private volatile boolean closed; + + private final Lock lock = new ReentrantLock(); + + private final Condition sendCondition = lock.newCondition(); + + private final Condition failoverCondition = lock.newCondition(); + + private final Object sendLock = new Object(); + + private final Object sendBlockingLock = new Object(); + + private boolean failingOver; + + private final int confWindowSize; + + private int receivedBytes; + + private CommandConfirmationHandler commandConfirmationHandler; + + private volatile boolean transferring; + + public ChannelImpl(final CoreRemotingConnection connection, final long id, final int confWindowSize) + { + this.connection = connection; + + this.id = id; + + this.confWindowSize = confWindowSize; + + if (confWindowSize != -1) + { + resendCache = new ConcurrentLinkedQueue<Packet>(); + } + else + { + resendCache = null; + } + } + + public long getID() + { + return id; + } + + public int getLastConfirmedCommandID() + { + return lastConfirmedCommandID; + } + + public Lock getLock() + { + return lock; + } + + public int getConfirmationWindowSize() + { + return confWindowSize; + } + + public void returnBlocking() + { + lock.lock(); + + try + { + response = new HornetQExceptionMessage(new HornetQException(HornetQException.UNBLOCKED, + "Connection failure detected. Unblocking a blocking call that will never get a response" + + )); + + sendCondition.signal(); + } + finally + { + lock.unlock(); + } + } + + public void sendAndFlush(final Packet packet) + { + send(packet, true); + } + + public void send(final Packet packet) + { + send(packet, false); + } + + public void setTransferring(boolean transferring) + { + this.transferring = transferring; + } + + // This must never called by more than one thread concurrently + public void send(final Packet packet, final boolean flush) + { + synchronized (sendLock) + { + packet.setChannelID(id); + + final HornetQBuffer buffer = packet.encode(connection); + + lock.lock(); + + try + { + while (failingOver) + { + // TODO - don't hardcode this timeout + try + { + failoverCondition.await(10000, TimeUnit.MILLISECONDS); + } + catch (InterruptedException e) + { + } + } + + //Sanity check + if (transferring) + { + throw new IllegalStateException("Cannot send a packet while channel is doing failover"); + } + + + if (resendCache != null && packet.isRequiresConfirmations()) + { + resendCache.add(packet); + } + + connection.getTransportConnection().write(buffer, flush); + } + finally + { + lock.unlock(); + } + } + } + + public Packet sendBlocking(final Packet packet) throws HornetQException + { + if (closed) + { + throw new HornetQException(HornetQException.NOT_CONNECTED, "Connection is destroyed"); + } + + if (connection.getBlockingCallTimeout() == -1) + { + throw new IllegalStateException("Cannot do a blocking call timeout on a server side connection"); + } + + // Synchronized since can't be called concurrently by more than one thread and this can occur + // E.g. blocking acknowledge() from inside a message handler at some time as other operation on main thread + synchronized (sendBlockingLock) + { + packet.setChannelID(id); + + final HornetQBuffer buffer = packet.encode(connection); + + lock.lock(); + + try + { + while (failingOver) + { + // TODO - don't hardcode this timeout + try + { + failoverCondition.await(10000, TimeUnit.MILLISECONDS); + } + catch (InterruptedException e) + { + } + } + + response = null; + + if (resendCache != null && packet.isRequiresConfirmations()) + { + resendCache.add(packet); + } + + connection.getTransportConnection().write(buffer); + + long toWait = connection.getBlockingCallTimeout(); + + long start = System.currentTimeMillis(); + + while (response == null && toWait > 0) + { + try + { + sendCondition.await(toWait, TimeUnit.MILLISECONDS); + } + catch (InterruptedException e) + { + } + + if (closed) + { + break; + } + + final long now = System.currentTimeMillis(); + + toWait -= now - start; + + start = now; + } + + if (response == null) + { + throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, + "Timed out waiting for response when sending packet " + packet.getType()); + } + + if (response.getType() == PacketImpl.EXCEPTION) + { + final HornetQExceptionMessage mem = (HornetQExceptionMessage)response; + + HornetQException e = mem.getException(); + + e.fillInStackTrace(); + + throw e; + } + } + finally + { + lock.unlock(); + } + + return response; + } + } + + public void setCommandConfirmationHandler(final CommandConfirmationHandler handler) + { + commandConfirmationHandler = handler; + } + + public void setHandler(final ChannelHandler handler) + { + this.handler = handler; + } + + public void close() + { + if (closed) + { + return; + } + + if (!connection.isDestroyed() && !connection.removeChannel(id)) + { + throw new IllegalArgumentException("Cannot find channel with id " + id + " to close"); + } + + closed = true; + } + + public void transferConnection(final CoreRemotingConnection newConnection) + { + // Needs to synchronize on the connection to make sure no packets from + // the old connection get processed after transfer has occurred + synchronized (connection.getTransferLock()) + { + connection.removeChannel(id); + + // And switch it + + final CoreRemotingConnection rnewConnection = (CoreRemotingConnection)newConnection; + + rnewConnection.putChannel(id, this); + + connection = rnewConnection; + + transferring = true; + } + } + + public void replayCommands(final int otherLastConfirmedCommandID) + { + if (resendCache != null) + { + clearUpTo(otherLastConfirmedCommandID); + + for (final Packet packet : resendCache) + { + doWrite(packet); + } + } + } + + public void lock() + { + lock.lock(); + + failingOver = true; + + lock.unlock(); + } + + public void unlock() + { + lock.lock(); + + failingOver = false; + + failoverCondition.signalAll(); + + lock.unlock(); + } + + public CoreRemotingConnection getConnection() + { + return connection; + } + + //Needs to be synchronized since can be called by remoting service timer thread too for timeout flush + public synchronized void flushConfirmations() + { + if (resendCache != null && receivedBytes != 0) + { + receivedBytes = 0; + + final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); + + confirmed.setChannelID(id); + + doWrite(confirmed); + } + } + + public void confirm(final Packet packet) + { + if (resendCache != null && packet.isRequiresConfirmations()) + { + lastConfirmedCommandID++; + + receivedBytes += packet.getPacketSize(); + + if (receivedBytes >= confWindowSize) + { + receivedBytes = 0; + + final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); + + confirmed.setChannelID(id); + + doWrite(confirmed); + } + } + } + + public void clearCommands() + { + if (resendCache != null) + { + lastConfirmedCommandID = -1; + + firstStoredCommandID = 0; + + resendCache.clear(); + } + } + + public void handlePacket(final Packet packet) + { + if (packet.getType() == PacketImpl.PACKETS_CONFIRMED) + { + if (resendCache != null) + { + final PacketsConfirmedMessage msg = (PacketsConfirmedMessage)packet; + + clearUpTo(msg.getCommandID()); + } + + if (!connection.isClient()) + { + handler.handlePacket(packet); + } + + return; + } + else + { + if (packet.isResponse()) + { + confirm(packet); + + lock.lock(); + + response = packet; + + try + { + sendCondition.signal(); + } + finally + { + lock.unlock(); + } + } + else if (handler != null) + { + handler.handlePacket(packet); + } + } + } + + private void doWrite(final Packet packet) + { + final HornetQBuffer buffer = packet.encode(connection); + + connection.getTransportConnection().write(buffer); + } + + private void clearUpTo(final int lastReceivedCommandID) + { + final int numberToClear = 1 + lastReceivedCommandID - firstStoredCommandID; + + if (numberToClear == -1) + { + throw new IllegalArgumentException("Invalid lastReceivedCommandID: " + lastReceivedCommandID); + } + + int sizeToFree = 0; + + for (int i = 0; i < numberToClear; i++) + { + final Packet packet = resendCache.poll(); + + if (packet == null) + { + ChannelImpl.log.warn("Can't find packet to clear: " + " last received command id " + + lastReceivedCommandID + + " first stored command id " + + firstStoredCommandID); + return; + } + + if (packet.getType() != PacketImpl.PACKETS_CONFIRMED) + { + sizeToFree += packet.getPacketSize(); + } + + if (commandConfirmationHandler != null) + { + commandConfirmationHandler.commandConfirmed(packet); + } + } + + firstStoredCommandID += numberToClear; + } +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,32 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - - -/** - * A CommandConfirmationHandler is used by the channel to confirm confirmations of packets. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 9 Feb 2009 12:39:11 - */ -public interface CommandConfirmationHandler -{ - /** - * called by channel after a confirmation has been received. - * - * @param packet the packet confirmed - */ - void commandConfirmed(Packet packet); -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,32 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + + +/** + * A CommandConfirmationHandler is used by the channel to confirm confirmations of packets. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 9 Feb 2009 12:39:11 + */ +public interface CommandConfirmationHandler +{ + /** + * called by channel after a confirmation has been received. + * + * @param packet the packet confirmed + */ + void commandConfirmed(Packet packet); +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,116 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.protocol.core.wireformat.Ping; -import org.hornetq.core.remoting.server.ConnectionEntry; -import org.hornetq.core.remoting.server.ProtocolManager; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.spi.core.remoting.Connection; - -/** - * A CoreProtocolManager - * - * @author Tim Fox - * - * - */ -public class CoreProtocolManager implements ProtocolManager -{ - private final HornetQServer server; - - private final List<Interceptor> interceptors; - - public CoreProtocolManager(final HornetQServer server, - final List<Interceptor> interceptors) - { - this.server = server; - - this.interceptors = interceptors; - } - - public ConnectionEntry createConnectionEntry(final Connection connection) - { - final Configuration config = server.getConfiguration(); - - CoreRemotingConnection rc = new RemotingConnectionImpl(connection, - interceptors, - config.isAsyncConnectionExecutionEnabled() ? server.getExecutorFactory().getExecutor() - : null); - - Channel channel1 = rc.getChannel(1, -1); - - ChannelHandler handler = new HornetQPacketHandler(this, server, channel1, rc); - - channel1.setHandler(handler); - - long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; - - if (config.getConnectionTTLOverride() != -1) - { - ttl = config.getConnectionTTLOverride(); - } - - final ConnectionEntry entry = new ConnectionEntry(rc, System.currentTimeMillis(), ttl); - - final Channel channel0 = rc.getChannel(0, -1); - - channel0.setHandler(new ChannelHandler() - { - public void handlePacket(final Packet packet) - { - if (packet.getType() == PacketImpl.PING) - { - Ping ping = (Ping)packet; - - if (config.getConnectionTTLOverride() == -1) - { - // Allow clients to specify connection ttl - entry.ttl = ping.getConnectionTTL(); - } - - // Just send a ping back - channel0.send(packet); - } - } - }); - - return entry; - } - - private Map<String, ServerSessionPacketHandler> sessionHandlers = - new ConcurrentHashMap<String, ServerSessionPacketHandler>(); - - public ServerSessionPacketHandler getSessionHandler(final String sessionName) - { - return sessionHandlers.get(sessionName); - } - - public void addSessionHandler(final String name, final ServerSessionPacketHandler handler) - { - sessionHandlers.put(name, handler); - } - - public void removeHandler(final String name) - { - sessionHandlers.remove(name); - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,116 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.protocol.core.wireformat.Ping; +import org.hornetq.core.remoting.server.ConnectionEntry; +import org.hornetq.core.remoting.server.ProtocolManager; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.spi.core.remoting.Connection; + +/** + * A CoreProtocolManager + * + * @author Tim Fox + * + * + */ +public class CoreProtocolManager implements ProtocolManager +{ + private final HornetQServer server; + + private final List<Interceptor> interceptors; + + public CoreProtocolManager(final HornetQServer server, + final List<Interceptor> interceptors) + { + this.server = server; + + this.interceptors = interceptors; + } + + public ConnectionEntry createConnectionEntry(final Connection connection) + { + final Configuration config = server.getConfiguration(); + + CoreRemotingConnection rc = new RemotingConnectionImpl(connection, + interceptors, + config.isAsyncConnectionExecutionEnabled() ? server.getExecutorFactory().getExecutor() + : null); + + Channel channel1 = rc.getChannel(1, -1); + + ChannelHandler handler = new HornetQPacketHandler(this, server, channel1, rc); + + channel1.setHandler(handler); + + long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; + + if (config.getConnectionTTLOverride() != -1) + { + ttl = config.getConnectionTTLOverride(); + } + + final ConnectionEntry entry = new ConnectionEntry(rc, System.currentTimeMillis(), ttl); + + final Channel channel0 = rc.getChannel(0, -1); + + channel0.setHandler(new ChannelHandler() + { + public void handlePacket(final Packet packet) + { + if (packet.getType() == PacketImpl.PING) + { + Ping ping = (Ping)packet; + + if (config.getConnectionTTLOverride() == -1) + { + // Allow clients to specify connection ttl + entry.ttl = ping.getConnectionTTL(); + } + + // Just send a ping back + channel0.send(packet); + } + } + }); + + return entry; + } + + private Map<String, ServerSessionPacketHandler> sessionHandlers = + new ConcurrentHashMap<String, ServerSessionPacketHandler>(); + + public ServerSessionPacketHandler getSessionHandler(final String sessionName) + { + return sessionHandlers.get(sessionName); + } + + public void addSessionHandler(final String name, final ServerSessionPacketHandler handler) + { + sessionHandlers.put(name, handler); + } + + public void removeHandler(final String name) + { + sessionHandlers.remove(name); + } +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,89 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import org.hornetq.core.remoting.RemotingConnection; - - -/** - * Extension of RemotingConnection for the HornetQ core protocol - * - * @author Tim Fox - * - * - */ -public interface CoreRemotingConnection extends RemotingConnection -{ - /** - * return the channel with the channel id specified. - * - * If it does not exist create it with the confirmation window size. - * - * @param channelID the channel id - * @param confWindowSize the confirmation window size - * @return the channel - */ - Channel getChannel(long channelID, int confWindowSize); - - /** - * add the channel with the specified channel id - * - * @param channelID the channel id - * @param channel the channel - */ - void putChannel(long channelID, Channel channel); - - /** - * remove the channel with the specified channel id - * - * @param channelID the channel id - * @return true if removed - */ - boolean removeChannel(long channelID); - - /** - * generate a unique (within this connection) channel id - * - * @return the id - */ - long generateChannelID(); - - /** - * resets the id generator used to when generating id's - * - * @param id the first id to set it to - */ - void syncIDGeneratorSequence(long id); - - /** - * return the next id that will be chosen. - * - * @return the id - */ - long getIDGeneratorSequence(); - - /** - * return the current tomeout for blocking calls - * - * @return the timeout in milliseconds - */ - long getBlockingCallTimeout(); - - /** - * return the transfer lock used when transferring connections. - * - * @return the lock - */ - Object getTransferLock(); -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,89 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import org.hornetq.core.remoting.RemotingConnection; + + +/** + * Extension of RemotingConnection for the HornetQ core protocol + * + * @author Tim Fox + * + * + */ +public interface CoreRemotingConnection extends RemotingConnection +{ + /** + * return the channel with the channel id specified. + * + * If it does not exist create it with the confirmation window size. + * + * @param channelID the channel id + * @param confWindowSize the confirmation window size + * @return the channel + */ + Channel getChannel(long channelID, int confWindowSize); + + /** + * add the channel with the specified channel id + * + * @param channelID the channel id + * @param channel the channel + */ + void putChannel(long channelID, Channel channel); + + /** + * remove the channel with the specified channel id + * + * @param channelID the channel id + * @return true if removed + */ + boolean removeChannel(long channelID); + + /** + * generate a unique (within this connection) channel id + * + * @return the id + */ + long generateChannelID(); + + /** + * resets the id generator used to when generating id's + * + * @param id the first id to set it to + */ + void syncIDGeneratorSequence(long id); + + /** + * return the next id that will be chosen. + * + * @return the id + */ + long getIDGeneratorSequence(); + + /** + * return the current tomeout for blocking calls + * + * @return the timeout in milliseconds + */ + long getBlockingCallTimeout(); + + /** + * return the transfer lock used when transferring connections. + * + * @return the lock + */ + Object getTransferLock(); +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,310 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION; -import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.protocol.core.PacketImpl.CREATE_REPLICATION; -import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; -import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; -import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.replication.ReplicationEndpoint; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.version.Version; - -/** - * A packet handler for all packets that need to be handled at the server level - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> - */ -public class HornetQPacketHandler implements ChannelHandler -{ - private static final Logger log = Logger.getLogger(HornetQPacketHandler.class); - - private final HornetQServer server; - - private final Channel channel1; - - private final CoreRemotingConnection connection; - - private final CoreProtocolManager protocolManager; - - public HornetQPacketHandler(final CoreProtocolManager protocolManager, - final HornetQServer server, - final Channel channel1, - final CoreRemotingConnection connection) - { - this.protocolManager = protocolManager; - - this.server = server; - - this.channel1 = channel1; - - this.connection = connection; - } - - public void handlePacket(final Packet packet) - { - byte type = packet.getType(); - - switch (type) - { - case CREATESESSION: - { - CreateSessionMessage request = (CreateSessionMessage)packet; - - handleCreateSession(request); - - break; - } - case REATTACH_SESSION: - { - ReattachSessionMessage request = (ReattachSessionMessage)packet; - - handleReattachSession(request); - - break; - } - case CREATE_QUEUE: - { - // Create queue can also be fielded here in the case of a replicated store and forward queue creation - - CreateQueueMessage request = (CreateQueueMessage)packet; - - handleCreateQueue(request); - - break; - } - case CREATE_REPLICATION: - { - // Create queue can also be fielded here in the case of a replicated store and forward queue creation - - CreateReplicationSessionMessage request = (CreateReplicationSessionMessage)packet; - - handleCreateReplication(request); - - break; - } - default: - { - HornetQPacketHandler.log.error("Invalid packet " + packet); - } - } - } - - private void handleCreateSession(final CreateSessionMessage request) - { - boolean incompatibleVersion = false; - Packet response; - try - { - Version version = server.getVersion(); - - if (version.getIncrementingVersion() != request.getVersion()) - { - log.warn("Client with version " + request.getVersion() + - " and address " + - connection.getRemoteAddress() + - " is not compatible with server version " + - version.getFullVersion() + - ". " + - "Please ensure all clients and servers are upgraded to the same version for them to " + - "interoperate properly"); - throw new HornetQException(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, - "Server and client versions incompatible"); - } - - if (!server.isStarted()) - { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, "Server not started"); - } - - if (!server.checkActivate()) - { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, - "Server will not accept create session requests"); - } - - Channel channel = connection.getChannel(request.getSessionChannelID(), request.getWindowSize()); - - ServerSession session = server.createSession(request.getName(), - request.getUsername(), - request.getPassword(), - request.getMinLargeMessageSize(), - connection, - request.isAutoCommitSends(), - request.isAutoCommitAcks(), - request.isPreAcknowledge(), - request.isXA()); - - ServerSessionPacketHandler handler = new ServerSessionPacketHandler(protocolManager, - session, - server.getStorageManager() - .newContext(server.getExecutorFactory() - .getExecutor()), - server.getStorageManager(), - channel); - - session.setCallback(handler); - - channel.setHandler(handler); - - // TODO - where is this removed? - protocolManager.addSessionHandler(request.getName(), handler); - - response = new CreateSessionResponseMessage(server.getVersion().getIncrementingVersion()); - } - catch (HornetQException e) - { - response = new HornetQExceptionMessage((HornetQException)e); - - if (e.getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) - { - incompatibleVersion = true; - } - } - catch (Exception e) - { - HornetQPacketHandler.log.error("Failed to create session", e); - - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - - // send the exception to the client and destroy - // the connection if the client and server versions - // are not compatible - if (incompatibleVersion) - { - channel1.sendAndFlush(response); - } - else - { - channel1.send(response); - } - } - - private void handleReattachSession(final ReattachSessionMessage request) - { - Packet response = null; - - try - { - - if (!server.isStarted()) - { - response = new ReattachSessionResponseMessage(-1, false); - } - - ServerSessionPacketHandler sessionHandler = protocolManager.getSessionHandler(request.getName()); - - if (!server.checkActivate()) - { - response = new ReattachSessionResponseMessage(-1, false); - } - - if (sessionHandler == null) - { - response = new ReattachSessionResponseMessage(-1, false); - } - else - { - if (sessionHandler.getChannel().getConfirmationWindowSize() == -1) - { - // Even though session exists, we can't reattach since confi window size == -1, - // i.e. we don't have a resend cache for commands, so we just close the old session - // and let the client recreate - - sessionHandler.close(); - - response = new ReattachSessionResponseMessage(-1, false); - } - else - { - // Reconnect the channel to the new connection - int serverLastConfirmedCommandID = sessionHandler.transferConnection(connection, - request.getLastConfirmedCommandID()); - - response = new ReattachSessionResponseMessage(serverLastConfirmedCommandID, true); - } - } - } - catch (Exception e) - { - HornetQPacketHandler.log.error("Failed to reattach session", e); - - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - - channel1.send(response); - } - - private void handleCreateQueue(final CreateQueueMessage request) - { - try - { - server.createQueue(request.getAddress(), - request.getQueueName(), - request.getFilterString(), - request.isDurable(), - request.isTemporary()); - } - catch (Exception e) - { - HornetQPacketHandler.log.error("Failed to handle create queue", e); - } - } - - private void handleCreateReplication(final CreateReplicationSessionMessage request) - { - Packet response; - - try - { - Channel channel = connection.getChannel(request.getSessionChannelID(), -1); - - ReplicationEndpoint endpoint = server.connectToReplicationEndpoint(channel); - - channel.setHandler(endpoint); - - response = new NullResponseMessage(); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - HornetQPacketHandler.log.warn(e.getMessage(), e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - channel1.send(response); - } - -} \ No newline at end of file Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,310 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_REPLICATION; +import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.replication.ReplicationEndpoint; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.ServerSession; +import org.hornetq.core.version.Version; + +/** + * A packet handler for all packets that need to be handled at the server level + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> + */ +public class HornetQPacketHandler implements ChannelHandler +{ + private static final Logger log = Logger.getLogger(HornetQPacketHandler.class); + + private final HornetQServer server; + + private final Channel channel1; + + private final CoreRemotingConnection connection; + + private final CoreProtocolManager protocolManager; + + public HornetQPacketHandler(final CoreProtocolManager protocolManager, + final HornetQServer server, + final Channel channel1, + final CoreRemotingConnection connection) + { + this.protocolManager = protocolManager; + + this.server = server; + + this.channel1 = channel1; + + this.connection = connection; + } + + public void handlePacket(final Packet packet) + { + byte type = packet.getType(); + + switch (type) + { + case CREATESESSION: + { + CreateSessionMessage request = (CreateSessionMessage)packet; + + handleCreateSession(request); + + break; + } + case REATTACH_SESSION: + { + ReattachSessionMessage request = (ReattachSessionMessage)packet; + + handleReattachSession(request); + + break; + } + case CREATE_QUEUE: + { + // Create queue can also be fielded here in the case of a replicated store and forward queue creation + + CreateQueueMessage request = (CreateQueueMessage)packet; + + handleCreateQueue(request); + + break; + } + case CREATE_REPLICATION: + { + // Create queue can also be fielded here in the case of a replicated store and forward queue creation + + CreateReplicationSessionMessage request = (CreateReplicationSessionMessage)packet; + + handleCreateReplication(request); + + break; + } + default: + { + HornetQPacketHandler.log.error("Invalid packet " + packet); + } + } + } + + private void handleCreateSession(final CreateSessionMessage request) + { + boolean incompatibleVersion = false; + Packet response; + try + { + Version version = server.getVersion(); + + if (version.getIncrementingVersion() != request.getVersion()) + { + log.warn("Client with version " + request.getVersion() + + " and address " + + connection.getRemoteAddress() + + " is not compatible with server version " + + version.getFullVersion() + + ". " + + "Please ensure all clients and servers are upgraded to the same version for them to " + + "interoperate properly"); + throw new HornetQException(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, + "Server and client versions incompatible"); + } + + if (!server.isStarted()) + { + throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, "Server not started"); + } + + if (!server.checkActivate()) + { + throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, + "Server will not accept create session requests"); + } + + Channel channel = connection.getChannel(request.getSessionChannelID(), request.getWindowSize()); + + ServerSession session = server.createSession(request.getName(), + request.getUsername(), + request.getPassword(), + request.getMinLargeMessageSize(), + connection, + request.isAutoCommitSends(), + request.isAutoCommitAcks(), + request.isPreAcknowledge(), + request.isXA()); + + ServerSessionPacketHandler handler = new ServerSessionPacketHandler(protocolManager, + session, + server.getStorageManager() + .newContext(server.getExecutorFactory() + .getExecutor()), + server.getStorageManager(), + channel); + + session.setCallback(handler); + + channel.setHandler(handler); + + // TODO - where is this removed? + protocolManager.addSessionHandler(request.getName(), handler); + + response = new CreateSessionResponseMessage(server.getVersion().getIncrementingVersion()); + } + catch (HornetQException e) + { + response = new HornetQExceptionMessage((HornetQException)e); + + if (e.getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) + { + incompatibleVersion = true; + } + } + catch (Exception e) + { + HornetQPacketHandler.log.error("Failed to create session", e); + + response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + } + + // send the exception to the client and destroy + // the connection if the client and server versions + // are not compatible + if (incompatibleVersion) + { + channel1.sendAndFlush(response); + } + else + { + channel1.send(response); + } + } + + private void handleReattachSession(final ReattachSessionMessage request) + { + Packet response = null; + + try + { + + if (!server.isStarted()) + { + response = new ReattachSessionResponseMessage(-1, false); + } + + ServerSessionPacketHandler sessionHandler = protocolManager.getSessionHandler(request.getName()); + + if (!server.checkActivate()) + { + response = new ReattachSessionResponseMessage(-1, false); + } + + if (sessionHandler == null) + { + response = new ReattachSessionResponseMessage(-1, false); + } + else + { + if (sessionHandler.getChannel().getConfirmationWindowSize() == -1) + { + // Even though session exists, we can't reattach since confi window size == -1, + // i.e. we don't have a resend cache for commands, so we just close the old session + // and let the client recreate + + sessionHandler.close(); + + response = new ReattachSessionResponseMessage(-1, false); + } + else + { + // Reconnect the channel to the new connection + int serverLastConfirmedCommandID = sessionHandler.transferConnection(connection, + request.getLastConfirmedCommandID()); + + response = new ReattachSessionResponseMessage(serverLastConfirmedCommandID, true); + } + } + } + catch (Exception e) + { + HornetQPacketHandler.log.error("Failed to reattach session", e); + + response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + } + + channel1.send(response); + } + + private void handleCreateQueue(final CreateQueueMessage request) + { + try + { + server.createQueue(request.getAddress(), + request.getQueueName(), + request.getFilterString(), + request.isDurable(), + request.isTemporary()); + } + catch (Exception e) + { + HornetQPacketHandler.log.error("Failed to handle create queue", e); + } + } + + private void handleCreateReplication(final CreateReplicationSessionMessage request) + { + Packet response; + + try + { + Channel channel = connection.getChannel(request.getSessionChannelID(), -1); + + ReplicationEndpoint endpoint = server.connectToReplicationEndpoint(channel); + + channel.setHandler(endpoint); + + response = new NullResponseMessage(); + } + catch (Exception e) + { + if (e instanceof HornetQException) + { + response = new HornetQExceptionMessage((HornetQException)e); + } + else + { + HornetQPacketHandler.log.warn(e.getMessage(), e); + response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + } + } + + channel1.send(response); + } + +} \ No newline at end of file Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/Packet.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,86 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.remoting.RemotingConnection; - -/** - * A Packet represents a pcaket of data transmitted over a connection. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Packet -{ - /** - * This sets the channel id that should be used once the packet has been successfully decoded it is sent to the correct channel. - * - * @param channelID the id of the channel to handle the packet - */ - void setChannelID(long channelID); - - /** - * returns the channel id of the channel that should handle this pcaket - * - * @return the id of the channel - */ - long getChannelID(); - - /** - * returns true if this packet is being sent in response to a previously received packet - * - * @return true if a response - */ - boolean isResponse(); - - /** - * returns the type of the packet. - * - * This is needed when decoding the packet - * - * @return the packet type - */ - byte getType(); - - /** - * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data - * - * @param connection the connection - * @return the buffer to encode to - */ - HornetQBuffer encode(RemotingConnection connection); - - /** - * decodes the buffer into this packet - * - * @param buffer the buffer to decode from - */ - void decode(HornetQBuffer buffer); - - /** - * returns the size needed to encode this packet. - * - * @return The size of the entire packet including headers, and extra data - */ - int getPacketSize(); - - /** - * returns true if a confirmation should be sent on receipt of this packet. - * - * @return true if confirmation is required - */ - boolean isRequiresConfirmations(); - - boolean isAsyncExec(); -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/Packet.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/Packet.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,86 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.remoting.RemotingConnection; + +/** + * A Packet represents a pcaket of data transmitted over a connection. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface Packet +{ + /** + * This sets the channel id that should be used once the packet has been successfully decoded it is sent to the correct channel. + * + * @param channelID the id of the channel to handle the packet + */ + void setChannelID(long channelID); + + /** + * returns the channel id of the channel that should handle this pcaket + * + * @return the id of the channel + */ + long getChannelID(); + + /** + * returns true if this packet is being sent in response to a previously received packet + * + * @return true if a response + */ + boolean isResponse(); + + /** + * returns the type of the packet. + * + * This is needed when decoding the packet + * + * @return the packet type + */ + byte getType(); + + /** + * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data + * + * @param connection the connection + * @return the buffer to encode to + */ + HornetQBuffer encode(RemotingConnection connection); + + /** + * decodes the buffer into this packet + * + * @param buffer the buffer to decode from + */ + void decode(HornetQBuffer buffer); + + /** + * returns the size needed to encode this packet. + * + * @return The size of the entire packet including headers, and extra data + */ + int getPacketSize(); + + /** + * returns true if a confirmation should be sent on receipt of this packet. + * + * @return true if confirmation is required + */ + boolean isRequiresConfirmations(); + + boolean isAsyncExec(); +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/PacketDecoder.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,492 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION; -import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.protocol.core.PacketImpl.CREATE_REPLICATION; -import static org.hornetq.core.protocol.core.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.protocol.core.PacketImpl.DISCONNECT; -import static org.hornetq.core.protocol.core.PacketImpl.EXCEPTION; -import static org.hornetq.core.protocol.core.PacketImpl.NULL_RESPONSE; -import static org.hornetq.core.protocol.core.PacketImpl.PACKETS_CONFIRMED; -import static org.hornetq.core.protocol.core.PacketImpl.PING; -import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION; -import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_APPEND; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_APPEND_TX; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_COMMIT_ROLLBACK; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_COMPARE_DATA; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_DELETE; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_DELETE_TX; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_END; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PAGE_EVENT; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PAGE_WRITE; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PREPARE; -import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_RESPONSE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_PRODUCER_CREDITS; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_MSG; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_START; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_STOP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_END; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_START; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SUSPEND; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; -import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; -import org.hornetq.core.protocol.core.wireformat.PacketsConfirmedMessage; -import org.hornetq.core.protocol.core.wireformat.Ping; -import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; -import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.protocol.core.wireformat.ReplicationResponseMessage; -import org.hornetq.core.protocol.core.wireformat.RollbackMessage; -import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionCloseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionCommitMessage; -import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; -import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; -import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; - -/** - * A PacketDecoder - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * - */ -public class PacketDecoder -{ - private static final Logger log = Logger.getLogger(PacketDecoder.class); - - public Packet decode(final HornetQBuffer in) - { - final byte packetType = in.readByte(); - - Packet packet; - - switch (packetType) - { - case PING: - { - packet = new Ping(); - break; - } - case DISCONNECT: - { - packet = new PacketImpl(PacketImpl.DISCONNECT); - break; - } - case EXCEPTION: - { - packet = new HornetQExceptionMessage(); - break; - } - case PACKETS_CONFIRMED: - { - packet = new PacketsConfirmedMessage(); - break; - } - case CREATESESSION: - { - packet = new CreateSessionMessage(); - break; - } - case CREATESESSION_RESP: - { - packet = new CreateSessionResponseMessage(); - break; - } - case REATTACH_SESSION: - { - packet = new ReattachSessionMessage(); - break; - } - case REATTACH_SESSION_RESP: - { - packet = new ReattachSessionResponseMessage(); - break; - } - case SESS_CLOSE: - { - packet = new SessionCloseMessage(); - break; - } - case SESS_CREATECONSUMER: - { - packet = new SessionCreateConsumerMessage(); - break; - } - case SESS_ACKNOWLEDGE: - { - packet = new SessionAcknowledgeMessage(); - break; - } - case SESS_EXPIRED: - { - packet = new SessionExpiredMessage(); - break; - } - case SESS_COMMIT: - { - packet = new SessionCommitMessage(); - break; - } - case SESS_ROLLBACK: - { - packet = new RollbackMessage(); - break; - } - case SESS_QUEUEQUERY: - { - packet = new SessionQueueQueryMessage(); - break; - } - case SESS_QUEUEQUERY_RESP: - { - packet = new SessionQueueQueryResponseMessage(); - break; - } - case CREATE_QUEUE: - { - packet = new CreateQueueMessage(); - break; - } - case DELETE_QUEUE: - { - packet = new SessionDeleteQueueMessage(); - break; - } - case SESS_BINDINGQUERY: - { - packet = new SessionBindingQueryMessage(); - break; - } - case SESS_BINDINGQUERY_RESP: - { - packet = new SessionBindingQueryResponseMessage(); - break; - } - case SESS_XA_START: - { - packet = new SessionXAStartMessage(); - break; - } - case SESS_XA_END: - { - packet = new SessionXAEndMessage(); - break; - } - case SESS_XA_COMMIT: - { - packet = new SessionXACommitMessage(); - break; - } - case SESS_XA_PREPARE: - { - packet = new SessionXAPrepareMessage(); - break; - } - case SESS_XA_RESP: - { - packet = new SessionXAResponseMessage(); - break; - } - case SESS_XA_ROLLBACK: - { - packet = new SessionXARollbackMessage(); - break; - } - case SESS_XA_JOIN: - { - packet = new SessionXAJoinMessage(); - break; - } - case SESS_XA_SUSPEND: - { - packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); - break; - } - case SESS_XA_RESUME: - { - packet = new SessionXAResumeMessage(); - break; - } - case SESS_XA_FORGET: - { - packet = new SessionXAForgetMessage(); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); - break; - } - case SESS_XA_INDOUBT_XIDS_RESP: - { - packet = new SessionXAGetInDoubtXidsResponseMessage(); - break; - } - case SESS_XA_SET_TIMEOUT: - { - packet = new SessionXASetTimeoutMessage(); - break; - } - case SESS_XA_SET_TIMEOUT_RESP: - { - packet = new SessionXASetTimeoutResponseMessage(); - break; - } - case SESS_XA_GET_TIMEOUT: - { - packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); - break; - } - case SESS_XA_GET_TIMEOUT_RESP: - { - packet = new SessionXAGetTimeoutResponseMessage(); - break; - } - case SESS_START: - { - packet = new PacketImpl(PacketImpl.SESS_START); - break; - } - case SESS_STOP: - { - packet = new PacketImpl(PacketImpl.SESS_STOP); - break; - } - case SESS_FLOWTOKEN: - { - packet = new SessionConsumerFlowCreditMessage(); - break; - } - case SESS_SEND: - { - packet = new SessionSendMessage(); - break; - } - case SESS_SEND_LARGE: - { - packet = new SessionSendLargeMessage(); - break; - } - case SESS_RECEIVE_MSG: - { - packet = new SessionReceiveMessage(); - break; - } - case SESS_RECEIVE_LARGE_MSG: - { - packet = new SessionReceiveLargeMessage(); - break; - } - case SESS_CONSUMER_CLOSE: - { - packet = new SessionConsumerCloseMessage(); - break; - } - case NULL_RESPONSE: - { - packet = new NullResponseMessage(); - break; - } - case SESS_RECEIVE_CONTINUATION: - { - packet = new SessionReceiveContinuationMessage(); - break; - } - case SESS_SEND_CONTINUATION: - { - packet = new SessionSendContinuationMessage(); - break; - } - case SESS_PRODUCER_REQUEST_CREDITS: - { - packet = new SessionRequestProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_CREDITS: - { - packet = new SessionProducerCreditsMessage(); - break; - } - case CREATE_REPLICATION: - { - packet = new CreateReplicationSessionMessage(); - break; - } - case REPLICATION_APPEND: - { - packet = new ReplicationAddMessage(); - break; - } - case REPLICATION_APPEND_TX: - { - packet = new ReplicationAddTXMessage(); - break; - } - case REPLICATION_DELETE: - { - packet = new ReplicationDeleteMessage(); - break; - } - case REPLICATION_DELETE_TX: - { - packet = new ReplicationDeleteTXMessage(); - break; - } - case REPLICATION_PREPARE: - { - packet = new ReplicationPrepareMessage(); - break; - } - case REPLICATION_COMMIT_ROLLBACK: - { - packet = new ReplicationCommitMessage(); - break; - } - case REPLICATION_RESPONSE: - { - packet = new ReplicationResponseMessage(); - break; - } - case REPLICATION_PAGE_WRITE: - { - packet = new ReplicationPageWriteMessage(); - break; - } - case REPLICATION_PAGE_EVENT: - { - packet = new ReplicationPageEventMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_BEGIN: - { - packet = new ReplicationLargeMessageBeingMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_END: - { - packet = new ReplicationLargemessageEndMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_WRITE: - { - packet = new ReplicationLargeMessageWriteMessage(); - break; - } - case REPLICATION_COMPARE_DATA: - { - packet = new ReplicationCompareDataMessage(); - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - packet = new SessionForceConsumerDelivery(); - break; - } - default: - { - throw new IllegalArgumentException("Invalid type: " + packetType); - } - } - - packet.decode(in); - - return packet; - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/PacketDecoder.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketDecoder.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,492 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION; +import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_REPLICATION; +import static org.hornetq.core.protocol.core.PacketImpl.DELETE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.DISCONNECT; +import static org.hornetq.core.protocol.core.PacketImpl.EXCEPTION; +import static org.hornetq.core.protocol.core.PacketImpl.NULL_RESPONSE; +import static org.hornetq.core.protocol.core.PacketImpl.PACKETS_CONFIRMED; +import static org.hornetq.core.protocol.core.PacketImpl.PING; +import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION; +import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_APPEND; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_APPEND_TX; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_COMMIT_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_COMPARE_DATA; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_DELETE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_DELETE_TX; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_END; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PAGE_EVENT; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PAGE_WRITE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PREPARE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_RESPONSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ACKNOWLEDGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CREATECONSUMER; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_EXPIRED; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FLOWTOKEN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_PRODUCER_CREDITS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_LARGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_STOP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_END; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_FORGET; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_JOIN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_PREPARE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESUME; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SUSPEND; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.PacketsConfirmedMessage; +import org.hornetq.core.protocol.core.wireformat.Ping; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationResponseMessage; +import org.hornetq.core.protocol.core.wireformat.RollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; +import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; +import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; +import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; + +/** + * A PacketDecoder + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * + */ +public class PacketDecoder +{ + private static final Logger log = Logger.getLogger(PacketDecoder.class); + + public Packet decode(final HornetQBuffer in) + { + final byte packetType = in.readByte(); + + Packet packet; + + switch (packetType) + { + case PING: + { + packet = new Ping(); + break; + } + case DISCONNECT: + { + packet = new PacketImpl(PacketImpl.DISCONNECT); + break; + } + case EXCEPTION: + { + packet = new HornetQExceptionMessage(); + break; + } + case PACKETS_CONFIRMED: + { + packet = new PacketsConfirmedMessage(); + break; + } + case CREATESESSION: + { + packet = new CreateSessionMessage(); + break; + } + case CREATESESSION_RESP: + { + packet = new CreateSessionResponseMessage(); + break; + } + case REATTACH_SESSION: + { + packet = new ReattachSessionMessage(); + break; + } + case REATTACH_SESSION_RESP: + { + packet = new ReattachSessionResponseMessage(); + break; + } + case SESS_CLOSE: + { + packet = new SessionCloseMessage(); + break; + } + case SESS_CREATECONSUMER: + { + packet = new SessionCreateConsumerMessage(); + break; + } + case SESS_ACKNOWLEDGE: + { + packet = new SessionAcknowledgeMessage(); + break; + } + case SESS_EXPIRED: + { + packet = new SessionExpiredMessage(); + break; + } + case SESS_COMMIT: + { + packet = new SessionCommitMessage(); + break; + } + case SESS_ROLLBACK: + { + packet = new RollbackMessage(); + break; + } + case SESS_QUEUEQUERY: + { + packet = new SessionQueueQueryMessage(); + break; + } + case SESS_QUEUEQUERY_RESP: + { + packet = new SessionQueueQueryResponseMessage(); + break; + } + case CREATE_QUEUE: + { + packet = new CreateQueueMessage(); + break; + } + case DELETE_QUEUE: + { + packet = new SessionDeleteQueueMessage(); + break; + } + case SESS_BINDINGQUERY: + { + packet = new SessionBindingQueryMessage(); + break; + } + case SESS_BINDINGQUERY_RESP: + { + packet = new SessionBindingQueryResponseMessage(); + break; + } + case SESS_XA_START: + { + packet = new SessionXAStartMessage(); + break; + } + case SESS_XA_END: + { + packet = new SessionXAEndMessage(); + break; + } + case SESS_XA_COMMIT: + { + packet = new SessionXACommitMessage(); + break; + } + case SESS_XA_PREPARE: + { + packet = new SessionXAPrepareMessage(); + break; + } + case SESS_XA_RESP: + { + packet = new SessionXAResponseMessage(); + break; + } + case SESS_XA_ROLLBACK: + { + packet = new SessionXARollbackMessage(); + break; + } + case SESS_XA_JOIN: + { + packet = new SessionXAJoinMessage(); + break; + } + case SESS_XA_SUSPEND: + { + packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); + break; + } + case SESS_XA_RESUME: + { + packet = new SessionXAResumeMessage(); + break; + } + case SESS_XA_FORGET: + { + packet = new SessionXAForgetMessage(); + break; + } + case SESS_XA_INDOUBT_XIDS: + { + packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); + break; + } + case SESS_XA_INDOUBT_XIDS_RESP: + { + packet = new SessionXAGetInDoubtXidsResponseMessage(); + break; + } + case SESS_XA_SET_TIMEOUT: + { + packet = new SessionXASetTimeoutMessage(); + break; + } + case SESS_XA_SET_TIMEOUT_RESP: + { + packet = new SessionXASetTimeoutResponseMessage(); + break; + } + case SESS_XA_GET_TIMEOUT: + { + packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); + break; + } + case SESS_XA_GET_TIMEOUT_RESP: + { + packet = new SessionXAGetTimeoutResponseMessage(); + break; + } + case SESS_START: + { + packet = new PacketImpl(PacketImpl.SESS_START); + break; + } + case SESS_STOP: + { + packet = new PacketImpl(PacketImpl.SESS_STOP); + break; + } + case SESS_FLOWTOKEN: + { + packet = new SessionConsumerFlowCreditMessage(); + break; + } + case SESS_SEND: + { + packet = new SessionSendMessage(); + break; + } + case SESS_SEND_LARGE: + { + packet = new SessionSendLargeMessage(); + break; + } + case SESS_RECEIVE_MSG: + { + packet = new SessionReceiveMessage(); + break; + } + case SESS_RECEIVE_LARGE_MSG: + { + packet = new SessionReceiveLargeMessage(); + break; + } + case SESS_CONSUMER_CLOSE: + { + packet = new SessionConsumerCloseMessage(); + break; + } + case NULL_RESPONSE: + { + packet = new NullResponseMessage(); + break; + } + case SESS_RECEIVE_CONTINUATION: + { + packet = new SessionReceiveContinuationMessage(); + break; + } + case SESS_SEND_CONTINUATION: + { + packet = new SessionSendContinuationMessage(); + break; + } + case SESS_PRODUCER_REQUEST_CREDITS: + { + packet = new SessionRequestProducerCreditsMessage(); + break; + } + case SESS_PRODUCER_CREDITS: + { + packet = new SessionProducerCreditsMessage(); + break; + } + case CREATE_REPLICATION: + { + packet = new CreateReplicationSessionMessage(); + break; + } + case REPLICATION_APPEND: + { + packet = new ReplicationAddMessage(); + break; + } + case REPLICATION_APPEND_TX: + { + packet = new ReplicationAddTXMessage(); + break; + } + case REPLICATION_DELETE: + { + packet = new ReplicationDeleteMessage(); + break; + } + case REPLICATION_DELETE_TX: + { + packet = new ReplicationDeleteTXMessage(); + break; + } + case REPLICATION_PREPARE: + { + packet = new ReplicationPrepareMessage(); + break; + } + case REPLICATION_COMMIT_ROLLBACK: + { + packet = new ReplicationCommitMessage(); + break; + } + case REPLICATION_RESPONSE: + { + packet = new ReplicationResponseMessage(); + break; + } + case REPLICATION_PAGE_WRITE: + { + packet = new ReplicationPageWriteMessage(); + break; + } + case REPLICATION_PAGE_EVENT: + { + packet = new ReplicationPageEventMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_BEGIN: + { + packet = new ReplicationLargeMessageBeingMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_END: + { + packet = new ReplicationLargemessageEndMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_WRITE: + { + packet = new ReplicationLargeMessageWriteMessage(); + break; + } + case REPLICATION_COMPARE_DATA: + { + packet = new ReplicationCompareDataMessage(); + break; + } + case SESS_FORCE_CONSUMER_DELIVERY: + { + packet = new SessionForceConsumerDelivery(); + break; + } + default: + { + throw new IllegalArgumentException("Invalid type: " + packetType); + } + } + + packet.decode(in); + + return packet; + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/PacketImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,310 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class PacketImpl implements Packet -{ - // Constants ------------------------------------------------------------------------- - - private static final Logger log = Logger.getLogger(PacketImpl.class); - - // The minimal size for all the packets, Common data for all the packets (look at PacketImpl.encode) - public static final int PACKET_HEADERS_SIZE = DataConstants.SIZE_INT + DataConstants.SIZE_BYTE + - DataConstants.SIZE_LONG; - - private static final int INITIAL_PACKET_SIZE = 1500; - - protected long channelID; - - protected final byte type; - - protected int size = -1; - - // The packet types - // ----------------------------------------------------------------------------------- - - public static final byte PING = 10; - - public static final byte DISCONNECT = 11; - - // Miscellaneous - public static final byte EXCEPTION = 20; - - public static final byte NULL_RESPONSE = 21; - - public static final byte PACKETS_CONFIRMED = 22; - - // Server - public static final byte CREATESESSION = 30; - - public static final byte CREATESESSION_RESP = 31; - - public static final byte REATTACH_SESSION = 32; - - public static final byte REATTACH_SESSION_RESP = 33; - - public static final byte CREATE_QUEUE = 34; - - public static final byte DELETE_QUEUE = 35; - - public static final byte CREATE_REPLICATION = 36; - - // Session - public static final byte SESS_CREATECONSUMER = 40; - - public static final byte SESS_ACKNOWLEDGE = 41; - - public static final byte SESS_EXPIRED = 42; - - public static final byte SESS_COMMIT = 43; - - public static final byte SESS_ROLLBACK = 44; - - public static final byte SESS_QUEUEQUERY = 45; - - public static final byte SESS_QUEUEQUERY_RESP = 46; - - public static final byte SESS_BINDINGQUERY = 49; - - public static final byte SESS_BINDINGQUERY_RESP = 50; - - public static final byte SESS_XA_START = 51; - - public static final byte SESS_XA_END = 52; - - public static final byte SESS_XA_COMMIT = 53; - - public static final byte SESS_XA_PREPARE = 54; - - public static final byte SESS_XA_RESP = 55; - - public static final byte SESS_XA_ROLLBACK = 56; - - public static final byte SESS_XA_JOIN = 57; - - public static final byte SESS_XA_SUSPEND = 58; - - public static final byte SESS_XA_RESUME = 59; - - public static final byte SESS_XA_FORGET = 60; - - public static final byte SESS_XA_INDOUBT_XIDS = 61; - - public static final byte SESS_XA_INDOUBT_XIDS_RESP = 62; - - public static final byte SESS_XA_SET_TIMEOUT = 63; - - public static final byte SESS_XA_SET_TIMEOUT_RESP = 64; - - public static final byte SESS_XA_GET_TIMEOUT = 65; - - public static final byte SESS_XA_GET_TIMEOUT_RESP = 66; - - public static final byte SESS_START = 67; - - public static final byte SESS_STOP = 68; - - public static final byte SESS_CLOSE = 69; - - public static final byte SESS_FLOWTOKEN = 70; - - public static final byte SESS_SEND = 71; - - public static final byte SESS_SEND_LARGE = 72; - - public static final byte SESS_SEND_CONTINUATION = 73; - - public static final byte SESS_CONSUMER_CLOSE = 74; - - public static final byte SESS_RECEIVE_MSG = 75; - - public static final byte SESS_RECEIVE_LARGE_MSG = 76; - - public static final byte SESS_RECEIVE_CONTINUATION = 77; - - public static final byte SESS_FORCE_CONSUMER_DELIVERY = 78; - - public static final byte SESS_PRODUCER_REQUEST_CREDITS = 79; - - public static final byte SESS_PRODUCER_CREDITS = 80; - - // Replication - - public static final byte REPLICATION_RESPONSE = 90; - - public static final byte REPLICATION_APPEND = 91; - - public static final byte REPLICATION_APPEND_TX = 92; - - public static final byte REPLICATION_DELETE = 93; - - public static final byte REPLICATION_DELETE_TX = 94; - - public static final byte REPLICATION_PREPARE = 95; - - public static final byte REPLICATION_COMMIT_ROLLBACK = 96; - - public static final byte REPLICATION_PAGE_WRITE = 97; - - public static final byte REPLICATION_PAGE_EVENT = 98; - - public static final byte REPLICATION_LARGE_MESSAGE_BEGIN = 99; - - public static final byte REPLICATION_LARGE_MESSAGE_END = 100; - - public static final byte REPLICATION_LARGE_MESSAGE_WRITE = 101; - - public static final byte REPLICATION_COMPARE_DATA = 102; - - public static final byte REPLICATION_SYNC = 103; - - // Static -------------------------------------------------------- - - public PacketImpl(final byte type) - { - this.type = type; - } - - // Public -------------------------------------------------------- - - public byte getType() - { - return type; - } - - public long getChannelID() - { - return channelID; - } - - public void setChannelID(final long channelID) - { - this.channelID = channelID; - } - - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = connection.createBuffer(PacketImpl.INITIAL_PACKET_SIZE); - - // The standard header fields - - buffer.writeInt(0); // The length gets filled in at the end - buffer.writeByte(type); - buffer.writeLong(channelID); - - encodeRest(buffer); - - size = buffer.writerIndex(); - - // The length doesn't include the actual length byte - int len = size - DataConstants.SIZE_INT; - - buffer.setInt(0, len); - - return buffer; - } - - public void decode(final HornetQBuffer buffer) - { - channelID = buffer.readLong(); - - decodeRest(buffer); - - size = buffer.readerIndex(); - } - - public int getPacketSize() - { - if (size == -1) - { - throw new IllegalStateException("Packet hasn't been encoded/decoded yet"); - } - - return size; - } - - public boolean isResponse() - { - return false; - } - - public void encodeRest(final HornetQBuffer buffer) - { - } - - public void decodeRest(final HornetQBuffer buffer) - { - } - - public boolean isRequiresConfirmations() - { - return true; - } - - public boolean isAsyncExec() - { - return false; - } - - @Override - public String toString() - { - return getParentString() + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof PacketImpl == false) - { - return false; - } - - PacketImpl r = (PacketImpl)other; - - return r.type == type && r.channelID == channelID; - } - - // Package protected --------------------------------------------- - - protected String getParentString() - { - return "PACKET[type=" + type + ", channelID=" + channelID + "]"; - } - - // Protected ----------------------------------------------------- - - protected int stringEncodeSize(final String str) - { - return DataConstants.SIZE_INT + str.length() * 2; - } - - protected int nullableStringEncodeSize(final String str) - { - return DataConstants.SIZE_BOOLEAN + (str != null ? stringEncodeSize(str) : 0); - } - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/PacketImpl.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/PacketImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,310 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class PacketImpl implements Packet +{ + // Constants ------------------------------------------------------------------------- + + private static final Logger log = Logger.getLogger(PacketImpl.class); + + // The minimal size for all the packets, Common data for all the packets (look at PacketImpl.encode) + public static final int PACKET_HEADERS_SIZE = DataConstants.SIZE_INT + DataConstants.SIZE_BYTE + + DataConstants.SIZE_LONG; + + private static final int INITIAL_PACKET_SIZE = 1500; + + protected long channelID; + + protected final byte type; + + protected int size = -1; + + // The packet types + // ----------------------------------------------------------------------------------- + + public static final byte PING = 10; + + public static final byte DISCONNECT = 11; + + // Miscellaneous + public static final byte EXCEPTION = 20; + + public static final byte NULL_RESPONSE = 21; + + public static final byte PACKETS_CONFIRMED = 22; + + // Server + public static final byte CREATESESSION = 30; + + public static final byte CREATESESSION_RESP = 31; + + public static final byte REATTACH_SESSION = 32; + + public static final byte REATTACH_SESSION_RESP = 33; + + public static final byte CREATE_QUEUE = 34; + + public static final byte DELETE_QUEUE = 35; + + public static final byte CREATE_REPLICATION = 36; + + // Session + public static final byte SESS_CREATECONSUMER = 40; + + public static final byte SESS_ACKNOWLEDGE = 41; + + public static final byte SESS_EXPIRED = 42; + + public static final byte SESS_COMMIT = 43; + + public static final byte SESS_ROLLBACK = 44; + + public static final byte SESS_QUEUEQUERY = 45; + + public static final byte SESS_QUEUEQUERY_RESP = 46; + + public static final byte SESS_BINDINGQUERY = 49; + + public static final byte SESS_BINDINGQUERY_RESP = 50; + + public static final byte SESS_XA_START = 51; + + public static final byte SESS_XA_END = 52; + + public static final byte SESS_XA_COMMIT = 53; + + public static final byte SESS_XA_PREPARE = 54; + + public static final byte SESS_XA_RESP = 55; + + public static final byte SESS_XA_ROLLBACK = 56; + + public static final byte SESS_XA_JOIN = 57; + + public static final byte SESS_XA_SUSPEND = 58; + + public static final byte SESS_XA_RESUME = 59; + + public static final byte SESS_XA_FORGET = 60; + + public static final byte SESS_XA_INDOUBT_XIDS = 61; + + public static final byte SESS_XA_INDOUBT_XIDS_RESP = 62; + + public static final byte SESS_XA_SET_TIMEOUT = 63; + + public static final byte SESS_XA_SET_TIMEOUT_RESP = 64; + + public static final byte SESS_XA_GET_TIMEOUT = 65; + + public static final byte SESS_XA_GET_TIMEOUT_RESP = 66; + + public static final byte SESS_START = 67; + + public static final byte SESS_STOP = 68; + + public static final byte SESS_CLOSE = 69; + + public static final byte SESS_FLOWTOKEN = 70; + + public static final byte SESS_SEND = 71; + + public static final byte SESS_SEND_LARGE = 72; + + public static final byte SESS_SEND_CONTINUATION = 73; + + public static final byte SESS_CONSUMER_CLOSE = 74; + + public static final byte SESS_RECEIVE_MSG = 75; + + public static final byte SESS_RECEIVE_LARGE_MSG = 76; + + public static final byte SESS_RECEIVE_CONTINUATION = 77; + + public static final byte SESS_FORCE_CONSUMER_DELIVERY = 78; + + public static final byte SESS_PRODUCER_REQUEST_CREDITS = 79; + + public static final byte SESS_PRODUCER_CREDITS = 80; + + // Replication + + public static final byte REPLICATION_RESPONSE = 90; + + public static final byte REPLICATION_APPEND = 91; + + public static final byte REPLICATION_APPEND_TX = 92; + + public static final byte REPLICATION_DELETE = 93; + + public static final byte REPLICATION_DELETE_TX = 94; + + public static final byte REPLICATION_PREPARE = 95; + + public static final byte REPLICATION_COMMIT_ROLLBACK = 96; + + public static final byte REPLICATION_PAGE_WRITE = 97; + + public static final byte REPLICATION_PAGE_EVENT = 98; + + public static final byte REPLICATION_LARGE_MESSAGE_BEGIN = 99; + + public static final byte REPLICATION_LARGE_MESSAGE_END = 100; + + public static final byte REPLICATION_LARGE_MESSAGE_WRITE = 101; + + public static final byte REPLICATION_COMPARE_DATA = 102; + + public static final byte REPLICATION_SYNC = 103; + + // Static -------------------------------------------------------- + + public PacketImpl(final byte type) + { + this.type = type; + } + + // Public -------------------------------------------------------- + + public byte getType() + { + return type; + } + + public long getChannelID() + { + return channelID; + } + + public void setChannelID(final long channelID) + { + this.channelID = channelID; + } + + public HornetQBuffer encode(final RemotingConnection connection) + { + HornetQBuffer buffer = connection.createBuffer(PacketImpl.INITIAL_PACKET_SIZE); + + // The standard header fields + + buffer.writeInt(0); // The length gets filled in at the end + buffer.writeByte(type); + buffer.writeLong(channelID); + + encodeRest(buffer); + + size = buffer.writerIndex(); + + // The length doesn't include the actual length byte + int len = size - DataConstants.SIZE_INT; + + buffer.setInt(0, len); + + return buffer; + } + + public void decode(final HornetQBuffer buffer) + { + channelID = buffer.readLong(); + + decodeRest(buffer); + + size = buffer.readerIndex(); + } + + public int getPacketSize() + { + if (size == -1) + { + throw new IllegalStateException("Packet hasn't been encoded/decoded yet"); + } + + return size; + } + + public boolean isResponse() + { + return false; + } + + public void encodeRest(final HornetQBuffer buffer) + { + } + + public void decodeRest(final HornetQBuffer buffer) + { + } + + public boolean isRequiresConfirmations() + { + return true; + } + + public boolean isAsyncExec() + { + return false; + } + + @Override + public String toString() + { + return getParentString() + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof PacketImpl == false) + { + return false; + } + + PacketImpl r = (PacketImpl)other; + + return r.type == type && r.channelID == channelID; + } + + // Package protected --------------------------------------------- + + protected String getParentString() + { + return "PACKET[type=" + type + ", channelID=" + channelID + "]"; + } + + // Protected ----------------------------------------------------- + + protected int stringEncodeSize(final String str) + { + return DataConstants.SIZE_INT + str.length() * 2; + } + + protected int nullableStringEncodeSize(final String str) + { + return DataConstants.SIZE_BOOLEAN + (str != null ? stringEncodeSize(str) : 0); + } + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,509 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.Executor; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.impl.AbstractBufferHandler; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.SimpleIDGenerator; - -/** - * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @version <tt>$Revision$</tt> $Id$ - */ -public class RemotingConnectionImpl extends AbstractBufferHandler implements CoreRemotingConnection -{ - // Constants - // ------------------------------------------------------------------------------------ - - private static final Logger log = Logger.getLogger(RemotingConnectionImpl.class); - - // Static - // --------------------------------------------------------------------------------------- - - // Attributes - // ----------------------------------------------------------------------------------- - - private final Connection transportConnection; - - private final Map<Long, Channel> channels = new ConcurrentHashMap<Long, Channel>(); - - private final List<FailureListener> failureListeners = new CopyOnWriteArrayList<FailureListener>(); - - private final List<CloseListener> closeListeners = new CopyOnWriteArrayList<CloseListener>(); - - private final long blockingCallTimeout; - - private final List<Interceptor> interceptors; - - private volatile boolean destroyed; - - private final boolean client; - - // Channels 0-9 are reserved for the system - // 0 is for pinging - // 1 is for session creation and attachment - // 2 is for replication - private volatile SimpleIDGenerator idGenerator = new SimpleIDGenerator(10); - - private boolean idGeneratorSynced = false; - - private final Object transferLock = new Object(); - - private final Object failLock = new Object(); - - private final PacketDecoder decoder = new PacketDecoder(); - - private volatile boolean dataReceived; - - private final Executor executor; - - private volatile boolean executing; - - // Constructors - // --------------------------------------------------------------------------------- - - /* - * Create a client side connection - */ - public RemotingConnectionImpl(final Connection transportConnection, - final long blockingCallTimeout, - final List<Interceptor> interceptors) - { - this(transportConnection, blockingCallTimeout, interceptors, true, null); - } - - /* - * Create a server side connection - */ - public RemotingConnectionImpl(final Connection transportConnection, - final List<Interceptor> interceptors, - final Executor executor) - - { - this(transportConnection, -1, interceptors, false, executor); - } - - private RemotingConnectionImpl(final Connection transportConnection, - final long blockingCallTimeout, - final List<Interceptor> interceptors, - final boolean client, - final Executor executor) - - { - this.transportConnection = transportConnection; - - this.blockingCallTimeout = blockingCallTimeout; - - this.interceptors = interceptors; - - this.client = client; - - this.executor = executor; - } - - // RemotingConnection implementation - // ------------------------------------------------------------ - - public Connection getTransportConnection() - { - return transportConnection; - } - - public List<FailureListener> getFailureListeners() - { - return new ArrayList<FailureListener>(failureListeners); - } - - public void setFailureListeners(final List<FailureListener> listeners) - { - failureListeners.clear(); - - failureListeners.addAll(listeners); - } - - public Object getID() - { - return transportConnection.getID(); - } - - public String getRemoteAddress() - { - return transportConnection.getRemoteAddress(); - } - - public synchronized Channel getChannel(final long channelID, final int confWindowSize) - { - Channel channel = channels.get(channelID); - - if (channel == null) - { - channel = new ChannelImpl(this, channelID, confWindowSize); - - channels.put(channelID, channel); - } - - return channel; - } - - public synchronized boolean removeChannel(final long channelID) - { - return channels.remove(channelID) != null; - } - - public synchronized void putChannel(final long channelID, final Channel channel) - { - channels.put(channelID, channel); - } - - public void addFailureListener(final FailureListener listener) - { - if (listener == null) - { - throw new IllegalStateException("FailureListener cannot be null"); - } - - failureListeners.add(listener); - } - - public boolean removeFailureListener(final FailureListener listener) - { - if (listener == null) - { - throw new IllegalStateException("FailureListener cannot be null"); - } - - return failureListeners.remove(listener); - } - - public void addCloseListener(final CloseListener listener) - { - if (listener == null) - { - throw new IllegalStateException("CloseListener cannot be null"); - } - - closeListeners.add(listener); - } - - public boolean removeCloseListener(final CloseListener listener) - { - if (listener == null) - { - throw new IllegalStateException("CloseListener cannot be null"); - } - - return closeListeners.remove(listener); - } - - public HornetQBuffer createBuffer(final int size) - { - return transportConnection.createBuffer(size); - } - - /* - * This can be called concurrently by more than one thread so needs to be locked - */ - public void fail(final HornetQException me) - { - synchronized (failLock) - { - if (destroyed) - { - return; - } - - destroyed = true; - } - - RemotingConnectionImpl.log.warn("Connection failure has been detected: " + me.getMessage() + - " [code=" + - me.getCode() + - "]"); - - // Then call the listeners - callFailureListeners(me); - - callClosingListeners(); - - internalClose(); - - for (Channel channel : channels.values()) - { - channel.returnBlocking(); - } - } - - public void destroy() - { - synchronized (failLock) - { - if (destroyed) - { - return; - } - - destroyed = true; - } - - internalClose(); - - callClosingListeners(); - } - - public void disconnect() - { - Channel channel0 = getChannel(0, -1); - - // And we remove all channels from the connection, this ensures no more packets will be processed after this - // method is - // complete - - Set<Channel> allChannels = new HashSet<Channel>(channels.values()); - - removeAllChannels(); - - // Now we are 100% sure that no more packets will be processed we can flush then send the disconnect - - for (Channel channel: allChannels) - { - channel.flushConfirmations(); - } - - channel0.sendAndFlush(new PacketImpl(PacketImpl.DISCONNECT)); - } - - public long generateChannelID() - { - return idGenerator.generateID(); - } - - public synchronized void syncIDGeneratorSequence(final long id) - { - if (!idGeneratorSynced) - { - idGenerator = new SimpleIDGenerator(id); - - idGeneratorSynced = true; - } - } - - public long getIDGeneratorSequence() - { - return idGenerator.getCurrentID(); - } - - public Object getTransferLock() - { - return transferLock; - } - - public boolean isClient() - { - return client; - } - - public boolean isDestroyed() - { - return destroyed; - } - - public long getBlockingCallTimeout() - { - return blockingCallTimeout; - } - - public boolean checkDataReceived() - { - boolean res = dataReceived; - - dataReceived = false; - - return res; - } - - //We flush any confirmations on the connection - this prevents idle bridges for example - //sitting there with many unacked messages - public void flush() - { - synchronized (transferLock) - { - for (Channel channel : channels.values()) - { - channel.flushConfirmations(); - } - } - } - - // Buffer Handler implementation - // ---------------------------------------------------- - - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) - { - final Packet packet = decoder.decode(buffer); - - if (packet.isAsyncExec() && executor != null) - { - executing = true; - - executor.execute(new Runnable() - { - public void run() - { - try - { - doBufferReceived(packet); - } - catch (Throwable t) - { - RemotingConnectionImpl.log.error("Unexpected error", t); - } - - executing = false; - } - }); - } - else - { - //To prevent out of order execution if interleaving sync and async operations on same connection - while (executing) - { - Thread.yield(); - } - - // Pings must always be handled out of band so we can send pings back to the client quickly - // otherwise they would get in the queue with everything else which might give an intolerable delay - doBufferReceived(packet); - } - - dataReceived = true; - } - - private void doBufferReceived(final Packet packet) - { - if (interceptors != null) - { - for (final Interceptor interceptor : interceptors) - { - try - { - boolean callNext = interceptor.intercept(packet, this); - - if (!callNext) - { - return; - } - } - catch (final Throwable e) - { - RemotingConnectionImpl.log.warn("Failure in calling interceptor: " + interceptor, e); - } - } - } - - synchronized (transferLock) - { - final Channel channel = channels.get(packet.getChannelID()); - - if (channel != null) - { - channel.handlePacket(packet); - } - } - } - - // Package protected - // ---------------------------------------------------------------------------- - - // Protected - // ------------------------------------------------------------------------------------ - - // Private - // -------------------------------------------------------------------------------------- - - private void removeAllChannels() - { - // We get the transfer lock first - this ensures no packets are being processed AND - // it's guaranteed no more packets will be processed once this method is complete - synchronized (transferLock) - { - channels.clear(); - } - } - private void callFailureListeners(final HornetQException me) - { - final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners); - - for (final FailureListener listener : listenersClone) - { - try - { - listener.connectionFailed(me); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - RemotingConnectionImpl.log.error("Failed to execute failure listener", t); - } - } - } - - private void callClosingListeners() - { - final List<CloseListener> listenersClone = new ArrayList<CloseListener>(closeListeners); - - for (final CloseListener listener : listenersClone) - { - try - { - listener.connectionClosed(); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - RemotingConnectionImpl.log.error("Failed to execute failure listener", t); - } - } - } - - private void internalClose() - { - // We close the underlying transport connection - transportConnection.close(); - - for (Channel channel : channels.values()) - { - channel.close(); - } - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,509 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Executor; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.CloseListener; +import org.hornetq.core.remoting.FailureListener; +import org.hornetq.spi.core.remoting.BufferHandler; +import org.hornetq.spi.core.remoting.Connection; +import org.hornetq.utils.SimpleIDGenerator; + +/** + * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @version <tt>$Revision$</tt> $Id$ + */ +public class RemotingConnectionImpl implements CoreRemotingConnection, BufferHandler +{ + // Constants + // ------------------------------------------------------------------------------------ + + private static final Logger log = Logger.getLogger(RemotingConnectionImpl.class); + + // Static + // --------------------------------------------------------------------------------------- + + // Attributes + // ----------------------------------------------------------------------------------- + + private final Connection transportConnection; + + private final Map<Long, Channel> channels = new ConcurrentHashMap<Long, Channel>(); + + private final List<FailureListener> failureListeners = new CopyOnWriteArrayList<FailureListener>(); + + private final List<CloseListener> closeListeners = new CopyOnWriteArrayList<CloseListener>(); + + private final long blockingCallTimeout; + + private final List<Interceptor> interceptors; + + private volatile boolean destroyed; + + private final boolean client; + + // Channels 0-9 are reserved for the system + // 0 is for pinging + // 1 is for session creation and attachment + // 2 is for replication + private volatile SimpleIDGenerator idGenerator = new SimpleIDGenerator(10); + + private boolean idGeneratorSynced = false; + + private final Object transferLock = new Object(); + + private final Object failLock = new Object(); + + private volatile boolean dataReceived; + + private final Executor executor; + + private volatile boolean executing; + + private final PacketDecoder decoder = new PacketDecoder(); + + // Constructors + // --------------------------------------------------------------------------------- + + /* + * Create a client side connection + */ + public RemotingConnectionImpl(final Connection transportConnection, + final long blockingCallTimeout, + final List<Interceptor> interceptors) + { + this(transportConnection, blockingCallTimeout, interceptors, true, null); + } + + /* + * Create a server side connection + */ + public RemotingConnectionImpl(final Connection transportConnection, + final List<Interceptor> interceptors, + final Executor executor) + + { + this(transportConnection, -1, interceptors, false, executor); + } + + private RemotingConnectionImpl(final Connection transportConnection, + final long blockingCallTimeout, + final List<Interceptor> interceptors, + final boolean client, + final Executor executor) + + { + this.transportConnection = transportConnection; + + this.blockingCallTimeout = blockingCallTimeout; + + this.interceptors = interceptors; + + this.client = client; + + this.executor = executor; + } + + // RemotingConnection implementation + // ------------------------------------------------------------ + + public Connection getTransportConnection() + { + return transportConnection; + } + + public List<FailureListener> getFailureListeners() + { + return new ArrayList<FailureListener>(failureListeners); + } + + public void setFailureListeners(final List<FailureListener> listeners) + { + failureListeners.clear(); + + failureListeners.addAll(listeners); + } + + public Object getID() + { + return transportConnection.getID(); + } + + public String getRemoteAddress() + { + return transportConnection.getRemoteAddress(); + } + + public synchronized Channel getChannel(final long channelID, final int confWindowSize) + { + Channel channel = channels.get(channelID); + + if (channel == null) + { + channel = new ChannelImpl(this, channelID, confWindowSize); + + channels.put(channelID, channel); + } + + return channel; + } + + public synchronized boolean removeChannel(final long channelID) + { + return channels.remove(channelID) != null; + } + + public synchronized void putChannel(final long channelID, final Channel channel) + { + channels.put(channelID, channel); + } + + public void addFailureListener(final FailureListener listener) + { + if (listener == null) + { + throw new IllegalStateException("FailureListener cannot be null"); + } + + failureListeners.add(listener); + } + + public boolean removeFailureListener(final FailureListener listener) + { + if (listener == null) + { + throw new IllegalStateException("FailureListener cannot be null"); + } + + return failureListeners.remove(listener); + } + + public void addCloseListener(final CloseListener listener) + { + if (listener == null) + { + throw new IllegalStateException("CloseListener cannot be null"); + } + + closeListeners.add(listener); + } + + public boolean removeCloseListener(final CloseListener listener) + { + if (listener == null) + { + throw new IllegalStateException("CloseListener cannot be null"); + } + + return closeListeners.remove(listener); + } + + public HornetQBuffer createBuffer(final int size) + { + return transportConnection.createBuffer(size); + } + + /* + * This can be called concurrently by more than one thread so needs to be locked + */ + public void fail(final HornetQException me) + { + synchronized (failLock) + { + if (destroyed) + { + return; + } + + destroyed = true; + } + + RemotingConnectionImpl.log.warn("Connection failure has been detected: " + me.getMessage() + + " [code=" + + me.getCode() + + "]"); + + // Then call the listeners + callFailureListeners(me); + + callClosingListeners(); + + internalClose(); + + for (Channel channel : channels.values()) + { + channel.returnBlocking(); + } + } + + public void destroy() + { + synchronized (failLock) + { + if (destroyed) + { + return; + } + + destroyed = true; + } + + internalClose(); + + callClosingListeners(); + } + + public void disconnect() + { + Channel channel0 = getChannel(0, -1); + + // And we remove all channels from the connection, this ensures no more packets will be processed after this + // method is + // complete + + Set<Channel> allChannels = new HashSet<Channel>(channels.values()); + + removeAllChannels(); + + // Now we are 100% sure that no more packets will be processed we can flush then send the disconnect + + for (Channel channel: allChannels) + { + channel.flushConfirmations(); + } + + channel0.sendAndFlush(new PacketImpl(PacketImpl.DISCONNECT)); + } + + public long generateChannelID() + { + return idGenerator.generateID(); + } + + public synchronized void syncIDGeneratorSequence(final long id) + { + if (!idGeneratorSynced) + { + idGenerator = new SimpleIDGenerator(id); + + idGeneratorSynced = true; + } + } + + public long getIDGeneratorSequence() + { + return idGenerator.getCurrentID(); + } + + public Object getTransferLock() + { + return transferLock; + } + + public boolean isClient() + { + return client; + } + + public boolean isDestroyed() + { + return destroyed; + } + + public long getBlockingCallTimeout() + { + return blockingCallTimeout; + } + + public boolean checkDataReceived() + { + boolean res = dataReceived; + + dataReceived = false; + + return res; + } + + //We flush any confirmations on the connection - this prevents idle bridges for example + //sitting there with many unacked messages + public void flush() + { + synchronized (transferLock) + { + for (Channel channel : channels.values()) + { + channel.flushConfirmations(); + } + } + } + + // Buffer Handler implementation + // ---------------------------------------------------- + + public void bufferReceived(Object connectionID, HornetQBuffer buffer) + { + final Packet packet = decoder.decode(buffer); + + if (packet.isAsyncExec() && executor != null) + { + executing = true; + + executor.execute(new Runnable() + { + public void run() + { + try + { + doBufferReceived(packet); + } + catch (Throwable t) + { + RemotingConnectionImpl.log.error("Unexpected error", t); + } + + executing = false; + } + }); + } + else + { + //To prevent out of order execution if interleaving sync and async operations on same connection + while (executing) + { + Thread.yield(); + } + + // Pings must always be handled out of band so we can send pings back to the client quickly + // otherwise they would get in the queue with everything else which might give an intolerable delay + doBufferReceived(packet); + } + + dataReceived = true; + } + + private void doBufferReceived(final Packet packet) + { + if (interceptors != null) + { + for (final Interceptor interceptor : interceptors) + { + try + { + boolean callNext = interceptor.intercept(packet, this); + + if (!callNext) + { + return; + } + } + catch (final Throwable e) + { + RemotingConnectionImpl.log.warn("Failure in calling interceptor: " + interceptor, e); + } + } + } + + synchronized (transferLock) + { + final Channel channel = channels.get(packet.getChannelID()); + + if (channel != null) + { + channel.handlePacket(packet); + } + } + } + + // Package protected + // ---------------------------------------------------------------------------- + + // Protected + // ------------------------------------------------------------------------------------ + + // Private + // -------------------------------------------------------------------------------------- + + private void removeAllChannels() + { + // We get the transfer lock first - this ensures no packets are being processed AND + // it's guaranteed no more packets will be processed once this method is complete + synchronized (transferLock) + { + channels.clear(); + } + } + private void callFailureListeners(final HornetQException me) + { + final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners); + + for (final FailureListener listener : listenersClone) + { + try + { + listener.connectionFailed(me); + } + catch (final Throwable t) + { + // Failure of one listener to execute shouldn't prevent others + // from + // executing + RemotingConnectionImpl.log.error("Failed to execute failure listener", t); + } + } + } + + private void callClosingListeners() + { + final List<CloseListener> listenersClone = new ArrayList<CloseListener>(closeListeners); + + for (final CloseListener listener : listenersClone) + { + try + { + listener.connectionClosed(); + } + catch (final Throwable t) + { + // Failure of one listener to execute shouldn't prevent others + // from + // executing + RemotingConnectionImpl.log.error("Failed to execute failure listener", t); + } + } + } + + private void internalClose() + { + // We close the underlying transport connection + transportConnection.close(); + + for (Channel channel : channels.values()) + { + channel.close(); + } + } +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,648 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core; - -import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.protocol.core.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_START; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_STOP; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_END; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_START; -import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SUSPEND; - -import java.util.List; - -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.exception.HornetQXAException; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; -import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; -import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; -import org.hornetq.core.protocol.core.wireformat.RollbackMessage; -import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; -import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; -import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.server.BindingQueryResult; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.SessionCallback; - -/** - * A ServerSessionPacketHandler - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a> - * @author <a href="mailto:clebert.suconic@jboss.org>Clebert Suconic</a> - */ -public class ServerSessionPacketHandler implements ChannelHandler, CloseListener, FailureListener, SessionCallback -{ - private static final Logger log = Logger.getLogger(ServerSessionPacketHandler.class); - - private final CoreProtocolManager protocolManager; - - private final ServerSession session; - - private final OperationContext sessionContext; - - // Storagemanager here is used to set the Context - private final StorageManager storageManager; - - private final Channel channel; - - private volatile CoreRemotingConnection remotingConnection; - - public ServerSessionPacketHandler(final CoreProtocolManager protocolManager, - final ServerSession session, - final OperationContext sessionContext, - final StorageManager storageManager, - final Channel channel) - { - this.protocolManager = protocolManager; - - this.session = session; - - this.storageManager = storageManager; - - this.sessionContext = sessionContext; - - this.channel = channel; - - this.remotingConnection = channel.getConnection(); - - addConnectionListeners(); - } - - public long getID() - { - return channel.getID(); - } - - public void connectionFailed(final HornetQException exception) - { - log.warn("Client connection failed, clearing up resources for session " + session.getName()); - - session.runConnectionFailureRunners(); - - try - { - session.close(); - } - catch (Exception e) - { - log.error("Failed to close session", e); - } - - log.warn("Cleared up resources for session " + session.getName()); - } - - public void close() - { - channel.flushConfirmations(); - - try - { - session.close(); - } - catch (Exception e) - { - log.error("Failed to close session", e); - } - } - - public void connectionClosed() - { - session.runConnectionFailureRunners(); - } - - private void addConnectionListeners() - { - remotingConnection.addFailureListener(this); - remotingConnection.addCloseListener(this); - } - - private void removeConnectionListeners() - { - remotingConnection.removeFailureListener(this); - remotingConnection.removeCloseListener(this); - } - - public Channel getChannel() - { - return channel; - } - - public void handlePacket(final Packet packet) - { - byte type = packet.getType(); - - storageManager.setContext(sessionContext); - - Packet response = null; - boolean flush = false; - boolean closeChannel = false; - boolean requiresResponse = false; - - try - { - try - { - switch (type) - { - case SESS_CREATECONSUMER: - { - SessionCreateConsumerMessage request = (SessionCreateConsumerMessage)packet; - requiresResponse = request.isRequiresResponse(); - session.createConsumer(request.getID(), - request.getQueueName(), - request.getFilterString(), - request.isBrowseOnly()); - if (requiresResponse) - { - // We send back queue information on the queue as a response- this allows the queue to - // be automaticall recreated on failover - response = new SessionQueueQueryResponseMessage(session.executeQueueQuery(request.getQueueName())); - } - - break; - } - case CREATE_QUEUE: - { - CreateQueueMessage request = (CreateQueueMessage)packet; - requiresResponse = request.isRequiresResponse(); - session.createQueue(request.getAddress(), - request.getQueueName(), - request.getFilterString(), - request.isTemporary(), - request.isDurable()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case DELETE_QUEUE: - { - requiresResponse = true; - SessionDeleteQueueMessage request = (SessionDeleteQueueMessage)packet; - session.deleteQueue(request.getQueueName()); - response = new NullResponseMessage(); - break; - } - case SESS_QUEUEQUERY: - { - requiresResponse = true; - SessionQueueQueryMessage request = (SessionQueueQueryMessage)packet; - QueueQueryResult result = session.executeQueueQuery(request.getQueueName()); - response = new SessionQueueQueryResponseMessage(result); - break; - } - case SESS_BINDINGQUERY: - { - requiresResponse = true; - SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet; - BindingQueryResult result = session.executeBindingQuery(request.getAddress()); - response = new SessionBindingQueryResponseMessage(result.isExists(), result.getQueueNames()); - break; - } - case SESS_ACKNOWLEDGE: - { - SessionAcknowledgeMessage message = (SessionAcknowledgeMessage)packet; - requiresResponse = message.isRequiresResponse(); - session.acknowledge(message.getConsumerID(), message.getMessageID()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case SESS_EXPIRED: - { - SessionExpiredMessage message = (SessionExpiredMessage)packet; - session.expire(message.getConsumerID(), message.getMessageID()); - break; - } - case SESS_COMMIT: - { - requiresResponse = true; - session.commit(); - response = new NullResponseMessage(); - break; - } - case SESS_ROLLBACK: - { - requiresResponse = true; - session.rollback(((RollbackMessage)packet).isConsiderLastMessageAsDelivered()); - response = new NullResponseMessage(); - break; - } - case SESS_XA_COMMIT: - { - requiresResponse = true; - SessionXACommitMessage message = (SessionXACommitMessage)packet; - session.xaCommit(message.getXid(), message.isOnePhase()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_END: - { - requiresResponse = true; - SessionXAEndMessage message = (SessionXAEndMessage)packet; - session.xaEnd(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_FORGET: - { - requiresResponse = true; - SessionXAForgetMessage message = (SessionXAForgetMessage)packet; - session.xaForget(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_JOIN: - { - requiresResponse = true; - SessionXAJoinMessage message = (SessionXAJoinMessage)packet; - session.xaJoin(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_RESUME: - { - requiresResponse = true; - SessionXAResumeMessage message = (SessionXAResumeMessage)packet; - session.xaResume(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_ROLLBACK: - { - requiresResponse = true; - SessionXARollbackMessage message = (SessionXARollbackMessage)packet; - session.xaRollback(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_START: - { - requiresResponse = true; - SessionXAStartMessage message = (SessionXAStartMessage)packet; - session.xaStart(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_SUSPEND: - { - requiresResponse = true; - session.xaSuspend(); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_PREPARE: - { - requiresResponse = true; - SessionXAPrepareMessage message = (SessionXAPrepareMessage)packet; - session.xaPrepare(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - requiresResponse = true; - List<Xid> xids = session.xaGetInDoubtXids(); - response = new SessionXAGetInDoubtXidsResponseMessage(xids); - break; - } - case SESS_XA_GET_TIMEOUT: - { - requiresResponse = true; - int timeout = session.xaGetTimeout(); - response = new SessionXAGetTimeoutResponseMessage(timeout); - break; - } - case SESS_XA_SET_TIMEOUT: - { - requiresResponse = true; - SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage)packet; - session.xaSetTimeout(message.getTimeoutSeconds()); - response = new SessionXASetTimeoutResponseMessage(true); - break; - } - case SESS_START: - { - session.start(); - break; - } - case SESS_STOP: - { - requiresResponse = true; - session.stop(); - response = new NullResponseMessage(); - break; - } - case SESS_CLOSE: - { - requiresResponse = true; - session.close(); - removeConnectionListeners(); - response = new NullResponseMessage(); - flush = true; - closeChannel = true; - break; - } - case SESS_CONSUMER_CLOSE: - { - requiresResponse = true; - SessionConsumerCloseMessage message = (SessionConsumerCloseMessage)packet; - session.closeConsumer(message.getConsumerID()); - response = new NullResponseMessage(); - break; - } - case SESS_FLOWTOKEN: - { - SessionConsumerFlowCreditMessage message = (SessionConsumerFlowCreditMessage)packet; - session.receiveConsumerCredits(message.getConsumerID(), message.getCredits()); - break; - } - case SESS_SEND: - { - SessionSendMessage message = (SessionSendMessage)packet; - requiresResponse = message.isRequiresResponse(); - session.send((ServerMessage)message.getMessage()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case SESS_SEND_LARGE: - { - SessionSendLargeMessage message = (SessionSendLargeMessage)packet; - session.sendLarge(message.getLargeMessageHeader()); - break; - } - case SESS_SEND_CONTINUATION: - { - SessionSendContinuationMessage message = (SessionSendContinuationMessage)packet; - requiresResponse = message.isRequiresResponse(); - session.sendContinuations(message.getPacketSize(), message.getBody(), message.isContinues()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - SessionForceConsumerDelivery message = (SessionForceConsumerDelivery)packet; - session.forceConsumerDelivery(message.getConsumerID(), message.getSequence()); - break; - } - case PacketImpl.SESS_PRODUCER_REQUEST_CREDITS: - { - SessionRequestProducerCreditsMessage message = (SessionRequestProducerCreditsMessage)packet; - session.requestProducerCredits(message.getAddress(), message.getCredits()); - break; - } - } - } - catch (HornetQXAException e) - { - if (requiresResponse) - { - response = new SessionXAResponseMessage(true, e.errorCode, e.getMessage()); - } - else - { - log.error("Caught XA exception", e); - } - } - catch (HornetQException e) - { - if (requiresResponse) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - log.error("Caught exception", e); - } - } - catch (Throwable t) - { - log.error("Caught unexpected exception", t); - } - - sendResponse(packet, response, flush, closeChannel); - } - finally - { - storageManager.completeOperations(); - storageManager.clearContext(); - } - } - - private void sendResponse(final Packet confirmPacket, - final Packet response, - final boolean flush, - final boolean closeChannel) - { - storageManager.afterCompleteOperations(new IOAsyncTask() - { - public void onError(final int errorCode, final String errorMessage) - { - log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage); - - HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage(new HornetQException(errorCode, - errorMessage)); - - doConfirmAndResponse(confirmPacket, exceptionMessage, flush, closeChannel); - } - - public void done() - { - doConfirmAndResponse(confirmPacket, response, flush, closeChannel); - } - }); - } - - private void doConfirmAndResponse(final Packet confirmPacket, - final Packet response, - final boolean flush, - final boolean closeChannel) - { - if (confirmPacket != null) - { - channel.confirm(confirmPacket); - - if (flush) - { - channel.flushConfirmations(); - } - } - - if (response != null) - { - channel.send(response); - } - - if (closeChannel) - { - channel.close(); - } - } - - public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) - { - Packet packet = new SessionReceiveLargeMessage(consumerID, headerBuffer, bodySize, deliveryCount); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) - { - Packet packet = new SessionReceiveContinuationMessage(consumerID, body, continues, requiresResponse); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public int sendMessage(ServerMessage message, long consumerID, int deliveryCount) - { - Packet packet = new SessionReceiveMessage(consumerID, message, deliveryCount); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) - { - Packet packet = new SessionProducerCreditsMessage(credits, address, offset); - - channel.send(packet); - } - - public void closed() - { - protocolManager.removeHandler(session.getName()); - } - - public int transferConnection(final CoreRemotingConnection newConnection, final int lastReceivedCommandID) - { - // We need to disable delivery on all the consumers while the transfer is occurring- otherwise packets might get - // delivered - // after the channel has transferred but *before* packets have been replayed - this will give the client the wrong - // sequence of packets. - // It is not sufficient to just stop the session, since right after stopping the session, another session start - // might be executed - // before we have transferred the connection, leaving it in a started state - session.setTransferring(true); - - remotingConnection.removeFailureListener(this); - remotingConnection.removeCloseListener(this); - - // Note. We do not destroy the replicating connection here. In the case the live server has really crashed - // then the connection will get cleaned up anyway when the server ping timeout kicks in. - // In the case the live server is really still up, i.e. a split brain situation (or in tests), then closing - // the replicating connection will cause the outstanding responses to be be replayed on the live server, - // if these reach the client who then subsequently fails over, on reconnection to backup, it will have - // received responses that the backup did not know about. - - channel.transferConnection(newConnection); - - newConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); - - remotingConnection = newConnection; - - remotingConnection.addFailureListener(this); - remotingConnection.addCloseListener(this); - - int serverLastReceivedCommandID = channel.getLastConfirmedCommandID(); - - channel.replayCommands(lastReceivedCommandID); - - channel.setTransferring(false); - - session.setTransferring(false); - - return serverLastReceivedCommandID; - } -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,648 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.DELETE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ACKNOWLEDGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CREATECONSUMER; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_EXPIRED; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FLOWTOKEN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_LARGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_STOP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_END; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_FORGET; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_JOIN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_PREPARE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESUME; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SUSPEND; + +import java.util.List; + +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.exception.HornetQXAException; +import org.hornetq.core.journal.IOAsyncTask; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.persistence.OperationContext; +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.RollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; +import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; +import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; +import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; +import org.hornetq.core.remoting.CloseListener; +import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.server.BindingQueryResult; +import org.hornetq.core.server.QueueQueryResult; +import org.hornetq.core.server.ServerMessage; +import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.SessionCallback; + +/** + * A ServerSessionPacketHandler + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a> + * @author <a href="mailto:clebert.suconic@jboss.org>Clebert Suconic</a> + */ +public class ServerSessionPacketHandler implements ChannelHandler, CloseListener, FailureListener, SessionCallback +{ + private static final Logger log = Logger.getLogger(ServerSessionPacketHandler.class); + + private final CoreProtocolManager protocolManager; + + private final ServerSession session; + + private final OperationContext sessionContext; + + // Storagemanager here is used to set the Context + private final StorageManager storageManager; + + private final Channel channel; + + private volatile CoreRemotingConnection remotingConnection; + + public ServerSessionPacketHandler(final CoreProtocolManager protocolManager, + final ServerSession session, + final OperationContext sessionContext, + final StorageManager storageManager, + final Channel channel) + { + this.protocolManager = protocolManager; + + this.session = session; + + this.storageManager = storageManager; + + this.sessionContext = sessionContext; + + this.channel = channel; + + this.remotingConnection = channel.getConnection(); + + addConnectionListeners(); + } + + public long getID() + { + return channel.getID(); + } + + public void connectionFailed(final HornetQException exception) + { + log.warn("Client connection failed, clearing up resources for session " + session.getName()); + + session.runConnectionFailureRunners(); + + try + { + session.close(); + } + catch (Exception e) + { + log.error("Failed to close session", e); + } + + log.warn("Cleared up resources for session " + session.getName()); + } + + public void close() + { + channel.flushConfirmations(); + + try + { + session.close(); + } + catch (Exception e) + { + log.error("Failed to close session", e); + } + } + + public void connectionClosed() + { + session.runConnectionFailureRunners(); + } + + private void addConnectionListeners() + { + remotingConnection.addFailureListener(this); + remotingConnection.addCloseListener(this); + } + + private void removeConnectionListeners() + { + remotingConnection.removeFailureListener(this); + remotingConnection.removeCloseListener(this); + } + + public Channel getChannel() + { + return channel; + } + + public void handlePacket(final Packet packet) + { + byte type = packet.getType(); + + storageManager.setContext(sessionContext); + + Packet response = null; + boolean flush = false; + boolean closeChannel = false; + boolean requiresResponse = false; + + try + { + try + { + switch (type) + { + case SESS_CREATECONSUMER: + { + SessionCreateConsumerMessage request = (SessionCreateConsumerMessage)packet; + requiresResponse = request.isRequiresResponse(); + session.createConsumer(request.getID(), + request.getQueueName(), + request.getFilterString(), + request.isBrowseOnly()); + if (requiresResponse) + { + // We send back queue information on the queue as a response- this allows the queue to + // be automaticall recreated on failover + response = new SessionQueueQueryResponseMessage(session.executeQueueQuery(request.getQueueName())); + } + + break; + } + case CREATE_QUEUE: + { + CreateQueueMessage request = (CreateQueueMessage)packet; + requiresResponse = request.isRequiresResponse(); + session.createQueue(request.getAddress(), + request.getQueueName(), + request.getFilterString(), + request.isTemporary(), + request.isDurable()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case DELETE_QUEUE: + { + requiresResponse = true; + SessionDeleteQueueMessage request = (SessionDeleteQueueMessage)packet; + session.deleteQueue(request.getQueueName()); + response = new NullResponseMessage(); + break; + } + case SESS_QUEUEQUERY: + { + requiresResponse = true; + SessionQueueQueryMessage request = (SessionQueueQueryMessage)packet; + QueueQueryResult result = session.executeQueueQuery(request.getQueueName()); + response = new SessionQueueQueryResponseMessage(result); + break; + } + case SESS_BINDINGQUERY: + { + requiresResponse = true; + SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet; + BindingQueryResult result = session.executeBindingQuery(request.getAddress()); + response = new SessionBindingQueryResponseMessage(result.isExists(), result.getQueueNames()); + break; + } + case SESS_ACKNOWLEDGE: + { + SessionAcknowledgeMessage message = (SessionAcknowledgeMessage)packet; + requiresResponse = message.isRequiresResponse(); + session.acknowledge(message.getConsumerID(), message.getMessageID()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case SESS_EXPIRED: + { + SessionExpiredMessage message = (SessionExpiredMessage)packet; + session.expire(message.getConsumerID(), message.getMessageID()); + break; + } + case SESS_COMMIT: + { + requiresResponse = true; + session.commit(); + response = new NullResponseMessage(); + break; + } + case SESS_ROLLBACK: + { + requiresResponse = true; + session.rollback(((RollbackMessage)packet).isConsiderLastMessageAsDelivered()); + response = new NullResponseMessage(); + break; + } + case SESS_XA_COMMIT: + { + requiresResponse = true; + SessionXACommitMessage message = (SessionXACommitMessage)packet; + session.xaCommit(message.getXid(), message.isOnePhase()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_END: + { + requiresResponse = true; + SessionXAEndMessage message = (SessionXAEndMessage)packet; + session.xaEnd(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_FORGET: + { + requiresResponse = true; + SessionXAForgetMessage message = (SessionXAForgetMessage)packet; + session.xaForget(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_JOIN: + { + requiresResponse = true; + SessionXAJoinMessage message = (SessionXAJoinMessage)packet; + session.xaJoin(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_RESUME: + { + requiresResponse = true; + SessionXAResumeMessage message = (SessionXAResumeMessage)packet; + session.xaResume(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_ROLLBACK: + { + requiresResponse = true; + SessionXARollbackMessage message = (SessionXARollbackMessage)packet; + session.xaRollback(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_START: + { + requiresResponse = true; + SessionXAStartMessage message = (SessionXAStartMessage)packet; + session.xaStart(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_SUSPEND: + { + requiresResponse = true; + session.xaSuspend(); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_PREPARE: + { + requiresResponse = true; + SessionXAPrepareMessage message = (SessionXAPrepareMessage)packet; + session.xaPrepare(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_INDOUBT_XIDS: + { + requiresResponse = true; + List<Xid> xids = session.xaGetInDoubtXids(); + response = new SessionXAGetInDoubtXidsResponseMessage(xids); + break; + } + case SESS_XA_GET_TIMEOUT: + { + requiresResponse = true; + int timeout = session.xaGetTimeout(); + response = new SessionXAGetTimeoutResponseMessage(timeout); + break; + } + case SESS_XA_SET_TIMEOUT: + { + requiresResponse = true; + SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage)packet; + session.xaSetTimeout(message.getTimeoutSeconds()); + response = new SessionXASetTimeoutResponseMessage(true); + break; + } + case SESS_START: + { + session.start(); + break; + } + case SESS_STOP: + { + requiresResponse = true; + session.stop(); + response = new NullResponseMessage(); + break; + } + case SESS_CLOSE: + { + requiresResponse = true; + session.close(); + removeConnectionListeners(); + response = new NullResponseMessage(); + flush = true; + closeChannel = true; + break; + } + case SESS_CONSUMER_CLOSE: + { + requiresResponse = true; + SessionConsumerCloseMessage message = (SessionConsumerCloseMessage)packet; + session.closeConsumer(message.getConsumerID()); + response = new NullResponseMessage(); + break; + } + case SESS_FLOWTOKEN: + { + SessionConsumerFlowCreditMessage message = (SessionConsumerFlowCreditMessage)packet; + session.receiveConsumerCredits(message.getConsumerID(), message.getCredits()); + break; + } + case SESS_SEND: + { + SessionSendMessage message = (SessionSendMessage)packet; + requiresResponse = message.isRequiresResponse(); + session.send((ServerMessage)message.getMessage()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case SESS_SEND_LARGE: + { + SessionSendLargeMessage message = (SessionSendLargeMessage)packet; + session.sendLarge(message.getLargeMessageHeader()); + break; + } + case SESS_SEND_CONTINUATION: + { + SessionSendContinuationMessage message = (SessionSendContinuationMessage)packet; + requiresResponse = message.isRequiresResponse(); + session.sendContinuations(message.getPacketSize(), message.getBody(), message.isContinues()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case SESS_FORCE_CONSUMER_DELIVERY: + { + SessionForceConsumerDelivery message = (SessionForceConsumerDelivery)packet; + session.forceConsumerDelivery(message.getConsumerID(), message.getSequence()); + break; + } + case PacketImpl.SESS_PRODUCER_REQUEST_CREDITS: + { + SessionRequestProducerCreditsMessage message = (SessionRequestProducerCreditsMessage)packet; + session.requestProducerCredits(message.getAddress(), message.getCredits()); + break; + } + } + } + catch (HornetQXAException e) + { + if (requiresResponse) + { + response = new SessionXAResponseMessage(true, e.errorCode, e.getMessage()); + } + else + { + log.error("Caught XA exception", e); + } + } + catch (HornetQException e) + { + if (requiresResponse) + { + response = new HornetQExceptionMessage((HornetQException)e); + } + else + { + log.error("Caught exception", e); + } + } + catch (Throwable t) + { + log.error("Caught unexpected exception", t); + } + + sendResponse(packet, response, flush, closeChannel); + } + finally + { + storageManager.completeOperations(); + storageManager.clearContext(); + } + } + + private void sendResponse(final Packet confirmPacket, + final Packet response, + final boolean flush, + final boolean closeChannel) + { + storageManager.afterCompleteOperations(new IOAsyncTask() + { + public void onError(final int errorCode, final String errorMessage) + { + log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage); + + HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage(new HornetQException(errorCode, + errorMessage)); + + doConfirmAndResponse(confirmPacket, exceptionMessage, flush, closeChannel); + } + + public void done() + { + doConfirmAndResponse(confirmPacket, response, flush, closeChannel); + } + }); + } + + private void doConfirmAndResponse(final Packet confirmPacket, + final Packet response, + final boolean flush, + final boolean closeChannel) + { + if (confirmPacket != null) + { + channel.confirm(confirmPacket); + + if (flush) + { + channel.flushConfirmations(); + } + } + + if (response != null) + { + channel.send(response); + } + + if (closeChannel) + { + channel.close(); + } + } + + public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) + { + Packet packet = new SessionReceiveLargeMessage(consumerID, headerBuffer, bodySize, deliveryCount); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) + { + Packet packet = new SessionReceiveContinuationMessage(consumerID, body, continues, requiresResponse); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public int sendMessage(ServerMessage message, long consumerID, int deliveryCount) + { + Packet packet = new SessionReceiveMessage(consumerID, message, deliveryCount); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) + { + Packet packet = new SessionProducerCreditsMessage(credits, address, offset); + + channel.send(packet); + } + + public void closed() + { + protocolManager.removeHandler(session.getName()); + } + + public int transferConnection(final CoreRemotingConnection newConnection, final int lastReceivedCommandID) + { + // We need to disable delivery on all the consumers while the transfer is occurring- otherwise packets might get + // delivered + // after the channel has transferred but *before* packets have been replayed - this will give the client the wrong + // sequence of packets. + // It is not sufficient to just stop the session, since right after stopping the session, another session start + // might be executed + // before we have transferred the connection, leaving it in a started state + session.setTransferring(true); + + remotingConnection.removeFailureListener(this); + remotingConnection.removeCloseListener(this); + + // Note. We do not destroy the replicating connection here. In the case the live server has really crashed + // then the connection will get cleaned up anyway when the server ping timeout kicks in. + // In the case the live server is really still up, i.e. a split brain situation (or in tests), then closing + // the replicating connection will cause the outstanding responses to be be replayed on the live server, + // if these reach the client who then subsequently fails over, on reconnection to backup, it will have + // received responses that the backup did not know about. + + channel.transferConnection(newConnection); + + newConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); + + remotingConnection = newConnection; + + remotingConnection.addFailureListener(this); + remotingConnection.addCloseListener(this); + + int serverLastReceivedCommandID = channel.getLastConfirmedCommandID(); + + channel.replayCommands(lastReceivedCommandID); + + channel.setTransferring(false); + + session.setTransferring(false); + + return serverLastReceivedCommandID; + } +} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat) Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,163 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - - * @version <tt>$Revision$</tt> - */ -public class CreateQueueMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(CreateQueueMessage.class); - - // Attributes ---------------------------------------------------- - - private SimpleString address; - - private SimpleString queueName; - - private SimpleString filterString; - - private boolean durable; - - private boolean temporary; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateQueueMessage(final SimpleString address, - final SimpleString queueName, - final SimpleString filterString, - final boolean durable, - final boolean temporary, - final boolean requiresResponse) - { - super(PacketImpl.CREATE_QUEUE); - - this.address = address; - this.queueName = queueName; - this.filterString = filterString; - this.durable = durable; - this.temporary = temporary; - this.requiresResponse = requiresResponse; - } - - public CreateQueueMessage() - { - super(PacketImpl.CREATE_QUEUE); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", address=" + address); - buff.append(", queueName=" + queueName); - buff.append(", filterString=" + filterString); - buff.append(", durable=" + durable); - buff.append(", temporary=" + temporary); - buff.append("]"); - return buff.toString(); - } - - public SimpleString getAddress() - { - return address; - } - - public SimpleString getQueueName() - { - return queueName; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public boolean isDurable() - { - return durable; - } - - public boolean isTemporary() - { - return temporary; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(address); - buffer.writeSimpleString(queueName); - buffer.writeNullableSimpleString(filterString); - buffer.writeBoolean(durable); - buffer.writeBoolean(temporary); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - address = buffer.readSimpleString(); - queueName = buffer.readSimpleString(); - filterString = buffer.readNullableSimpleString(); - durable = buffer.readBoolean(); - temporary = buffer.readBoolean(); - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateQueueMessage == false) - { - return false; - } - - CreateQueueMessage r = (CreateQueueMessage)other; - - return super.equals(other) && r.address.equals(address) && - r.queueName.equals(queueName) && - (r.filterString == null ? filterString == null : r.filterString.equals(filterString)) && - r.durable == durable && - r.temporary == temporary; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,163 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + + * @version <tt>$Revision$</tt> + */ +public class CreateQueueMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(CreateQueueMessage.class); + + // Attributes ---------------------------------------------------- + + private SimpleString address; + + private SimpleString queueName; + + private SimpleString filterString; + + private boolean durable; + + private boolean temporary; + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateQueueMessage(final SimpleString address, + final SimpleString queueName, + final SimpleString filterString, + final boolean durable, + final boolean temporary, + final boolean requiresResponse) + { + super(PacketImpl.CREATE_QUEUE); + + this.address = address; + this.queueName = queueName; + this.filterString = filterString; + this.durable = durable; + this.temporary = temporary; + this.requiresResponse = requiresResponse; + } + + public CreateQueueMessage() + { + super(PacketImpl.CREATE_QUEUE); + } + + // Public -------------------------------------------------------- + + @Override + public String toString() + { + StringBuffer buff = new StringBuffer(getParentString()); + buff.append(", address=" + address); + buff.append(", queueName=" + queueName); + buff.append(", filterString=" + filterString); + buff.append(", durable=" + durable); + buff.append(", temporary=" + temporary); + buff.append("]"); + return buff.toString(); + } + + public SimpleString getAddress() + { + return address; + } + + public SimpleString getQueueName() + { + return queueName; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public boolean isDurable() + { + return durable; + } + + public boolean isTemporary() + { + return temporary; + } + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(address); + buffer.writeSimpleString(queueName); + buffer.writeNullableSimpleString(filterString); + buffer.writeBoolean(durable); + buffer.writeBoolean(temporary); + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + address = buffer.readSimpleString(); + queueName = buffer.readSimpleString(); + filterString = buffer.readNullableSimpleString(); + durable = buffer.readBoolean(); + temporary = buffer.readBoolean(); + requiresResponse = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof CreateQueueMessage == false) + { + return false; + } + + CreateQueueMessage r = (CreateQueueMessage)other; + + return super.equals(other) && r.address.equals(address) && + r.queueName.equals(queueName) && + (r.filterString == null ? filterString == null : r.filterString.equals(filterString)) && + r.durable == durable && + r.temporary == temporary; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,75 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> - */ -public class CreateReplicationSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long sessionChannelID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateReplicationSessionMessage(final long sessionChannelID) - { - super(PacketImpl.CREATE_REPLICATION); - - this.sessionChannelID = sessionChannelID; - } - - public CreateReplicationSessionMessage() - { - super(PacketImpl.CREATE_REPLICATION); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(sessionChannelID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - sessionChannelID = buffer.readLong(); - } - - /** - * @return the sessionChannelID - */ - public long getSessionChannelID() - { - return sessionChannelID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,75 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> + */ +public class CreateReplicationSessionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long sessionChannelID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateReplicationSessionMessage(final long sessionChannelID) + { + super(PacketImpl.CREATE_REPLICATION); + + this.sessionChannelID = sessionChannelID; + } + + public CreateReplicationSessionMessage() + { + super(PacketImpl.CREATE_REPLICATION); + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(sessionChannelID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + sessionChannelID = buffer.readLong(); + } + + /** + * @return the sessionChannelID + */ + public long getSessionChannelID() + { + return sessionChannelID; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,223 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class CreateSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private String name; - - private long sessionChannelID; - - private int version; - - private String username; - - private String password; - - private int minLargeMessageSize; - - private boolean xa; - - private boolean autoCommitSends; - - private boolean autoCommitAcks; - - private boolean preAcknowledge; - - private int windowSize; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateSessionMessage(final String name, - final long sessionChannelID, - final int version, - final String username, - final String password, - final int minLargeMessageSize, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int windowSize) - { - super(PacketImpl.CREATESESSION); - - this.name = name; - - this.sessionChannelID = sessionChannelID; - - this.version = version; - - this.username = username; - - this.password = password; - - this.minLargeMessageSize = minLargeMessageSize; - - this.xa = xa; - - this.autoCommitSends = autoCommitSends; - - this.autoCommitAcks = autoCommitAcks; - - this.windowSize = windowSize; - - this.preAcknowledge = preAcknowledge; - } - - public CreateSessionMessage() - { - super(PacketImpl.CREATESESSION); - } - - // Public -------------------------------------------------------- - - public String getName() - { - return name; - } - - public long getSessionChannelID() - { - return sessionChannelID; - } - - public int getVersion() - { - return version; - } - - public String getUsername() - { - return username; - } - - public String getPassword() - { - return password; - } - - public boolean isXA() - { - return xa; - } - - public boolean isAutoCommitSends() - { - return autoCommitSends; - } - - public boolean isAutoCommitAcks() - { - return autoCommitAcks; - } - - public boolean isPreAcknowledge() - { - return preAcknowledge; - } - - public int getWindowSize() - { - return windowSize; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeLong(sessionChannelID); - buffer.writeInt(version); - buffer.writeNullableString(username); - buffer.writeNullableString(password); - buffer.writeInt(minLargeMessageSize); - buffer.writeBoolean(xa); - buffer.writeBoolean(autoCommitSends); - buffer.writeBoolean(autoCommitAcks); - buffer.writeInt(windowSize); - buffer.writeBoolean(preAcknowledge); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - name = buffer.readString(); - sessionChannelID = buffer.readLong(); - version = buffer.readInt(); - username = buffer.readNullableString(); - password = buffer.readNullableString(); - minLargeMessageSize = buffer.readInt(); - xa = buffer.readBoolean(); - autoCommitSends = buffer.readBoolean(); - autoCommitAcks = buffer.readBoolean(); - windowSize = buffer.readInt(); - preAcknowledge = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateSessionMessage == false) - { - return false; - } - - CreateSessionMessage r = (CreateSessionMessage)other; - - boolean matches = super.equals(other) && name.equals(r.name) && - sessionChannelID == r.sessionChannelID && - version == r.version && - xa == r.xa && - autoCommitSends == r.autoCommitSends && - autoCommitAcks == r.autoCommitAcks && - (username == null ? r.username == null : username.equals(r.username)) && - (password == null ? r.password == null : password.equals(r.password)); - - return matches; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - public int getMinLargeMessageSize() - { - return minLargeMessageSize; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,223 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public class CreateSessionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private String name; + + private long sessionChannelID; + + private int version; + + private String username; + + private String password; + + private int minLargeMessageSize; + + private boolean xa; + + private boolean autoCommitSends; + + private boolean autoCommitAcks; + + private boolean preAcknowledge; + + private int windowSize; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateSessionMessage(final String name, + final long sessionChannelID, + final int version, + final String username, + final String password, + final int minLargeMessageSize, + final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final int windowSize) + { + super(PacketImpl.CREATESESSION); + + this.name = name; + + this.sessionChannelID = sessionChannelID; + + this.version = version; + + this.username = username; + + this.password = password; + + this.minLargeMessageSize = minLargeMessageSize; + + this.xa = xa; + + this.autoCommitSends = autoCommitSends; + + this.autoCommitAcks = autoCommitAcks; + + this.windowSize = windowSize; + + this.preAcknowledge = preAcknowledge; + } + + public CreateSessionMessage() + { + super(PacketImpl.CREATESESSION); + } + + // Public -------------------------------------------------------- + + public String getName() + { + return name; + } + + public long getSessionChannelID() + { + return sessionChannelID; + } + + public int getVersion() + { + return version; + } + + public String getUsername() + { + return username; + } + + public String getPassword() + { + return password; + } + + public boolean isXA() + { + return xa; + } + + public boolean isAutoCommitSends() + { + return autoCommitSends; + } + + public boolean isAutoCommitAcks() + { + return autoCommitAcks; + } + + public boolean isPreAcknowledge() + { + return preAcknowledge; + } + + public int getWindowSize() + { + return windowSize; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeString(name); + buffer.writeLong(sessionChannelID); + buffer.writeInt(version); + buffer.writeNullableString(username); + buffer.writeNullableString(password); + buffer.writeInt(minLargeMessageSize); + buffer.writeBoolean(xa); + buffer.writeBoolean(autoCommitSends); + buffer.writeBoolean(autoCommitAcks); + buffer.writeInt(windowSize); + buffer.writeBoolean(preAcknowledge); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + name = buffer.readString(); + sessionChannelID = buffer.readLong(); + version = buffer.readInt(); + username = buffer.readNullableString(); + password = buffer.readNullableString(); + minLargeMessageSize = buffer.readInt(); + xa = buffer.readBoolean(); + autoCommitSends = buffer.readBoolean(); + autoCommitAcks = buffer.readBoolean(); + windowSize = buffer.readInt(); + preAcknowledge = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof CreateSessionMessage == false) + { + return false; + } + + CreateSessionMessage r = (CreateSessionMessage)other; + + boolean matches = super.equals(other) && name.equals(r.name) && + sessionChannelID == r.sessionChannelID && + version == r.version && + xa == r.xa && + autoCommitSends == r.autoCommitSends && + autoCommitAcks == r.autoCommitAcks && + (username == null ? r.username == null : username.equals(r.username)) && + (password == null ? r.password == null : password.equals(r.password)); + + return matches; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + public int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,102 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class CreateSessionResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int serverVersion; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateSessionResponseMessage(final int serverVersion) - { - super(PacketImpl.CREATESESSION_RESP); - - this.serverVersion = serverVersion; - } - - public CreateSessionResponseMessage() - { - super(PacketImpl.CREATESESSION_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public int getServerVersion() - { - return serverVersion; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(serverVersion); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - serverVersion = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateSessionResponseMessage == false) - { - return false; - } - - CreateSessionResponseMessage r = (CreateSessionResponseMessage)other; - - boolean matches = super.equals(other) && serverVersion == r.serverVersion; - - return matches; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public class CreateSessionResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int serverVersion; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateSessionResponseMessage(final int serverVersion) + { + super(PacketImpl.CREATESESSION_RESP); + + this.serverVersion = serverVersion; + } + + public CreateSessionResponseMessage() + { + super(PacketImpl.CREATESESSION_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public int getServerVersion() + { + return serverVersion; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(serverVersion); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + serverVersion = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof CreateSessionResponseMessage == false) + { + return false; + } + + CreateSessionResponseMessage r = (CreateSessionResponseMessage)other; + + boolean matches = super.equals(other) && serverVersion == r.serverVersion; + + return matches; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,109 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - * - */ -public class HornetQExceptionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(HornetQExceptionMessage.class); - - // Attributes ---------------------------------------------------- - - private HornetQException exception; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQExceptionMessage(final HornetQException exception) - { - super(PacketImpl.EXCEPTION); - - this.exception = exception; - } - - public HornetQExceptionMessage() - { - super(PacketImpl.EXCEPTION); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public HornetQException getException() - { - return exception; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(exception.getCode()); - buffer.writeNullableString(exception.getMessage()); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int code = buffer.readInt(); - String msg = buffer.readNullableString(); - - exception = new HornetQException(code, msg); - } - - @Override - public String toString() - { - return getParentString() + ", exception= " + exception + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof HornetQExceptionMessage == false) - { - return false; - } - - HornetQExceptionMessage r = (HornetQExceptionMessage)other; - - return super.equals(other) && exception.equals(r.exception); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,109 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + * + */ +public class HornetQExceptionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(HornetQExceptionMessage.class); + + // Attributes ---------------------------------------------------- + + private HornetQException exception; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public HornetQExceptionMessage(final HornetQException exception) + { + super(PacketImpl.EXCEPTION); + + this.exception = exception; + } + + public HornetQExceptionMessage() + { + super(PacketImpl.EXCEPTION); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public HornetQException getException() + { + return exception; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(exception.getCode()); + buffer.writeNullableString(exception.getMessage()); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int code = buffer.readInt(); + String msg = buffer.readNullableString(); + + exception = new HornetQException(code, msg); + } + + @Override + public String toString() + { + return getParentString() + ", exception= " + exception + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof HornetQExceptionMessage == false) + { + return false; + } + + HornetQExceptionMessage r = (HornetQExceptionMessage)other; + + return super.equals(other) && exception.equals(r.exception); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,46 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.Message; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A MessagePacket - * - * @author Tim Fox - * - * - */ -public abstract class MessagePacket extends PacketImpl -{ - private static final Logger log = Logger.getLogger(MessagePacket.class); - - protected MessageInternal message; - - public MessagePacket(final byte type, final MessageInternal message) - { - super(type); - - this.message = message; - } - - public Message getMessage() - { - return message; - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,46 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.Message; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.message.impl.MessageInternal; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A MessagePacket + * + * @author Tim Fox + * + * + */ +public abstract class MessagePacket extends PacketImpl +{ + private static final Logger log = Logger.getLogger(MessagePacket.class); + + protected MessageInternal message; + + public MessagePacket(final byte type, final MessageInternal message) + { + super(type); + + this.message = message; + } + + public Message getMessage() + { + return message; + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,52 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class NullResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public NullResponseMessage() - { - super(PacketImpl.NULL_RESPONSE); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,52 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class NullResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public NullResponseMessage() + { + super(PacketImpl.NULL_RESPONSE); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A PacketsConfirmedMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class PacketsConfirmedMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int commandID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public PacketsConfirmedMessage(final int commandID) - { - super(PacketImpl.PACKETS_CONFIRMED); - - this.commandID = commandID; - } - - public PacketsConfirmedMessage() - { - super(PacketImpl.PACKETS_CONFIRMED); - } - - // Public -------------------------------------------------------- - - public int getCommandID() - { - return commandID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(commandID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - commandID = buffer.readInt(); - } - - @Override - public String toString() - { - return getParentString() + ", commandID=" + commandID + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof PacketsConfirmedMessage == false) - { - return false; - } - - PacketsConfirmedMessage r = (PacketsConfirmedMessage)other; - - return super.equals(other) && commandID == r.commandID; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,101 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A PacketsConfirmedMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class PacketsConfirmedMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int commandID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public PacketsConfirmedMessage(final int commandID) + { + super(PacketImpl.PACKETS_CONFIRMED); + + this.commandID = commandID; + } + + public PacketsConfirmedMessage() + { + super(PacketImpl.PACKETS_CONFIRMED); + } + + // Public -------------------------------------------------------- + + public int getCommandID() + { + return commandID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(commandID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + commandID = buffer.readInt(); + } + + @Override + public String toString() + { + return getParentString() + ", commandID=" + commandID + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof PacketsConfirmedMessage == false) + { + return false; + } + + PacketsConfirmedMessage r = (PacketsConfirmedMessage)other; + + return super.equals(other) && commandID == r.commandID; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,104 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A Ping - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class Ping extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long connectionTTL; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public Ping(final long connectionTTL) - { - super(PacketImpl.PING); - - this.connectionTTL = connectionTTL; - } - - public Ping() - { - super(PacketImpl.PING); - } - - // Public -------------------------------------------------------- - - public long getConnectionTTL() - { - return connectionTTL; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(connectionTTL); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - connectionTTL = buffer.readLong(); - } - - @Override - public String toString() - { - StringBuffer buf = new StringBuffer(getParentString()); - buf.append(", connectionTTL=" + connectionTTL); - buf.append("]"); - return buf.toString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof Ping == false) - { - return false; - } - - Ping r = (Ping)other; - - return super.equals(other) && connectionTTL == r.connectionTTL; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,104 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A Ping + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class Ping extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long connectionTTL; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public Ping(final long connectionTTL) + { + super(PacketImpl.PING); + + this.connectionTTL = connectionTTL; + } + + public Ping() + { + super(PacketImpl.PING); + } + + // Public -------------------------------------------------------- + + public long getConnectionTTL() + { + return connectionTTL; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(connectionTTL); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + connectionTTL = buffer.readLong(); + } + + @Override + public String toString() + { + StringBuffer buf = new StringBuffer(getParentString()); + buf.append(", connectionTTL=" + connectionTTL); + buf.append("]"); + return buf.toString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof Ping == false) + { + return false; + } + + Ping r = (Ping)other; + + return super.equals(other) && connectionTTL == r.connectionTTL; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,106 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A ReattachSessionMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class ReattachSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private String name; - - private int lastConfirmedCommandID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) - { - super(PacketImpl.REATTACH_SESSION); - - this.name = name; - - this.lastConfirmedCommandID = lastConfirmedCommandID; - } - - public ReattachSessionMessage() - { - super(PacketImpl.REATTACH_SESSION); - } - - // Public -------------------------------------------------------- - - public String getName() - { - return name; - } - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeInt(lastConfirmedCommandID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - name = buffer.readString(); - lastConfirmedCommandID = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof ReattachSessionMessage == false) - { - return false; - } - - ReattachSessionMessage r = (ReattachSessionMessage)other; - - return super.equals(other) && name.equals(r.name); - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,106 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A ReattachSessionMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class ReattachSessionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private String name; + + private int lastConfirmedCommandID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) + { + super(PacketImpl.REATTACH_SESSION); + + this.name = name; + + this.lastConfirmedCommandID = lastConfirmedCommandID; + } + + public ReattachSessionMessage() + { + super(PacketImpl.REATTACH_SESSION); + } + + // Public -------------------------------------------------------- + + public String getName() + { + return name; + } + + public int getLastConfirmedCommandID() + { + return lastConfirmedCommandID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeString(name); + buffer.writeInt(lastConfirmedCommandID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + name = buffer.readString(); + lastConfirmedCommandID = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof ReattachSessionMessage == false) + { + return false; + } + + ReattachSessionMessage r = (ReattachSessionMessage)other; + + return super.equals(other) && name.equals(r.name); + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,112 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A ReattachSessionResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class ReattachSessionResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int lastConfirmedCommandID; - - private boolean reattached; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) - { - super(PacketImpl.REATTACH_SESSION_RESP); - - this.lastConfirmedCommandID = lastConfirmedCommandID; - - this.reattached = reattached; - } - - public ReattachSessionResponseMessage() - { - super(PacketImpl.REATTACH_SESSION_RESP); - } - - // Public -------------------------------------------------------- - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - public boolean isReattached() - { - return reattached; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(lastConfirmedCommandID); - buffer.writeBoolean(reattached); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - lastConfirmedCommandID = buffer.readInt(); - reattached = buffer.readBoolean(); - } - - @Override - public boolean isResponse() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof ReattachSessionResponseMessage == false) - { - return false; - } - - ReattachSessionResponseMessage r = (ReattachSessionResponseMessage)other; - - return super.equals(other) && lastConfirmedCommandID == r.lastConfirmedCommandID; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,112 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A ReattachSessionResponseMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class ReattachSessionResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int lastConfirmedCommandID; + + private boolean reattached; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) + { + super(PacketImpl.REATTACH_SESSION_RESP); + + this.lastConfirmedCommandID = lastConfirmedCommandID; + + this.reattached = reattached; + } + + public ReattachSessionResponseMessage() + { + super(PacketImpl.REATTACH_SESSION_RESP); + } + + // Public -------------------------------------------------------- + + public int getLastConfirmedCommandID() + { + return lastConfirmedCommandID; + } + + public boolean isReattached() + { + return reattached; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(lastConfirmedCommandID); + buffer.writeBoolean(reattached); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + lastConfirmedCommandID = buffer.readInt(); + reattached = buffer.readBoolean(); + } + + @Override + public boolean isResponse() + { + return true; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof ReattachSessionResponseMessage == false) + { + return false; + } + + ReattachSessionResponseMessage r = (ReattachSessionResponseMessage)other; + + return super.equals(other) && lastConfirmedCommandID == r.lastConfirmedCommandID; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,143 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationAddMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(ReplicationAddMessage.class); - - // Attributes ---------------------------------------------------- - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean isUpdate; - - private byte recordType; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationAddMessage() - { - super(PacketImpl.REPLICATION_APPEND); - } - - public ReplicationAddMessage(final byte journalID, - final boolean isUpdate, - final long id, - final byte recordType, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.isUpdate = isUpdate; - this.id = id; - this.recordType = recordType; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(isUpdate); - buffer.writeLong(id); - buffer.writeByte(recordType); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - isUpdate = buffer.readBoolean(); - id = buffer.readLong(); - recordType = buffer.readByte(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - public boolean isUpdate() - { - return isUpdate; - } - - /** - * @return the recordType - */ - public byte getRecordType() - { - return recordType; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,143 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationAddMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(ReplicationAddMessage.class); + + // Attributes ---------------------------------------------------- + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private boolean isUpdate; + + private byte recordType; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationAddMessage() + { + super(PacketImpl.REPLICATION_APPEND); + } + + public ReplicationAddMessage(final byte journalID, + final boolean isUpdate, + final long id, + final byte recordType, + final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.isUpdate = isUpdate; + this.id = id; + this.recordType = recordType; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeBoolean(isUpdate); + buffer.writeLong(id); + buffer.writeByte(recordType); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + isUpdate = buffer.readBoolean(); + id = buffer.readLong(); + recordType = buffer.readByte(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + public boolean isUpdate() + { + return isUpdate; + } + + /** + * @return the recordType + */ + public byte getRecordType() + { + return recordType; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,151 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationAddTXMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean isUpdate; - - private byte recordType; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationAddTXMessage() - { - super(PacketImpl.REPLICATION_APPEND_TX); - } - - public ReplicationAddTXMessage(final byte journalID, - final boolean isUpdate, - final long txId, - final long id, - final byte recordType, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.isUpdate = isUpdate; - this.txId = txId; - this.id = id; - this.recordType = recordType; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(isUpdate); - buffer.writeLong(txId); - buffer.writeLong(id); - buffer.writeByte(recordType); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - isUpdate = buffer.readBoolean(); - txId = buffer.readLong(); - id = buffer.readLong(); - recordType = buffer.readByte(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - public boolean isUpdate() - { - return isUpdate; - } - - /** - * @return the recordType - */ - public byte getRecordType() - { - return recordType; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,151 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationAddTXMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long txId; + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private boolean isUpdate; + + private byte recordType; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationAddTXMessage() + { + super(PacketImpl.REPLICATION_APPEND_TX); + } + + public ReplicationAddTXMessage(final byte journalID, + final boolean isUpdate, + final long txId, + final long id, + final byte recordType, + final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.isUpdate = isUpdate; + this.txId = txId; + this.id = id; + this.recordType = recordType; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeBoolean(isUpdate); + buffer.writeLong(txId); + buffer.writeLong(id); + buffer.writeByte(recordType); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + isUpdate = buffer.readBoolean(); + txId = buffer.readLong(); + id = buffer.readLong(); + recordType = buffer.readByte(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + public boolean isUpdate() + { + return isUpdate; + } + + /** + * @return the recordType + */ + public byte getRecordType() + { + return recordType; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationCommitMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean rollback; - - private long txId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationCommitMessage() - { - super(PacketImpl.REPLICATION_COMMIT_ROLLBACK); - } - - public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId) - { - this(); - this.journalID = journalID; - this.rollback = rollback; - this.txId = txId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(rollback); - buffer.writeLong(txId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - rollback = buffer.readBoolean(); - txId = buffer.readLong(); - } - - public boolean isRollback() - { - return rollback; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,101 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationCommitMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private boolean rollback; + + private long txId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationCommitMessage() + { + super(PacketImpl.REPLICATION_COMMIT_ROLLBACK); + } + + public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId) + { + this(); + this.journalID = journalID; + this.rollback = rollback; + this.txId = txId; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeBoolean(rollback); + buffer.writeLong(txId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + rollback = buffer.readBoolean(); + txId = buffer.readLong(); + } + + public boolean isRollback() + { + return rollback; + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * Message used to compare if the Journals between the live and - * backup nodes are equivalent and can be used over replication. - * The backup journal needs to be an exact copy of the live node before it starts. - * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> - */ -public class ReplicationCompareDataMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private JournalLoadInformation[] journalInformation; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationCompareDataMessage(final JournalLoadInformation[] journalInformation) - { - super(PacketImpl.REPLICATION_COMPARE_DATA); - - this.journalInformation = journalInformation; - } - - public ReplicationCompareDataMessage() - { - super(PacketImpl.REPLICATION_COMPARE_DATA); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(journalInformation.length); - for (JournalLoadInformation info : journalInformation) - { - buffer.writeInt(info.getNumberOfRecords()); - buffer.writeLong(info.getMaxID()); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int numberOfJournals = buffer.readInt(); - - journalInformation = new JournalLoadInformation[numberOfJournals]; - - for (int i = 0; i < numberOfJournals; i++) - { - journalInformation[i] = new JournalLoadInformation(); - journalInformation[i].setNumberOfRecords(buffer.readInt()); - journalInformation[i].setMaxID(buffer.readLong()); - } - } - - /** - * @return the journalInformation - */ - public JournalLoadInformation[] getJournalInformation() - { - return journalInformation; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.JournalLoadInformation; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * Message used to compare if the Journals between the live and + * backup nodes are equivalent and can be used over replication. + * The backup journal needs to be an exact copy of the live node before it starts. + * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> + */ +public class ReplicationCompareDataMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private JournalLoadInformation[] journalInformation; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationCompareDataMessage(final JournalLoadInformation[] journalInformation) + { + super(PacketImpl.REPLICATION_COMPARE_DATA); + + this.journalInformation = journalInformation; + } + + public ReplicationCompareDataMessage() + { + super(PacketImpl.REPLICATION_COMPARE_DATA); + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(journalInformation.length); + for (JournalLoadInformation info : journalInformation) + { + buffer.writeInt(info.getNumberOfRecords()); + buffer.writeLong(info.getMaxID()); + } + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int numberOfJournals = buffer.readInt(); + + journalInformation = new JournalLoadInformation[numberOfJournals]; + + for (int i = 0; i < numberOfJournals; i++) + { + journalInformation[i] = new JournalLoadInformation(); + journalInformation[i].setNumberOfRecords(buffer.readInt()); + journalInformation[i].setMaxID(buffer.readLong()); + } + } + + /** + * @return the journalInformation + */ + public JournalLoadInformation[] getJournalInformation() + { + return journalInformation; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,94 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationDeleteMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationDeleteMessage() - { - super(PacketImpl.REPLICATION_DELETE); - } - - public ReplicationDeleteMessage(final byte journalID, final long id) - { - this(); - this.journalID = journalID; - this.id = id; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(id); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - id = buffer.readLong(); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,94 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationDeleteMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationDeleteMessage() + { + super(PacketImpl.REPLICATION_DELETE); + } + + public ReplicationDeleteMessage(final byte journalID, final long id) + { + this(); + this.journalID = journalID; + this.id = id; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeLong(id); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + id = buffer.readLong(); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,126 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationDeleteTXMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationDeleteTXMessage() - { - super(PacketImpl.REPLICATION_DELETE_TX); - } - - public ReplicationDeleteTXMessage(final byte journalID, - final long txId, - final long id, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.txId = txId; - this.id = id; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(txId); - buffer.writeLong(id); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - txId = buffer.readLong(); - id = buffer.readLong(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,126 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationDeleteTXMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long txId; + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationDeleteTXMessage() + { + super(PacketImpl.REPLICATION_DELETE_TX); + } + + public ReplicationDeleteTXMessage(final byte journalID, + final long txId, + final long id, + final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.txId = txId; + this.id = id; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeLong(txId); + buffer.writeLong(id); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + txId = buffer.readLong(); + id = buffer.readLong(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,80 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationLargeMessageBeingMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargeMessageBeingMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargeMessageBeingMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - public ReplicationLargeMessageBeingMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,80 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationLargeMessageBeingMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargeMessageBeingMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + long messageId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationLargeMessageBeingMessage(final long messageId) + { + this(); + this.messageId = messageId; + } + + public ReplicationLargeMessageBeingMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN); + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,100 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationLargeMessageWriteMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargeMessageWriteMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long messageId; - - private byte body[]; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - public ReplicationLargeMessageWriteMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE); - } - - /** - * @param messageId - * @param body - */ - public ReplicationLargeMessageWriteMessage(final long messageId, final byte[] body) - { - this(); - - this.messageId = messageId; - this.body = body; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - buffer.writeInt(body.length); - buffer.writeBytes(body); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - int size = buffer.readInt(); - body = new byte[size]; - buffer.readBytes(body); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - /** - * @return the body - */ - public byte[] getBody() - { - return body; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,100 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationLargeMessageWriteMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargeMessageWriteMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long messageId; + + private byte body[]; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + public ReplicationLargeMessageWriteMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE); + } + + /** + * @param messageId + * @param body + */ + public ReplicationLargeMessageWriteMessage(final long messageId, final byte[] body) + { + this(); + + this.messageId = messageId; + this.body = body; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + buffer.writeInt(body.length); + buffer.writeBytes(body); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + int size = buffer.readInt(); + body = new byte[size]; + buffer.readBytes(body); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + /** + * @return the body + */ + public byte[] getBody() + { + return body; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,79 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationLargemessageEndMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargemessageEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargemessageEndMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); - } - - public ReplicationLargemessageEndMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,79 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationLargemessageEndMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargemessageEndMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + long messageId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationLargemessageEndMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); + } + + public ReplicationLargemessageEndMessage(final long messageId) + { + this(); + this.messageId = messageId; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,110 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationPageWrite - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPageEventMessage extends PacketImpl -{ - - private int pageNumber; - - private SimpleString storeName; - - /** - * True = delete page, False = close page - */ - private boolean isDelete; - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPageEventMessage() - { - super(PacketImpl.REPLICATION_PAGE_EVENT); - } - - public ReplicationPageEventMessage(final SimpleString storeName, final int pageNumber, final boolean isDelete) - { - this(); - this.pageNumber = pageNumber; - this.isDelete = isDelete; - this.storeName = storeName; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(storeName); - buffer.writeInt(pageNumber); - buffer.writeBoolean(isDelete); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - storeName = buffer.readSimpleString(); - pageNumber = buffer.readInt(); - isDelete = buffer.readBoolean(); - } - - /** - * @return the pageNumber - */ - public int getPageNumber() - { - return pageNumber; - } - - /** - * @return the storeName - */ - public SimpleString getStoreName() - { - return storeName; - } - - /** - * @return the isDelete - */ - public boolean isDelete() - { - return isDelete; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,110 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationPageWrite + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationPageEventMessage extends PacketImpl +{ + + private int pageNumber; + + private SimpleString storeName; + + /** + * True = delete page, False = close page + */ + private boolean isDelete; + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationPageEventMessage() + { + super(PacketImpl.REPLICATION_PAGE_EVENT); + } + + public ReplicationPageEventMessage(final SimpleString storeName, final int pageNumber, final boolean isDelete) + { + this(); + this.pageNumber = pageNumber; + this.isDelete = isDelete; + this.storeName = storeName; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(storeName); + buffer.writeInt(pageNumber); + buffer.writeBoolean(isDelete); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + storeName = buffer.readSimpleString(); + pageNumber = buffer.readInt(); + isDelete = buffer.readBoolean(); + } + + /** + * @return the pageNumber + */ + public int getPageNumber() + { + return pageNumber; + } + + /** + * @return the storeName + */ + public SimpleString getStoreName() + { + return storeName; + } + + /** + * @return the isDelete + */ + public boolean isDelete() + { + return isDelete; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,96 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.impl.PagedMessageImpl; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationPageWrite - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPageWriteMessage extends PacketImpl -{ - - int pageNumber; - - PagedMessage pagedMessage; - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPageWriteMessage() - { - super(PacketImpl.REPLICATION_PAGE_WRITE); - } - - public ReplicationPageWriteMessage(final PagedMessage pagedMessage, final int pageNumber) - { - this(); - this.pageNumber = pageNumber; - this.pagedMessage = pagedMessage; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(pageNumber); - pagedMessage.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - pageNumber = buffer.readInt(); - pagedMessage = new PagedMessageImpl(); - pagedMessage.decode(buffer); - } - - /** - * @return the pageNumber - */ - public int getPageNumber() - { - return pageNumber; - } - - /** - * @return the pagedMessage - */ - public PagedMessage getPagedMessage() - { - return pagedMessage; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.paging.PagedMessage; +import org.hornetq.core.paging.impl.PagedMessageImpl; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationPageWrite + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationPageWriteMessage extends PacketImpl +{ + + int pageNumber; + + PagedMessage pagedMessage; + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationPageWriteMessage() + { + super(PacketImpl.REPLICATION_PAGE_WRITE); + } + + public ReplicationPageWriteMessage(final PagedMessage pagedMessage, final int pageNumber) + { + this(); + this.pageNumber = pageNumber; + this.pagedMessage = pagedMessage; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(pageNumber); + pagedMessage.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + pageNumber = buffer.readInt(); + pagedMessage = new PagedMessageImpl(); + pagedMessage.decode(buffer); + } + + /** + * @return the pageNumber + */ + public int getPageNumber() + { + return pageNumber; + } + + /** + * @return the pagedMessage + */ + public PagedMessage getPagedMessage() + { + return pagedMessage; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,110 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPrepareMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPrepareMessage() - { - super(PacketImpl.REPLICATION_PREPARE); - } - - public ReplicationPrepareMessage(final byte journalID, final long txId, final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.txId = txId; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(txId); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - txId = buffer.readLong(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,110 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationPrepareMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long txId; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationPrepareMessage() + { + super(PacketImpl.REPLICATION_PREPARE); + } + + public ReplicationPrepareMessage(final byte journalID, final long txId, final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.txId = txId; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeLong(txId); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + txId = buffer.readLong(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,46 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class ReplicationResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationResponseMessage() - { - super(PacketImpl.REPLICATION_RESPONSE); - } - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,46 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class ReplicationResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationResponseMessage() + { + super(PacketImpl.REPLICATION_RESPONSE); + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,96 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A RollbackMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Feb 18, 2009 2:11:17 PM - * - * - */ -public class RollbackMessage extends PacketImpl -{ - - public RollbackMessage() - { - super(PacketImpl.SESS_ROLLBACK); - } - - public RollbackMessage(final boolean considerLastMessageAsDelivered) - { - super(PacketImpl.SESS_ROLLBACK); - - this.considerLastMessageAsDelivered = considerLastMessageAsDelivered; - } - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean considerLastMessageAsDelivered; - - /** - * @return the considerLastMessageAsDelivered - */ - public boolean isConsiderLastMessageAsDelivered() - { - return considerLastMessageAsDelivered; - } - - /** - * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set - */ - public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) - { - considerLastMessageAsDelivered = isLastMessageAsDelivered; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(considerLastMessageAsDelivered); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - considerLastMessageAsDelivered = buffer.readBoolean(); - } - - public boolean isAsyncExec() - { - return true; - } - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A RollbackMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Feb 18, 2009 2:11:17 PM + * + * + */ +public class RollbackMessage extends PacketImpl +{ + + public RollbackMessage() + { + super(PacketImpl.SESS_ROLLBACK); + } + + public RollbackMessage(final boolean considerLastMessageAsDelivered) + { + super(PacketImpl.SESS_ROLLBACK); + + this.considerLastMessageAsDelivered = considerLastMessageAsDelivered; + } + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean considerLastMessageAsDelivered; + + /** + * @return the considerLastMessageAsDelivered + */ + public boolean isConsiderLastMessageAsDelivered() + { + return considerLastMessageAsDelivered; + } + + /** + * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set + */ + public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) + { + considerLastMessageAsDelivered = isLastMessageAsDelivered; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(considerLastMessageAsDelivered); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + considerLastMessageAsDelivered = buffer.readBoolean(); + } + + public boolean isAsyncExec() + { + return true; + } + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,113 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionAcknowledgeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long messageID; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) - { - super(PacketImpl.SESS_ACKNOWLEDGE); - - this.consumerID = consumerID; - - this.messageID = messageID; - - this.requiresResponse = requiresResponse; - } - - public SessionAcknowledgeMessage() - { - super(PacketImpl.SESS_ACKNOWLEDGE); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getMessageID() - { - return messageID; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - - buffer.writeLong(messageID); - - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - - messageID = buffer.readLong(); - - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionAcknowledgeMessage == false) - { - return false; - } - - SessionAcknowledgeMessage r = (SessionAcknowledgeMessage)other; - - return super.equals(other) && consumerID == r.consumerID && - messageID == r.messageID && - requiresResponse == r.requiresResponse; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,113 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class SessionAcknowledgeMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private long messageID; + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) + { + super(PacketImpl.SESS_ACKNOWLEDGE); + + this.consumerID = consumerID; + + this.messageID = messageID; + + this.requiresResponse = requiresResponse; + } + + public SessionAcknowledgeMessage() + { + super(PacketImpl.SESS_ACKNOWLEDGE); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public long getMessageID() + { + return messageID; + } + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + + buffer.writeLong(messageID); + + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + + messageID = buffer.readLong(); + + requiresResponse = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionAcknowledgeMessage == false) + { + return false; + } + + SessionAcknowledgeMessage r = (SessionAcknowledgeMessage)other; + + return super.equals(other) && consumerID == r.consumerID && + messageID == r.messageID && + requiresResponse == r.requiresResponse; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,73 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A SessionQueueQueryMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionBindingQueryMessage extends PacketImpl -{ - private SimpleString address; - - public SessionBindingQueryMessage(final SimpleString address) - { - super(PacketImpl.SESS_BINDINGQUERY); - - this.address = address; - } - - public SessionBindingQueryMessage() - { - super(PacketImpl.SESS_BINDINGQUERY); - } - - public SimpleString getAddress() - { - return address; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(address); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - address = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionBindingQueryMessage == false) - { - return false; - } - - SessionBindingQueryMessage r = (SessionBindingQueryMessage)other; - - return super.equals(other) && address.equals(r.address); - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,73 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionQueueQueryMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionBindingQueryMessage extends PacketImpl +{ + private SimpleString address; + + public SessionBindingQueryMessage(final SimpleString address) + { + super(PacketImpl.SESS_BINDINGQUERY); + + this.address = address; + } + + public SessionBindingQueryMessage() + { + super(PacketImpl.SESS_BINDINGQUERY); + } + + public SimpleString getAddress() + { + return address; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(address); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + address = buffer.readSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionBindingQueryMessage == false) + { + return false; + } + + SessionBindingQueryMessage r = (SessionBindingQueryMessage)other; + + return super.equals(other) && address.equals(r.address); + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,124 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import java.util.ArrayList; -import java.util.List; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A SessionBindingQueryResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionBindingQueryResponseMessage extends PacketImpl -{ - private boolean exists; - - private List<SimpleString> queueNames; - - public SessionBindingQueryResponseMessage(final boolean exists, final List<SimpleString> queueNames) - { - super(PacketImpl.SESS_BINDINGQUERY_RESP); - - this.exists = exists; - - this.queueNames = queueNames; - } - - public SessionBindingQueryResponseMessage() - { - super(PacketImpl.SESS_BINDINGQUERY_RESP); - } - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isExists() - { - return exists; - } - - public List<SimpleString> getQueueNames() - { - return queueNames; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(exists); - buffer.writeInt(queueNames.size()); - for (SimpleString queueName : queueNames) - { - buffer.writeSimpleString(queueName); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - exists = buffer.readBoolean(); - int numQueues = buffer.readInt(); - queueNames = new ArrayList<SimpleString>(numQueues); - for (int i = 0; i < numQueues; i++) - { - queueNames.add(buffer.readSimpleString()); - } - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionBindingQueryResponseMessage == false) - { - return false; - } - - SessionBindingQueryResponseMessage r = (SessionBindingQueryResponseMessage)other; - - if (super.equals(other) && exists == r.exists) - { - if (queueNames.size() == r.queueNames.size()) - { - for (int i = 0; i < queueNames.size(); i++) - { - if (!queueNames.get(i).equals(r.queueNames.get(i))) - { - return false; - } - } - } - else - { - return false; - } - } - else - { - return false; - } - - return true; - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,124 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import java.util.ArrayList; +import java.util.List; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionBindingQueryResponseMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionBindingQueryResponseMessage extends PacketImpl +{ + private boolean exists; + + private List<SimpleString> queueNames; + + public SessionBindingQueryResponseMessage(final boolean exists, final List<SimpleString> queueNames) + { + super(PacketImpl.SESS_BINDINGQUERY_RESP); + + this.exists = exists; + + this.queueNames = queueNames; + } + + public SessionBindingQueryResponseMessage() + { + super(PacketImpl.SESS_BINDINGQUERY_RESP); + } + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isExists() + { + return exists; + } + + public List<SimpleString> getQueueNames() + { + return queueNames; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(exists); + buffer.writeInt(queueNames.size()); + for (SimpleString queueName : queueNames) + { + buffer.writeSimpleString(queueName); + } + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + exists = buffer.readBoolean(); + int numQueues = buffer.readInt(); + queueNames = new ArrayList<SimpleString>(numQueues); + for (int i = 0; i < numQueues; i++) + { + queueNames.add(buffer.readSimpleString()); + } + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionBindingQueryResponseMessage == false) + { + return false; + } + + SessionBindingQueryResponseMessage r = (SessionBindingQueryResponseMessage)other; + + if (super.equals(other) && exists == r.exists) + { + if (queueNames.size() == r.queueNames.size()) + { + for (int i = 0; i < queueNames.size(); i++) + { + if (!queueNames.get(i).equals(r.queueNames.get(i))) + { + return false; + } + } + } + else + { + return false; + } + } + else + { + return false; + } + + return true; + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,63 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionCloseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionCloseMessage() - { - super(PacketImpl.SESS_CLOSE); - } - - // Public -------------------------------------------------------- - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCloseMessage == false) - { - return false; - } - - return super.equals(other); - } - - @Override - public boolean isAsyncExec() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,63 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class SessionCloseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionCloseMessage() + { + super(PacketImpl.SESS_CLOSE); + } + + // Public -------------------------------------------------------- + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionCloseMessage == false) + { + return false; + } + + return super.equals(other); + } + + @Override + public boolean isAsyncExec() + { + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,59 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A SessionCommitMessage - * - * @author tim - * - * - */ -public class SessionCommitMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - /** - * @param type - */ - public SessionCommitMessage() - { - super(PacketImpl.SESS_COMMIT); - } - - public boolean isAsyncExec() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,59 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A SessionCommitMessage + * + * @author tim + * + * + */ +public class SessionCommitMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + /** + * @param type + */ + public SessionCommitMessage() + { + super(PacketImpl.SESS_COMMIT); + } + + public boolean isAsyncExec() + { + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionConsumerCloseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionConsumerCloseMessage(final long objectID) - { - super(PacketImpl.SESS_CONSUMER_CLOSE); - - consumerID = objectID; - } - - public SessionConsumerCloseMessage() - { - super(PacketImpl.SESS_CONSUMER_CLOSE); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - } - - @Override - public String toString() - { - return getParentString() + ", consumerID=" + consumerID + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionConsumerCloseMessage == false) - { - return false; - } - - SessionConsumerCloseMessage r = (SessionConsumerCloseMessage)other; - - return super.equals(other) && consumerID == r.consumerID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,92 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionConsumerCloseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionConsumerCloseMessage(final long objectID) + { + super(PacketImpl.SESS_CONSUMER_CLOSE); + + consumerID = objectID; + } + + public SessionConsumerCloseMessage() + { + super(PacketImpl.SESS_CONSUMER_CLOSE); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + } + + @Override + public String toString() + { + return getParentString() + ", consumerID=" + consumerID + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionConsumerCloseMessage == false) + { + return false; + } + + SessionConsumerCloseMessage r = (SessionConsumerCloseMessage)other; + + return super.equals(other) && consumerID == r.consumerID; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,104 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class SessionConsumerFlowCreditMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private int credits; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) - { - super(PacketImpl.SESS_FLOWTOKEN); - - this.consumerID = consumerID; - - this.credits = credits; - } - - public SessionConsumerFlowCreditMessage() - { - super(PacketImpl.SESS_FLOWTOKEN); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public int getCredits() - { - return credits; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeInt(credits); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - credits = buffer.readInt(); - } - - @Override - public String toString() - { - return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionConsumerFlowCreditMessage == false) - { - return false; - } - - SessionConsumerFlowCreditMessage r = (SessionConsumerFlowCreditMessage)other; - - return super.equals(other) && credits == r.credits && consumerID == r.consumerID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,104 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public class SessionConsumerFlowCreditMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private int credits; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) + { + super(PacketImpl.SESS_FLOWTOKEN); + + this.consumerID = consumerID; + + this.credits = credits; + } + + public SessionConsumerFlowCreditMessage() + { + super(PacketImpl.SESS_FLOWTOKEN); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public int getCredits() + { + return credits; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + buffer.writeInt(credits); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + credits = buffer.readInt(); + } + + @Override + public String toString() + { + return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionConsumerFlowCreditMessage == false) + { + return false; + } + + SessionConsumerFlowCreditMessage r = (SessionConsumerFlowCreditMessage)other; + + return super.equals(other) && credits == r.credits && consumerID == r.consumerID; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,102 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.utils.DataConstants; - -/** - * A SessionContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 5, 2008 10:08:40 AM - * - * - */ -public abstract class SessionContinuationMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - public static final int SESSION_CONTINUATION_BASE_SIZE = PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT + - DataConstants.SIZE_BOOLEAN; - - // Attributes ---------------------------------------------------- - - protected byte[] body; - - protected boolean continues; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) - { - super(type); - this.body = body; - this.continues = continues; - } - - public SessionContinuationMessage(final byte type) - { - super(type); - } - - // Public -------------------------------------------------------- - - /** - * @return the body - */ - public byte[] getBody() - { - return body; - } - - /** - * @return the continues - */ - public boolean isContinues() - { - return continues; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(body.length); - buffer.writeBytes(body); - buffer.writeBoolean(continues); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int size = buffer.readInt(); - body = new byte[size]; - buffer.readBytes(body); - continues = buffer.readBoolean(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.utils.DataConstants; + +/** + * A SessionContinuationMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Dec 5, 2008 10:08:40 AM + * + * + */ +public abstract class SessionContinuationMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + public static final int SESSION_CONTINUATION_BASE_SIZE = PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT + + DataConstants.SIZE_BOOLEAN; + + // Attributes ---------------------------------------------------- + + protected byte[] body; + + protected boolean continues; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) + { + super(type); + this.body = body; + this.continues = continues; + } + + public SessionContinuationMessage(final byte type) + { + super(type); + } + + // Public -------------------------------------------------------- + + /** + * @return the body + */ + public byte[] getBody() + { + return body; + } + + /** + * @return the continues + */ + public boolean isContinues() + { + return continues; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(body.length); + buffer.writeBytes(body); + buffer.writeBoolean(continues); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int size = buffer.readInt(); + body = new byte[size]; + buffer.readBytes(body); + continues = buffer.readBoolean(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,143 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionCreateConsumerMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long id; - - private SimpleString queueName; - - private SimpleString filterString; - - private boolean browseOnly; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionCreateConsumerMessage(final long id, - final SimpleString queueName, - final SimpleString filterString, - final boolean browseOnly, - final boolean requiresResponse) - { - super(PacketImpl.SESS_CREATECONSUMER); - - this.id = id; - this.queueName = queueName; - this.filterString = filterString; - this.browseOnly = browseOnly; - this.requiresResponse = requiresResponse; - } - - public SessionCreateConsumerMessage() - { - super(PacketImpl.SESS_CREATECONSUMER); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", queueName=" + queueName); - buff.append(", filterString=" + filterString); - buff.append("]"); - return buff.toString(); - } - - public long getID() - { - return id; - } - - public SimpleString getQueueName() - { - return queueName; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public boolean isBrowseOnly() - { - return browseOnly; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(id); - buffer.writeSimpleString(queueName); - buffer.writeNullableSimpleString(filterString); - buffer.writeBoolean(browseOnly); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - id = buffer.readLong(); - queueName = buffer.readSimpleString(); - filterString = buffer.readNullableSimpleString(); - browseOnly = buffer.readBoolean(); - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCreateConsumerMessage == false) - { - return false; - } - - SessionCreateConsumerMessage r = (SessionCreateConsumerMessage)other; - - return super.equals(other) && queueName.equals(r.queueName) && filterString == null ? r.filterString == null - : filterString.equals(r.filterString); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,143 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionCreateConsumerMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long id; + + private SimpleString queueName; + + private SimpleString filterString; + + private boolean browseOnly; + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionCreateConsumerMessage(final long id, + final SimpleString queueName, + final SimpleString filterString, + final boolean browseOnly, + final boolean requiresResponse) + { + super(PacketImpl.SESS_CREATECONSUMER); + + this.id = id; + this.queueName = queueName; + this.filterString = filterString; + this.browseOnly = browseOnly; + this.requiresResponse = requiresResponse; + } + + public SessionCreateConsumerMessage() + { + super(PacketImpl.SESS_CREATECONSUMER); + } + + // Public -------------------------------------------------------- + + @Override + public String toString() + { + StringBuffer buff = new StringBuffer(getParentString()); + buff.append(", queueName=" + queueName); + buff.append(", filterString=" + filterString); + buff.append("]"); + return buff.toString(); + } + + public long getID() + { + return id; + } + + public SimpleString getQueueName() + { + return queueName; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public boolean isBrowseOnly() + { + return browseOnly; + } + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(id); + buffer.writeSimpleString(queueName); + buffer.writeNullableSimpleString(filterString); + buffer.writeBoolean(browseOnly); + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + id = buffer.readLong(); + queueName = buffer.readSimpleString(); + filterString = buffer.readNullableSimpleString(); + browseOnly = buffer.readBoolean(); + requiresResponse = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionCreateConsumerMessage == false) + { + return false; + } + + SessionCreateConsumerMessage r = (SessionCreateConsumerMessage)other; + + return super.equals(other) && queueName.equals(r.queueName) && filterString == null ? r.filterString == null + : filterString.equals(r.filterString); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,97 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - - * @version <tt>$Revision$</tt> - */ -public class SessionDeleteQueueMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private SimpleString queueName; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionDeleteQueueMessage(final SimpleString queueName) - { - super(PacketImpl.DELETE_QUEUE); - - this.queueName = queueName; - } - - public SessionDeleteQueueMessage() - { - super(PacketImpl.DELETE_QUEUE); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", queueName=" + queueName); - buff.append("]"); - return buff.toString(); - } - - public SimpleString getQueueName() - { - return queueName; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(queueName); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - queueName = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionDeleteQueueMessage == false) - { - return false; - } - - SessionDeleteQueueMessage r = (SessionDeleteQueueMessage)other; - - return super.equals(other) && r.queueName.equals(queueName); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,97 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + + * @version <tt>$Revision$</tt> + */ +public class SessionDeleteQueueMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private SimpleString queueName; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionDeleteQueueMessage(final SimpleString queueName) + { + super(PacketImpl.DELETE_QUEUE); + + this.queueName = queueName; + } + + public SessionDeleteQueueMessage() + { + super(PacketImpl.DELETE_QUEUE); + } + + // Public -------------------------------------------------------- + + @Override + public String toString() + { + StringBuffer buff = new StringBuffer(getParentString()); + buff.append(", queueName=" + queueName); + buff.append("]"); + return buff.toString(); + } + + public SimpleString getQueueName() + { + return queueName; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(queueName); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + queueName = buffer.readSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionDeleteQueueMessage == false) + { + return false; + } + + SessionDeleteQueueMessage r = (SessionDeleteQueueMessage)other; + + return super.equals(other) && r.queueName.equals(queueName); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,98 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionExpiredMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long messageID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionExpiredMessage(final long consumerID, final long messageID) - { - super(PacketImpl.SESS_EXPIRED); - - this.consumerID = consumerID; - - this.messageID = messageID; - } - - public SessionExpiredMessage() - { - super(PacketImpl.SESS_EXPIRED); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getMessageID() - { - return messageID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - - buffer.writeLong(messageID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - - messageID = buffer.readLong(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionExpiredMessage == false) - { - return false; - } - - SessionExpiredMessage r = (SessionExpiredMessage)other; - - return super.equals(other) && consumerID == r.consumerID && messageID == r.messageID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,98 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class SessionExpiredMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private long messageID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionExpiredMessage(final long consumerID, final long messageID) + { + super(PacketImpl.SESS_EXPIRED); + + this.consumerID = consumerID; + + this.messageID = messageID; + } + + public SessionExpiredMessage() + { + super(PacketImpl.SESS_EXPIRED); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public long getMessageID() + { + return messageID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + + buffer.writeLong(messageID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + + messageID = buffer.readLong(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionExpiredMessage == false) + { + return false; + } + + SessionExpiredMessage r = (SessionExpiredMessage)other; + + return super.equals(other) && consumerID == r.consumerID && messageID == r.messageID; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,109 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A SessionConsumerForceDelivery - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - */ -public class SessionForceConsumerDelivery extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long sequence; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionForceConsumerDelivery(final long consumerID, final long sequence) - { - super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); - - this.consumerID = consumerID; - this.sequence = sequence; - } - - public SessionForceConsumerDelivery() - { - super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getSequence() - { - return sequence; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeLong(sequence); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - sequence = buffer.readLong(); - } - - @Override - public String toString() - { - StringBuffer buf = new StringBuffer(getParentString()); - buf.append(", consumerID=" + consumerID); - buf.append(", sequence=" + sequence); - buf.append("]"); - return buf.toString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionForceConsumerDelivery == false) - { - return false; - } - - SessionForceConsumerDelivery r = (SessionForceConsumerDelivery)other; - - return super.equals(other) && consumerID == r.consumerID && sequence == r.sequence; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,109 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionConsumerForceDelivery + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + */ +public class SessionForceConsumerDelivery extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private long sequence; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionForceConsumerDelivery(final long consumerID, final long sequence) + { + super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); + + this.consumerID = consumerID; + this.sequence = sequence; + } + + public SessionForceConsumerDelivery() + { + super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public long getSequence() + { + return sequence; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + buffer.writeLong(sequence); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + sequence = buffer.readLong(); + } + + @Override + public String toString() + { + StringBuffer buf = new StringBuffer(getParentString()); + buf.append(", consumerID=" + consumerID); + buf.append(", sequence=" + sequence); + buf.append("]"); + return buf.toString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionForceConsumerDelivery == false) + { + return false; + } + + SessionForceConsumerDelivery r = (SessionForceConsumerDelivery)other; + + return super.equals(other) && consumerID == r.consumerID && sequence == r.sequence; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,96 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionProducerCreditsMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int credits; - - private SimpleString address; - - private int offset; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionProducerCreditsMessage(final int credits, final SimpleString address, final int offset) - { - super(PacketImpl.SESS_PRODUCER_CREDITS); - - this.credits = credits; - - this.address = address; - - this.offset = offset; - } - - public SessionProducerCreditsMessage() - { - super(PacketImpl.SESS_PRODUCER_CREDITS); - } - - // Public -------------------------------------------------------- - - public int getCredits() - { - return credits; - } - - public SimpleString getAddress() - { - return address; - } - - public int getOffset() - { - return offset; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(credits); - buffer.writeSimpleString(address); - buffer.writeInt(offset); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - credits = buffer.readInt(); - address = buffer.readSimpleString(); - offset = buffer.readInt(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionProducerCreditsMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int credits; + + private SimpleString address; + + private int offset; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionProducerCreditsMessage(final int credits, final SimpleString address, final int offset) + { + super(PacketImpl.SESS_PRODUCER_CREDITS); + + this.credits = credits; + + this.address = address; + + this.offset = offset; + } + + public SessionProducerCreditsMessage() + { + super(PacketImpl.SESS_PRODUCER_CREDITS); + } + + // Public -------------------------------------------------------- + + public int getCredits() + { + return credits; + } + + public SimpleString getAddress() + { + return address; + } + + public int getOffset() + { + return offset; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(credits); + buffer.writeSimpleString(address); + buffer.writeInt(offset); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + credits = buffer.readInt(); + address = buffer.readSimpleString(); + offset = buffer.readInt(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,73 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * - * A SessionQueueQueryMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionQueueQueryMessage extends PacketImpl -{ - private SimpleString queueName; - - public SessionQueueQueryMessage(final SimpleString queueName) - { - super(PacketImpl.SESS_QUEUEQUERY); - - this.queueName = queueName; - } - - public SessionQueueQueryMessage() - { - super(PacketImpl.SESS_QUEUEQUERY); - } - - public SimpleString getQueueName() - { - return queueName; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(queueName); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - queueName = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionQueueQueryMessage == false) - { - return false; - } - - SessionQueueQueryMessage r = (SessionQueueQueryMessage)other; - - return super.equals(other) && r.queueName.equals(queueName); - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,73 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionQueueQueryMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionQueueQueryMessage extends PacketImpl +{ + private SimpleString queueName; + + public SessionQueueQueryMessage(final SimpleString queueName) + { + super(PacketImpl.SESS_QUEUEQUERY); + + this.queueName = queueName; + } + + public SessionQueueQueryMessage() + { + super(PacketImpl.SESS_QUEUEQUERY); + } + + public SimpleString getQueueName() + { + return queueName; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(queueName); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + queueName = buffer.readSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionQueueQueryMessage == false) + { + return false; + } + + SessionQueueQueryMessage r = (SessionQueueQueryMessage)other; + + return super.equals(other) && r.queueName.equals(queueName); + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,176 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.server.QueueQueryResult; - -/** - * - * A SessionQueueQueryResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionQueueQueryResponseMessage extends PacketImpl -{ - private SimpleString name; - - private boolean exists; - - private boolean durable; - - private int consumerCount; - - private int messageCount; - - private SimpleString filterString; - - private SimpleString address; - - private boolean temporary; - - public SessionQueueQueryResponseMessage(final QueueQueryResult result) - { - this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), - result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists()); - } - - public SessionQueueQueryResponseMessage() - { - this(null, null, false, false, null, 0, 0, false); - } - - private SessionQueueQueryResponseMessage(final SimpleString name, - final SimpleString address, - final boolean durable, - final boolean temporary, - final SimpleString filterString, - final int consumerCount, - final int messageCount, - final boolean exists) - { - super(PacketImpl.SESS_QUEUEQUERY_RESP); - - this.durable = durable; - - this.temporary = temporary; - - this.consumerCount = consumerCount; - - this.messageCount = messageCount; - - this.filterString = filterString; - - this.address = address; - - this.name = name; - - this.exists = exists; - } - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isExists() - { - return exists; - } - - public boolean isDurable() - { - return durable; - } - - public int getConsumerCount() - { - return consumerCount; - } - - public int getMessageCount() - { - return messageCount; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public SimpleString getAddress() - { - return address; - } - - public SimpleString getName() - { - return name; - } - - public boolean isTemporary() - { - return temporary; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(exists); - buffer.writeBoolean(durable); - buffer.writeBoolean(temporary); - buffer.writeInt(consumerCount); - buffer.writeInt(messageCount); - buffer.writeNullableSimpleString(filterString); - buffer.writeNullableSimpleString(address); - buffer.writeNullableSimpleString(name); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - exists = buffer.readBoolean(); - durable = buffer.readBoolean(); - temporary = buffer.readBoolean(); - consumerCount = buffer.readInt(); - messageCount = buffer.readInt(); - filterString = buffer.readNullableSimpleString(); - address = buffer.readNullableSimpleString(); - name = buffer.readNullableSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionQueueQueryResponseMessage == false) - { - return false; - } - - SessionQueueQueryResponseMessage r = (SessionQueueQueryResponseMessage)other; - - return super.equals(other) && exists == r.exists && - durable == r.durable && - consumerCount == r.consumerCount && - messageCount == r.messageCount && - filterString == null ? r.filterString == null - : filterString.equals(r.filterString) && address == null ? r.address == null - : address.equals(r.address); - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,176 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.server.QueueQueryResult; + +/** + * + * A SessionQueueQueryResponseMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionQueueQueryResponseMessage extends PacketImpl +{ + private SimpleString name; + + private boolean exists; + + private boolean durable; + + private int consumerCount; + + private int messageCount; + + private SimpleString filterString; + + private SimpleString address; + + private boolean temporary; + + public SessionQueueQueryResponseMessage(final QueueQueryResult result) + { + this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), + result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists()); + } + + public SessionQueueQueryResponseMessage() + { + this(null, null, false, false, null, 0, 0, false); + } + + private SessionQueueQueryResponseMessage(final SimpleString name, + final SimpleString address, + final boolean durable, + final boolean temporary, + final SimpleString filterString, + final int consumerCount, + final int messageCount, + final boolean exists) + { + super(PacketImpl.SESS_QUEUEQUERY_RESP); + + this.durable = durable; + + this.temporary = temporary; + + this.consumerCount = consumerCount; + + this.messageCount = messageCount; + + this.filterString = filterString; + + this.address = address; + + this.name = name; + + this.exists = exists; + } + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isExists() + { + return exists; + } + + public boolean isDurable() + { + return durable; + } + + public int getConsumerCount() + { + return consumerCount; + } + + public int getMessageCount() + { + return messageCount; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public SimpleString getAddress() + { + return address; + } + + public SimpleString getName() + { + return name; + } + + public boolean isTemporary() + { + return temporary; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(exists); + buffer.writeBoolean(durable); + buffer.writeBoolean(temporary); + buffer.writeInt(consumerCount); + buffer.writeInt(messageCount); + buffer.writeNullableSimpleString(filterString); + buffer.writeNullableSimpleString(address); + buffer.writeNullableSimpleString(name); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + exists = buffer.readBoolean(); + durable = buffer.readBoolean(); + temporary = buffer.readBoolean(); + consumerCount = buffer.readInt(); + messageCount = buffer.readInt(); + filterString = buffer.readNullableSimpleString(); + address = buffer.readNullableSimpleString(); + name = buffer.readNullableSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionQueueQueryResponseMessage == false) + { + return false; + } + + SessionQueueQueryResponseMessage r = (SessionQueueQueryResponseMessage)other; + + return super.equals(other) && exists == r.exists && + durable == r.durable && + consumerCount == r.consumerCount && + messageCount == r.messageCount && + filterString == null ? r.filterString == null + : filterString.equals(r.filterString) && address == null ? r.address == null + : address.equals(r.address); + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,96 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.utils.DataConstants; - -/** - * A SessionSendContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 4, 2008 12:25:14 PM - * - * - */ -public class SessionReceiveContinuationMessage extends SessionContinuationMessage -{ - - // Constants ----------------------------------------------------- - - public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SessionContinuationMessage.SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG; - - // Attributes ---------------------------------------------------- - - private long consumerID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionReceiveContinuationMessage() - { - super(PacketImpl.SESS_RECEIVE_CONTINUATION); - } - - /** - * @param consumerID - * @param body - * @param continues - * @param requiresResponse - */ - public SessionReceiveContinuationMessage(final long consumerID, - final byte[] body, - final boolean continues, - final boolean requiresResponse) - { - super(PacketImpl.SESS_RECEIVE_CONTINUATION, body, continues); - this.consumerID = consumerID; - } - - /** - * @return the consumerID - */ - public long getConsumerID() - { - return consumerID; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - super.encodeRest(buffer); - buffer.writeLong(consumerID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - super.decodeRest(buffer); - consumerID = buffer.readLong(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.utils.DataConstants; + +/** + * A SessionSendContinuationMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Dec 4, 2008 12:25:14 PM + * + * + */ +public class SessionReceiveContinuationMessage extends SessionContinuationMessage +{ + + // Constants ----------------------------------------------------- + + public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SessionContinuationMessage.SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG; + + // Attributes ---------------------------------------------------- + + private long consumerID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionReceiveContinuationMessage() + { + super(PacketImpl.SESS_RECEIVE_CONTINUATION); + } + + /** + * @param consumerID + * @param body + * @param continues + * @param requiresResponse + */ + public SessionReceiveContinuationMessage(final long consumerID, + final byte[] body, + final boolean continues, + final boolean requiresResponse) + { + super(PacketImpl.SESS_RECEIVE_CONTINUATION, body, continues); + this.consumerID = consumerID; + } + + /** + * @return the consumerID + */ + public long getConsumerID() + { + return consumerID; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + super.encodeRest(buffer); + buffer.writeLong(consumerID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + super.decodeRest(buffer); + consumerID = buffer.readLong(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,102 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A SessionReceiveLargeMessage - * - * @author Clebert Suconic - * - * - */ -public class SessionReceiveLargeMessage extends PacketImpl -{ - private byte[] largeMessageHeader; - - /** Since we receive the message before the entire message was received, */ - private long largeMessageSize; - - private long consumerID; - - private int deliveryCount; - - public SessionReceiveLargeMessage() - { - super(PacketImpl.SESS_RECEIVE_LARGE_MSG); - } - - public SessionReceiveLargeMessage(final long consumerID, - final byte[] largeMessageHeader, - final long largeMessageSize, - final int deliveryCount) - { - super(PacketImpl.SESS_RECEIVE_LARGE_MSG); - - this.consumerID = consumerID; - - this.largeMessageHeader = largeMessageHeader; - - this.deliveryCount = deliveryCount; - - this.largeMessageSize = largeMessageSize; - } - - public byte[] getLargeMessageHeader() - { - return largeMessageHeader; - } - - public long getConsumerID() - { - return consumerID; - } - - public int getDeliveryCount() - { - return deliveryCount; - } - - /** - * @return the largeMessageSize - */ - public long getLargeMessageSize() - { - return largeMessageSize; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeInt(deliveryCount); - buffer.writeLong(largeMessageSize); - buffer.writeInt(largeMessageHeader.length); - buffer.writeBytes(largeMessageHeader); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - deliveryCount = buffer.readInt(); - largeMessageSize = buffer.readLong(); - int size = buffer.readInt(); - largeMessageHeader = new byte[size]; - buffer.readBytes(largeMessageHeader); - } - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A SessionReceiveLargeMessage + * + * @author Clebert Suconic + * + * + */ +public class SessionReceiveLargeMessage extends PacketImpl +{ + private byte[] largeMessageHeader; + + /** Since we receive the message before the entire message was received, */ + private long largeMessageSize; + + private long consumerID; + + private int deliveryCount; + + public SessionReceiveLargeMessage() + { + super(PacketImpl.SESS_RECEIVE_LARGE_MSG); + } + + public SessionReceiveLargeMessage(final long consumerID, + final byte[] largeMessageHeader, + final long largeMessageSize, + final int deliveryCount) + { + super(PacketImpl.SESS_RECEIVE_LARGE_MSG); + + this.consumerID = consumerID; + + this.largeMessageHeader = largeMessageHeader; + + this.deliveryCount = deliveryCount; + + this.largeMessageSize = largeMessageSize; + } + + public byte[] getLargeMessageHeader() + { + return largeMessageHeader; + } + + public long getConsumerID() + { + return consumerID; + } + + public int getDeliveryCount() + { + return deliveryCount; + } + + /** + * @return the largeMessageSize + */ + public long getLargeMessageSize() + { + return largeMessageSize; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + buffer.writeInt(deliveryCount); + buffer.writeLong(largeMessageSize); + buffer.writeInt(largeMessageHeader.length); + buffer.writeBytes(largeMessageHeader); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + deliveryCount = buffer.readInt(); + largeMessageSize = buffer.readLong(); + int size = buffer.readInt(); + largeMessageHeader = new byte[size]; + buffer.readBytes(largeMessageHeader); + } + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,120 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionReceiveMessage extends MessagePacket -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(SessionReceiveMessage.class); - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private int deliveryCount; - - public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) - { - super(PacketImpl.SESS_RECEIVE_MSG, message); - - this.consumerID = consumerID; - - this.deliveryCount = deliveryCount; - } - - public SessionReceiveMessage() - { - super(PacketImpl.SESS_RECEIVE_MSG, new ClientMessageImpl()); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public int getDeliveryCount() - { - return deliveryCount; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = message.getEncodedBuffer(); - - // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { - throw new IllegalStateException("Wrong encode position"); - } - - buffer.writeLong(consumerID); - buffer.writeInt(deliveryCount); - - size = buffer.writerIndex(); - - // Write standard headers - - int len = size - DataConstants.SIZE_INT; - buffer.setInt(0, len); - buffer.setByte(DataConstants.SIZE_INT, type); - buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); - - // Position reader for reading by Netty - buffer.setIndex(0, size); - - return buffer; - } - - @Override - public void decode(final HornetQBuffer buffer) - { - channelID = buffer.readLong(); - - message.decodeFromBuffer(buffer); - - consumerID = buffer.readLong(); - - deliveryCount = buffer.readInt(); - - size = buffer.readerIndex(); - - // Need to position buffer for reading - - buffer.setIndex(PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT, message.getEndOfBodyPosition()); - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,120 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.client.impl.ClientMessageImpl; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.message.impl.MessageInternal; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionReceiveMessage extends MessagePacket +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(SessionReceiveMessage.class); + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private int deliveryCount; + + public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) + { + super(PacketImpl.SESS_RECEIVE_MSG, message); + + this.consumerID = consumerID; + + this.deliveryCount = deliveryCount; + } + + public SessionReceiveMessage() + { + super(PacketImpl.SESS_RECEIVE_MSG, new ClientMessageImpl()); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public int getDeliveryCount() + { + return deliveryCount; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + public HornetQBuffer encode(final RemotingConnection connection) + { + HornetQBuffer buffer = message.getEncodedBuffer(); + + // Sanity check + if (buffer.writerIndex() != message.getEndOfMessagePosition()) + { + throw new IllegalStateException("Wrong encode position"); + } + + buffer.writeLong(consumerID); + buffer.writeInt(deliveryCount); + + size = buffer.writerIndex(); + + // Write standard headers + + int len = size - DataConstants.SIZE_INT; + buffer.setInt(0, len); + buffer.setByte(DataConstants.SIZE_INT, type); + buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); + + // Position reader for reading by Netty + buffer.setIndex(0, size); + + return buffer; + } + + @Override + public void decode(final HornetQBuffer buffer) + { + channelID = buffer.readLong(); + + message.decodeFromBuffer(buffer); + + consumerID = buffer.readLong(); + + deliveryCount = buffer.readInt(); + + size = buffer.readerIndex(); + + // Need to position buffer for reading + + buffer.setIndex(PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT, message.getEndOfBodyPosition()); + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,90 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionRequestProducerCreditsMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int credits; - - private SimpleString address; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) - { - super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); - - this.credits = credits; - - this.address = address; - } - - public SessionRequestProducerCreditsMessage() - { - super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); - } - - // Public -------------------------------------------------------- - - public int getCredits() - { - return credits; - } - - public SimpleString getAddress() - { - return address; - } - - // public boolean isRequiresConfirmations() - // { - // return false; - // } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(credits); - buffer.writeSimpleString(address); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - credits = buffer.readInt(); - address = buffer.readSimpleString(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,90 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionRequestProducerCreditsMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int credits; + + private SimpleString address; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) + { + super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); + + this.credits = credits; + + this.address = address; + } + + public SessionRequestProducerCreditsMessage() + { + super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); + } + + // Public -------------------------------------------------------- + + public int getCredits() + { + return credits; + } + + public SimpleString getAddress() + { + return address; + } + + // public boolean isRequiresConfirmations() + // { + // return false; + // } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(credits); + buffer.writeSimpleString(address); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + credits = buffer.readInt(); + address = buffer.readSimpleString(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * A SessionSendContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 4, 2008 12:25:14 PM - * - * - */ -public class SessionSendContinuationMessage extends SessionContinuationMessage -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendContinuationMessage() - { - super(PacketImpl.SESS_SEND_CONTINUATION); - } - - /** - * @param body - * @param continues - * @param requiresResponse - */ - public SessionSendContinuationMessage(final byte[] body, final boolean continues, final boolean requiresResponse) - { - super(PacketImpl.SESS_SEND_CONTINUATION, body, continues); - this.requiresResponse = requiresResponse; - } - - // Public -------------------------------------------------------- - - /** - * @return the requiresResponse - */ - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - super.encodeRest(buffer); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - super.decodeRest(buffer); - requiresResponse = buffer.readBoolean(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A SessionSendContinuationMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Dec 4, 2008 12:25:14 PM + * + * + */ +public class SessionSendContinuationMessage extends SessionContinuationMessage +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionSendContinuationMessage() + { + super(PacketImpl.SESS_SEND_CONTINUATION); + } + + /** + * @param body + * @param continues + * @param requiresResponse + */ + public SessionSendContinuationMessage(final byte[] body, final boolean continues, final boolean requiresResponse) + { + super(PacketImpl.SESS_SEND_CONTINUATION, body, continues); + this.requiresResponse = requiresResponse; + } + + // Public -------------------------------------------------------- + + /** + * @return the requiresResponse + */ + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + super.encodeRest(buffer); + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + super.decodeRest(buffer); + requiresResponse = buffer.readBoolean(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,82 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:csuconic@redhat.com">Clebert Suconic</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionSendLargeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** Used only if largeMessage */ - private byte[] largeMessageHeader; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendLargeMessage(final byte[] largeMessageHeader) - { - super(PacketImpl.SESS_SEND_LARGE); - - this.largeMessageHeader = largeMessageHeader; - } - - public SessionSendLargeMessage() - { - super(PacketImpl.SESS_SEND_LARGE); - } - - // Public -------------------------------------------------------- - - public byte[] getLargeMessageHeader() - { - return largeMessageHeader; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(largeMessageHeader.length); - buffer.writeBytes(largeMessageHeader); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int largeMessageLength = buffer.readInt(); - - largeMessageHeader = new byte[largeMessageLength]; - - buffer.readBytes(largeMessageHeader); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:csuconic@redhat.com">Clebert Suconic</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionSendLargeMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + /** Used only if largeMessage */ + private byte[] largeMessageHeader; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionSendLargeMessage(final byte[] largeMessageHeader) + { + super(PacketImpl.SESS_SEND_LARGE); + + this.largeMessageHeader = largeMessageHeader; + } + + public SessionSendLargeMessage() + { + super(PacketImpl.SESS_SEND_LARGE); + } + + // Public -------------------------------------------------------- + + public byte[] getLargeMessageHeader() + { + return largeMessageHeader; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(largeMessageHeader.length); + buffer.writeBytes(largeMessageHeader); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int largeMessageLength = buffer.readInt(); + + largeMessageHeader = new byte[largeMessageLength]; + + buffer.readBytes(largeMessageHeader); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,115 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.protocol.core.PacketImpl; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionSendMessage extends MessagePacket -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(SessionSendMessage.class); - - // Attributes ---------------------------------------------------- - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendMessage(final MessageInternal message, final boolean requiresResponse) - { - super(PacketImpl.SESS_SEND, message); - - this.requiresResponse = requiresResponse; - } - - public SessionSendMessage() - { - super(PacketImpl.SESS_SEND, new ServerMessageImpl()); - } - - // Public -------------------------------------------------------- - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = message.getEncodedBuffer(); - - // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { - throw new IllegalStateException("Wrong encode position"); - } - - buffer.writeBoolean(requiresResponse); - - size = buffer.writerIndex(); - - // Write standard headers - - int len = size - DataConstants.SIZE_INT; - buffer.setInt(0, len); - buffer.setByte(DataConstants.SIZE_INT, type); - buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); - - // Position reader for reading by Netty - buffer.readerIndex(0); - - message.resetCopied(); - - return buffer; - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - // Buffer comes in after having read standard headers and positioned at Beginning of body part - - message.decodeFromBuffer(buffer); - - int ri = buffer.readerIndex(); - - requiresResponse = buffer.readBoolean(); - - buffer.readerIndex(ri); - - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,115 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.Message; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.message.impl.MessageInternal; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.server.impl.ServerMessageImpl; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionSendMessage extends MessagePacket +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(SessionSendMessage.class); + + // Attributes ---------------------------------------------------- + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionSendMessage(final MessageInternal message, final boolean requiresResponse) + { + super(PacketImpl.SESS_SEND, message); + + this.requiresResponse = requiresResponse; + } + + public SessionSendMessage() + { + super(PacketImpl.SESS_SEND, new ServerMessageImpl()); + } + + // Public -------------------------------------------------------- + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + public HornetQBuffer encode(final RemotingConnection connection) + { + HornetQBuffer buffer = message.getEncodedBuffer(); + + // Sanity check + if (buffer.writerIndex() != message.getEndOfMessagePosition()) + { + throw new IllegalStateException("Wrong encode position"); + } + + buffer.writeBoolean(requiresResponse); + + size = buffer.writerIndex(); + + // Write standard headers + + int len = size - DataConstants.SIZE_INT; + buffer.setInt(0, len); + buffer.setByte(DataConstants.SIZE_INT, type); + buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); + + // Position reader for reading by Netty + buffer.readerIndex(0); + + message.resetCopied(); + + return buffer; + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + // Buffer comes in after having read standard headers and positioned at Beginning of body part + + message.decodeFromBuffer(buffer); + + int ri = buffer.readerIndex(); + + requiresResponse = buffer.readBoolean(); + + buffer.readerIndex(ri); + + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,111 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXACommitMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean onePhase; - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXACommitMessage(final Xid xid, final boolean onePhase) - { - super(PacketImpl.SESS_XA_COMMIT); - - this.xid = xid; - this.onePhase = onePhase; - } - - public SessionXACommitMessage() - { - super(PacketImpl.SESS_XA_COMMIT); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - public boolean isOnePhase() - { - return onePhase; - } - - @Override - public boolean isAsyncExec() - { - return true; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - buffer.writeBoolean(onePhase); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - onePhase = buffer.readBoolean(); - } - - @Override - public String toString() - { - return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXACommitMessage == false) - { - return false; - } - - SessionXACommitMessage r = (SessionXACommitMessage)other; - - return super.equals(other) && xid.equals(r.xid) && onePhase == r.onePhase; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,111 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXACommitMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean onePhase; + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXACommitMessage(final Xid xid, final boolean onePhase) + { + super(PacketImpl.SESS_XA_COMMIT); + + this.xid = xid; + this.onePhase = onePhase; + } + + public SessionXACommitMessage() + { + super(PacketImpl.SESS_XA_COMMIT); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + public boolean isOnePhase() + { + return onePhase; + } + + @Override + public boolean isAsyncExec() + { + return true; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + buffer.writeBoolean(onePhase); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + onePhase = buffer.readBoolean(); + } + + @Override + public String toString() + { + return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXACommitMessage == false) + { + return false; + } + + SessionXACommitMessage r = (SessionXACommitMessage)other; + + return super.equals(other) && xid.equals(r.xid) && onePhase == r.onePhase; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,106 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - private boolean failed; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAEndMessage(final Xid xid, final boolean failed) - { - super(PacketImpl.SESS_XA_END); - - this.xid = xid; - - this.failed = failed; - } - - public SessionXAEndMessage() - { - super(PacketImpl.SESS_XA_END); - } - - // Public -------------------------------------------------------- - - public boolean isFailed() - { - return failed; - } - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - buffer.writeBoolean(failed); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - failed = buffer.readBoolean(); - } - - @Override - public String toString() - { - return getParentString() + ", xid=" + xid + ", failed=" + failed + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAEndMessage == false) - { - return false; - } - - SessionXAEndMessage r = (SessionXAEndMessage)other; - - return super.equals(other) && xid.equals(r.xid) && failed == r.failed; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,106 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAEndMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + private boolean failed; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAEndMessage(final Xid xid, final boolean failed) + { + super(PacketImpl.SESS_XA_END); + + this.xid = xid; + + this.failed = failed; + } + + public SessionXAEndMessage() + { + super(PacketImpl.SESS_XA_END); + } + + // Public -------------------------------------------------------- + + public boolean isFailed() + { + return failed; + } + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + buffer.writeBoolean(failed); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + failed = buffer.readBoolean(); + } + + @Override + public String toString() + { + return getParentString() + ", xid=" + xid + ", failed=" + failed + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAEndMessage == false) + { + return false; + } + + SessionXAEndMessage r = (SessionXAEndMessage)other; + + return super.equals(other) && xid.equals(r.xid) && failed == r.failed; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAForgetMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAForgetMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_FORGET); - - this.xid = xid; - } - - public SessionXAForgetMessage() - { - super(PacketImpl.SESS_XA_FORGET); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAForgetMessage == false) - { - return false; - } - - SessionXAForgetMessage r = (SessionXAForgetMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAForgetMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAForgetMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_FORGET); + + this.xid = xid; + } + + public SessionXAForgetMessage() + { + super(PacketImpl.SESS_XA_FORGET); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAForgetMessage == false) + { + return false; + } + + SessionXAForgetMessage r = (SessionXAForgetMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,127 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import java.util.ArrayList; -import java.util.List; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private List<Xid> xids; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAGetInDoubtXidsResponseMessage(final List<Xid> xids) - { - super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); - - this.xids = xids; - } - - public SessionXAGetInDoubtXidsResponseMessage() - { - super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public List<Xid> getXids() - { - return xids; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(xids.size()); - - for (Xid xid : xids) - { - XidCodecSupport.encodeXid(xid, buffer); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int len = buffer.readInt(); - xids = new ArrayList<Xid>(len); - for (int i = 0; i < len; i++) - { - Xid xid = XidCodecSupport.decodeXid(buffer); - - xids.add(xid); - } - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAGetInDoubtXidsResponseMessage == false) - { - return false; - } - - SessionXAGetInDoubtXidsResponseMessage r = (SessionXAGetInDoubtXidsResponseMessage)other; - - if (super.equals(other)) - { - if (xids.size() == r.xids.size()) - { - for (int i = 0; i < xids.size(); i++) - { - if (!xids.get(i).equals(r.xids.get(i))) - { - return false; - } - } - } - } - else - { - return false; - } - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,127 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import java.util.ArrayList; +import java.util.List; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private List<Xid> xids; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAGetInDoubtXidsResponseMessage(final List<Xid> xids) + { + super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); + + this.xids = xids; + } + + public SessionXAGetInDoubtXidsResponseMessage() + { + super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public List<Xid> getXids() + { + return xids; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(xids.size()); + + for (Xid xid : xids) + { + XidCodecSupport.encodeXid(xid, buffer); + } + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int len = buffer.readInt(); + xids = new ArrayList<Xid>(len); + for (int i = 0; i < len; i++) + { + Xid xid = XidCodecSupport.decodeXid(buffer); + + xids.add(xid); + } + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAGetInDoubtXidsResponseMessage == false) + { + return false; + } + + SessionXAGetInDoubtXidsResponseMessage r = (SessionXAGetInDoubtXidsResponseMessage)other; + + if (super.equals(other)) + { + if (xids.size() == r.xids.size()) + { + for (int i = 0; i < xids.size(); i++) + { + if (!xids.get(i).equals(r.xids.get(i))) + { + return false; + } + } + } + } + else + { + return false; + } + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAGetTimeoutResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int timeoutSeconds; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) - { - super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); - - this.timeoutSeconds = timeoutSeconds; - } - - public SessionXAGetTimeoutResponseMessage() - { - super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public int getTimeoutSeconds() - { - return timeoutSeconds; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(timeoutSeconds); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - timeoutSeconds = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAGetTimeoutResponseMessage == false) - { - return false; - } - - SessionXAGetTimeoutResponseMessage r = (SessionXAGetTimeoutResponseMessage)other; - - return super.equals(other) && timeoutSeconds == r.timeoutSeconds; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAGetTimeoutResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int timeoutSeconds; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) + { + super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); + + this.timeoutSeconds = timeoutSeconds; + } + + public SessionXAGetTimeoutResponseMessage() + { + super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public int getTimeoutSeconds() + { + return timeoutSeconds; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(timeoutSeconds); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + timeoutSeconds = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAGetTimeoutResponseMessage == false) + { + return false; + } + + SessionXAGetTimeoutResponseMessage r = (SessionXAGetTimeoutResponseMessage)other; + + return super.equals(other) && timeoutSeconds == r.timeoutSeconds; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAJoinMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAJoinMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_JOIN); - - this.xid = xid; - } - - public SessionXAJoinMessage() - { - super(PacketImpl.SESS_XA_JOIN); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAJoinMessage == false) - { - return false; - } - - SessionXAJoinMessage r = (SessionXAJoinMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAJoinMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAJoinMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_JOIN); + + this.xid = xid; + } + + public SessionXAJoinMessage() + { + super(PacketImpl.SESS_XA_JOIN); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAJoinMessage == false) + { + return false; + } + + SessionXAJoinMessage r = (SessionXAJoinMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,94 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAPrepareMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAPrepareMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_PREPARE); - - this.xid = xid; - } - - public SessionXAPrepareMessage() - { - super(PacketImpl.SESS_XA_PREPARE); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - public boolean isAsyncExec() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAPrepareMessage == false) - { - return false; - } - - SessionXAPrepareMessage r = (SessionXAPrepareMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,94 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAPrepareMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAPrepareMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_PREPARE); + + this.xid = xid; + } + + public SessionXAPrepareMessage() + { + super(PacketImpl.SESS_XA_PREPARE); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + public boolean isAsyncExec() + { + return true; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAPrepareMessage == false) + { + return false; + } + + SessionXAPrepareMessage r = (SessionXAPrepareMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,115 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean error; - - private int responseCode; - - private String message; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAResponseMessage(final boolean isError, final int responseCode, final String message) - { - super(PacketImpl.SESS_XA_RESP); - - error = isError; - - this.responseCode = responseCode; - - this.message = message; - } - - public SessionXAResponseMessage() - { - super(PacketImpl.SESS_XA_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isError() - { - return error; - } - - public int getResponseCode() - { - return responseCode; - } - - public String getMessage() - { - return message; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(error); - buffer.writeInt(responseCode); - buffer.writeNullableString(message); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - error = buffer.readBoolean(); - responseCode = buffer.readInt(); - message = buffer.readNullableString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAResponseMessage == false) - { - return false; - } - - SessionXAResponseMessage r = (SessionXAResponseMessage)other; - - return super.equals(other) && error == r.error && responseCode == r.responseCode && message.equals(r.message); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,115 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean error; + + private int responseCode; + + private String message; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAResponseMessage(final boolean isError, final int responseCode, final String message) + { + super(PacketImpl.SESS_XA_RESP); + + error = isError; + + this.responseCode = responseCode; + + this.message = message; + } + + public SessionXAResponseMessage() + { + super(PacketImpl.SESS_XA_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isError() + { + return error; + } + + public int getResponseCode() + { + return responseCode; + } + + public String getMessage() + { + return message; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(error); + buffer.writeInt(responseCode); + buffer.writeNullableString(message); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + error = buffer.readBoolean(); + responseCode = buffer.readInt(); + message = buffer.readNullableString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAResponseMessage == false) + { + return false; + } + + SessionXAResponseMessage r = (SessionXAResponseMessage)other; + + return super.equals(other) && error == r.error && responseCode == r.responseCode && message.equals(r.message); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAResumeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAResumeMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_RESUME); - - this.xid = xid; - } - - public SessionXAResumeMessage() - { - super(PacketImpl.SESS_XA_RESUME); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAResumeMessage == false) - { - return false; - } - - SessionXAResumeMessage r = (SessionXAResumeMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAResumeMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAResumeMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_RESUME); + + this.xid = xid; + } + + public SessionXAResumeMessage() + { + super(PacketImpl.SESS_XA_RESUME); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAResumeMessage == false) + { + return false; + } + + SessionXAResumeMessage r = (SessionXAResumeMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXARollbackMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXARollbackMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_ROLLBACK); - - this.xid = xid; - } - - public SessionXARollbackMessage() - { - super(PacketImpl.SESS_XA_ROLLBACK); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - public boolean isAsyncExec() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXARollbackMessage == false) - { - return false; - } - - SessionXARollbackMessage r = (SessionXARollbackMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,95 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXARollbackMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXARollbackMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_ROLLBACK); + + this.xid = xid; + } + + public SessionXARollbackMessage() + { + super(PacketImpl.SESS_XA_ROLLBACK); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + public boolean isAsyncExec() + { + return true; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXARollbackMessage == false) + { + return false; + } + + SessionXARollbackMessage r = (SessionXARollbackMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,87 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXASetTimeoutMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int timeoutSeconds; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXASetTimeoutMessage(final int timeoutSeconds) - { - super(PacketImpl.SESS_XA_SET_TIMEOUT); - - this.timeoutSeconds = timeoutSeconds; - } - - public SessionXASetTimeoutMessage() - { - super(PacketImpl.SESS_XA_SET_TIMEOUT); - } - - // Public -------------------------------------------------------- - - public int getTimeoutSeconds() - { - return timeoutSeconds; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(timeoutSeconds); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - timeoutSeconds = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXASetTimeoutMessage == false) - { - return false; - } - - SessionXASetTimeoutMessage r = (SessionXASetTimeoutMessage)other; - - return super.equals(other) && timeoutSeconds == r.timeoutSeconds; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,87 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXASetTimeoutMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int timeoutSeconds; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXASetTimeoutMessage(final int timeoutSeconds) + { + super(PacketImpl.SESS_XA_SET_TIMEOUT); + + this.timeoutSeconds = timeoutSeconds; + } + + public SessionXASetTimeoutMessage() + { + super(PacketImpl.SESS_XA_SET_TIMEOUT); + } + + // Public -------------------------------------------------------- + + public int getTimeoutSeconds() + { + return timeoutSeconds; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(timeoutSeconds); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + timeoutSeconds = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXASetTimeoutMessage == false) + { + return false; + } + + SessionXASetTimeoutMessage r = (SessionXASetTimeoutMessage)other; + + return super.equals(other) && timeoutSeconds == r.timeoutSeconds; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXASetTimeoutResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean ok; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXASetTimeoutResponseMessage(final boolean ok) - { - super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); - - this.ok = ok; - } - - public SessionXASetTimeoutResponseMessage() - { - super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isOK() - { - return ok; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(ok); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - ok = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXASetTimeoutResponseMessage == false) - { - return false; - } - - SessionXASetTimeoutResponseMessage r = (SessionXASetTimeoutResponseMessage)other; - - return super.equals(other) && ok == r.ok; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXASetTimeoutResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean ok; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXASetTimeoutResponseMessage(final boolean ok) + { + super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); + + this.ok = ok; + } + + public SessionXASetTimeoutResponseMessage() + { + super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isOK() + { + return ok; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(ok); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + ok = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXASetTimeoutResponseMessage == false) + { + return false; + } + + SessionXASetTimeoutResponseMessage r = (SessionXASetTimeoutResponseMessage)other; + + return super.equals(other) && ok == r.ok; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.protocol.core.PacketImpl; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAStartMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAStartMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_START); - - this.xid = xid; - } - - public SessionXAStartMessage() - { - super(PacketImpl.SESS_XA_START); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAStartMessage == false) - { - return false; - } - - SessionXAStartMessage r = (SessionXAStartMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAStartMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAStartMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_START); + + this.xid = xid; + } + + public SessionXAStartMessage() + { + super(PacketImpl.SESS_XA_START); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAStartMessage == false) + { + return false; + } + + SessionXAStartMessage r = (SessionXAStartMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java 2010-01-21 13:31:05 UTC (rev 8821) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -1,73 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.protocol.core.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -public class XidCodecSupport -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - public static void encodeXid(final Xid xid, final HornetQBuffer out) - { - out.writeInt(xid.getFormatId()); - out.writeInt(xid.getBranchQualifier().length); - out.writeBytes(xid.getBranchQualifier()); - out.writeInt(xid.getGlobalTransactionId().length); - out.writeBytes(xid.getGlobalTransactionId()); - } - - public static Xid decodeXid(final HornetQBuffer in) - { - int formatID = in.readInt(); - byte[] bq = new byte[in.readInt()]; - in.readBytes(bq); - byte[] gtxid = new byte[in.readInt()]; - in.readBytes(gtxid); - Xid xid = new XidImpl(bq, formatID, gtxid); - return xid; - } - - public static int getXidEncodeLength(final Xid xid) - { - return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length; - } - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Copied: branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java (from rev 8821, trunk/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java) =================================================================== --- branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java (rev 0) +++ branches/HORNETQ-129_STOMP_protocol/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java 2010-01-21 14:33:41 UTC (rev 8822) @@ -0,0 +1,73 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.transaction.impl.XidImpl; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +public class XidCodecSupport +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + public static void encodeXid(final Xid xid, final HornetQBuffer out) + { + out.writeInt(xid.getFormatId()); + out.writeInt(xid.getBranchQualifier().length); + out.writeBytes(xid.getBranchQualifier()); + out.writeInt(xid.getGlobalTransactionId().length); + out.writeBytes(xid.getGlobalTransactionId()); + } + + public static Xid decodeXid(final HornetQBuffer in) + { + int formatID = in.readInt(); + byte[] bq = new byte[in.readInt()]; + in.readBytes(bq); + byte[] gtxid = new byte[in.readInt()]; + in.readBytes(gtxid); + Xid xid = new XidImpl(bq, formatID, gtxid); + return xid; + } + + public static int getXidEncodeLength(final Xid xid) + { + return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length; + } + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +}

16 years, 6 months

1
0
0 / 0

JBoss hornetq SVN: r8821 - in trunk: src/main/org/hornetq/api/core and 24 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-21 08:31:05 -0500 (Thu, 21 Jan 2010) New Revision: 8821 Added: trunk/src/main/org/hornetq/core/protocol/ trunk/src/main/org/hornetq/core/protocol/core/ trunk/src/main/org/hornetq/core/protocol/core/Channel.java trunk/src/main/org/hornetq/core/protocol/core/ChannelHandler.java trunk/src/main/org/hornetq/core/protocol/core/ChannelImpl.java trunk/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java trunk/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java trunk/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java trunk/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java trunk/src/main/org/hornetq/core/protocol/core/Packet.java trunk/src/main/org/hornetq/core/protocol/core/PacketDecoder.java trunk/src/main/org/hornetq/core/protocol/core/PacketImpl.java trunk/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java trunk/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java Removed: trunk/src/main/org/hornetq/core/remoting/Channel.java trunk/src/main/org/hornetq/core/remoting/ChannelHandler.java trunk/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java trunk/src/main/org/hornetq/core/remoting/CoreRemotingConnection.java trunk/src/main/org/hornetq/core/remoting/Packet.java trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java trunk/src/main/org/hornetq/core/remoting/server/impl/CoreProtocolManager.java trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java trunk/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java Modified: trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java trunk/src/main/org/hornetq/api/core/Interceptor.java trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java trunk/src/main/org/hornetq/core/server/HornetQServer.java trunk/src/main/org/hornetq/core/server/ServerSession.java trunk/src/main/org/hornetq/core/server/SessionCallback.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java Log: more refactoring for multi-protocols Modified: trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java =================================================================== --- trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -17,9 +17,9 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; /** * A simple Interceptor implementation Modified: trunk/src/main/org/hornetq/api/core/Interceptor.java =================================================================== --- trunk/src/main/org/hornetq/api/core/Interceptor.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/api/core/Interceptor.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -14,7 +14,7 @@ package org.hornetq.api.core; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; /** Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -25,12 +25,12 @@ import org.hornetq.core.list.PriorityLinkedList; import org.hornetq.core.list.impl.PriorityLinkedListImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; import org.hornetq.utils.Future; import org.hornetq.utils.TokenBucketLimiter; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -17,9 +17,9 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; /** * Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -24,10 +24,10 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; import org.hornetq.utils.TokenBucketLimiter; import org.hornetq.utils.UUIDGenerator; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -33,47 +33,47 @@ import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CommandConfirmationHandler; -import org.hornetq.core.remoting.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CommandConfirmationHandler; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.RollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; +import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; +import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; +import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.utils.ConcurrentHashSet; import org.hornetq.utils.IDGenerator; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -16,11 +16,11 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.core.remoting.CoreRemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; /** * A ClientSessionInternal Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -13,21 +13,21 @@ package org.hornetq.core.client.impl; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.EXCEPTION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.EXCEPTION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_MSG; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; /** * Modified: trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -27,11 +27,11 @@ import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.CoreRemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; import org.hornetq.utils.ConcurrentHashSet; /** Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -16,7 +16,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.core.remoting.CoreRemotingConnection; +import org.hornetq.core.protocol.core.CoreRemotingConnection; /** * A ConnectionManager Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -35,18 +35,18 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.Ping; import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.impl.AbstractBufferHandler; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.Ping; import org.hornetq.core.version.Version; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; Modified: trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -30,7 +30,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; import org.hornetq.utils.DataConstants; import org.hornetq.utils.UTF8Util; import org.jboss.netty.buffer.ChannelBuffer; Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -27,7 +27,7 @@ import org.hornetq.core.client.impl.LargeMessageBufferInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.utils.DataConstants; import org.hornetq.utils.TypedProperties; Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -55,7 +55,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.impl.wireformat.XidCodecSupport; +import org.hornetq.core.protocol.core.wireformat.XidCodecSupport; import org.hornetq.core.replication.ReplicationManager; import org.hornetq.core.replication.impl.ReplicatedJournal; import org.hornetq.core.server.JournalType; Copied: trunk/src/main/org/hornetq/core/protocol/core/Channel.java (from rev 8818, trunk/src/main/org/hornetq/core/remoting/Channel.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/Channel.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/Channel.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,178 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.concurrent.locks.Lock; + +import org.hornetq.api.core.HornetQException; + +/** + * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. + * + * Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel + * when received by the {@link org.hornetq.core.protocol.core.CoreRemotingConnection}. see {@link org.hornetq.core.protocol.core.Packet#setChannelID(long)}. + * + * Each Channel should will forward any packets received to its {@link org.hornetq.core.protocol.core.ChannelHandler}. + * + * A Channel *does not* support concurrent access by more than one thread! + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface Channel +{ + /** + * returns the id of this channel. + * + * @return the id + */ + long getID(); + + /** + * sends a packet on this channel. + * + * @param packet the packet to send + */ + void send(Packet packet); + + /** + * sends a packet on this channel and then blocks until it has been written to the connection. + * + * @param packet the packet to send + */ + void sendAndFlush(Packet packet); + + /** + * sends a packet on this channel and then blocks until a response is received or a timeout occurs. + * + * @param packet the packet to send + * @return the response + * @throws HornetQException if an error occurs during the send + */ + Packet sendBlocking(Packet packet) throws HornetQException; + + /** + * sets the {@link org.hornetq.core.protocol.core.ChannelHandler} that this channel should forward received packets to. + * + * @param handler the handler + */ + void setHandler(ChannelHandler handler); + + /** + * closes this channel. + * + * once closed no packets can be sent. + */ + void close(); + + /** + * transfers the connection used by this channel to the one specified. + * + * All new packets will be sent via this connection. + * + * @param newConnection the new connection + */ + void transferConnection(CoreRemotingConnection newConnection); + + /** + * resends any packets that have not received confirmations yet. + * + * Typically called after a connection has been transferred. + * + * @param lastConfirmedCommandID the last confirmed packet + */ + void replayCommands(int lastConfirmedCommandID); + + /** + * returns the last confirmed packet command id + * + * @return the id + */ + int getLastConfirmedCommandID(); + + /** + * locks the channel. + * + * While locked no packets can be sent or received + */ + void lock(); + + /** + * unlocks the channel. + */ + void unlock(); + + /** + * forces any {@link org.hornetq.core.protocol.core.Channel#sendBlocking(Packet)} request to return with an exception. + */ + void returnBlocking(); + + /** + * returns the channel lock + * + * @return the lock + */ + Lock getLock(); + + /** + * returns the Remoting Connection being used by the channel + */ + CoreRemotingConnection getConnection(); + + /** + * sends a confirmation of a packet being received. + * + * @param packet the packet to confirm + */ + void confirm(Packet packet); + + /** + * sets the handler to use when a confirmation is received. + * + * @param handler the handler to call + */ + void setCommandConfirmationHandler(CommandConfirmationHandler handler); + + /** + * flushes any confirmations on to the connection. + */ + void flushConfirmations(); + + /** + * Called by {@link org.hornetq.core.protocol.core.CoreRemotingConnection} when a packet is received. + * + * This method should then call its {@link org.hornetq.core.protocol.core.ChannelHandler} after appropriate processing of + * the packet + * + * @param packet the packet to process. + */ + void handlePacket(Packet packet); + + /** + * clears any commands from the cache that are yet to be confirmed. + */ + void clearCommands(); + + /** + * returns the confirmation window size this channel is using. + * + * @return the window size + */ + int getConfirmationWindowSize(); + + /** + * notifies the channel if it is transferring its connection. When true it is illegal to send messages. + * + * @param transferring whether the channel is transferring + */ + void setTransferring(boolean transferring); +} Copied: trunk/src/main/org/hornetq/core/protocol/core/ChannelHandler.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/ChannelHandler.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ChannelHandler.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/ChannelHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + + +/** + * A ChannelHandler is used by {@link Channel}. When a channel receives a packet it will call its handler to deal with the + * packet. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface ChannelHandler +{ + /** + * called by the channel when a packet is received.. + * + * @param packet the packet received + */ + void handlePacket(Packet packet); +} Copied: trunk/src/main/org/hornetq/core/protocol/core/ChannelImpl.java (from rev 8818, trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ChannelImpl.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/ChannelImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,508 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.PacketsConfirmedMessage; +import org.hornetq.core.remoting.RemotingConnection; + +/** + * A ChannelImpl + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public class ChannelImpl implements Channel +{ + private static final Logger log = Logger.getLogger(ChannelImpl.class); + + private volatile long id; + + private ChannelHandler handler; + + private Packet response; + + private final java.util.Queue<Packet> resendCache; + + private volatile int firstStoredCommandID; + + private volatile int lastConfirmedCommandID = -1; + + private volatile CoreRemotingConnection connection; + + private volatile boolean closed; + + private final Lock lock = new ReentrantLock(); + + private final Condition sendCondition = lock.newCondition(); + + private final Condition failoverCondition = lock.newCondition(); + + private final Object sendLock = new Object(); + + private final Object sendBlockingLock = new Object(); + + private boolean failingOver; + + private final int confWindowSize; + + private int receivedBytes; + + private CommandConfirmationHandler commandConfirmationHandler; + + private volatile boolean transferring; + + public ChannelImpl(final CoreRemotingConnection connection, final long id, final int confWindowSize) + { + this.connection = connection; + + this.id = id; + + this.confWindowSize = confWindowSize; + + if (confWindowSize != -1) + { + resendCache = new ConcurrentLinkedQueue<Packet>(); + } + else + { + resendCache = null; + } + } + + public long getID() + { + return id; + } + + public int getLastConfirmedCommandID() + { + return lastConfirmedCommandID; + } + + public Lock getLock() + { + return lock; + } + + public int getConfirmationWindowSize() + { + return confWindowSize; + } + + public void returnBlocking() + { + lock.lock(); + + try + { + response = new HornetQExceptionMessage(new HornetQException(HornetQException.UNBLOCKED, + "Connection failure detected. Unblocking a blocking call that will never get a response" + + )); + + sendCondition.signal(); + } + finally + { + lock.unlock(); + } + } + + public void sendAndFlush(final Packet packet) + { + send(packet, true); + } + + public void send(final Packet packet) + { + send(packet, false); + } + + public void setTransferring(boolean transferring) + { + this.transferring = transferring; + } + + // This must never called by more than one thread concurrently + public void send(final Packet packet, final boolean flush) + { + synchronized (sendLock) + { + packet.setChannelID(id); + + final HornetQBuffer buffer = packet.encode(connection); + + lock.lock(); + + try + { + while (failingOver) + { + // TODO - don't hardcode this timeout + try + { + failoverCondition.await(10000, TimeUnit.MILLISECONDS); + } + catch (InterruptedException e) + { + } + } + + //Sanity check + if (transferring) + { + throw new IllegalStateException("Cannot send a packet while channel is doing failover"); + } + + + if (resendCache != null && packet.isRequiresConfirmations()) + { + resendCache.add(packet); + } + + connection.getTransportConnection().write(buffer, flush); + } + finally + { + lock.unlock(); + } + } + } + + public Packet sendBlocking(final Packet packet) throws HornetQException + { + if (closed) + { + throw new HornetQException(HornetQException.NOT_CONNECTED, "Connection is destroyed"); + } + + if (connection.getBlockingCallTimeout() == -1) + { + throw new IllegalStateException("Cannot do a blocking call timeout on a server side connection"); + } + + // Synchronized since can't be called concurrently by more than one thread and this can occur + // E.g. blocking acknowledge() from inside a message handler at some time as other operation on main thread + synchronized (sendBlockingLock) + { + packet.setChannelID(id); + + final HornetQBuffer buffer = packet.encode(connection); + + lock.lock(); + + try + { + while (failingOver) + { + // TODO - don't hardcode this timeout + try + { + failoverCondition.await(10000, TimeUnit.MILLISECONDS); + } + catch (InterruptedException e) + { + } + } + + response = null; + + if (resendCache != null && packet.isRequiresConfirmations()) + { + resendCache.add(packet); + } + + connection.getTransportConnection().write(buffer); + + long toWait = connection.getBlockingCallTimeout(); + + long start = System.currentTimeMillis(); + + while (response == null && toWait > 0) + { + try + { + sendCondition.await(toWait, TimeUnit.MILLISECONDS); + } + catch (InterruptedException e) + { + } + + if (closed) + { + break; + } + + final long now = System.currentTimeMillis(); + + toWait -= now - start; + + start = now; + } + + if (response == null) + { + throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, + "Timed out waiting for response when sending packet " + packet.getType()); + } + + if (response.getType() == PacketImpl.EXCEPTION) + { + final HornetQExceptionMessage mem = (HornetQExceptionMessage)response; + + HornetQException e = mem.getException(); + + e.fillInStackTrace(); + + throw e; + } + } + finally + { + lock.unlock(); + } + + return response; + } + } + + public void setCommandConfirmationHandler(final CommandConfirmationHandler handler) + { + commandConfirmationHandler = handler; + } + + public void setHandler(final ChannelHandler handler) + { + this.handler = handler; + } + + public void close() + { + if (closed) + { + return; + } + + if (!connection.isDestroyed() && !connection.removeChannel(id)) + { + throw new IllegalArgumentException("Cannot find channel with id " + id + " to close"); + } + + closed = true; + } + + public void transferConnection(final CoreRemotingConnection newConnection) + { + // Needs to synchronize on the connection to make sure no packets from + // the old connection get processed after transfer has occurred + synchronized (connection.getTransferLock()) + { + connection.removeChannel(id); + + // And switch it + + final CoreRemotingConnection rnewConnection = (CoreRemotingConnection)newConnection; + + rnewConnection.putChannel(id, this); + + connection = rnewConnection; + + transferring = true; + } + } + + public void replayCommands(final int otherLastConfirmedCommandID) + { + if (resendCache != null) + { + clearUpTo(otherLastConfirmedCommandID); + + for (final Packet packet : resendCache) + { + doWrite(packet); + } + } + } + + public void lock() + { + lock.lock(); + + failingOver = true; + + lock.unlock(); + } + + public void unlock() + { + lock.lock(); + + failingOver = false; + + failoverCondition.signalAll(); + + lock.unlock(); + } + + public CoreRemotingConnection getConnection() + { + return connection; + } + + //Needs to be synchronized since can be called by remoting service timer thread too for timeout flush + public synchronized void flushConfirmations() + { + if (resendCache != null && receivedBytes != 0) + { + receivedBytes = 0; + + final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); + + confirmed.setChannelID(id); + + doWrite(confirmed); + } + } + + public void confirm(final Packet packet) + { + if (resendCache != null && packet.isRequiresConfirmations()) + { + lastConfirmedCommandID++; + + receivedBytes += packet.getPacketSize(); + + if (receivedBytes >= confWindowSize) + { + receivedBytes = 0; + + final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); + + confirmed.setChannelID(id); + + doWrite(confirmed); + } + } + } + + public void clearCommands() + { + if (resendCache != null) + { + lastConfirmedCommandID = -1; + + firstStoredCommandID = 0; + + resendCache.clear(); + } + } + + public void handlePacket(final Packet packet) + { + if (packet.getType() == PacketImpl.PACKETS_CONFIRMED) + { + if (resendCache != null) + { + final PacketsConfirmedMessage msg = (PacketsConfirmedMessage)packet; + + clearUpTo(msg.getCommandID()); + } + + if (!connection.isClient()) + { + handler.handlePacket(packet); + } + + return; + } + else + { + if (packet.isResponse()) + { + confirm(packet); + + lock.lock(); + + response = packet; + + try + { + sendCondition.signal(); + } + finally + { + lock.unlock(); + } + } + else if (handler != null) + { + handler.handlePacket(packet); + } + } + } + + private void doWrite(final Packet packet) + { + final HornetQBuffer buffer = packet.encode(connection); + + connection.getTransportConnection().write(buffer); + } + + private void clearUpTo(final int lastReceivedCommandID) + { + final int numberToClear = 1 + lastReceivedCommandID - firstStoredCommandID; + + if (numberToClear == -1) + { + throw new IllegalArgumentException("Invalid lastReceivedCommandID: " + lastReceivedCommandID); + } + + int sizeToFree = 0; + + for (int i = 0; i < numberToClear; i++) + { + final Packet packet = resendCache.poll(); + + if (packet == null) + { + ChannelImpl.log.warn("Can't find packet to clear: " + " last received command id " + + lastReceivedCommandID + + " first stored command id " + + firstStoredCommandID); + return; + } + + if (packet.getType() != PacketImpl.PACKETS_CONFIRMED) + { + sizeToFree += packet.getPacketSize(); + } + + if (commandConfirmationHandler != null) + { + commandConfirmationHandler.commandConfirmed(packet); + } + } + + firstStoredCommandID += numberToClear; + } +} Copied: trunk/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/CommandConfirmationHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,32 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + + +/** + * A CommandConfirmationHandler is used by the channel to confirm confirmations of packets. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 9 Feb 2009 12:39:11 + */ +public interface CommandConfirmationHandler +{ + /** + * called by channel after a confirmation has been received. + * + * @param packet the packet confirmed + */ + void commandConfirmed(Packet packet); +} Copied: trunk/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java (from rev 8818, trunk/src/main/org/hornetq/core/remoting/server/impl/CoreProtocolManager.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/CoreProtocolManager.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,116 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.protocol.core.wireformat.Ping; +import org.hornetq.core.remoting.server.ConnectionEntry; +import org.hornetq.core.remoting.server.ProtocolManager; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.spi.core.remoting.Connection; + +/** + * A CoreProtocolManager + * + * @author Tim Fox + * + * + */ +public class CoreProtocolManager implements ProtocolManager +{ + private final HornetQServer server; + + private final List<Interceptor> interceptors; + + public CoreProtocolManager(final HornetQServer server, + final List<Interceptor> interceptors) + { + this.server = server; + + this.interceptors = interceptors; + } + + public ConnectionEntry createConnectionEntry(final Connection connection) + { + final Configuration config = server.getConfiguration(); + + CoreRemotingConnection rc = new RemotingConnectionImpl(connection, + interceptors, + config.isAsyncConnectionExecutionEnabled() ? server.getExecutorFactory().getExecutor() + : null); + + Channel channel1 = rc.getChannel(1, -1); + + ChannelHandler handler = new HornetQPacketHandler(this, server, channel1, rc); + + channel1.setHandler(handler); + + long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; + + if (config.getConnectionTTLOverride() != -1) + { + ttl = config.getConnectionTTLOverride(); + } + + final ConnectionEntry entry = new ConnectionEntry(rc, System.currentTimeMillis(), ttl); + + final Channel channel0 = rc.getChannel(0, -1); + + channel0.setHandler(new ChannelHandler() + { + public void handlePacket(final Packet packet) + { + if (packet.getType() == PacketImpl.PING) + { + Ping ping = (Ping)packet; + + if (config.getConnectionTTLOverride() == -1) + { + // Allow clients to specify connection ttl + entry.ttl = ping.getConnectionTTL(); + } + + // Just send a ping back + channel0.send(packet); + } + } + }); + + return entry; + } + + private Map<String, ServerSessionPacketHandler> sessionHandlers = + new ConcurrentHashMap<String, ServerSessionPacketHandler>(); + + public ServerSessionPacketHandler getSessionHandler(final String sessionName) + { + return sessionHandlers.get(sessionName); + } + + public void addSessionHandler(final String name, final ServerSessionPacketHandler handler) + { + sessionHandlers.put(name, handler); + } + + public void removeHandler(final String name) + { + sessionHandlers.remove(name); + } +} Copied: trunk/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java (from rev 8818, trunk/src/main/org/hornetq/core/remoting/CoreRemotingConnection.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/CoreRemotingConnection.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,89 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import org.hornetq.core.remoting.RemotingConnection; + + +/** + * Extension of RemotingConnection for the HornetQ core protocol + * + * @author Tim Fox + * + * + */ +public interface CoreRemotingConnection extends RemotingConnection +{ + /** + * return the channel with the channel id specified. + * + * If it does not exist create it with the confirmation window size. + * + * @param channelID the channel id + * @param confWindowSize the confirmation window size + * @return the channel + */ + Channel getChannel(long channelID, int confWindowSize); + + /** + * add the channel with the specified channel id + * + * @param channelID the channel id + * @param channel the channel + */ + void putChannel(long channelID, Channel channel); + + /** + * remove the channel with the specified channel id + * + * @param channelID the channel id + * @return true if removed + */ + boolean removeChannel(long channelID); + + /** + * generate a unique (within this connection) channel id + * + * @return the id + */ + long generateChannelID(); + + /** + * resets the id generator used to when generating id's + * + * @param id the first id to set it to + */ + void syncIDGeneratorSequence(long id); + + /** + * return the next id that will be chosen. + * + * @return the id + */ + long getIDGeneratorSequence(); + + /** + * return the current tomeout for blocking calls + * + * @return the timeout in milliseconds + */ + long getBlockingCallTimeout(); + + /** + * return the transfer lock used when transferring connections. + * + * @return the lock + */ + Object getTransferLock(); +} Copied: trunk/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java (from rev 8818, trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/HornetQPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,310 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_REPLICATION; +import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.replication.ReplicationEndpoint; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.ServerSession; +import org.hornetq.core.version.Version; + +/** + * A packet handler for all packets that need to be handled at the server level + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> + */ +public class HornetQPacketHandler implements ChannelHandler +{ + private static final Logger log = Logger.getLogger(HornetQPacketHandler.class); + + private final HornetQServer server; + + private final Channel channel1; + + private final CoreRemotingConnection connection; + + private final CoreProtocolManager protocolManager; + + public HornetQPacketHandler(final CoreProtocolManager protocolManager, + final HornetQServer server, + final Channel channel1, + final CoreRemotingConnection connection) + { + this.protocolManager = protocolManager; + + this.server = server; + + this.channel1 = channel1; + + this.connection = connection; + } + + public void handlePacket(final Packet packet) + { + byte type = packet.getType(); + + switch (type) + { + case CREATESESSION: + { + CreateSessionMessage request = (CreateSessionMessage)packet; + + handleCreateSession(request); + + break; + } + case REATTACH_SESSION: + { + ReattachSessionMessage request = (ReattachSessionMessage)packet; + + handleReattachSession(request); + + break; + } + case CREATE_QUEUE: + { + // Create queue can also be fielded here in the case of a replicated store and forward queue creation + + CreateQueueMessage request = (CreateQueueMessage)packet; + + handleCreateQueue(request); + + break; + } + case CREATE_REPLICATION: + { + // Create queue can also be fielded here in the case of a replicated store and forward queue creation + + CreateReplicationSessionMessage request = (CreateReplicationSessionMessage)packet; + + handleCreateReplication(request); + + break; + } + default: + { + HornetQPacketHandler.log.error("Invalid packet " + packet); + } + } + } + + private void handleCreateSession(final CreateSessionMessage request) + { + boolean incompatibleVersion = false; + Packet response; + try + { + Version version = server.getVersion(); + + if (version.getIncrementingVersion() != request.getVersion()) + { + log.warn("Client with version " + request.getVersion() + + " and address " + + connection.getRemoteAddress() + + " is not compatible with server version " + + version.getFullVersion() + + ". " + + "Please ensure all clients and servers are upgraded to the same version for them to " + + "interoperate properly"); + throw new HornetQException(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, + "Server and client versions incompatible"); + } + + if (!server.isStarted()) + { + throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, "Server not started"); + } + + if (!server.checkActivate()) + { + throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, + "Server will not accept create session requests"); + } + + Channel channel = connection.getChannel(request.getSessionChannelID(), request.getWindowSize()); + + ServerSession session = server.createSession(request.getName(), + request.getUsername(), + request.getPassword(), + request.getMinLargeMessageSize(), + connection, + request.isAutoCommitSends(), + request.isAutoCommitAcks(), + request.isPreAcknowledge(), + request.isXA()); + + ServerSessionPacketHandler handler = new ServerSessionPacketHandler(protocolManager, + session, + server.getStorageManager() + .newContext(server.getExecutorFactory() + .getExecutor()), + server.getStorageManager(), + channel); + + session.setCallback(handler); + + channel.setHandler(handler); + + // TODO - where is this removed? + protocolManager.addSessionHandler(request.getName(), handler); + + response = new CreateSessionResponseMessage(server.getVersion().getIncrementingVersion()); + } + catch (HornetQException e) + { + response = new HornetQExceptionMessage((HornetQException)e); + + if (e.getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) + { + incompatibleVersion = true; + } + } + catch (Exception e) + { + HornetQPacketHandler.log.error("Failed to create session", e); + + response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + } + + // send the exception to the client and destroy + // the connection if the client and server versions + // are not compatible + if (incompatibleVersion) + { + channel1.sendAndFlush(response); + } + else + { + channel1.send(response); + } + } + + private void handleReattachSession(final ReattachSessionMessage request) + { + Packet response = null; + + try + { + + if (!server.isStarted()) + { + response = new ReattachSessionResponseMessage(-1, false); + } + + ServerSessionPacketHandler sessionHandler = protocolManager.getSessionHandler(request.getName()); + + if (!server.checkActivate()) + { + response = new ReattachSessionResponseMessage(-1, false); + } + + if (sessionHandler == null) + { + response = new ReattachSessionResponseMessage(-1, false); + } + else + { + if (sessionHandler.getChannel().getConfirmationWindowSize() == -1) + { + // Even though session exists, we can't reattach since confi window size == -1, + // i.e. we don't have a resend cache for commands, so we just close the old session + // and let the client recreate + + sessionHandler.close(); + + response = new ReattachSessionResponseMessage(-1, false); + } + else + { + // Reconnect the channel to the new connection + int serverLastConfirmedCommandID = sessionHandler.transferConnection(connection, + request.getLastConfirmedCommandID()); + + response = new ReattachSessionResponseMessage(serverLastConfirmedCommandID, true); + } + } + } + catch (Exception e) + { + HornetQPacketHandler.log.error("Failed to reattach session", e); + + response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + } + + channel1.send(response); + } + + private void handleCreateQueue(final CreateQueueMessage request) + { + try + { + server.createQueue(request.getAddress(), + request.getQueueName(), + request.getFilterString(), + request.isDurable(), + request.isTemporary()); + } + catch (Exception e) + { + HornetQPacketHandler.log.error("Failed to handle create queue", e); + } + } + + private void handleCreateReplication(final CreateReplicationSessionMessage request) + { + Packet response; + + try + { + Channel channel = connection.getChannel(request.getSessionChannelID(), -1); + + ReplicationEndpoint endpoint = server.connectToReplicationEndpoint(channel); + + channel.setHandler(endpoint); + + response = new NullResponseMessage(); + } + catch (Exception e) + { + if (e instanceof HornetQException) + { + response = new HornetQExceptionMessage((HornetQException)e); + } + else + { + HornetQPacketHandler.log.warn(e.getMessage(), e); + response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); + } + } + + channel1.send(response); + } + +} \ No newline at end of file Copied: trunk/src/main/org/hornetq/core/protocol/core/Packet.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/Packet.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/Packet.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/Packet.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,86 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.remoting.RemotingConnection; + +/** + * A Packet represents a pcaket of data transmitted over a connection. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface Packet +{ + /** + * This sets the channel id that should be used once the packet has been successfully decoded it is sent to the correct channel. + * + * @param channelID the id of the channel to handle the packet + */ + void setChannelID(long channelID); + + /** + * returns the channel id of the channel that should handle this pcaket + * + * @return the id of the channel + */ + long getChannelID(); + + /** + * returns true if this packet is being sent in response to a previously received packet + * + * @return true if a response + */ + boolean isResponse(); + + /** + * returns the type of the packet. + * + * This is needed when decoding the packet + * + * @return the packet type + */ + byte getType(); + + /** + * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data + * + * @param connection the connection + * @return the buffer to encode to + */ + HornetQBuffer encode(RemotingConnection connection); + + /** + * decodes the buffer into this packet + * + * @param buffer the buffer to decode from + */ + void decode(HornetQBuffer buffer); + + /** + * returns the size needed to encode this packet. + * + * @return The size of the entire packet including headers, and extra data + */ + int getPacketSize(); + + /** + * returns true if a confirmation should be sent on receipt of this packet. + * + * @return true if confirmation is required + */ + boolean isRequiresConfirmations(); + + boolean isAsyncExec(); +} Copied: trunk/src/main/org/hornetq/core/protocol/core/PacketDecoder.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/PacketDecoder.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/PacketDecoder.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,492 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION; +import static org.hornetq.core.protocol.core.PacketImpl.CREATESESSION_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_REPLICATION; +import static org.hornetq.core.protocol.core.PacketImpl.DELETE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.DISCONNECT; +import static org.hornetq.core.protocol.core.PacketImpl.EXCEPTION; +import static org.hornetq.core.protocol.core.PacketImpl.NULL_RESPONSE; +import static org.hornetq.core.protocol.core.PacketImpl.PACKETS_CONFIRMED; +import static org.hornetq.core.protocol.core.PacketImpl.PING; +import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION; +import static org.hornetq.core.protocol.core.PacketImpl.REATTACH_SESSION_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_APPEND; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_APPEND_TX; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_COMMIT_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_COMPARE_DATA; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_DELETE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_DELETE_TX; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_END; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PAGE_EVENT; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PAGE_WRITE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_PREPARE; +import static org.hornetq.core.protocol.core.PacketImpl.REPLICATION_RESPONSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ACKNOWLEDGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CREATECONSUMER; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_EXPIRED; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FLOWTOKEN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_PRODUCER_CREDITS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_LARGE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_RECEIVE_MSG; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_LARGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_STOP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_END; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_FORGET; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_JOIN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_PREPARE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESUME; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SUSPEND; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.PacketsConfirmedMessage; +import org.hornetq.core.protocol.core.wireformat.Ping; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationResponseMessage; +import org.hornetq.core.protocol.core.wireformat.RollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; +import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; +import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; +import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; + +/** + * A PacketDecoder + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * + */ +public class PacketDecoder +{ + private static final Logger log = Logger.getLogger(PacketDecoder.class); + + public Packet decode(final HornetQBuffer in) + { + final byte packetType = in.readByte(); + + Packet packet; + + switch (packetType) + { + case PING: + { + packet = new Ping(); + break; + } + case DISCONNECT: + { + packet = new PacketImpl(PacketImpl.DISCONNECT); + break; + } + case EXCEPTION: + { + packet = new HornetQExceptionMessage(); + break; + } + case PACKETS_CONFIRMED: + { + packet = new PacketsConfirmedMessage(); + break; + } + case CREATESESSION: + { + packet = new CreateSessionMessage(); + break; + } + case CREATESESSION_RESP: + { + packet = new CreateSessionResponseMessage(); + break; + } + case REATTACH_SESSION: + { + packet = new ReattachSessionMessage(); + break; + } + case REATTACH_SESSION_RESP: + { + packet = new ReattachSessionResponseMessage(); + break; + } + case SESS_CLOSE: + { + packet = new SessionCloseMessage(); + break; + } + case SESS_CREATECONSUMER: + { + packet = new SessionCreateConsumerMessage(); + break; + } + case SESS_ACKNOWLEDGE: + { + packet = new SessionAcknowledgeMessage(); + break; + } + case SESS_EXPIRED: + { + packet = new SessionExpiredMessage(); + break; + } + case SESS_COMMIT: + { + packet = new SessionCommitMessage(); + break; + } + case SESS_ROLLBACK: + { + packet = new RollbackMessage(); + break; + } + case SESS_QUEUEQUERY: + { + packet = new SessionQueueQueryMessage(); + break; + } + case SESS_QUEUEQUERY_RESP: + { + packet = new SessionQueueQueryResponseMessage(); + break; + } + case CREATE_QUEUE: + { + packet = new CreateQueueMessage(); + break; + } + case DELETE_QUEUE: + { + packet = new SessionDeleteQueueMessage(); + break; + } + case SESS_BINDINGQUERY: + { + packet = new SessionBindingQueryMessage(); + break; + } + case SESS_BINDINGQUERY_RESP: + { + packet = new SessionBindingQueryResponseMessage(); + break; + } + case SESS_XA_START: + { + packet = new SessionXAStartMessage(); + break; + } + case SESS_XA_END: + { + packet = new SessionXAEndMessage(); + break; + } + case SESS_XA_COMMIT: + { + packet = new SessionXACommitMessage(); + break; + } + case SESS_XA_PREPARE: + { + packet = new SessionXAPrepareMessage(); + break; + } + case SESS_XA_RESP: + { + packet = new SessionXAResponseMessage(); + break; + } + case SESS_XA_ROLLBACK: + { + packet = new SessionXARollbackMessage(); + break; + } + case SESS_XA_JOIN: + { + packet = new SessionXAJoinMessage(); + break; + } + case SESS_XA_SUSPEND: + { + packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); + break; + } + case SESS_XA_RESUME: + { + packet = new SessionXAResumeMessage(); + break; + } + case SESS_XA_FORGET: + { + packet = new SessionXAForgetMessage(); + break; + } + case SESS_XA_INDOUBT_XIDS: + { + packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); + break; + } + case SESS_XA_INDOUBT_XIDS_RESP: + { + packet = new SessionXAGetInDoubtXidsResponseMessage(); + break; + } + case SESS_XA_SET_TIMEOUT: + { + packet = new SessionXASetTimeoutMessage(); + break; + } + case SESS_XA_SET_TIMEOUT_RESP: + { + packet = new SessionXASetTimeoutResponseMessage(); + break; + } + case SESS_XA_GET_TIMEOUT: + { + packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); + break; + } + case SESS_XA_GET_TIMEOUT_RESP: + { + packet = new SessionXAGetTimeoutResponseMessage(); + break; + } + case SESS_START: + { + packet = new PacketImpl(PacketImpl.SESS_START); + break; + } + case SESS_STOP: + { + packet = new PacketImpl(PacketImpl.SESS_STOP); + break; + } + case SESS_FLOWTOKEN: + { + packet = new SessionConsumerFlowCreditMessage(); + break; + } + case SESS_SEND: + { + packet = new SessionSendMessage(); + break; + } + case SESS_SEND_LARGE: + { + packet = new SessionSendLargeMessage(); + break; + } + case SESS_RECEIVE_MSG: + { + packet = new SessionReceiveMessage(); + break; + } + case SESS_RECEIVE_LARGE_MSG: + { + packet = new SessionReceiveLargeMessage(); + break; + } + case SESS_CONSUMER_CLOSE: + { + packet = new SessionConsumerCloseMessage(); + break; + } + case NULL_RESPONSE: + { + packet = new NullResponseMessage(); + break; + } + case SESS_RECEIVE_CONTINUATION: + { + packet = new SessionReceiveContinuationMessage(); + break; + } + case SESS_SEND_CONTINUATION: + { + packet = new SessionSendContinuationMessage(); + break; + } + case SESS_PRODUCER_REQUEST_CREDITS: + { + packet = new SessionRequestProducerCreditsMessage(); + break; + } + case SESS_PRODUCER_CREDITS: + { + packet = new SessionProducerCreditsMessage(); + break; + } + case CREATE_REPLICATION: + { + packet = new CreateReplicationSessionMessage(); + break; + } + case REPLICATION_APPEND: + { + packet = new ReplicationAddMessage(); + break; + } + case REPLICATION_APPEND_TX: + { + packet = new ReplicationAddTXMessage(); + break; + } + case REPLICATION_DELETE: + { + packet = new ReplicationDeleteMessage(); + break; + } + case REPLICATION_DELETE_TX: + { + packet = new ReplicationDeleteTXMessage(); + break; + } + case REPLICATION_PREPARE: + { + packet = new ReplicationPrepareMessage(); + break; + } + case REPLICATION_COMMIT_ROLLBACK: + { + packet = new ReplicationCommitMessage(); + break; + } + case REPLICATION_RESPONSE: + { + packet = new ReplicationResponseMessage(); + break; + } + case REPLICATION_PAGE_WRITE: + { + packet = new ReplicationPageWriteMessage(); + break; + } + case REPLICATION_PAGE_EVENT: + { + packet = new ReplicationPageEventMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_BEGIN: + { + packet = new ReplicationLargeMessageBeingMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_END: + { + packet = new ReplicationLargemessageEndMessage(); + break; + } + case REPLICATION_LARGE_MESSAGE_WRITE: + { + packet = new ReplicationLargeMessageWriteMessage(); + break; + } + case REPLICATION_COMPARE_DATA: + { + packet = new ReplicationCompareDataMessage(); + break; + } + case SESS_FORCE_CONSUMER_DELIVERY: + { + packet = new SessionForceConsumerDelivery(); + break; + } + default: + { + throw new IllegalArgumentException("Invalid type: " + packetType); + } + } + + packet.decode(in); + + return packet; + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/PacketImpl.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/PacketImpl.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/PacketImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,310 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class PacketImpl implements Packet +{ + // Constants ------------------------------------------------------------------------- + + private static final Logger log = Logger.getLogger(PacketImpl.class); + + // The minimal size for all the packets, Common data for all the packets (look at PacketImpl.encode) + public static final int PACKET_HEADERS_SIZE = DataConstants.SIZE_INT + DataConstants.SIZE_BYTE + + DataConstants.SIZE_LONG; + + private static final int INITIAL_PACKET_SIZE = 1500; + + protected long channelID; + + protected final byte type; + + protected int size = -1; + + // The packet types + // ----------------------------------------------------------------------------------- + + public static final byte PING = 10; + + public static final byte DISCONNECT = 11; + + // Miscellaneous + public static final byte EXCEPTION = 20; + + public static final byte NULL_RESPONSE = 21; + + public static final byte PACKETS_CONFIRMED = 22; + + // Server + public static final byte CREATESESSION = 30; + + public static final byte CREATESESSION_RESP = 31; + + public static final byte REATTACH_SESSION = 32; + + public static final byte REATTACH_SESSION_RESP = 33; + + public static final byte CREATE_QUEUE = 34; + + public static final byte DELETE_QUEUE = 35; + + public static final byte CREATE_REPLICATION = 36; + + // Session + public static final byte SESS_CREATECONSUMER = 40; + + public static final byte SESS_ACKNOWLEDGE = 41; + + public static final byte SESS_EXPIRED = 42; + + public static final byte SESS_COMMIT = 43; + + public static final byte SESS_ROLLBACK = 44; + + public static final byte SESS_QUEUEQUERY = 45; + + public static final byte SESS_QUEUEQUERY_RESP = 46; + + public static final byte SESS_BINDINGQUERY = 49; + + public static final byte SESS_BINDINGQUERY_RESP = 50; + + public static final byte SESS_XA_START = 51; + + public static final byte SESS_XA_END = 52; + + public static final byte SESS_XA_COMMIT = 53; + + public static final byte SESS_XA_PREPARE = 54; + + public static final byte SESS_XA_RESP = 55; + + public static final byte SESS_XA_ROLLBACK = 56; + + public static final byte SESS_XA_JOIN = 57; + + public static final byte SESS_XA_SUSPEND = 58; + + public static final byte SESS_XA_RESUME = 59; + + public static final byte SESS_XA_FORGET = 60; + + public static final byte SESS_XA_INDOUBT_XIDS = 61; + + public static final byte SESS_XA_INDOUBT_XIDS_RESP = 62; + + public static final byte SESS_XA_SET_TIMEOUT = 63; + + public static final byte SESS_XA_SET_TIMEOUT_RESP = 64; + + public static final byte SESS_XA_GET_TIMEOUT = 65; + + public static final byte SESS_XA_GET_TIMEOUT_RESP = 66; + + public static final byte SESS_START = 67; + + public static final byte SESS_STOP = 68; + + public static final byte SESS_CLOSE = 69; + + public static final byte SESS_FLOWTOKEN = 70; + + public static final byte SESS_SEND = 71; + + public static final byte SESS_SEND_LARGE = 72; + + public static final byte SESS_SEND_CONTINUATION = 73; + + public static final byte SESS_CONSUMER_CLOSE = 74; + + public static final byte SESS_RECEIVE_MSG = 75; + + public static final byte SESS_RECEIVE_LARGE_MSG = 76; + + public static final byte SESS_RECEIVE_CONTINUATION = 77; + + public static final byte SESS_FORCE_CONSUMER_DELIVERY = 78; + + public static final byte SESS_PRODUCER_REQUEST_CREDITS = 79; + + public static final byte SESS_PRODUCER_CREDITS = 80; + + // Replication + + public static final byte REPLICATION_RESPONSE = 90; + + public static final byte REPLICATION_APPEND = 91; + + public static final byte REPLICATION_APPEND_TX = 92; + + public static final byte REPLICATION_DELETE = 93; + + public static final byte REPLICATION_DELETE_TX = 94; + + public static final byte REPLICATION_PREPARE = 95; + + public static final byte REPLICATION_COMMIT_ROLLBACK = 96; + + public static final byte REPLICATION_PAGE_WRITE = 97; + + public static final byte REPLICATION_PAGE_EVENT = 98; + + public static final byte REPLICATION_LARGE_MESSAGE_BEGIN = 99; + + public static final byte REPLICATION_LARGE_MESSAGE_END = 100; + + public static final byte REPLICATION_LARGE_MESSAGE_WRITE = 101; + + public static final byte REPLICATION_COMPARE_DATA = 102; + + public static final byte REPLICATION_SYNC = 103; + + // Static -------------------------------------------------------- + + public PacketImpl(final byte type) + { + this.type = type; + } + + // Public -------------------------------------------------------- + + public byte getType() + { + return type; + } + + public long getChannelID() + { + return channelID; + } + + public void setChannelID(final long channelID) + { + this.channelID = channelID; + } + + public HornetQBuffer encode(final RemotingConnection connection) + { + HornetQBuffer buffer = connection.createBuffer(PacketImpl.INITIAL_PACKET_SIZE); + + // The standard header fields + + buffer.writeInt(0); // The length gets filled in at the end + buffer.writeByte(type); + buffer.writeLong(channelID); + + encodeRest(buffer); + + size = buffer.writerIndex(); + + // The length doesn't include the actual length byte + int len = size - DataConstants.SIZE_INT; + + buffer.setInt(0, len); + + return buffer; + } + + public void decode(final HornetQBuffer buffer) + { + channelID = buffer.readLong(); + + decodeRest(buffer); + + size = buffer.readerIndex(); + } + + public int getPacketSize() + { + if (size == -1) + { + throw new IllegalStateException("Packet hasn't been encoded/decoded yet"); + } + + return size; + } + + public boolean isResponse() + { + return false; + } + + public void encodeRest(final HornetQBuffer buffer) + { + } + + public void decodeRest(final HornetQBuffer buffer) + { + } + + public boolean isRequiresConfirmations() + { + return true; + } + + public boolean isAsyncExec() + { + return false; + } + + @Override + public String toString() + { + return getParentString() + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof PacketImpl == false) + { + return false; + } + + PacketImpl r = (PacketImpl)other; + + return r.type == type && r.channelID == channelID; + } + + // Package protected --------------------------------------------- + + protected String getParentString() + { + return "PACKET[type=" + type + ", channelID=" + channelID + "]"; + } + + // Protected ----------------------------------------------------- + + protected int stringEncodeSize(final String str) + { + return DataConstants.SIZE_INT + str.length() * 2; + } + + protected int nullableStringEncodeSize(final String str) + { + return DataConstants.SIZE_BOOLEAN + (str != null ? stringEncodeSize(str) : 0); + } + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java (from rev 8818, trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/RemotingConnectionImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,509 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Executor; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.remoting.CloseListener; +import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.remoting.impl.AbstractBufferHandler; +import org.hornetq.spi.core.remoting.Connection; +import org.hornetq.utils.SimpleIDGenerator; + +/** + * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @version <tt>$Revision$</tt> $Id$ + */ +public class RemotingConnectionImpl extends AbstractBufferHandler implements CoreRemotingConnection +{ + // Constants + // ------------------------------------------------------------------------------------ + + private static final Logger log = Logger.getLogger(RemotingConnectionImpl.class); + + // Static + // --------------------------------------------------------------------------------------- + + // Attributes + // ----------------------------------------------------------------------------------- + + private final Connection transportConnection; + + private final Map<Long, Channel> channels = new ConcurrentHashMap<Long, Channel>(); + + private final List<FailureListener> failureListeners = new CopyOnWriteArrayList<FailureListener>(); + + private final List<CloseListener> closeListeners = new CopyOnWriteArrayList<CloseListener>(); + + private final long blockingCallTimeout; + + private final List<Interceptor> interceptors; + + private volatile boolean destroyed; + + private final boolean client; + + // Channels 0-9 are reserved for the system + // 0 is for pinging + // 1 is for session creation and attachment + // 2 is for replication + private volatile SimpleIDGenerator idGenerator = new SimpleIDGenerator(10); + + private boolean idGeneratorSynced = false; + + private final Object transferLock = new Object(); + + private final Object failLock = new Object(); + + private final PacketDecoder decoder = new PacketDecoder(); + + private volatile boolean dataReceived; + + private final Executor executor; + + private volatile boolean executing; + + // Constructors + // --------------------------------------------------------------------------------- + + /* + * Create a client side connection + */ + public RemotingConnectionImpl(final Connection transportConnection, + final long blockingCallTimeout, + final List<Interceptor> interceptors) + { + this(transportConnection, blockingCallTimeout, interceptors, true, null); + } + + /* + * Create a server side connection + */ + public RemotingConnectionImpl(final Connection transportConnection, + final List<Interceptor> interceptors, + final Executor executor) + + { + this(transportConnection, -1, interceptors, false, executor); + } + + private RemotingConnectionImpl(final Connection transportConnection, + final long blockingCallTimeout, + final List<Interceptor> interceptors, + final boolean client, + final Executor executor) + + { + this.transportConnection = transportConnection; + + this.blockingCallTimeout = blockingCallTimeout; + + this.interceptors = interceptors; + + this.client = client; + + this.executor = executor; + } + + // RemotingConnection implementation + // ------------------------------------------------------------ + + public Connection getTransportConnection() + { + return transportConnection; + } + + public List<FailureListener> getFailureListeners() + { + return new ArrayList<FailureListener>(failureListeners); + } + + public void setFailureListeners(final List<FailureListener> listeners) + { + failureListeners.clear(); + + failureListeners.addAll(listeners); + } + + public Object getID() + { + return transportConnection.getID(); + } + + public String getRemoteAddress() + { + return transportConnection.getRemoteAddress(); + } + + public synchronized Channel getChannel(final long channelID, final int confWindowSize) + { + Channel channel = channels.get(channelID); + + if (channel == null) + { + channel = new ChannelImpl(this, channelID, confWindowSize); + + channels.put(channelID, channel); + } + + return channel; + } + + public synchronized boolean removeChannel(final long channelID) + { + return channels.remove(channelID) != null; + } + + public synchronized void putChannel(final long channelID, final Channel channel) + { + channels.put(channelID, channel); + } + + public void addFailureListener(final FailureListener listener) + { + if (listener == null) + { + throw new IllegalStateException("FailureListener cannot be null"); + } + + failureListeners.add(listener); + } + + public boolean removeFailureListener(final FailureListener listener) + { + if (listener == null) + { + throw new IllegalStateException("FailureListener cannot be null"); + } + + return failureListeners.remove(listener); + } + + public void addCloseListener(final CloseListener listener) + { + if (listener == null) + { + throw new IllegalStateException("CloseListener cannot be null"); + } + + closeListeners.add(listener); + } + + public boolean removeCloseListener(final CloseListener listener) + { + if (listener == null) + { + throw new IllegalStateException("CloseListener cannot be null"); + } + + return closeListeners.remove(listener); + } + + public HornetQBuffer createBuffer(final int size) + { + return transportConnection.createBuffer(size); + } + + /* + * This can be called concurrently by more than one thread so needs to be locked + */ + public void fail(final HornetQException me) + { + synchronized (failLock) + { + if (destroyed) + { + return; + } + + destroyed = true; + } + + RemotingConnectionImpl.log.warn("Connection failure has been detected: " + me.getMessage() + + " [code=" + + me.getCode() + + "]"); + + // Then call the listeners + callFailureListeners(me); + + callClosingListeners(); + + internalClose(); + + for (Channel channel : channels.values()) + { + channel.returnBlocking(); + } + } + + public void destroy() + { + synchronized (failLock) + { + if (destroyed) + { + return; + } + + destroyed = true; + } + + internalClose(); + + callClosingListeners(); + } + + public void disconnect() + { + Channel channel0 = getChannel(0, -1); + + // And we remove all channels from the connection, this ensures no more packets will be processed after this + // method is + // complete + + Set<Channel> allChannels = new HashSet<Channel>(channels.values()); + + removeAllChannels(); + + // Now we are 100% sure that no more packets will be processed we can flush then send the disconnect + + for (Channel channel: allChannels) + { + channel.flushConfirmations(); + } + + channel0.sendAndFlush(new PacketImpl(PacketImpl.DISCONNECT)); + } + + public long generateChannelID() + { + return idGenerator.generateID(); + } + + public synchronized void syncIDGeneratorSequence(final long id) + { + if (!idGeneratorSynced) + { + idGenerator = new SimpleIDGenerator(id); + + idGeneratorSynced = true; + } + } + + public long getIDGeneratorSequence() + { + return idGenerator.getCurrentID(); + } + + public Object getTransferLock() + { + return transferLock; + } + + public boolean isClient() + { + return client; + } + + public boolean isDestroyed() + { + return destroyed; + } + + public long getBlockingCallTimeout() + { + return blockingCallTimeout; + } + + public boolean checkDataReceived() + { + boolean res = dataReceived; + + dataReceived = false; + + return res; + } + + //We flush any confirmations on the connection - this prevents idle bridges for example + //sitting there with many unacked messages + public void flush() + { + synchronized (transferLock) + { + for (Channel channel : channels.values()) + { + channel.flushConfirmations(); + } + } + } + + // Buffer Handler implementation + // ---------------------------------------------------- + + public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) + { + final Packet packet = decoder.decode(buffer); + + if (packet.isAsyncExec() && executor != null) + { + executing = true; + + executor.execute(new Runnable() + { + public void run() + { + try + { + doBufferReceived(packet); + } + catch (Throwable t) + { + RemotingConnectionImpl.log.error("Unexpected error", t); + } + + executing = false; + } + }); + } + else + { + //To prevent out of order execution if interleaving sync and async operations on same connection + while (executing) + { + Thread.yield(); + } + + // Pings must always be handled out of band so we can send pings back to the client quickly + // otherwise they would get in the queue with everything else which might give an intolerable delay + doBufferReceived(packet); + } + + dataReceived = true; + } + + private void doBufferReceived(final Packet packet) + { + if (interceptors != null) + { + for (final Interceptor interceptor : interceptors) + { + try + { + boolean callNext = interceptor.intercept(packet, this); + + if (!callNext) + { + return; + } + } + catch (final Throwable e) + { + RemotingConnectionImpl.log.warn("Failure in calling interceptor: " + interceptor, e); + } + } + } + + synchronized (transferLock) + { + final Channel channel = channels.get(packet.getChannelID()); + + if (channel != null) + { + channel.handlePacket(packet); + } + } + } + + // Package protected + // ---------------------------------------------------------------------------- + + // Protected + // ------------------------------------------------------------------------------------ + + // Private + // -------------------------------------------------------------------------------------- + + private void removeAllChannels() + { + // We get the transfer lock first - this ensures no packets are being processed AND + // it's guaranteed no more packets will be processed once this method is complete + synchronized (transferLock) + { + channels.clear(); + } + } + private void callFailureListeners(final HornetQException me) + { + final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners); + + for (final FailureListener listener : listenersClone) + { + try + { + listener.connectionFailed(me); + } + catch (final Throwable t) + { + // Failure of one listener to execute shouldn't prevent others + // from + // executing + RemotingConnectionImpl.log.error("Failed to execute failure listener", t); + } + } + } + + private void callClosingListeners() + { + final List<CloseListener> listenersClone = new ArrayList<CloseListener>(closeListeners); + + for (final CloseListener listener : listenersClone) + { + try + { + listener.connectionClosed(); + } + catch (final Throwable t) + { + // Failure of one listener to execute shouldn't prevent others + // from + // executing + RemotingConnectionImpl.log.error("Failed to execute failure listener", t); + } + } + } + + private void internalClose() + { + // We close the underlying transport connection + transportConnection.close(); + + for (Channel channel : channels.values()) + { + channel.close(); + } + } +} Copied: trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java (from rev 8819, trunk/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,648 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core; + +import static org.hornetq.core.protocol.core.PacketImpl.CREATE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.DELETE_QUEUE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ACKNOWLEDGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_BINDINGQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CONSUMER_CLOSE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_CREATECONSUMER; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_EXPIRED; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FLOWTOKEN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_QUEUEQUERY; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_CONTINUATION; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_SEND_LARGE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_STOP; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_COMMIT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_END; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_FORGET; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_GET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_INDOUBT_XIDS; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_JOIN; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_PREPARE; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_RESUME; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_ROLLBACK; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SET_TIMEOUT; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_START; +import static org.hornetq.core.protocol.core.PacketImpl.SESS_XA_SUSPEND; + +import java.util.List; + +import javax.transaction.xa.XAResource; +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.exception.HornetQXAException; +import org.hornetq.core.journal.IOAsyncTask; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.persistence.OperationContext; +import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.protocol.core.wireformat.CreateQueueMessage; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.RollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionAcknowledgeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionBindingQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerCloseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionConsumerFlowCreditMessage; +import org.hornetq.core.protocol.core.wireformat.SessionCreateConsumerMessage; +import org.hornetq.core.protocol.core.wireformat.SessionDeleteQueueMessage; +import org.hornetq.core.protocol.core.wireformat.SessionExpiredMessage; +import org.hornetq.core.protocol.core.wireformat.SessionForceConsumerDelivery; +import org.hornetq.core.protocol.core.wireformat.SessionProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionRequestProducerCreditsMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXACommitMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAEndMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAForgetMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetInDoubtXidsResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAGetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAJoinMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAResumeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXARollbackMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXASetTimeoutResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionXAStartMessage; +import org.hornetq.core.remoting.CloseListener; +import org.hornetq.core.remoting.FailureListener; +import org.hornetq.core.server.BindingQueryResult; +import org.hornetq.core.server.QueueQueryResult; +import org.hornetq.core.server.ServerMessage; +import org.hornetq.core.server.ServerSession; +import org.hornetq.core.server.SessionCallback; + +/** + * A ServerSessionPacketHandler + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a> + * @author <a href="mailto:clebert.suconic@jboss.org>Clebert Suconic</a> + */ +public class ServerSessionPacketHandler implements ChannelHandler, CloseListener, FailureListener, SessionCallback +{ + private static final Logger log = Logger.getLogger(ServerSessionPacketHandler.class); + + private final CoreProtocolManager protocolManager; + + private final ServerSession session; + + private final OperationContext sessionContext; + + // Storagemanager here is used to set the Context + private final StorageManager storageManager; + + private final Channel channel; + + private volatile CoreRemotingConnection remotingConnection; + + public ServerSessionPacketHandler(final CoreProtocolManager protocolManager, + final ServerSession session, + final OperationContext sessionContext, + final StorageManager storageManager, + final Channel channel) + { + this.protocolManager = protocolManager; + + this.session = session; + + this.storageManager = storageManager; + + this.sessionContext = sessionContext; + + this.channel = channel; + + this.remotingConnection = channel.getConnection(); + + addConnectionListeners(); + } + + public long getID() + { + return channel.getID(); + } + + public void connectionFailed(final HornetQException exception) + { + log.warn("Client connection failed, clearing up resources for session " + session.getName()); + + session.runConnectionFailureRunners(); + + try + { + session.close(); + } + catch (Exception e) + { + log.error("Failed to close session", e); + } + + log.warn("Cleared up resources for session " + session.getName()); + } + + public void close() + { + channel.flushConfirmations(); + + try + { + session.close(); + } + catch (Exception e) + { + log.error("Failed to close session", e); + } + } + + public void connectionClosed() + { + session.runConnectionFailureRunners(); + } + + private void addConnectionListeners() + { + remotingConnection.addFailureListener(this); + remotingConnection.addCloseListener(this); + } + + private void removeConnectionListeners() + { + remotingConnection.removeFailureListener(this); + remotingConnection.removeCloseListener(this); + } + + public Channel getChannel() + { + return channel; + } + + public void handlePacket(final Packet packet) + { + byte type = packet.getType(); + + storageManager.setContext(sessionContext); + + Packet response = null; + boolean flush = false; + boolean closeChannel = false; + boolean requiresResponse = false; + + try + { + try + { + switch (type) + { + case SESS_CREATECONSUMER: + { + SessionCreateConsumerMessage request = (SessionCreateConsumerMessage)packet; + requiresResponse = request.isRequiresResponse(); + session.createConsumer(request.getID(), + request.getQueueName(), + request.getFilterString(), + request.isBrowseOnly()); + if (requiresResponse) + { + // We send back queue information on the queue as a response- this allows the queue to + // be automaticall recreated on failover + response = new SessionQueueQueryResponseMessage(session.executeQueueQuery(request.getQueueName())); + } + + break; + } + case CREATE_QUEUE: + { + CreateQueueMessage request = (CreateQueueMessage)packet; + requiresResponse = request.isRequiresResponse(); + session.createQueue(request.getAddress(), + request.getQueueName(), + request.getFilterString(), + request.isTemporary(), + request.isDurable()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case DELETE_QUEUE: + { + requiresResponse = true; + SessionDeleteQueueMessage request = (SessionDeleteQueueMessage)packet; + session.deleteQueue(request.getQueueName()); + response = new NullResponseMessage(); + break; + } + case SESS_QUEUEQUERY: + { + requiresResponse = true; + SessionQueueQueryMessage request = (SessionQueueQueryMessage)packet; + QueueQueryResult result = session.executeQueueQuery(request.getQueueName()); + response = new SessionQueueQueryResponseMessage(result); + break; + } + case SESS_BINDINGQUERY: + { + requiresResponse = true; + SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet; + BindingQueryResult result = session.executeBindingQuery(request.getAddress()); + response = new SessionBindingQueryResponseMessage(result.isExists(), result.getQueueNames()); + break; + } + case SESS_ACKNOWLEDGE: + { + SessionAcknowledgeMessage message = (SessionAcknowledgeMessage)packet; + requiresResponse = message.isRequiresResponse(); + session.acknowledge(message.getConsumerID(), message.getMessageID()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case SESS_EXPIRED: + { + SessionExpiredMessage message = (SessionExpiredMessage)packet; + session.expire(message.getConsumerID(), message.getMessageID()); + break; + } + case SESS_COMMIT: + { + requiresResponse = true; + session.commit(); + response = new NullResponseMessage(); + break; + } + case SESS_ROLLBACK: + { + requiresResponse = true; + session.rollback(((RollbackMessage)packet).isConsiderLastMessageAsDelivered()); + response = new NullResponseMessage(); + break; + } + case SESS_XA_COMMIT: + { + requiresResponse = true; + SessionXACommitMessage message = (SessionXACommitMessage)packet; + session.xaCommit(message.getXid(), message.isOnePhase()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_END: + { + requiresResponse = true; + SessionXAEndMessage message = (SessionXAEndMessage)packet; + session.xaEnd(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_FORGET: + { + requiresResponse = true; + SessionXAForgetMessage message = (SessionXAForgetMessage)packet; + session.xaForget(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_JOIN: + { + requiresResponse = true; + SessionXAJoinMessage message = (SessionXAJoinMessage)packet; + session.xaJoin(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_RESUME: + { + requiresResponse = true; + SessionXAResumeMessage message = (SessionXAResumeMessage)packet; + session.xaResume(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_ROLLBACK: + { + requiresResponse = true; + SessionXARollbackMessage message = (SessionXARollbackMessage)packet; + session.xaRollback(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_START: + { + requiresResponse = true; + SessionXAStartMessage message = (SessionXAStartMessage)packet; + session.xaStart(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_SUSPEND: + { + requiresResponse = true; + session.xaSuspend(); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_PREPARE: + { + requiresResponse = true; + SessionXAPrepareMessage message = (SessionXAPrepareMessage)packet; + session.xaPrepare(message.getXid()); + response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); + break; + } + case SESS_XA_INDOUBT_XIDS: + { + requiresResponse = true; + List<Xid> xids = session.xaGetInDoubtXids(); + response = new SessionXAGetInDoubtXidsResponseMessage(xids); + break; + } + case SESS_XA_GET_TIMEOUT: + { + requiresResponse = true; + int timeout = session.xaGetTimeout(); + response = new SessionXAGetTimeoutResponseMessage(timeout); + break; + } + case SESS_XA_SET_TIMEOUT: + { + requiresResponse = true; + SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage)packet; + session.xaSetTimeout(message.getTimeoutSeconds()); + response = new SessionXASetTimeoutResponseMessage(true); + break; + } + case SESS_START: + { + session.start(); + break; + } + case SESS_STOP: + { + requiresResponse = true; + session.stop(); + response = new NullResponseMessage(); + break; + } + case SESS_CLOSE: + { + requiresResponse = true; + session.close(); + removeConnectionListeners(); + response = new NullResponseMessage(); + flush = true; + closeChannel = true; + break; + } + case SESS_CONSUMER_CLOSE: + { + requiresResponse = true; + SessionConsumerCloseMessage message = (SessionConsumerCloseMessage)packet; + session.closeConsumer(message.getConsumerID()); + response = new NullResponseMessage(); + break; + } + case SESS_FLOWTOKEN: + { + SessionConsumerFlowCreditMessage message = (SessionConsumerFlowCreditMessage)packet; + session.receiveConsumerCredits(message.getConsumerID(), message.getCredits()); + break; + } + case SESS_SEND: + { + SessionSendMessage message = (SessionSendMessage)packet; + requiresResponse = message.isRequiresResponse(); + session.send((ServerMessage)message.getMessage()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case SESS_SEND_LARGE: + { + SessionSendLargeMessage message = (SessionSendLargeMessage)packet; + session.sendLarge(message.getLargeMessageHeader()); + break; + } + case SESS_SEND_CONTINUATION: + { + SessionSendContinuationMessage message = (SessionSendContinuationMessage)packet; + requiresResponse = message.isRequiresResponse(); + session.sendContinuations(message.getPacketSize(), message.getBody(), message.isContinues()); + if (requiresResponse) + { + response = new NullResponseMessage(); + } + break; + } + case SESS_FORCE_CONSUMER_DELIVERY: + { + SessionForceConsumerDelivery message = (SessionForceConsumerDelivery)packet; + session.forceConsumerDelivery(message.getConsumerID(), message.getSequence()); + break; + } + case PacketImpl.SESS_PRODUCER_REQUEST_CREDITS: + { + SessionRequestProducerCreditsMessage message = (SessionRequestProducerCreditsMessage)packet; + session.requestProducerCredits(message.getAddress(), message.getCredits()); + break; + } + } + } + catch (HornetQXAException e) + { + if (requiresResponse) + { + response = new SessionXAResponseMessage(true, e.errorCode, e.getMessage()); + } + else + { + log.error("Caught XA exception", e); + } + } + catch (HornetQException e) + { + if (requiresResponse) + { + response = new HornetQExceptionMessage((HornetQException)e); + } + else + { + log.error("Caught exception", e); + } + } + catch (Throwable t) + { + log.error("Caught unexpected exception", t); + } + + sendResponse(packet, response, flush, closeChannel); + } + finally + { + storageManager.completeOperations(); + storageManager.clearContext(); + } + } + + private void sendResponse(final Packet confirmPacket, + final Packet response, + final boolean flush, + final boolean closeChannel) + { + storageManager.afterCompleteOperations(new IOAsyncTask() + { + public void onError(final int errorCode, final String errorMessage) + { + log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage); + + HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage(new HornetQException(errorCode, + errorMessage)); + + doConfirmAndResponse(confirmPacket, exceptionMessage, flush, closeChannel); + } + + public void done() + { + doConfirmAndResponse(confirmPacket, response, flush, closeChannel); + } + }); + } + + private void doConfirmAndResponse(final Packet confirmPacket, + final Packet response, + final boolean flush, + final boolean closeChannel) + { + if (confirmPacket != null) + { + channel.confirm(confirmPacket); + + if (flush) + { + channel.flushConfirmations(); + } + } + + if (response != null) + { + channel.send(response); + } + + if (closeChannel) + { + channel.close(); + } + } + + public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) + { + Packet packet = new SessionReceiveLargeMessage(consumerID, headerBuffer, bodySize, deliveryCount); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) + { + Packet packet = new SessionReceiveContinuationMessage(consumerID, body, continues, requiresResponse); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public int sendMessage(ServerMessage message, long consumerID, int deliveryCount) + { + Packet packet = new SessionReceiveMessage(consumerID, message, deliveryCount); + + channel.send(packet); + + return packet.getPacketSize(); + } + + public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) + { + Packet packet = new SessionProducerCreditsMessage(credits, address, offset); + + channel.send(packet); + } + + public void closed() + { + protocolManager.removeHandler(session.getName()); + } + + public int transferConnection(final CoreRemotingConnection newConnection, final int lastReceivedCommandID) + { + // We need to disable delivery on all the consumers while the transfer is occurring- otherwise packets might get + // delivered + // after the channel has transferred but *before* packets have been replayed - this will give the client the wrong + // sequence of packets. + // It is not sufficient to just stop the session, since right after stopping the session, another session start + // might be executed + // before we have transferred the connection, leaving it in a started state + session.setTransferring(true); + + remotingConnection.removeFailureListener(this); + remotingConnection.removeCloseListener(this); + + // Note. We do not destroy the replicating connection here. In the case the live server has really crashed + // then the connection will get cleaned up anyway when the server ping timeout kicks in. + // In the case the live server is really still up, i.e. a split brain situation (or in tests), then closing + // the replicating connection will cause the outstanding responses to be be replayed on the live server, + // if these reach the client who then subsequently fails over, on reconnection to backup, it will have + // received responses that the backup did not know about. + + channel.transferConnection(newConnection); + + newConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); + + remotingConnection = newConnection; + + remotingConnection.addFailureListener(this); + remotingConnection.addCloseListener(this); + + int serverLastReceivedCommandID = channel.getLastConfirmedCommandID(); + + channel.replayCommands(lastReceivedCommandID); + + channel.setTransferring(false); + + session.setTransferring(false); + + return serverLastReceivedCommandID; + } +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateQueueMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,163 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + + * @version <tt>$Revision$</tt> + */ +public class CreateQueueMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(CreateQueueMessage.class); + + // Attributes ---------------------------------------------------- + + private SimpleString address; + + private SimpleString queueName; + + private SimpleString filterString; + + private boolean durable; + + private boolean temporary; + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateQueueMessage(final SimpleString address, + final SimpleString queueName, + final SimpleString filterString, + final boolean durable, + final boolean temporary, + final boolean requiresResponse) + { + super(PacketImpl.CREATE_QUEUE); + + this.address = address; + this.queueName = queueName; + this.filterString = filterString; + this.durable = durable; + this.temporary = temporary; + this.requiresResponse = requiresResponse; + } + + public CreateQueueMessage() + { + super(PacketImpl.CREATE_QUEUE); + } + + // Public -------------------------------------------------------- + + @Override + public String toString() + { + StringBuffer buff = new StringBuffer(getParentString()); + buff.append(", address=" + address); + buff.append(", queueName=" + queueName); + buff.append(", filterString=" + filterString); + buff.append(", durable=" + durable); + buff.append(", temporary=" + temporary); + buff.append("]"); + return buff.toString(); + } + + public SimpleString getAddress() + { + return address; + } + + public SimpleString getQueueName() + { + return queueName; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public boolean isDurable() + { + return durable; + } + + public boolean isTemporary() + { + return temporary; + } + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(address); + buffer.writeSimpleString(queueName); + buffer.writeNullableSimpleString(filterString); + buffer.writeBoolean(durable); + buffer.writeBoolean(temporary); + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + address = buffer.readSimpleString(); + queueName = buffer.readSimpleString(); + filterString = buffer.readNullableSimpleString(); + durable = buffer.readBoolean(); + temporary = buffer.readBoolean(); + requiresResponse = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof CreateQueueMessage == false) + { + return false; + } + + CreateQueueMessage r = (CreateQueueMessage)other; + + return super.equals(other) && r.address.equals(address) && + r.queueName.equals(queueName) && + (r.filterString == null ? filterString == null : r.filterString.equals(filterString)) && + r.durable == durable && + r.temporary == temporary; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateReplicationSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,75 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> + */ +public class CreateReplicationSessionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long sessionChannelID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateReplicationSessionMessage(final long sessionChannelID) + { + super(PacketImpl.CREATE_REPLICATION); + + this.sessionChannelID = sessionChannelID; + } + + public CreateReplicationSessionMessage() + { + super(PacketImpl.CREATE_REPLICATION); + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(sessionChannelID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + sessionChannelID = buffer.readLong(); + } + + /** + * @return the sessionChannelID + */ + public long getSessionChannelID() + { + return sessionChannelID; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,223 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public class CreateSessionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private String name; + + private long sessionChannelID; + + private int version; + + private String username; + + private String password; + + private int minLargeMessageSize; + + private boolean xa; + + private boolean autoCommitSends; + + private boolean autoCommitAcks; + + private boolean preAcknowledge; + + private int windowSize; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateSessionMessage(final String name, + final long sessionChannelID, + final int version, + final String username, + final String password, + final int minLargeMessageSize, + final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final int windowSize) + { + super(PacketImpl.CREATESESSION); + + this.name = name; + + this.sessionChannelID = sessionChannelID; + + this.version = version; + + this.username = username; + + this.password = password; + + this.minLargeMessageSize = minLargeMessageSize; + + this.xa = xa; + + this.autoCommitSends = autoCommitSends; + + this.autoCommitAcks = autoCommitAcks; + + this.windowSize = windowSize; + + this.preAcknowledge = preAcknowledge; + } + + public CreateSessionMessage() + { + super(PacketImpl.CREATESESSION); + } + + // Public -------------------------------------------------------- + + public String getName() + { + return name; + } + + public long getSessionChannelID() + { + return sessionChannelID; + } + + public int getVersion() + { + return version; + } + + public String getUsername() + { + return username; + } + + public String getPassword() + { + return password; + } + + public boolean isXA() + { + return xa; + } + + public boolean isAutoCommitSends() + { + return autoCommitSends; + } + + public boolean isAutoCommitAcks() + { + return autoCommitAcks; + } + + public boolean isPreAcknowledge() + { + return preAcknowledge; + } + + public int getWindowSize() + { + return windowSize; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeString(name); + buffer.writeLong(sessionChannelID); + buffer.writeInt(version); + buffer.writeNullableString(username); + buffer.writeNullableString(password); + buffer.writeInt(minLargeMessageSize); + buffer.writeBoolean(xa); + buffer.writeBoolean(autoCommitSends); + buffer.writeBoolean(autoCommitAcks); + buffer.writeInt(windowSize); + buffer.writeBoolean(preAcknowledge); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + name = buffer.readString(); + sessionChannelID = buffer.readLong(); + version = buffer.readInt(); + username = buffer.readNullableString(); + password = buffer.readNullableString(); + minLargeMessageSize = buffer.readInt(); + xa = buffer.readBoolean(); + autoCommitSends = buffer.readBoolean(); + autoCommitAcks = buffer.readBoolean(); + windowSize = buffer.readInt(); + preAcknowledge = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof CreateSessionMessage == false) + { + return false; + } + + CreateSessionMessage r = (CreateSessionMessage)other; + + boolean matches = super.equals(other) && name.equals(r.name) && + sessionChannelID == r.sessionChannelID && + version == r.version && + xa == r.xa && + autoCommitSends == r.autoCommitSends && + autoCommitAcks == r.autoCommitAcks && + (username == null ? r.username == null : username.equals(r.username)) && + (password == null ? r.password == null : password.equals(r.password)); + + return matches; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + public int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/CreateSessionResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public class CreateSessionResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int serverVersion; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public CreateSessionResponseMessage(final int serverVersion) + { + super(PacketImpl.CREATESESSION_RESP); + + this.serverVersion = serverVersion; + } + + public CreateSessionResponseMessage() + { + super(PacketImpl.CREATESESSION_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public int getServerVersion() + { + return serverVersion; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(serverVersion); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + serverVersion = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof CreateSessionResponseMessage == false) + { + return false; + } + + CreateSessionResponseMessage r = (CreateSessionResponseMessage)other; + + boolean matches = super.equals(other) && serverVersion == r.serverVersion; + + return matches; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/HornetQExceptionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,109 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + * + */ +public class HornetQExceptionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(HornetQExceptionMessage.class); + + // Attributes ---------------------------------------------------- + + private HornetQException exception; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public HornetQExceptionMessage(final HornetQException exception) + { + super(PacketImpl.EXCEPTION); + + this.exception = exception; + } + + public HornetQExceptionMessage() + { + super(PacketImpl.EXCEPTION); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public HornetQException getException() + { + return exception; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(exception.getCode()); + buffer.writeNullableString(exception.getMessage()); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int code = buffer.readInt(); + String msg = buffer.readNullableString(); + + exception = new HornetQException(code, msg); + } + + @Override + public String toString() + { + return getParentString() + ", exception= " + exception + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof HornetQExceptionMessage == false) + { + return false; + } + + HornetQExceptionMessage r = (HornetQExceptionMessage)other; + + return super.equals(other) && exception.equals(r.exception); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/MessagePacket.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,46 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.Message; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.message.impl.MessageInternal; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A MessagePacket + * + * @author Tim Fox + * + * + */ +public abstract class MessagePacket extends PacketImpl +{ + private static final Logger log = Logger.getLogger(MessagePacket.class); + + protected MessageInternal message; + + public MessagePacket(final byte type, final MessageInternal message) + { + super(type); + + this.message = message; + } + + public Message getMessage() + { + return message; + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/NullResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,52 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class NullResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public NullResponseMessage() + { + super(PacketImpl.NULL_RESPONSE); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/PacketsConfirmedMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,101 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A PacketsConfirmedMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class PacketsConfirmedMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int commandID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public PacketsConfirmedMessage(final int commandID) + { + super(PacketImpl.PACKETS_CONFIRMED); + + this.commandID = commandID; + } + + public PacketsConfirmedMessage() + { + super(PacketImpl.PACKETS_CONFIRMED); + } + + // Public -------------------------------------------------------- + + public int getCommandID() + { + return commandID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(commandID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + commandID = buffer.readInt(); + } + + @Override + public String toString() + { + return getParentString() + ", commandID=" + commandID + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof PacketsConfirmedMessage == false) + { + return false; + } + + PacketsConfirmedMessage r = (PacketsConfirmedMessage)other; + + return super.equals(other) && commandID == r.commandID; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/Ping.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,104 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A Ping + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class Ping extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long connectionTTL; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public Ping(final long connectionTTL) + { + super(PacketImpl.PING); + + this.connectionTTL = connectionTTL; + } + + public Ping() + { + super(PacketImpl.PING); + } + + // Public -------------------------------------------------------- + + public long getConnectionTTL() + { + return connectionTTL; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(connectionTTL); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + connectionTTL = buffer.readLong(); + } + + @Override + public String toString() + { + StringBuffer buf = new StringBuffer(getParentString()); + buf.append(", connectionTTL=" + connectionTTL); + buf.append("]"); + return buf.toString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof Ping == false) + { + return false; + } + + Ping r = (Ping)other; + + return super.equals(other) && connectionTTL == r.connectionTTL; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,106 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A ReattachSessionMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class ReattachSessionMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private String name; + + private int lastConfirmedCommandID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) + { + super(PacketImpl.REATTACH_SESSION); + + this.name = name; + + this.lastConfirmedCommandID = lastConfirmedCommandID; + } + + public ReattachSessionMessage() + { + super(PacketImpl.REATTACH_SESSION); + } + + // Public -------------------------------------------------------- + + public String getName() + { + return name; + } + + public int getLastConfirmedCommandID() + { + return lastConfirmedCommandID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeString(name); + buffer.writeInt(lastConfirmedCommandID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + name = buffer.readString(); + lastConfirmedCommandID = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof ReattachSessionMessage == false) + { + return false; + } + + ReattachSessionMessage r = (ReattachSessionMessage)other; + + return super.equals(other) && name.equals(r.name); + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReattachSessionResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,112 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A ReattachSessionResponseMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class ReattachSessionResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int lastConfirmedCommandID; + + private boolean reattached; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) + { + super(PacketImpl.REATTACH_SESSION_RESP); + + this.lastConfirmedCommandID = lastConfirmedCommandID; + + this.reattached = reattached; + } + + public ReattachSessionResponseMessage() + { + super(PacketImpl.REATTACH_SESSION_RESP); + } + + // Public -------------------------------------------------------- + + public int getLastConfirmedCommandID() + { + return lastConfirmedCommandID; + } + + public boolean isReattached() + { + return reattached; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(lastConfirmedCommandID); + buffer.writeBoolean(reattached); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + lastConfirmedCommandID = buffer.readInt(); + reattached = buffer.readBoolean(); + } + + @Override + public boolean isResponse() + { + return true; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof ReattachSessionResponseMessage == false) + { + return false; + } + + ReattachSessionResponseMessage r = (ReattachSessionResponseMessage)other; + + return super.equals(other) && lastConfirmedCommandID == r.lastConfirmedCommandID; + } + + @Override + public final boolean isRequiresConfirmations() + { + return false; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,143 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationAddMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(ReplicationAddMessage.class); + + // Attributes ---------------------------------------------------- + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private boolean isUpdate; + + private byte recordType; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationAddMessage() + { + super(PacketImpl.REPLICATION_APPEND); + } + + public ReplicationAddMessage(final byte journalID, + final boolean isUpdate, + final long id, + final byte recordType, + final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.isUpdate = isUpdate; + this.id = id; + this.recordType = recordType; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeBoolean(isUpdate); + buffer.writeLong(id); + buffer.writeByte(recordType); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + isUpdate = buffer.readBoolean(); + id = buffer.readLong(); + recordType = buffer.readByte(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + public boolean isUpdate() + { + return isUpdate; + } + + /** + * @return the recordType + */ + public byte getRecordType() + { + return recordType; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationAddTXMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,151 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationAddTXMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long txId; + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private boolean isUpdate; + + private byte recordType; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationAddTXMessage() + { + super(PacketImpl.REPLICATION_APPEND_TX); + } + + public ReplicationAddTXMessage(final byte journalID, + final boolean isUpdate, + final long txId, + final long id, + final byte recordType, + final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.isUpdate = isUpdate; + this.txId = txId; + this.id = id; + this.recordType = recordType; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeBoolean(isUpdate); + buffer.writeLong(txId); + buffer.writeLong(id); + buffer.writeByte(recordType); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + isUpdate = buffer.readBoolean(); + txId = buffer.readLong(); + id = buffer.readLong(); + recordType = buffer.readByte(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + public boolean isUpdate() + { + return isUpdate; + } + + /** + * @return the recordType + */ + public byte getRecordType() + { + return recordType; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,101 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationCommitMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private boolean rollback; + + private long txId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationCommitMessage() + { + super(PacketImpl.REPLICATION_COMMIT_ROLLBACK); + } + + public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId) + { + this(); + this.journalID = journalID; + this.rollback = rollback; + this.txId = txId; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeBoolean(rollback); + buffer.writeLong(txId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + rollback = buffer.readBoolean(); + txId = buffer.readLong(); + } + + public boolean isRollback() + { + return rollback; + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationCompareDataMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.JournalLoadInformation; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * Message used to compare if the Journals between the live and + * backup nodes are equivalent and can be used over replication. + * The backup journal needs to be an exact copy of the live node before it starts. + * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> + */ +public class ReplicationCompareDataMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private JournalLoadInformation[] journalInformation; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationCompareDataMessage(final JournalLoadInformation[] journalInformation) + { + super(PacketImpl.REPLICATION_COMPARE_DATA); + + this.journalInformation = journalInformation; + } + + public ReplicationCompareDataMessage() + { + super(PacketImpl.REPLICATION_COMPARE_DATA); + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(journalInformation.length); + for (JournalLoadInformation info : journalInformation) + { + buffer.writeInt(info.getNumberOfRecords()); + buffer.writeLong(info.getMaxID()); + } + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int numberOfJournals = buffer.readInt(); + + journalInformation = new JournalLoadInformation[numberOfJournals]; + + for (int i = 0; i < numberOfJournals; i++) + { + journalInformation[i] = new JournalLoadInformation(); + journalInformation[i].setNumberOfRecords(buffer.readInt()); + journalInformation[i].setMaxID(buffer.readLong()); + } + } + + /** + * @return the journalInformation + */ + public JournalLoadInformation[] getJournalInformation() + { + return journalInformation; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,94 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationDeleteMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationDeleteMessage() + { + super(PacketImpl.REPLICATION_DELETE); + } + + public ReplicationDeleteMessage(final byte journalID, final long id) + { + this(); + this.journalID = journalID; + this.id = id; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeLong(id); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + id = buffer.readLong(); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,126 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationDeleteTXMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long txId; + + private long id; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationDeleteTXMessage() + { + super(PacketImpl.REPLICATION_DELETE_TX); + } + + public ReplicationDeleteTXMessage(final byte journalID, + final long txId, + final long id, + final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.txId = txId; + this.id = id; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeLong(txId); + buffer.writeLong(id); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + txId = buffer.readLong(); + id = buffer.readLong(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + /** + * @return the id + */ + public long getId() + { + return id; + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,80 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationLargeMessageBeingMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargeMessageBeingMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + long messageId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationLargeMessageBeingMessage(final long messageId) + { + this(); + this.messageId = messageId; + } + + public ReplicationLargeMessageBeingMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN); + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,100 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationLargeMessageWriteMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargeMessageWriteMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long messageId; + + private byte body[]; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + public ReplicationLargeMessageWriteMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE); + } + + /** + * @param messageId + * @param body + */ + public ReplicationLargeMessageWriteMessage(final long messageId, final byte[] body) + { + this(); + + this.messageId = messageId; + this.body = body; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + buffer.writeInt(body.length); + buffer.writeBytes(body); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + int size = buffer.readInt(); + body = new byte[size]; + buffer.readBytes(body); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + /** + * @return the body + */ + public byte[] getBody() + { + return body; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,79 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationLargemessageEndMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationLargemessageEndMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + long messageId; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationLargemessageEndMessage() + { + super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); + } + + public ReplicationLargemessageEndMessage(final long messageId) + { + this(); + this.messageId = messageId; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(messageId); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + messageId = buffer.readLong(); + } + + /** + * @return the messageId + */ + public long getMessageId() + { + return messageId; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageEventMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,110 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationPageWrite + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationPageEventMessage extends PacketImpl +{ + + private int pageNumber; + + private SimpleString storeName; + + /** + * True = delete page, False = close page + */ + private boolean isDelete; + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationPageEventMessage() + { + super(PacketImpl.REPLICATION_PAGE_EVENT); + } + + public ReplicationPageEventMessage(final SimpleString storeName, final int pageNumber, final boolean isDelete) + { + this(); + this.pageNumber = pageNumber; + this.isDelete = isDelete; + this.storeName = storeName; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(storeName); + buffer.writeInt(pageNumber); + buffer.writeBoolean(isDelete); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + storeName = buffer.readSimpleString(); + pageNumber = buffer.readInt(); + isDelete = buffer.readBoolean(); + } + + /** + * @return the pageNumber + */ + public int getPageNumber() + { + return pageNumber; + } + + /** + * @return the storeName + */ + public SimpleString getStoreName() + { + return storeName; + } + + /** + * @return the isDelete + */ + public boolean isDelete() + { + return isDelete; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPageWriteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.paging.PagedMessage; +import org.hornetq.core.paging.impl.PagedMessageImpl; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationPageWrite + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationPageWriteMessage extends PacketImpl +{ + + int pageNumber; + + PagedMessage pagedMessage; + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationPageWriteMessage() + { + super(PacketImpl.REPLICATION_PAGE_WRITE); + } + + public ReplicationPageWriteMessage(final PagedMessage pagedMessage, final int pageNumber) + { + this(); + this.pageNumber = pageNumber; + this.pagedMessage = pagedMessage; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(pageNumber); + pagedMessage.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + pageNumber = buffer.readInt(); + pagedMessage = new PagedMessageImpl(); + pagedMessage.decode(buffer); + } + + /** + * @return the pageNumber + */ + public int getPageNumber() + { + return pageNumber; + } + + /** + * @return the pagedMessage + */ + public PagedMessage getPagedMessage() + { + return pagedMessage; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationPrepareMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,110 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.journal.EncodingSupport; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A ReplicationAddMessage + * + * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * + */ +public class ReplicationPrepareMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long txId; + + /** 0 - Bindings, 1 - MessagesJournal */ + private byte journalID; + + private EncodingSupport encodingData; + + private byte[] recordData; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationPrepareMessage() + { + super(PacketImpl.REPLICATION_PREPARE); + } + + public ReplicationPrepareMessage(final byte journalID, final long txId, final EncodingSupport encodingData) + { + this(); + this.journalID = journalID; + this.txId = txId; + this.encodingData = encodingData; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeByte(journalID); + buffer.writeLong(txId); + buffer.writeInt(encodingData.getEncodeSize()); + encodingData.encode(buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + journalID = buffer.readByte(); + txId = buffer.readLong(); + int size = buffer.readInt(); + recordData = new byte[size]; + buffer.readBytes(recordData); + } + + public long getTxId() + { + return txId; + } + + /** + * @return the journalID + */ + public byte getJournalID() + { + return journalID; + } + + /** + * @return the recordData + */ + public byte[] getRecordData() + { + return recordData; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/ReplicationResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,46 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class ReplicationResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ReplicationResponseMessage() + { + super(PacketImpl.REPLICATION_RESPONSE); + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/RollbackMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A RollbackMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Feb 18, 2009 2:11:17 PM + * + * + */ +public class RollbackMessage extends PacketImpl +{ + + public RollbackMessage() + { + super(PacketImpl.SESS_ROLLBACK); + } + + public RollbackMessage(final boolean considerLastMessageAsDelivered) + { + super(PacketImpl.SESS_ROLLBACK); + + this.considerLastMessageAsDelivered = considerLastMessageAsDelivered; + } + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean considerLastMessageAsDelivered; + + /** + * @return the considerLastMessageAsDelivered + */ + public boolean isConsiderLastMessageAsDelivered() + { + return considerLastMessageAsDelivered; + } + + /** + * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set + */ + public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) + { + considerLastMessageAsDelivered = isLastMessageAsDelivered; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(considerLastMessageAsDelivered); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + considerLastMessageAsDelivered = buffer.readBoolean(); + } + + public boolean isAsyncExec() + { + return true; + } + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionAcknowledgeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,113 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class SessionAcknowledgeMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private long messageID; + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) + { + super(PacketImpl.SESS_ACKNOWLEDGE); + + this.consumerID = consumerID; + + this.messageID = messageID; + + this.requiresResponse = requiresResponse; + } + + public SessionAcknowledgeMessage() + { + super(PacketImpl.SESS_ACKNOWLEDGE); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public long getMessageID() + { + return messageID; + } + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + + buffer.writeLong(messageID); + + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + + messageID = buffer.readLong(); + + requiresResponse = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionAcknowledgeMessage == false) + { + return false; + } + + SessionAcknowledgeMessage r = (SessionAcknowledgeMessage)other; + + return super.equals(other) && consumerID == r.consumerID && + messageID == r.messageID && + requiresResponse == r.requiresResponse; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,73 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionQueueQueryMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionBindingQueryMessage extends PacketImpl +{ + private SimpleString address; + + public SessionBindingQueryMessage(final SimpleString address) + { + super(PacketImpl.SESS_BINDINGQUERY); + + this.address = address; + } + + public SessionBindingQueryMessage() + { + super(PacketImpl.SESS_BINDINGQUERY); + } + + public SimpleString getAddress() + { + return address; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(address); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + address = buffer.readSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionBindingQueryMessage == false) + { + return false; + } + + SessionBindingQueryMessage r = (SessionBindingQueryMessage)other; + + return super.equals(other) && address.equals(r.address); + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,124 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import java.util.ArrayList; +import java.util.List; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionBindingQueryResponseMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionBindingQueryResponseMessage extends PacketImpl +{ + private boolean exists; + + private List<SimpleString> queueNames; + + public SessionBindingQueryResponseMessage(final boolean exists, final List<SimpleString> queueNames) + { + super(PacketImpl.SESS_BINDINGQUERY_RESP); + + this.exists = exists; + + this.queueNames = queueNames; + } + + public SessionBindingQueryResponseMessage() + { + super(PacketImpl.SESS_BINDINGQUERY_RESP); + } + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isExists() + { + return exists; + } + + public List<SimpleString> getQueueNames() + { + return queueNames; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(exists); + buffer.writeInt(queueNames.size()); + for (SimpleString queueName : queueNames) + { + buffer.writeSimpleString(queueName); + } + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + exists = buffer.readBoolean(); + int numQueues = buffer.readInt(); + queueNames = new ArrayList<SimpleString>(numQueues); + for (int i = 0; i < numQueues; i++) + { + queueNames.add(buffer.readSimpleString()); + } + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionBindingQueryResponseMessage == false) + { + return false; + } + + SessionBindingQueryResponseMessage r = (SessionBindingQueryResponseMessage)other; + + if (super.equals(other) && exists == r.exists) + { + if (queueNames.size() == r.queueNames.size()) + { + for (int i = 0; i < queueNames.size(); i++) + { + if (!queueNames.get(i).equals(r.queueNames.get(i))) + { + return false; + } + } + } + else + { + return false; + } + } + else + { + return false; + } + + return true; + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCloseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,63 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class SessionCloseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionCloseMessage() + { + super(PacketImpl.SESS_CLOSE); + } + + // Public -------------------------------------------------------- + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionCloseMessage == false) + { + return false; + } + + return super.equals(other); + } + + @Override + public boolean isAsyncExec() + { + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,59 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A SessionCommitMessage + * + * @author tim + * + * + */ +public class SessionCommitMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + /** + * @param type + */ + public SessionCommitMessage() + { + super(PacketImpl.SESS_COMMIT); + } + + public boolean isAsyncExec() + { + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerCloseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,92 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionConsumerCloseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionConsumerCloseMessage(final long objectID) + { + super(PacketImpl.SESS_CONSUMER_CLOSE); + + consumerID = objectID; + } + + public SessionConsumerCloseMessage() + { + super(PacketImpl.SESS_CONSUMER_CLOSE); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + } + + @Override + public String toString() + { + return getParentString() + ", consumerID=" + consumerID + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionConsumerCloseMessage == false) + { + return false; + } + + SessionConsumerCloseMessage r = (SessionConsumerCloseMessage)other; + + return super.equals(other) && consumerID == r.consumerID; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,104 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public class SessionConsumerFlowCreditMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private int credits; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) + { + super(PacketImpl.SESS_FLOWTOKEN); + + this.consumerID = consumerID; + + this.credits = credits; + } + + public SessionConsumerFlowCreditMessage() + { + super(PacketImpl.SESS_FLOWTOKEN); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public int getCredits() + { + return credits; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + buffer.writeInt(credits); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + credits = buffer.readInt(); + } + + @Override + public String toString() + { + return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionConsumerFlowCreditMessage == false) + { + return false; + } + + SessionConsumerFlowCreditMessage r = (SessionConsumerFlowCreditMessage)other; + + return super.equals(other) && credits == r.credits && consumerID == r.consumerID; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.utils.DataConstants; + +/** + * A SessionContinuationMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Dec 5, 2008 10:08:40 AM + * + * + */ +public abstract class SessionContinuationMessage extends PacketImpl +{ + + // Constants ----------------------------------------------------- + + public static final int SESSION_CONTINUATION_BASE_SIZE = PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT + + DataConstants.SIZE_BOOLEAN; + + // Attributes ---------------------------------------------------- + + protected byte[] body; + + protected boolean continues; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) + { + super(type); + this.body = body; + this.continues = continues; + } + + public SessionContinuationMessage(final byte type) + { + super(type); + } + + // Public -------------------------------------------------------- + + /** + * @return the body + */ + public byte[] getBody() + { + return body; + } + + /** + * @return the continues + */ + public boolean isContinues() + { + return continues; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(body.length); + buffer.writeBytes(body); + buffer.writeBoolean(continues); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int size = buffer.readInt(); + body = new byte[size]; + buffer.readBytes(body); + continues = buffer.readBoolean(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionCreateConsumerMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,143 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionCreateConsumerMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long id; + + private SimpleString queueName; + + private SimpleString filterString; + + private boolean browseOnly; + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionCreateConsumerMessage(final long id, + final SimpleString queueName, + final SimpleString filterString, + final boolean browseOnly, + final boolean requiresResponse) + { + super(PacketImpl.SESS_CREATECONSUMER); + + this.id = id; + this.queueName = queueName; + this.filterString = filterString; + this.browseOnly = browseOnly; + this.requiresResponse = requiresResponse; + } + + public SessionCreateConsumerMessage() + { + super(PacketImpl.SESS_CREATECONSUMER); + } + + // Public -------------------------------------------------------- + + @Override + public String toString() + { + StringBuffer buff = new StringBuffer(getParentString()); + buff.append(", queueName=" + queueName); + buff.append(", filterString=" + filterString); + buff.append("]"); + return buff.toString(); + } + + public long getID() + { + return id; + } + + public SimpleString getQueueName() + { + return queueName; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public boolean isBrowseOnly() + { + return browseOnly; + } + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(id); + buffer.writeSimpleString(queueName); + buffer.writeNullableSimpleString(filterString); + buffer.writeBoolean(browseOnly); + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + id = buffer.readLong(); + queueName = buffer.readSimpleString(); + filterString = buffer.readNullableSimpleString(); + browseOnly = buffer.readBoolean(); + requiresResponse = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionCreateConsumerMessage == false) + { + return false; + } + + SessionCreateConsumerMessage r = (SessionCreateConsumerMessage)other; + + return super.equals(other) && queueName.equals(r.queueName) && filterString == null ? r.filterString == null + : filterString.equals(r.filterString); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionDeleteQueueMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,97 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + + * @version <tt>$Revision$</tt> + */ +public class SessionDeleteQueueMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private SimpleString queueName; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionDeleteQueueMessage(final SimpleString queueName) + { + super(PacketImpl.DELETE_QUEUE); + + this.queueName = queueName; + } + + public SessionDeleteQueueMessage() + { + super(PacketImpl.DELETE_QUEUE); + } + + // Public -------------------------------------------------------- + + @Override + public String toString() + { + StringBuffer buff = new StringBuffer(getParentString()); + buff.append(", queueName=" + queueName); + buff.append("]"); + return buff.toString(); + } + + public SimpleString getQueueName() + { + return queueName; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(queueName); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + queueName = buffer.readSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionDeleteQueueMessage == false) + { + return false; + } + + SessionDeleteQueueMessage r = (SessionDeleteQueueMessage)other; + + return super.equals(other) && r.queueName.equals(queueName); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionExpiredMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,98 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + */ +public class SessionExpiredMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private long messageID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionExpiredMessage(final long consumerID, final long messageID) + { + super(PacketImpl.SESS_EXPIRED); + + this.consumerID = consumerID; + + this.messageID = messageID; + } + + public SessionExpiredMessage() + { + super(PacketImpl.SESS_EXPIRED); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public long getMessageID() + { + return messageID; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + + buffer.writeLong(messageID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + + messageID = buffer.readLong(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionExpiredMessage == false) + { + return false; + } + + SessionExpiredMessage r = (SessionExpiredMessage)other; + + return super.equals(other) && consumerID == r.consumerID && messageID == r.messageID; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionForceConsumerDelivery.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,109 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionConsumerForceDelivery + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + */ +public class SessionForceConsumerDelivery extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private long sequence; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionForceConsumerDelivery(final long consumerID, final long sequence) + { + super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); + + this.consumerID = consumerID; + this.sequence = sequence; + } + + public SessionForceConsumerDelivery() + { + super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public long getSequence() + { + return sequence; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + buffer.writeLong(sequence); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + sequence = buffer.readLong(); + } + + @Override + public String toString() + { + StringBuffer buf = new StringBuffer(getParentString()); + buf.append(", consumerID=" + consumerID); + buf.append(", sequence=" + sequence); + buf.append("]"); + return buf.toString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionForceConsumerDelivery == false) + { + return false; + } + + SessionForceConsumerDelivery r = (SessionForceConsumerDelivery)other; + + return super.equals(other) && consumerID == r.consumerID && sequence == r.sequence; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionProducerCreditsMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionProducerCreditsMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int credits; + + private SimpleString address; + + private int offset; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionProducerCreditsMessage(final int credits, final SimpleString address, final int offset) + { + super(PacketImpl.SESS_PRODUCER_CREDITS); + + this.credits = credits; + + this.address = address; + + this.offset = offset; + } + + public SessionProducerCreditsMessage() + { + super(PacketImpl.SESS_PRODUCER_CREDITS); + } + + // Public -------------------------------------------------------- + + public int getCredits() + { + return credits; + } + + public SimpleString getAddress() + { + return address; + } + + public int getOffset() + { + return offset; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(credits); + buffer.writeSimpleString(address); + buffer.writeInt(offset); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + credits = buffer.readInt(); + address = buffer.readSimpleString(); + offset = buffer.readInt(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,73 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * + * A SessionQueueQueryMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionQueueQueryMessage extends PacketImpl +{ + private SimpleString queueName; + + public SessionQueueQueryMessage(final SimpleString queueName) + { + super(PacketImpl.SESS_QUEUEQUERY); + + this.queueName = queueName; + } + + public SessionQueueQueryMessage() + { + super(PacketImpl.SESS_QUEUEQUERY); + } + + public SimpleString getQueueName() + { + return queueName; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeSimpleString(queueName); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + queueName = buffer.readSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionQueueQueryMessage == false) + { + return false; + } + + SessionQueueQueryMessage r = (SessionQueueQueryMessage)other; + + return super.equals(other) && r.queueName.equals(queueName); + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,176 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.server.QueueQueryResult; + +/** + * + * A SessionQueueQueryResponseMessage + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionQueueQueryResponseMessage extends PacketImpl +{ + private SimpleString name; + + private boolean exists; + + private boolean durable; + + private int consumerCount; + + private int messageCount; + + private SimpleString filterString; + + private SimpleString address; + + private boolean temporary; + + public SessionQueueQueryResponseMessage(final QueueQueryResult result) + { + this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), + result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists()); + } + + public SessionQueueQueryResponseMessage() + { + this(null, null, false, false, null, 0, 0, false); + } + + private SessionQueueQueryResponseMessage(final SimpleString name, + final SimpleString address, + final boolean durable, + final boolean temporary, + final SimpleString filterString, + final int consumerCount, + final int messageCount, + final boolean exists) + { + super(PacketImpl.SESS_QUEUEQUERY_RESP); + + this.durable = durable; + + this.temporary = temporary; + + this.consumerCount = consumerCount; + + this.messageCount = messageCount; + + this.filterString = filterString; + + this.address = address; + + this.name = name; + + this.exists = exists; + } + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isExists() + { + return exists; + } + + public boolean isDurable() + { + return durable; + } + + public int getConsumerCount() + { + return consumerCount; + } + + public int getMessageCount() + { + return messageCount; + } + + public SimpleString getFilterString() + { + return filterString; + } + + public SimpleString getAddress() + { + return address; + } + + public SimpleString getName() + { + return name; + } + + public boolean isTemporary() + { + return temporary; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(exists); + buffer.writeBoolean(durable); + buffer.writeBoolean(temporary); + buffer.writeInt(consumerCount); + buffer.writeInt(messageCount); + buffer.writeNullableSimpleString(filterString); + buffer.writeNullableSimpleString(address); + buffer.writeNullableSimpleString(name); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + exists = buffer.readBoolean(); + durable = buffer.readBoolean(); + temporary = buffer.readBoolean(); + consumerCount = buffer.readInt(); + messageCount = buffer.readInt(); + filterString = buffer.readNullableSimpleString(); + address = buffer.readNullableSimpleString(); + name = buffer.readNullableSimpleString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionQueueQueryResponseMessage == false) + { + return false; + } + + SessionQueueQueryResponseMessage r = (SessionQueueQueryResponseMessage)other; + + return super.equals(other) && exists == r.exists && + durable == r.durable && + consumerCount == r.consumerCount && + messageCount == r.messageCount && + filterString == null ? r.filterString == null + : filterString.equals(r.filterString) && address == null ? r.address == null + : address.equals(r.address); + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.utils.DataConstants; + +/** + * A SessionSendContinuationMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Dec 4, 2008 12:25:14 PM + * + * + */ +public class SessionReceiveContinuationMessage extends SessionContinuationMessage +{ + + // Constants ----------------------------------------------------- + + public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SessionContinuationMessage.SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG; + + // Attributes ---------------------------------------------------- + + private long consumerID; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionReceiveContinuationMessage() + { + super(PacketImpl.SESS_RECEIVE_CONTINUATION); + } + + /** + * @param consumerID + * @param body + * @param continues + * @param requiresResponse + */ + public SessionReceiveContinuationMessage(final long consumerID, + final byte[] body, + final boolean continues, + final boolean requiresResponse) + { + super(PacketImpl.SESS_RECEIVE_CONTINUATION, body, continues); + this.consumerID = consumerID; + } + + /** + * @return the consumerID + */ + public long getConsumerID() + { + return consumerID; + } + + // Public -------------------------------------------------------- + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + super.encodeRest(buffer); + buffer.writeLong(consumerID); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + super.decodeRest(buffer); + consumerID = buffer.readLong(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveLargeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A SessionReceiveLargeMessage + * + * @author Clebert Suconic + * + * + */ +public class SessionReceiveLargeMessage extends PacketImpl +{ + private byte[] largeMessageHeader; + + /** Since we receive the message before the entire message was received, */ + private long largeMessageSize; + + private long consumerID; + + private int deliveryCount; + + public SessionReceiveLargeMessage() + { + super(PacketImpl.SESS_RECEIVE_LARGE_MSG); + } + + public SessionReceiveLargeMessage(final long consumerID, + final byte[] largeMessageHeader, + final long largeMessageSize, + final int deliveryCount) + { + super(PacketImpl.SESS_RECEIVE_LARGE_MSG); + + this.consumerID = consumerID; + + this.largeMessageHeader = largeMessageHeader; + + this.deliveryCount = deliveryCount; + + this.largeMessageSize = largeMessageSize; + } + + public byte[] getLargeMessageHeader() + { + return largeMessageHeader; + } + + public long getConsumerID() + { + return consumerID; + } + + public int getDeliveryCount() + { + return deliveryCount; + } + + /** + * @return the largeMessageSize + */ + public long getLargeMessageSize() + { + return largeMessageSize; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeLong(consumerID); + buffer.writeInt(deliveryCount); + buffer.writeLong(largeMessageSize); + buffer.writeInt(largeMessageHeader.length); + buffer.writeBytes(largeMessageHeader); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + consumerID = buffer.readLong(); + deliveryCount = buffer.readInt(); + largeMessageSize = buffer.readLong(); + int size = buffer.readInt(); + largeMessageHeader = new byte[size]; + buffer.readBytes(largeMessageHeader); + } + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionReceiveMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,120 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.client.impl.ClientMessageImpl; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.message.impl.MessageInternal; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionReceiveMessage extends MessagePacket +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(SessionReceiveMessage.class); + + // Attributes ---------------------------------------------------- + + private long consumerID; + + private int deliveryCount; + + public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) + { + super(PacketImpl.SESS_RECEIVE_MSG, message); + + this.consumerID = consumerID; + + this.deliveryCount = deliveryCount; + } + + public SessionReceiveMessage() + { + super(PacketImpl.SESS_RECEIVE_MSG, new ClientMessageImpl()); + } + + // Public -------------------------------------------------------- + + public long getConsumerID() + { + return consumerID; + } + + public int getDeliveryCount() + { + return deliveryCount; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + public HornetQBuffer encode(final RemotingConnection connection) + { + HornetQBuffer buffer = message.getEncodedBuffer(); + + // Sanity check + if (buffer.writerIndex() != message.getEndOfMessagePosition()) + { + throw new IllegalStateException("Wrong encode position"); + } + + buffer.writeLong(consumerID); + buffer.writeInt(deliveryCount); + + size = buffer.writerIndex(); + + // Write standard headers + + int len = size - DataConstants.SIZE_INT; + buffer.setInt(0, len); + buffer.setByte(DataConstants.SIZE_INT, type); + buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); + + // Position reader for reading by Netty + buffer.setIndex(0, size); + + return buffer; + } + + @Override + public void decode(final HornetQBuffer buffer) + { + channelID = buffer.readLong(); + + message.decodeFromBuffer(buffer); + + consumerID = buffer.readLong(); + + deliveryCount = buffer.readInt(); + + size = buffer.readerIndex(); + + // Need to position buffer for reading + + buffer.setIndex(PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT, message.getEndOfBodyPosition()); + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,90 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class SessionRequestProducerCreditsMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int credits; + + private SimpleString address; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) + { + super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); + + this.credits = credits; + + this.address = address; + } + + public SessionRequestProducerCreditsMessage() + { + super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); + } + + // Public -------------------------------------------------------- + + public int getCredits() + { + return credits; + } + + public SimpleString getAddress() + { + return address; + } + + // public boolean isRequiresConfirmations() + // { + // return false; + // } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(credits); + buffer.writeSimpleString(address); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + credits = buffer.readInt(); + address = buffer.readSimpleString(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * A SessionSendContinuationMessage + * + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * + * Created Dec 4, 2008 12:25:14 PM + * + * + */ +public class SessionSendContinuationMessage extends SessionContinuationMessage +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionSendContinuationMessage() + { + super(PacketImpl.SESS_SEND_CONTINUATION); + } + + /** + * @param body + * @param continues + * @param requiresResponse + */ + public SessionSendContinuationMessage(final byte[] body, final boolean continues, final boolean requiresResponse) + { + super(PacketImpl.SESS_SEND_CONTINUATION, body, continues); + this.requiresResponse = requiresResponse; + } + + // Public -------------------------------------------------------- + + /** + * @return the requiresResponse + */ + public boolean isRequiresResponse() + { + return requiresResponse; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + super.encodeRest(buffer); + buffer.writeBoolean(requiresResponse); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + super.decodeRest(buffer); + requiresResponse = buffer.readBoolean(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendLargeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:csuconic@redhat.com">Clebert Suconic</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionSendLargeMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + /** Used only if largeMessage */ + private byte[] largeMessageHeader; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionSendLargeMessage(final byte[] largeMessageHeader) + { + super(PacketImpl.SESS_SEND_LARGE); + + this.largeMessageHeader = largeMessageHeader; + } + + public SessionSendLargeMessage() + { + super(PacketImpl.SESS_SEND_LARGE); + } + + // Public -------------------------------------------------------- + + public byte[] getLargeMessageHeader() + { + return largeMessageHeader; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(largeMessageHeader.length); + buffer.writeBytes(largeMessageHeader); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int largeMessageLength = buffer.readInt(); + + largeMessageHeader = new byte[largeMessageLength]; + + buffer.readBytes(largeMessageHeader); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionSendMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,115 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.Message; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.message.impl.MessageInternal; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.remoting.RemotingConnection; +import org.hornetq.core.server.impl.ServerMessageImpl; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionSendMessage extends MessagePacket +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(SessionSendMessage.class); + + // Attributes ---------------------------------------------------- + + private boolean requiresResponse; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionSendMessage(final MessageInternal message, final boolean requiresResponse) + { + super(PacketImpl.SESS_SEND, message); + + this.requiresResponse = requiresResponse; + } + + public SessionSendMessage() + { + super(PacketImpl.SESS_SEND, new ServerMessageImpl()); + } + + // Public -------------------------------------------------------- + + public boolean isRequiresResponse() + { + return requiresResponse; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + public HornetQBuffer encode(final RemotingConnection connection) + { + HornetQBuffer buffer = message.getEncodedBuffer(); + + // Sanity check + if (buffer.writerIndex() != message.getEndOfMessagePosition()) + { + throw new IllegalStateException("Wrong encode position"); + } + + buffer.writeBoolean(requiresResponse); + + size = buffer.writerIndex(); + + // Write standard headers + + int len = size - DataConstants.SIZE_INT; + buffer.setInt(0, len); + buffer.setByte(DataConstants.SIZE_INT, type); + buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); + + // Position reader for reading by Netty + buffer.readerIndex(0); + + message.resetCopied(); + + return buffer; + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + // Buffer comes in after having read standard headers and positioned at Beginning of body part + + message.decodeFromBuffer(buffer); + + int ri = buffer.readerIndex(); + + requiresResponse = buffer.readBoolean(); + + buffer.readerIndex(ri); + + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXACommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,111 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXACommitMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean onePhase; + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXACommitMessage(final Xid xid, final boolean onePhase) + { + super(PacketImpl.SESS_XA_COMMIT); + + this.xid = xid; + this.onePhase = onePhase; + } + + public SessionXACommitMessage() + { + super(PacketImpl.SESS_XA_COMMIT); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + public boolean isOnePhase() + { + return onePhase; + } + + @Override + public boolean isAsyncExec() + { + return true; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + buffer.writeBoolean(onePhase); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + onePhase = buffer.readBoolean(); + } + + @Override + public String toString() + { + return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXACommitMessage == false) + { + return false; + } + + SessionXACommitMessage r = (SessionXACommitMessage)other; + + return super.equals(other) && xid.equals(r.xid) && onePhase == r.onePhase; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAEndMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,106 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAEndMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + private boolean failed; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAEndMessage(final Xid xid, final boolean failed) + { + super(PacketImpl.SESS_XA_END); + + this.xid = xid; + + this.failed = failed; + } + + public SessionXAEndMessage() + { + super(PacketImpl.SESS_XA_END); + } + + // Public -------------------------------------------------------- + + public boolean isFailed() + { + return failed; + } + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + buffer.writeBoolean(failed); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + failed = buffer.readBoolean(); + } + + @Override + public String toString() + { + return getParentString() + ", xid=" + xid + ", failed=" + failed + "]"; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAEndMessage == false) + { + return false; + } + + SessionXAEndMessage r = (SessionXAEndMessage)other; + + return super.equals(other) && xid.equals(r.xid) && failed == r.failed; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAForgetMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAForgetMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAForgetMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_FORGET); + + this.xid = xid; + } + + public SessionXAForgetMessage() + { + super(PacketImpl.SESS_XA_FORGET); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAForgetMessage == false) + { + return false; + } + + SessionXAForgetMessage r = (SessionXAForgetMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,127 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import java.util.ArrayList; +import java.util.List; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private List<Xid> xids; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAGetInDoubtXidsResponseMessage(final List<Xid> xids) + { + super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); + + this.xids = xids; + } + + public SessionXAGetInDoubtXidsResponseMessage() + { + super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public List<Xid> getXids() + { + return xids; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(xids.size()); + + for (Xid xid : xids) + { + XidCodecSupport.encodeXid(xid, buffer); + } + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + int len = buffer.readInt(); + xids = new ArrayList<Xid>(len); + for (int i = 0; i < len; i++) + { + Xid xid = XidCodecSupport.decodeXid(buffer); + + xids.add(xid); + } + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAGetInDoubtXidsResponseMessage == false) + { + return false; + } + + SessionXAGetInDoubtXidsResponseMessage r = (SessionXAGetInDoubtXidsResponseMessage)other; + + if (super.equals(other)) + { + if (xids.size() == r.xids.size()) + { + for (int i = 0; i < xids.size(); i++) + { + if (!xids.get(i).equals(r.xids.get(i))) + { + return false; + } + } + } + } + else + { + return false; + } + return true; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAGetTimeoutResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int timeoutSeconds; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) + { + super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); + + this.timeoutSeconds = timeoutSeconds; + } + + public SessionXAGetTimeoutResponseMessage() + { + super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public int getTimeoutSeconds() + { + return timeoutSeconds; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(timeoutSeconds); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + timeoutSeconds = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAGetTimeoutResponseMessage == false) + { + return false; + } + + SessionXAGetTimeoutResponseMessage r = (SessionXAGetTimeoutResponseMessage)other; + + return super.equals(other) && timeoutSeconds == r.timeoutSeconds; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAJoinMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAJoinMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAJoinMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_JOIN); + + this.xid = xid; + } + + public SessionXAJoinMessage() + { + super(PacketImpl.SESS_XA_JOIN); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAJoinMessage == false) + { + return false; + } + + SessionXAJoinMessage r = (SessionXAJoinMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAPrepareMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,94 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAPrepareMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAPrepareMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_PREPARE); + + this.xid = xid; + } + + public SessionXAPrepareMessage() + { + super(PacketImpl.SESS_XA_PREPARE); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + public boolean isAsyncExec() + { + return true; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAPrepareMessage == false) + { + return false; + } + + SessionXAPrepareMessage r = (SessionXAPrepareMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,115 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean error; + + private int responseCode; + + private String message; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAResponseMessage(final boolean isError, final int responseCode, final String message) + { + super(PacketImpl.SESS_XA_RESP); + + error = isError; + + this.responseCode = responseCode; + + this.message = message; + } + + public SessionXAResponseMessage() + { + super(PacketImpl.SESS_XA_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isError() + { + return error; + } + + public int getResponseCode() + { + return responseCode; + } + + public String getMessage() + { + return message; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(error); + buffer.writeInt(responseCode); + buffer.writeNullableString(message); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + error = buffer.readBoolean(); + responseCode = buffer.readInt(); + message = buffer.readNullableString(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAResponseMessage == false) + { + return false; + } + + SessionXAResponseMessage r = (SessionXAResponseMessage)other; + + return super.equals(other) && error == r.error && responseCode == r.responseCode && message.equals(r.message); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAResumeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAResumeMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAResumeMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_RESUME); + + this.xid = xid; + } + + public SessionXAResumeMessage() + { + super(PacketImpl.SESS_XA_RESUME); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAResumeMessage == false) + { + return false; + } + + SessionXAResumeMessage r = (SessionXAResumeMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXARollbackMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,95 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXARollbackMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXARollbackMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_ROLLBACK); + + this.xid = xid; + } + + public SessionXARollbackMessage() + { + super(PacketImpl.SESS_XA_ROLLBACK); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + public boolean isAsyncExec() + { + return true; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXARollbackMessage == false) + { + return false; + } + + SessionXARollbackMessage r = (SessionXARollbackMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,87 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXASetTimeoutMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private int timeoutSeconds; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXASetTimeoutMessage(final int timeoutSeconds) + { + super(PacketImpl.SESS_XA_SET_TIMEOUT); + + this.timeoutSeconds = timeoutSeconds; + } + + public SessionXASetTimeoutMessage() + { + super(PacketImpl.SESS_XA_SET_TIMEOUT); + } + + // Public -------------------------------------------------------- + + public int getTimeoutSeconds() + { + return timeoutSeconds; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeInt(timeoutSeconds); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + timeoutSeconds = buffer.readInt(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXASetTimeoutMessage == false) + { + return false; + } + + SessionXASetTimeoutMessage r = (SessionXASetTimeoutMessage)other; + + return super.equals(other) && timeoutSeconds == r.timeoutSeconds; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXASetTimeoutResponseMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private boolean ok; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXASetTimeoutResponseMessage(final boolean ok) + { + super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); + + this.ok = ok; + } + + public SessionXASetTimeoutResponseMessage() + { + super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isResponse() + { + return true; + } + + public boolean isOK() + { + return ok; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + buffer.writeBoolean(ok); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + ok = buffer.readBoolean(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXASetTimeoutResponseMessage == false) + { + return false; + } + + SessionXASetTimeoutResponseMessage r = (SessionXASetTimeoutResponseMessage)other; + + return super.equals(other) && ok == r.ok; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/SessionXAStartMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.protocol.core.PacketImpl; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class SessionXAStartMessage extends PacketImpl +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private Xid xid; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SessionXAStartMessage(final Xid xid) + { + super(PacketImpl.SESS_XA_START); + + this.xid = xid; + } + + public SessionXAStartMessage() + { + super(PacketImpl.SESS_XA_START); + } + + // Public -------------------------------------------------------- + + public Xid getXid() + { + return xid; + } + + @Override + public void encodeRest(final HornetQBuffer buffer) + { + XidCodecSupport.encodeXid(xid, buffer); + } + + @Override + public void decodeRest(final HornetQBuffer buffer) + { + xid = XidCodecSupport.decodeXid(buffer); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SessionXAStartMessage == false) + { + return false; + } + + SessionXAStartMessage r = (SessionXAStartMessage)other; + + return super.equals(other) && xid.equals(r.xid); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java (from rev 8817, trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java) =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java (rev 0) +++ trunk/src/main/org/hornetq/core/protocol/core/wireformat/XidCodecSupport.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -0,0 +1,73 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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.hornetq.core.protocol.core.wireformat; + +import javax.transaction.xa.Xid; + +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.core.transaction.impl.XidImpl; +import org.hornetq.utils.DataConstants; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +public class XidCodecSupport +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + public static void encodeXid(final Xid xid, final HornetQBuffer out) + { + out.writeInt(xid.getFormatId()); + out.writeInt(xid.getBranchQualifier().length); + out.writeBytes(xid.getBranchQualifier()); + out.writeInt(xid.getGlobalTransactionId().length); + out.writeBytes(xid.getGlobalTransactionId()); + } + + public static Xid decodeXid(final HornetQBuffer in) + { + int formatID = in.readInt(); + byte[] bq = new byte[in.readInt()]; + in.readBytes(bq); + byte[] gtxid = new byte[in.readInt()]; + in.readBytes(gtxid); + Xid xid = new XidImpl(bq, formatID, gtxid); + return xid; + } + + public static int getXidEncodeLength(final Xid xid) + { + return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length; + } + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Deleted: trunk/src/main/org/hornetq/core/remoting/Channel.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/Channel.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/Channel.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,178 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -import java.util.concurrent.locks.Lock; - -import org.hornetq.api.core.HornetQException; - -/** - * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.remoting.CoreRemotingConnection}. - * - * Any packet sent will have its channel id set to the specific channel sending so it can be routed to its correct channel - * when received by the {@link org.hornetq.core.remoting.CoreRemotingConnection}. see {@link org.hornetq.core.remoting.Packet#setChannelID(long)}. - * - * Each Channel should will forward any packets received to its {@link org.hornetq.core.remoting.ChannelHandler}. - * - * A Channel *does not* support concurrent access by more than one thread! - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Channel -{ - /** - * returns the id of this channel. - * - * @return the id - */ - long getID(); - - /** - * sends a packet on this channel. - * - * @param packet the packet to send - */ - void send(Packet packet); - - /** - * sends a packet on this channel and then blocks until it has been written to the connection. - * - * @param packet the packet to send - */ - void sendAndFlush(Packet packet); - - /** - * sends a packet on this channel and then blocks until a response is received or a timeout occurs. - * - * @param packet the packet to send - * @return the response - * @throws HornetQException if an error occurs during the send - */ - Packet sendBlocking(Packet packet) throws HornetQException; - - /** - * sets the {@link org.hornetq.core.remoting.ChannelHandler} that this channel should forward received packets to. - * - * @param handler the handler - */ - void setHandler(ChannelHandler handler); - - /** - * closes this channel. - * - * once closed no packets can be sent. - */ - void close(); - - /** - * transfers the connection used by this channel to the one specified. - * - * All new packets will be sent via this connection. - * - * @param newConnection the new connection - */ - void transferConnection(CoreRemotingConnection newConnection); - - /** - * resends any packets that have not received confirmations yet. - * - * Typically called after a connection has been transferred. - * - * @param lastConfirmedCommandID the last confirmed packet - */ - void replayCommands(int lastConfirmedCommandID); - - /** - * returns the last confirmed packet command id - * - * @return the id - */ - int getLastConfirmedCommandID(); - - /** - * locks the channel. - * - * While locked no packets can be sent or received - */ - void lock(); - - /** - * unlocks the channel. - */ - void unlock(); - - /** - * forces any {@link org.hornetq.core.remoting.Channel#sendBlocking(Packet)} request to return with an exception. - */ - void returnBlocking(); - - /** - * returns the channel lock - * - * @return the lock - */ - Lock getLock(); - - /** - * returns the Remoting Connection being used by the channel - */ - CoreRemotingConnection getConnection(); - - /** - * sends a confirmation of a packet being received. - * - * @param packet the packet to confirm - */ - void confirm(Packet packet); - - /** - * sets the handler to use when a confirmation is received. - * - * @param handler the handler to call - */ - void setCommandConfirmationHandler(CommandConfirmationHandler handler); - - /** - * flushes any confirmations on to the connection. - */ - void flushConfirmations(); - - /** - * Called by {@link org.hornetq.core.remoting.CoreRemotingConnection} when a packet is received. - * - * This method should then call its {@link org.hornetq.core.remoting.ChannelHandler} after appropriate processing of - * the packet - * - * @param packet the packet to process. - */ - void handlePacket(Packet packet); - - /** - * clears any commands from the cache that are yet to be confirmed. - */ - void clearCommands(); - - /** - * returns the confirmation window size this channel is using. - * - * @return the window size - */ - int getConfirmationWindowSize(); - - /** - * notifies the channel if it is transferring its connection. When true it is illegal to send messages. - * - * @param transferring whether the channel is transferring - */ - void setTransferring(boolean transferring); -} Deleted: trunk/src/main/org/hornetq/core/remoting/ChannelHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/ChannelHandler.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/ChannelHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,29 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -/** - * A ChannelHandler is used by {@link Channel}. When a channel receives a packet it will call its handler to deal with the - * packet. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface ChannelHandler -{ - /** - * called by the channel when a packet is received.. - * - * @param packet the packet received - */ - void handlePacket(Packet packet); -} Deleted: trunk/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/CommandConfirmationHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,31 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -/** - * A CommandConfirmationHandler is used by the channel to confirm confirmations of packets. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 9 Feb 2009 12:39:11 - */ -public interface CommandConfirmationHandler -{ - /** - * called by channel after a confirmation has been received. - * - * @param packet the packet confirmed - */ - void commandConfirmed(Packet packet); -} Deleted: trunk/src/main/org/hornetq/core/remoting/CoreRemotingConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/CoreRemotingConnection.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/CoreRemotingConnection.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,87 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - - -/** - * Extension of RemotingConnection for the HornetQ core protocol - * - * @author Tim Fox - * - * - */ -public interface CoreRemotingConnection extends RemotingConnection -{ - /** - * return the channel with the channel id specified. - * - * If it does not exist create it with the confirmation window size. - * - * @param channelID the channel id - * @param confWindowSize the confirmation window size - * @return the channel - */ - Channel getChannel(long channelID, int confWindowSize); - - /** - * add the channel with the specified channel id - * - * @param channelID the channel id - * @param channel the channel - */ - void putChannel(long channelID, Channel channel); - - /** - * remove the channel with the specified channel id - * - * @param channelID the channel id - * @return true if removed - */ - boolean removeChannel(long channelID); - - /** - * generate a unique (within this connection) channel id - * - * @return the id - */ - long generateChannelID(); - - /** - * resets the id generator used to when generating id's - * - * @param id the first id to set it to - */ - void syncIDGeneratorSequence(long id); - - /** - * return the next id that will be chosen. - * - * @return the id - */ - long getIDGeneratorSequence(); - - /** - * return the current tomeout for blocking calls - * - * @return the timeout in milliseconds - */ - long getBlockingCallTimeout(); - - /** - * return the transfer lock used when transferring connections. - * - * @return the lock - */ - Object getTransferLock(); -} Deleted: trunk/src/main/org/hornetq/core/remoting/Packet.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/Packet.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/Packet.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,85 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A Packet represents a pcaket of data transmitted over a connection. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Packet -{ - /** - * This sets the channel id that should be used once the packet has been successfully decoded it is sent to the correct channel. - * - * @param channelID the id of the channel to handle the packet - */ - void setChannelID(long channelID); - - /** - * returns the channel id of the channel that should handle this pcaket - * - * @return the id of the channel - */ - long getChannelID(); - - /** - * returns true if this packet is being sent in response to a previously received packet - * - * @return true if a response - */ - boolean isResponse(); - - /** - * returns the type of the packet. - * - * This is needed when decoding the packet - * - * @return the packet type - */ - byte getType(); - - /** - * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data - * - * @param connection the connection - * @return the buffer to encode to - */ - HornetQBuffer encode(RemotingConnection connection); - - /** - * decodes the buffer into this packet - * - * @param buffer the buffer to decode from - */ - void decode(HornetQBuffer buffer); - - /** - * returns the size needed to encode this packet. - * - * @return The size of the entire packet including headers, and extra data - */ - int getPacketSize(); - - /** - * returns true if a confirmation should be sent on receipt of this packet. - * - * @return true if confirmation is required - */ - boolean isRequiresConfirmations(); - - boolean isAsyncExec(); -} Modified: trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -23,7 +23,7 @@ /** * A RemotingConnection is a connection between a client and a server. * - * It allows multiple {@link org.hornetq.core.remoting.Channel}'s to be created and data multiplexed over them. It uses + * It allows multiple {@link org.hornetq.core.protocol.core.Channel}'s to be created and data multiplexed over them. It uses * and a {@link Connection} implementation and takes care of failures etc. * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Deleted: trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,514 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl; - -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CommandConfirmationHandler; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.PacketsConfirmedMessage; - -/** - * A ChannelImpl - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public class ChannelImpl implements Channel -{ - private static final Logger log = Logger.getLogger(ChannelImpl.class); - - private volatile long id; - - private ChannelHandler handler; - - private Packet response; - - private final java.util.Queue<Packet> resendCache; - - private volatile int firstStoredCommandID; - - private volatile int lastConfirmedCommandID = -1; - - private volatile CoreRemotingConnection connection; - - private volatile boolean closed; - - private final Lock lock = new ReentrantLock(); - - private final Condition sendCondition = lock.newCondition(); - - private final Condition failoverCondition = lock.newCondition(); - - private final Object sendLock = new Object(); - - private final Object sendBlockingLock = new Object(); - - private boolean failingOver; - - private final int confWindowSize; - - private int receivedBytes; - - private CommandConfirmationHandler commandConfirmationHandler; - - private volatile boolean transferring; - - public ChannelImpl(final CoreRemotingConnection connection, final long id, final int confWindowSize) - { - this.connection = connection; - - this.id = id; - - this.confWindowSize = confWindowSize; - - if (confWindowSize != -1) - { - resendCache = new ConcurrentLinkedQueue<Packet>(); - } - else - { - resendCache = null; - } - } - - public long getID() - { - return id; - } - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - public Lock getLock() - { - return lock; - } - - public int getConfirmationWindowSize() - { - return confWindowSize; - } - - public void returnBlocking() - { - lock.lock(); - - try - { - response = new HornetQExceptionMessage(new HornetQException(HornetQException.UNBLOCKED, - "Connection failure detected. Unblocking a blocking call that will never get a response" - - )); - - sendCondition.signal(); - } - finally - { - lock.unlock(); - } - } - - public void sendAndFlush(final Packet packet) - { - send(packet, true); - } - - public void send(final Packet packet) - { - send(packet, false); - } - - public void setTransferring(boolean transferring) - { - this.transferring = transferring; - } - - // This must never called by more than one thread concurrently - public void send(final Packet packet, final boolean flush) - { - synchronized (sendLock) - { - packet.setChannelID(id); - - final HornetQBuffer buffer = packet.encode(connection); - - lock.lock(); - - try - { - while (failingOver) - { - // TODO - don't hardcode this timeout - try - { - failoverCondition.await(10000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - } - - //Sanity check - if (transferring) - { - throw new IllegalStateException("Cannot send a packet while channel is doing failover"); - } - - - if (resendCache != null && packet.isRequiresConfirmations()) - { - resendCache.add(packet); - } - - connection.getTransportConnection().write(buffer, flush); - } - finally - { - lock.unlock(); - } - } - } - - public Packet sendBlocking(final Packet packet) throws HornetQException - { - if (closed) - { - throw new HornetQException(HornetQException.NOT_CONNECTED, "Connection is destroyed"); - } - - if (connection.getBlockingCallTimeout() == -1) - { - throw new IllegalStateException("Cannot do a blocking call timeout on a server side connection"); - } - - // Synchronized since can't be called concurrently by more than one thread and this can occur - // E.g. blocking acknowledge() from inside a message handler at some time as other operation on main thread - synchronized (sendBlockingLock) - { - packet.setChannelID(id); - - final HornetQBuffer buffer = packet.encode(connection); - - lock.lock(); - - try - { - while (failingOver) - { - // TODO - don't hardcode this timeout - try - { - failoverCondition.await(10000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - } - - response = null; - - if (resendCache != null && packet.isRequiresConfirmations()) - { - resendCache.add(packet); - } - - connection.getTransportConnection().write(buffer); - - long toWait = connection.getBlockingCallTimeout(); - - long start = System.currentTimeMillis(); - - while (response == null && toWait > 0) - { - try - { - sendCondition.await(toWait, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - } - - if (closed) - { - break; - } - - final long now = System.currentTimeMillis(); - - toWait -= now - start; - - start = now; - } - - if (response == null) - { - throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, - "Timed out waiting for response when sending packet " + packet.getType()); - } - - if (response.getType() == PacketImpl.EXCEPTION) - { - final HornetQExceptionMessage mem = (HornetQExceptionMessage)response; - - HornetQException e = mem.getException(); - - e.fillInStackTrace(); - - throw e; - } - } - finally - { - lock.unlock(); - } - - return response; - } - } - - public void setCommandConfirmationHandler(final CommandConfirmationHandler handler) - { - commandConfirmationHandler = handler; - } - - public void setHandler(final ChannelHandler handler) - { - this.handler = handler; - } - - public void close() - { - if (closed) - { - return; - } - - if (!connection.isDestroyed() && !connection.removeChannel(id)) - { - throw new IllegalArgumentException("Cannot find channel with id " + id + " to close"); - } - - closed = true; - } - - public void transferConnection(final CoreRemotingConnection newConnection) - { - // Needs to synchronize on the connection to make sure no packets from - // the old connection get processed after transfer has occurred - synchronized (connection.getTransferLock()) - { - connection.removeChannel(id); - - // And switch it - - final CoreRemotingConnection rnewConnection = (CoreRemotingConnection)newConnection; - - rnewConnection.putChannel(id, this); - - connection = rnewConnection; - - transferring = true; - } - } - - public void replayCommands(final int otherLastConfirmedCommandID) - { - if (resendCache != null) - { - clearUpTo(otherLastConfirmedCommandID); - - for (final Packet packet : resendCache) - { - doWrite(packet); - } - } - } - - public void lock() - { - lock.lock(); - - failingOver = true; - - lock.unlock(); - } - - public void unlock() - { - lock.lock(); - - failingOver = false; - - failoverCondition.signalAll(); - - lock.unlock(); - } - - public CoreRemotingConnection getConnection() - { - return connection; - } - - //Needs to be synchronized since can be called by remoting service timer thread too for timeout flush - public synchronized void flushConfirmations() - { - if (resendCache != null && receivedBytes != 0) - { - receivedBytes = 0; - - final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); - - confirmed.setChannelID(id); - - doWrite(confirmed); - } - } - - public void confirm(final Packet packet) - { - if (resendCache != null && packet.isRequiresConfirmations()) - { - lastConfirmedCommandID++; - - receivedBytes += packet.getPacketSize(); - - if (receivedBytes >= confWindowSize) - { - receivedBytes = 0; - - final Packet confirmed = new PacketsConfirmedMessage(lastConfirmedCommandID); - - confirmed.setChannelID(id); - - doWrite(confirmed); - } - } - } - - public void clearCommands() - { - if (resendCache != null) - { - lastConfirmedCommandID = -1; - - firstStoredCommandID = 0; - - resendCache.clear(); - } - } - - public void handlePacket(final Packet packet) - { - if (packet.getType() == PacketImpl.PACKETS_CONFIRMED) - { - if (resendCache != null) - { - final PacketsConfirmedMessage msg = (PacketsConfirmedMessage)packet; - - clearUpTo(msg.getCommandID()); - } - - if (!connection.isClient()) - { - handler.handlePacket(packet); - } - - return; - } - else - { - if (packet.isResponse()) - { - confirm(packet); - - lock.lock(); - - response = packet; - - try - { - sendCondition.signal(); - } - finally - { - lock.unlock(); - } - } - else if (handler != null) - { - handler.handlePacket(packet); - } - } - } - - private void doWrite(final Packet packet) - { - final HornetQBuffer buffer = packet.encode(connection); - - connection.getTransportConnection().write(buffer); - } - - private void clearUpTo(final int lastReceivedCommandID) - { - final int numberToClear = 1 + lastReceivedCommandID - firstStoredCommandID; - - if (numberToClear == -1) - { - throw new IllegalArgumentException("Invalid lastReceivedCommandID: " + lastReceivedCommandID); - } - - int sizeToFree = 0; - - for (int i = 0; i < numberToClear; i++) - { - final Packet packet = resendCache.poll(); - - if (packet == null) - { - ChannelImpl.log.warn("Can't find packet to clear: " + " last received command id " + - lastReceivedCommandID + - " first stored command id " + - firstStoredCommandID); - return; - } - - if (packet.getType() != PacketImpl.PACKETS_CONFIRMED) - { - sizeToFree += packet.getPacketSize(); - } - - if (commandConfirmationHandler != null) - { - commandConfirmationHandler.commandConfirmed(packet); - } - } - - firstStoredCommandID += numberToClear; - } -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,494 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl; - -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATESESSION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATESESSION_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_REPLICATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.DISCONNECT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.EXCEPTION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.NULL_RESPONSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.PACKETS_CONFIRMED; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.PING; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_APPEND; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_APPEND_TX; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_COMMIT_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_COMPARE_DATA; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_DELETE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_DELETE_TX; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_LARGE_MESSAGE_END; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_PAGE_EVENT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_PAGE_WRITE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_PREPARE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_RESPONSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_BINDINGQUERY_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_PRODUCER_CREDITS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_PRODUCER_REQUEST_CREDITS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_QUEUEQUERY_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_LARGE_MSG; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_RECEIVE_MSG; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_STOP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_END; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_GET_TIMEOUT_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_INDOUBT_XIDS_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SET_TIMEOUT_RESP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SUSPEND; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.PacketsConfirmedMessage; -import org.hornetq.core.remoting.impl.wireformat.Ping; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; - -/** - * A PacketDecoder - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * - */ -public class PacketDecoder -{ - private static final Logger log = Logger.getLogger(PacketDecoder.class); - - public Packet decode(final HornetQBuffer in) - { - final byte packetType = in.readByte(); - - Packet packet; - - switch (packetType) - { - case PING: - { - packet = new Ping(); - break; - } - case DISCONNECT: - { - packet = new PacketImpl(PacketImpl.DISCONNECT); - break; - } - case EXCEPTION: - { - packet = new HornetQExceptionMessage(); - break; - } - case PACKETS_CONFIRMED: - { - packet = new PacketsConfirmedMessage(); - break; - } - case CREATESESSION: - { - packet = new CreateSessionMessage(); - break; - } - case CREATESESSION_RESP: - { - packet = new CreateSessionResponseMessage(); - break; - } - case REATTACH_SESSION: - { - packet = new ReattachSessionMessage(); - break; - } - case REATTACH_SESSION_RESP: - { - packet = new ReattachSessionResponseMessage(); - break; - } - case SESS_CLOSE: - { - packet = new SessionCloseMessage(); - break; - } - case SESS_CREATECONSUMER: - { - packet = new SessionCreateConsumerMessage(); - break; - } - case SESS_ACKNOWLEDGE: - { - packet = new SessionAcknowledgeMessage(); - break; - } - case SESS_EXPIRED: - { - packet = new SessionExpiredMessage(); - break; - } - case SESS_COMMIT: - { - packet = new SessionCommitMessage(); - break; - } - case SESS_ROLLBACK: - { - packet = new RollbackMessage(); - break; - } - case SESS_QUEUEQUERY: - { - packet = new SessionQueueQueryMessage(); - break; - } - case SESS_QUEUEQUERY_RESP: - { - packet = new SessionQueueQueryResponseMessage(); - break; - } - case CREATE_QUEUE: - { - packet = new CreateQueueMessage(); - break; - } - case DELETE_QUEUE: - { - packet = new SessionDeleteQueueMessage(); - break; - } - case SESS_BINDINGQUERY: - { - packet = new SessionBindingQueryMessage(); - break; - } - case SESS_BINDINGQUERY_RESP: - { - packet = new SessionBindingQueryResponseMessage(); - break; - } - case SESS_XA_START: - { - packet = new SessionXAStartMessage(); - break; - } - case SESS_XA_END: - { - packet = new SessionXAEndMessage(); - break; - } - case SESS_XA_COMMIT: - { - packet = new SessionXACommitMessage(); - break; - } - case SESS_XA_PREPARE: - { - packet = new SessionXAPrepareMessage(); - break; - } - case SESS_XA_RESP: - { - packet = new SessionXAResponseMessage(); - break; - } - case SESS_XA_ROLLBACK: - { - packet = new SessionXARollbackMessage(); - break; - } - case SESS_XA_JOIN: - { - packet = new SessionXAJoinMessage(); - break; - } - case SESS_XA_SUSPEND: - { - packet = new PacketImpl(PacketImpl.SESS_XA_SUSPEND); - break; - } - case SESS_XA_RESUME: - { - packet = new SessionXAResumeMessage(); - break; - } - case SESS_XA_FORGET: - { - packet = new SessionXAForgetMessage(); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - packet = new PacketImpl(PacketImpl.SESS_XA_INDOUBT_XIDS); - break; - } - case SESS_XA_INDOUBT_XIDS_RESP: - { - packet = new SessionXAGetInDoubtXidsResponseMessage(); - break; - } - case SESS_XA_SET_TIMEOUT: - { - packet = new SessionXASetTimeoutMessage(); - break; - } - case SESS_XA_SET_TIMEOUT_RESP: - { - packet = new SessionXASetTimeoutResponseMessage(); - break; - } - case SESS_XA_GET_TIMEOUT: - { - packet = new PacketImpl(PacketImpl.SESS_XA_GET_TIMEOUT); - break; - } - case SESS_XA_GET_TIMEOUT_RESP: - { - packet = new SessionXAGetTimeoutResponseMessage(); - break; - } - case SESS_START: - { - packet = new PacketImpl(PacketImpl.SESS_START); - break; - } - case SESS_STOP: - { - packet = new PacketImpl(PacketImpl.SESS_STOP); - break; - } - case SESS_FLOWTOKEN: - { - packet = new SessionConsumerFlowCreditMessage(); - break; - } - case SESS_SEND: - { - packet = new SessionSendMessage(); - break; - } - case SESS_SEND_LARGE: - { - packet = new SessionSendLargeMessage(); - break; - } - case SESS_RECEIVE_MSG: - { - packet = new SessionReceiveMessage(); - break; - } - case SESS_RECEIVE_LARGE_MSG: - { - packet = new SessionReceiveLargeMessage(); - break; - } - case SESS_CONSUMER_CLOSE: - { - packet = new SessionConsumerCloseMessage(); - break; - } - case NULL_RESPONSE: - { - packet = new NullResponseMessage(); - break; - } - case SESS_RECEIVE_CONTINUATION: - { - packet = new SessionReceiveContinuationMessage(); - break; - } - case SESS_SEND_CONTINUATION: - { - packet = new SessionSendContinuationMessage(); - break; - } - case SESS_PRODUCER_REQUEST_CREDITS: - { - packet = new SessionRequestProducerCreditsMessage(); - break; - } - case SESS_PRODUCER_CREDITS: - { - packet = new SessionProducerCreditsMessage(); - break; - } - case CREATE_REPLICATION: - { - packet = new CreateReplicationSessionMessage(); - break; - } - case REPLICATION_APPEND: - { - packet = new ReplicationAddMessage(); - break; - } - case REPLICATION_APPEND_TX: - { - packet = new ReplicationAddTXMessage(); - break; - } - case REPLICATION_DELETE: - { - packet = new ReplicationDeleteMessage(); - break; - } - case REPLICATION_DELETE_TX: - { - packet = new ReplicationDeleteTXMessage(); - break; - } - case REPLICATION_PREPARE: - { - packet = new ReplicationPrepareMessage(); - break; - } - case REPLICATION_COMMIT_ROLLBACK: - { - packet = new ReplicationCommitMessage(); - break; - } - case REPLICATION_RESPONSE: - { - packet = new ReplicationResponseMessage(); - break; - } - case REPLICATION_PAGE_WRITE: - { - packet = new ReplicationPageWriteMessage(); - break; - } - case REPLICATION_PAGE_EVENT: - { - packet = new ReplicationPageEventMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_BEGIN: - { - packet = new ReplicationLargeMessageBeingMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_END: - { - packet = new ReplicationLargemessageEndMessage(); - break; - } - case REPLICATION_LARGE_MESSAGE_WRITE: - { - packet = new ReplicationLargeMessageWriteMessage(); - break; - } - case REPLICATION_COMPARE_DATA: - { - packet = new ReplicationCompareDataMessage(); - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - packet = new SessionForceConsumerDelivery(); - break; - } - default: - { - throw new IllegalArgumentException("Invalid type: " + packetType); - } - } - - packet.decode(in); - - return packet; - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,503 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.Executor; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.Interceptor; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.spi.core.remoting.Connection; -import org.hornetq.utils.SimpleIDGenerator; - -/** - * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @version <tt>$Revision$</tt> $Id$ - */ -public class RemotingConnectionImpl extends AbstractBufferHandler implements CoreRemotingConnection -{ - // Constants - // ------------------------------------------------------------------------------------ - - private static final Logger log = Logger.getLogger(RemotingConnectionImpl.class); - - // Static - // --------------------------------------------------------------------------------------- - - // Attributes - // ----------------------------------------------------------------------------------- - - private final Connection transportConnection; - - private final Map<Long, Channel> channels = new ConcurrentHashMap<Long, Channel>(); - - private final List<FailureListener> failureListeners = new CopyOnWriteArrayList<FailureListener>(); - - private final List<CloseListener> closeListeners = new CopyOnWriteArrayList<CloseListener>(); - - private final long blockingCallTimeout; - - private final List<Interceptor> interceptors; - - private volatile boolean destroyed; - - private final boolean client; - - // Channels 0-9 are reserved for the system - // 0 is for pinging - // 1 is for session creation and attachment - // 2 is for replication - private volatile SimpleIDGenerator idGenerator = new SimpleIDGenerator(10); - - private boolean idGeneratorSynced = false; - - private final Object transferLock = new Object(); - - private final Object failLock = new Object(); - - private final PacketDecoder decoder = new PacketDecoder(); - - private volatile boolean dataReceived; - - private final Executor executor; - - private volatile boolean executing; - - // Constructors - // --------------------------------------------------------------------------------- - - /* - * Create a client side connection - */ - public RemotingConnectionImpl(final Connection transportConnection, - final long blockingCallTimeout, - final List<Interceptor> interceptors) - { - this(transportConnection, blockingCallTimeout, interceptors, true, null); - } - - /* - * Create a server side connection - */ - public RemotingConnectionImpl(final Connection transportConnection, - final List<Interceptor> interceptors, - final Executor executor) - - { - this(transportConnection, -1, interceptors, false, executor); - } - - private RemotingConnectionImpl(final Connection transportConnection, - final long blockingCallTimeout, - final List<Interceptor> interceptors, - final boolean client, - final Executor executor) - - { - this.transportConnection = transportConnection; - - this.blockingCallTimeout = blockingCallTimeout; - - this.interceptors = interceptors; - - this.client = client; - - this.executor = executor; - } - - // RemotingConnection implementation - // ------------------------------------------------------------ - - public Connection getTransportConnection() - { - return transportConnection; - } - - public List<FailureListener> getFailureListeners() - { - return new ArrayList<FailureListener>(failureListeners); - } - - public void setFailureListeners(final List<FailureListener> listeners) - { - failureListeners.clear(); - - failureListeners.addAll(listeners); - } - - public Object getID() - { - return transportConnection.getID(); - } - - public String getRemoteAddress() - { - return transportConnection.getRemoteAddress(); - } - - public synchronized Channel getChannel(final long channelID, final int confWindowSize) - { - Channel channel = channels.get(channelID); - - if (channel == null) - { - channel = new ChannelImpl(this, channelID, confWindowSize); - - channels.put(channelID, channel); - } - - return channel; - } - - public synchronized boolean removeChannel(final long channelID) - { - return channels.remove(channelID) != null; - } - - public synchronized void putChannel(final long channelID, final Channel channel) - { - channels.put(channelID, channel); - } - - public void addFailureListener(final FailureListener listener) - { - if (listener == null) - { - throw new IllegalStateException("FailureListener cannot be null"); - } - - failureListeners.add(listener); - } - - public boolean removeFailureListener(final FailureListener listener) - { - if (listener == null) - { - throw new IllegalStateException("FailureListener cannot be null"); - } - - return failureListeners.remove(listener); - } - - public void addCloseListener(final CloseListener listener) - { - if (listener == null) - { - throw new IllegalStateException("CloseListener cannot be null"); - } - - closeListeners.add(listener); - } - - public boolean removeCloseListener(final CloseListener listener) - { - if (listener == null) - { - throw new IllegalStateException("CloseListener cannot be null"); - } - - return closeListeners.remove(listener); - } - - public HornetQBuffer createBuffer(final int size) - { - return transportConnection.createBuffer(size); - } - - /* - * This can be called concurrently by more than one thread so needs to be locked - */ - public void fail(final HornetQException me) - { - synchronized (failLock) - { - if (destroyed) - { - return; - } - - destroyed = true; - } - - RemotingConnectionImpl.log.warn("Connection failure has been detected: " + me.getMessage() + - " [code=" + - me.getCode() + - "]"); - - // Then call the listeners - callFailureListeners(me); - - callClosingListeners(); - - internalClose(); - - for (Channel channel : channels.values()) - { - channel.returnBlocking(); - } - } - - public void destroy() - { - synchronized (failLock) - { - if (destroyed) - { - return; - } - - destroyed = true; - } - - internalClose(); - - callClosingListeners(); - } - - public void disconnect() - { - Channel channel0 = getChannel(0, -1); - - // And we remove all channels from the connection, this ensures no more packets will be processed after this - // method is - // complete - - removeAllChannels(); - - // Now we are 100% sure that no more packets will be processed we can send the disconnect - - channel0.sendAndFlush(new PacketImpl(PacketImpl.DISCONNECT)); - } - - public long generateChannelID() - { - return idGenerator.generateID(); - } - - public synchronized void syncIDGeneratorSequence(final long id) - { - if (!idGeneratorSynced) - { - idGenerator = new SimpleIDGenerator(id); - - idGeneratorSynced = true; - } - } - - public long getIDGeneratorSequence() - { - return idGenerator.getCurrentID(); - } - - public Object getTransferLock() - { - return transferLock; - } - - public boolean isClient() - { - return client; - } - - public boolean isDestroyed() - { - return destroyed; - } - - public long getBlockingCallTimeout() - { - return blockingCallTimeout; - } - - public boolean checkDataReceived() - { - boolean res = dataReceived; - - dataReceived = false; - - return res; - } - - //We flush any confirmations on the connection - this prevents idle bridges for example - //sitting there with many unacked messages - public void flush() - { - synchronized (transferLock) - { - for (Channel channel : channels.values()) - { - channel.flushConfirmations(); - } - } - } - - // Buffer Handler implementation - // ---------------------------------------------------- - - public void bufferReceived(final Object connectionID, final HornetQBuffer buffer) - { - final Packet packet = decoder.decode(buffer); - - if (packet.isAsyncExec() && executor != null) - { - executing = true; - - executor.execute(new Runnable() - { - public void run() - { - try - { - doBufferReceived(packet); - } - catch (Throwable t) - { - RemotingConnectionImpl.log.error("Unexpected error", t); - } - - executing = false; - } - }); - } - else - { - //To prevent out of order execution if interleaving sync and async operations on same connection - while (executing) - { - Thread.yield(); - } - - // Pings must always be handled out of band so we can send pings back to the client quickly - // otherwise they would get in the queue with everything else which might give an intolerable delay - doBufferReceived(packet); - } - - dataReceived = true; - } - - private void doBufferReceived(final Packet packet) - { - if (interceptors != null) - { - for (final Interceptor interceptor : interceptors) - { - try - { - boolean callNext = interceptor.intercept(packet, this); - - if (!callNext) - { - return; - } - } - catch (final Throwable e) - { - RemotingConnectionImpl.log.warn("Failure in calling interceptor: " + interceptor, e); - } - } - } - - synchronized (transferLock) - { - final Channel channel = channels.get(packet.getChannelID()); - - if (channel != null) - { - channel.handlePacket(packet); - } - } - } - - // Package protected - // ---------------------------------------------------------------------------- - - // Protected - // ------------------------------------------------------------------------------------ - - // Private - // -------------------------------------------------------------------------------------- - - private void removeAllChannels() - { - // We get the transfer lock first - this ensures no packets are being processed AND - // it's guaranteed no more packets will be processed once this method is complete - synchronized (transferLock) - { - channels.clear(); - } - } - private void callFailureListeners(final HornetQException me) - { - final List<FailureListener> listenersClone = new ArrayList<FailureListener>(failureListeners); - - for (final FailureListener listener : listenersClone) - { - try - { - listener.connectionFailed(me); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - RemotingConnectionImpl.log.error("Failed to execute failure listener", t); - } - } - } - - private void callClosingListeners() - { - final List<CloseListener> listenersClone = new ArrayList<CloseListener>(closeListeners); - - for (final CloseListener listener : listenersClone) - { - try - { - listener.connectionClosed(); - } - catch (final Throwable t) - { - // Failure of one listener to execute shouldn't prevent others - // from - // executing - RemotingConnectionImpl.log.error("Failed to execute failure listener", t); - } - } - } - - private void internalClose() - { - // We close the underlying transport connection - transportConnection.close(); - - for (Channel channel : channels.values()) - { - channel.close(); - } - } -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,162 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.logging.Logger; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - - * @version <tt>$Revision$</tt> - */ -public class CreateQueueMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(CreateQueueMessage.class); - - // Attributes ---------------------------------------------------- - - private SimpleString address; - - private SimpleString queueName; - - private SimpleString filterString; - - private boolean durable; - - private boolean temporary; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateQueueMessage(final SimpleString address, - final SimpleString queueName, - final SimpleString filterString, - final boolean durable, - final boolean temporary, - final boolean requiresResponse) - { - super(PacketImpl.CREATE_QUEUE); - - this.address = address; - this.queueName = queueName; - this.filterString = filterString; - this.durable = durable; - this.temporary = temporary; - this.requiresResponse = requiresResponse; - } - - public CreateQueueMessage() - { - super(PacketImpl.CREATE_QUEUE); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", address=" + address); - buff.append(", queueName=" + queueName); - buff.append(", filterString=" + filterString); - buff.append(", durable=" + durable); - buff.append(", temporary=" + temporary); - buff.append("]"); - return buff.toString(); - } - - public SimpleString getAddress() - { - return address; - } - - public SimpleString getQueueName() - { - return queueName; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public boolean isDurable() - { - return durable; - } - - public boolean isTemporary() - { - return temporary; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(address); - buffer.writeSimpleString(queueName); - buffer.writeNullableSimpleString(filterString); - buffer.writeBoolean(durable); - buffer.writeBoolean(temporary); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - address = buffer.readSimpleString(); - queueName = buffer.readSimpleString(); - filterString = buffer.readNullableSimpleString(); - durable = buffer.readBoolean(); - temporary = buffer.readBoolean(); - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateQueueMessage == false) - { - return false; - } - - CreateQueueMessage r = (CreateQueueMessage)other; - - return super.equals(other) && r.address.equals(address) && - r.queueName.equals(queueName) && - (r.filterString == null ? filterString == null : r.filterString.equals(filterString)) && - r.durable == durable && - r.temporary == temporary; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,74 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> - */ -public class CreateReplicationSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long sessionChannelID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateReplicationSessionMessage(final long sessionChannelID) - { - super(PacketImpl.CREATE_REPLICATION); - - this.sessionChannelID = sessionChannelID; - } - - public CreateReplicationSessionMessage() - { - super(PacketImpl.CREATE_REPLICATION); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(sessionChannelID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - sessionChannelID = buffer.readLong(); - } - - /** - * @return the sessionChannelID - */ - public long getSessionChannelID() - { - return sessionChannelID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,222 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class CreateSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private String name; - - private long sessionChannelID; - - private int version; - - private String username; - - private String password; - - private int minLargeMessageSize; - - private boolean xa; - - private boolean autoCommitSends; - - private boolean autoCommitAcks; - - private boolean preAcknowledge; - - private int windowSize; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateSessionMessage(final String name, - final long sessionChannelID, - final int version, - final String username, - final String password, - final int minLargeMessageSize, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int windowSize) - { - super(PacketImpl.CREATESESSION); - - this.name = name; - - this.sessionChannelID = sessionChannelID; - - this.version = version; - - this.username = username; - - this.password = password; - - this.minLargeMessageSize = minLargeMessageSize; - - this.xa = xa; - - this.autoCommitSends = autoCommitSends; - - this.autoCommitAcks = autoCommitAcks; - - this.windowSize = windowSize; - - this.preAcknowledge = preAcknowledge; - } - - public CreateSessionMessage() - { - super(PacketImpl.CREATESESSION); - } - - // Public -------------------------------------------------------- - - public String getName() - { - return name; - } - - public long getSessionChannelID() - { - return sessionChannelID; - } - - public int getVersion() - { - return version; - } - - public String getUsername() - { - return username; - } - - public String getPassword() - { - return password; - } - - public boolean isXA() - { - return xa; - } - - public boolean isAutoCommitSends() - { - return autoCommitSends; - } - - public boolean isAutoCommitAcks() - { - return autoCommitAcks; - } - - public boolean isPreAcknowledge() - { - return preAcknowledge; - } - - public int getWindowSize() - { - return windowSize; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeLong(sessionChannelID); - buffer.writeInt(version); - buffer.writeNullableString(username); - buffer.writeNullableString(password); - buffer.writeInt(minLargeMessageSize); - buffer.writeBoolean(xa); - buffer.writeBoolean(autoCommitSends); - buffer.writeBoolean(autoCommitAcks); - buffer.writeInt(windowSize); - buffer.writeBoolean(preAcknowledge); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - name = buffer.readString(); - sessionChannelID = buffer.readLong(); - version = buffer.readInt(); - username = buffer.readNullableString(); - password = buffer.readNullableString(); - minLargeMessageSize = buffer.readInt(); - xa = buffer.readBoolean(); - autoCommitSends = buffer.readBoolean(); - autoCommitAcks = buffer.readBoolean(); - windowSize = buffer.readInt(); - preAcknowledge = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateSessionMessage == false) - { - return false; - } - - CreateSessionMessage r = (CreateSessionMessage)other; - - boolean matches = super.equals(other) && name.equals(r.name) && - sessionChannelID == r.sessionChannelID && - version == r.version && - xa == r.xa && - autoCommitSends == r.autoCommitSends && - autoCommitAcks == r.autoCommitAcks && - (username == null ? r.username == null : username.equals(r.username)) && - (password == null ? r.password == null : password.equals(r.password)); - - return matches; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - public int getMinLargeMessageSize() - { - return minLargeMessageSize; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class CreateSessionResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int serverVersion; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public CreateSessionResponseMessage(final int serverVersion) - { - super(PacketImpl.CREATESESSION_RESP); - - this.serverVersion = serverVersion; - } - - public CreateSessionResponseMessage() - { - super(PacketImpl.CREATESESSION_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public int getServerVersion() - { - return serverVersion; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(serverVersion); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - serverVersion = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof CreateSessionResponseMessage == false) - { - return false; - } - - CreateSessionResponseMessage r = (CreateSessionResponseMessage)other; - - boolean matches = super.equals(other) && serverVersion == r.serverVersion; - - return matches; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,108 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - * - */ -public class HornetQExceptionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(HornetQExceptionMessage.class); - - // Attributes ---------------------------------------------------- - - private HornetQException exception; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQExceptionMessage(final HornetQException exception) - { - super(PacketImpl.EXCEPTION); - - this.exception = exception; - } - - public HornetQExceptionMessage() - { - super(PacketImpl.EXCEPTION); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public HornetQException getException() - { - return exception; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(exception.getCode()); - buffer.writeNullableString(exception.getMessage()); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int code = buffer.readInt(); - String msg = buffer.readNullableString(); - - exception = new HornetQException(code, msg); - } - - @Override - public String toString() - { - return getParentString() + ", exception= " + exception + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof HornetQExceptionMessage == false) - { - return false; - } - - HornetQExceptionMessage r = (HornetQExceptionMessage)other; - - return super.equals(other) && exception.equals(r.exception); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,45 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.Message; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; - -/** - * A MessagePacket - * - * @author Tim Fox - * - * - */ -public abstract class MessagePacket extends PacketImpl -{ - private static final Logger log = Logger.getLogger(MessagePacket.class); - - protected MessageInternal message; - - public MessagePacket(final byte type, final MessageInternal message) - { - super(type); - - this.message = message; - } - - public Message getMessage() - { - return message; - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/NullResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,50 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class NullResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public NullResponseMessage() - { - super(PacketImpl.NULL_RESPONSE); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,311 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class PacketImpl implements Packet -{ - // Constants ------------------------------------------------------------------------- - - private static final Logger log = Logger.getLogger(PacketImpl.class); - - // The minimal size for all the packets, Common data for all the packets (look at PacketImpl.encode) - public static final int PACKET_HEADERS_SIZE = DataConstants.SIZE_INT + DataConstants.SIZE_BYTE + - DataConstants.SIZE_LONG; - - private static final int INITIAL_PACKET_SIZE = 1500; - - protected long channelID; - - protected final byte type; - - protected int size = -1; - - // The packet types - // ----------------------------------------------------------------------------------- - - public static final byte PING = 10; - - public static final byte DISCONNECT = 11; - - // Miscellaneous - public static final byte EXCEPTION = 20; - - public static final byte NULL_RESPONSE = 21; - - public static final byte PACKETS_CONFIRMED = 22; - - // Server - public static final byte CREATESESSION = 30; - - public static final byte CREATESESSION_RESP = 31; - - public static final byte REATTACH_SESSION = 32; - - public static final byte REATTACH_SESSION_RESP = 33; - - public static final byte CREATE_QUEUE = 34; - - public static final byte DELETE_QUEUE = 35; - - public static final byte CREATE_REPLICATION = 36; - - // Session - public static final byte SESS_CREATECONSUMER = 40; - - public static final byte SESS_ACKNOWLEDGE = 41; - - public static final byte SESS_EXPIRED = 42; - - public static final byte SESS_COMMIT = 43; - - public static final byte SESS_ROLLBACK = 44; - - public static final byte SESS_QUEUEQUERY = 45; - - public static final byte SESS_QUEUEQUERY_RESP = 46; - - public static final byte SESS_BINDINGQUERY = 49; - - public static final byte SESS_BINDINGQUERY_RESP = 50; - - public static final byte SESS_XA_START = 51; - - public static final byte SESS_XA_END = 52; - - public static final byte SESS_XA_COMMIT = 53; - - public static final byte SESS_XA_PREPARE = 54; - - public static final byte SESS_XA_RESP = 55; - - public static final byte SESS_XA_ROLLBACK = 56; - - public static final byte SESS_XA_JOIN = 57; - - public static final byte SESS_XA_SUSPEND = 58; - - public static final byte SESS_XA_RESUME = 59; - - public static final byte SESS_XA_FORGET = 60; - - public static final byte SESS_XA_INDOUBT_XIDS = 61; - - public static final byte SESS_XA_INDOUBT_XIDS_RESP = 62; - - public static final byte SESS_XA_SET_TIMEOUT = 63; - - public static final byte SESS_XA_SET_TIMEOUT_RESP = 64; - - public static final byte SESS_XA_GET_TIMEOUT = 65; - - public static final byte SESS_XA_GET_TIMEOUT_RESP = 66; - - public static final byte SESS_START = 67; - - public static final byte SESS_STOP = 68; - - public static final byte SESS_CLOSE = 69; - - public static final byte SESS_FLOWTOKEN = 70; - - public static final byte SESS_SEND = 71; - - public static final byte SESS_SEND_LARGE = 72; - - public static final byte SESS_SEND_CONTINUATION = 73; - - public static final byte SESS_CONSUMER_CLOSE = 74; - - public static final byte SESS_RECEIVE_MSG = 75; - - public static final byte SESS_RECEIVE_LARGE_MSG = 76; - - public static final byte SESS_RECEIVE_CONTINUATION = 77; - - public static final byte SESS_FORCE_CONSUMER_DELIVERY = 78; - - public static final byte SESS_PRODUCER_REQUEST_CREDITS = 79; - - public static final byte SESS_PRODUCER_CREDITS = 80; - - // Replication - - public static final byte REPLICATION_RESPONSE = 90; - - public static final byte REPLICATION_APPEND = 91; - - public static final byte REPLICATION_APPEND_TX = 92; - - public static final byte REPLICATION_DELETE = 93; - - public static final byte REPLICATION_DELETE_TX = 94; - - public static final byte REPLICATION_PREPARE = 95; - - public static final byte REPLICATION_COMMIT_ROLLBACK = 96; - - public static final byte REPLICATION_PAGE_WRITE = 97; - - public static final byte REPLICATION_PAGE_EVENT = 98; - - public static final byte REPLICATION_LARGE_MESSAGE_BEGIN = 99; - - public static final byte REPLICATION_LARGE_MESSAGE_END = 100; - - public static final byte REPLICATION_LARGE_MESSAGE_WRITE = 101; - - public static final byte REPLICATION_COMPARE_DATA = 102; - - public static final byte REPLICATION_SYNC = 103; - - // Static -------------------------------------------------------- - - public PacketImpl(final byte type) - { - this.type = type; - } - - // Public -------------------------------------------------------- - - public byte getType() - { - return type; - } - - public long getChannelID() - { - return channelID; - } - - public void setChannelID(final long channelID) - { - this.channelID = channelID; - } - - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = connection.createBuffer(PacketImpl.INITIAL_PACKET_SIZE); - - // The standard header fields - - buffer.writeInt(0); // The length gets filled in at the end - buffer.writeByte(type); - buffer.writeLong(channelID); - - encodeRest(buffer); - - size = buffer.writerIndex(); - - // The length doesn't include the actual length byte - int len = size - DataConstants.SIZE_INT; - - buffer.setInt(0, len); - - return buffer; - } - - public void decode(final HornetQBuffer buffer) - { - channelID = buffer.readLong(); - - decodeRest(buffer); - - size = buffer.readerIndex(); - } - - public int getPacketSize() - { - if (size == -1) - { - throw new IllegalStateException("Packet hasn't been encoded/decoded yet"); - } - - return size; - } - - public boolean isResponse() - { - return false; - } - - public void encodeRest(final HornetQBuffer buffer) - { - } - - public void decodeRest(final HornetQBuffer buffer) - { - } - - public boolean isRequiresConfirmations() - { - return true; - } - - public boolean isAsyncExec() - { - return false; - } - - @Override - public String toString() - { - return getParentString() + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof PacketImpl == false) - { - return false; - } - - PacketImpl r = (PacketImpl)other; - - return r.type == type && r.channelID == channelID; - } - - // Package protected --------------------------------------------- - - protected String getParentString() - { - return "PACKET[type=" + type + ", channelID=" + channelID + "]"; - } - - // Protected ----------------------------------------------------- - - protected int stringEncodeSize(final String str) - { - return DataConstants.SIZE_INT + str.length() * 2; - } - - protected int nullableStringEncodeSize(final String str) - { - return DataConstants.SIZE_BOOLEAN + (str != null ? stringEncodeSize(str) : 0); - } - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,100 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A PacketsConfirmedMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class PacketsConfirmedMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int commandID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public PacketsConfirmedMessage(final int commandID) - { - super(PacketImpl.PACKETS_CONFIRMED); - - this.commandID = commandID; - } - - public PacketsConfirmedMessage() - { - super(PacketImpl.PACKETS_CONFIRMED); - } - - // Public -------------------------------------------------------- - - public int getCommandID() - { - return commandID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(commandID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - commandID = buffer.readInt(); - } - - @Override - public String toString() - { - return getParentString() + ", commandID=" + commandID + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof PacketsConfirmedMessage == false) - { - return false; - } - - PacketsConfirmedMessage r = (PacketsConfirmedMessage)other; - - return super.equals(other) && commandID == r.commandID; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,103 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A Ping - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class Ping extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long connectionTTL; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public Ping(final long connectionTTL) - { - super(PacketImpl.PING); - - this.connectionTTL = connectionTTL; - } - - public Ping() - { - super(PacketImpl.PING); - } - - // Public -------------------------------------------------------- - - public long getConnectionTTL() - { - return connectionTTL; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(connectionTTL); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - connectionTTL = buffer.readLong(); - } - - @Override - public String toString() - { - StringBuffer buf = new StringBuffer(getParentString()); - buf.append(", connectionTTL=" + connectionTTL); - buf.append("]"); - return buf.toString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof Ping == false) - { - return false; - } - - Ping r = (Ping)other; - - return super.equals(other) && connectionTTL == r.connectionTTL; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,105 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A ReattachSessionMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class ReattachSessionMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private String name; - - private int lastConfirmedCommandID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) - { - super(PacketImpl.REATTACH_SESSION); - - this.name = name; - - this.lastConfirmedCommandID = lastConfirmedCommandID; - } - - public ReattachSessionMessage() - { - super(PacketImpl.REATTACH_SESSION); - } - - // Public -------------------------------------------------------- - - public String getName() - { - return name; - } - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeInt(lastConfirmedCommandID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - name = buffer.readString(); - lastConfirmedCommandID = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof ReattachSessionMessage == false) - { - return false; - } - - ReattachSessionMessage r = (ReattachSessionMessage)other; - - return super.equals(other) && name.equals(r.name); - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,111 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A ReattachSessionResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class ReattachSessionResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int lastConfirmedCommandID; - - private boolean reattached; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) - { - super(PacketImpl.REATTACH_SESSION_RESP); - - this.lastConfirmedCommandID = lastConfirmedCommandID; - - this.reattached = reattached; - } - - public ReattachSessionResponseMessage() - { - super(PacketImpl.REATTACH_SESSION_RESP); - } - - // Public -------------------------------------------------------- - - public int getLastConfirmedCommandID() - { - return lastConfirmedCommandID; - } - - public boolean isReattached() - { - return reattached; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(lastConfirmedCommandID); - buffer.writeBoolean(reattached); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - lastConfirmedCommandID = buffer.readInt(); - reattached = buffer.readBoolean(); - } - - @Override - public boolean isResponse() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof ReattachSessionResponseMessage == false) - { - return false; - } - - ReattachSessionResponseMessage r = (ReattachSessionResponseMessage)other; - - return super.equals(other) && lastConfirmedCommandID == r.lastConfirmedCommandID; - } - - @Override - public final boolean isRequiresConfirmations() - { - return false; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,142 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.core.logging.Logger; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationAddMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(ReplicationAddMessage.class); - - // Attributes ---------------------------------------------------- - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean isUpdate; - - private byte recordType; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationAddMessage() - { - super(PacketImpl.REPLICATION_APPEND); - } - - public ReplicationAddMessage(final byte journalID, - final boolean isUpdate, - final long id, - final byte recordType, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.isUpdate = isUpdate; - this.id = id; - this.recordType = recordType; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(isUpdate); - buffer.writeLong(id); - buffer.writeByte(recordType); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - isUpdate = buffer.readBoolean(); - id = buffer.readLong(); - recordType = buffer.readByte(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - public boolean isUpdate() - { - return isUpdate; - } - - /** - * @return the recordType - */ - public byte getRecordType() - { - return recordType; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,150 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationAddTXMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean isUpdate; - - private byte recordType; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationAddTXMessage() - { - super(PacketImpl.REPLICATION_APPEND_TX); - } - - public ReplicationAddTXMessage(final byte journalID, - final boolean isUpdate, - final long txId, - final long id, - final byte recordType, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.isUpdate = isUpdate; - this.txId = txId; - this.id = id; - this.recordType = recordType; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(isUpdate); - buffer.writeLong(txId); - buffer.writeLong(id); - buffer.writeByte(recordType); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - isUpdate = buffer.readBoolean(); - txId = buffer.readLong(); - id = buffer.readLong(); - recordType = buffer.readByte(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - public boolean isUpdate() - { - return isUpdate; - } - - /** - * @return the recordType - */ - public byte getRecordType() - { - return recordType; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,100 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationCommitMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private boolean rollback; - - private long txId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationCommitMessage() - { - super(PacketImpl.REPLICATION_COMMIT_ROLLBACK); - } - - public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId) - { - this(); - this.journalID = journalID; - this.rollback = rollback; - this.txId = txId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeBoolean(rollback); - buffer.writeLong(txId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - rollback = buffer.readBoolean(); - txId = buffer.readLong(); - } - - public boolean isRollback() - { - return rollback; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.JournalLoadInformation; - -/** - * Message used to compare if the Journals between the live and - * backup nodes are equivalent and can be used over replication. - * The backup journal needs to be an exact copy of the live node before it starts. - * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> - */ -public class ReplicationCompareDataMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private JournalLoadInformation[] journalInformation; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationCompareDataMessage(final JournalLoadInformation[] journalInformation) - { - super(PacketImpl.REPLICATION_COMPARE_DATA); - - this.journalInformation = journalInformation; - } - - public ReplicationCompareDataMessage() - { - super(PacketImpl.REPLICATION_COMPARE_DATA); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(journalInformation.length); - for (JournalLoadInformation info : journalInformation) - { - buffer.writeInt(info.getNumberOfRecords()); - buffer.writeLong(info.getMaxID()); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int numberOfJournals = buffer.readInt(); - - journalInformation = new JournalLoadInformation[numberOfJournals]; - - for (int i = 0; i < numberOfJournals; i++) - { - journalInformation[i] = new JournalLoadInformation(); - journalInformation[i].setNumberOfRecords(buffer.readInt()); - journalInformation[i].setMaxID(buffer.readLong()); - } - } - - /** - * @return the journalInformation - */ - public JournalLoadInformation[] getJournalInformation() - { - return journalInformation; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationDeleteMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationDeleteMessage() - { - super(PacketImpl.REPLICATION_DELETE); - } - - public ReplicationDeleteMessage(final byte journalID, final long id) - { - this(); - this.journalID = journalID; - this.id = id; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(id); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - id = buffer.readLong(); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,125 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationDeleteTXMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - private long id; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationDeleteTXMessage() - { - super(PacketImpl.REPLICATION_DELETE_TX); - } - - public ReplicationDeleteTXMessage(final byte journalID, - final long txId, - final long id, - final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.txId = txId; - this.id = id; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(txId); - buffer.writeLong(id); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - txId = buffer.readLong(); - id = buffer.readLong(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - /** - * @return the id - */ - public long getId() - { - return id; - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,79 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationLargeMessageBeingMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargeMessageBeingMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargeMessageBeingMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - public ReplicationLargeMessageBeingMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_BEGIN); - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,99 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationLargeMessageWriteMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargeMessageWriteMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long messageId; - - private byte body[]; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - public ReplicationLargeMessageWriteMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_WRITE); - } - - /** - * @param messageId - * @param body - */ - public ReplicationLargeMessageWriteMessage(final long messageId, final byte[] body) - { - this(); - - this.messageId = messageId; - this.body = body; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - buffer.writeInt(body.length); - buffer.writeBytes(body); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - int size = buffer.readInt(); - body = new byte[size]; - buffer.readBytes(body); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - /** - * @return the body - */ - public byte[] getBody() - { - return body; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,78 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A ReplicationLargemessageEndMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationLargemessageEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - long messageId; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationLargemessageEndMessage() - { - super(PacketImpl.REPLICATION_LARGE_MESSAGE_END); - } - - public ReplicationLargemessageEndMessage(final long messageId) - { - this(); - this.messageId = messageId; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(messageId); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - messageId = buffer.readLong(); - } - - /** - * @return the messageId - */ - public long getMessageId() - { - return messageId; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,109 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * A ReplicationPageWrite - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPageEventMessage extends PacketImpl -{ - - private int pageNumber; - - private SimpleString storeName; - - /** - * True = delete page, False = close page - */ - private boolean isDelete; - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPageEventMessage() - { - super(PacketImpl.REPLICATION_PAGE_EVENT); - } - - public ReplicationPageEventMessage(final SimpleString storeName, final int pageNumber, final boolean isDelete) - { - this(); - this.pageNumber = pageNumber; - this.isDelete = isDelete; - this.storeName = storeName; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(storeName); - buffer.writeInt(pageNumber); - buffer.writeBoolean(isDelete); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - storeName = buffer.readSimpleString(); - pageNumber = buffer.readInt(); - isDelete = buffer.readBoolean(); - } - - /** - * @return the pageNumber - */ - public int getPageNumber() - { - return pageNumber; - } - - /** - * @return the storeName - */ - public SimpleString getStoreName() - { - return storeName; - } - - /** - * @return the isDelete - */ - public boolean isDelete() - { - return isDelete; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.paging.PagedMessage; -import org.hornetq.core.paging.impl.PagedMessageImpl; - -/** - * A ReplicationPageWrite - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPageWriteMessage extends PacketImpl -{ - - int pageNumber; - - PagedMessage pagedMessage; - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPageWriteMessage() - { - super(PacketImpl.REPLICATION_PAGE_WRITE); - } - - public ReplicationPageWriteMessage(final PagedMessage pagedMessage, final int pageNumber) - { - this(); - this.pageNumber = pageNumber; - this.pagedMessage = pagedMessage; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(pageNumber); - pagedMessage.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - pageNumber = buffer.readInt(); - pagedMessage = new PagedMessageImpl(); - pagedMessage.decode(buffer); - } - - /** - * @return the pageNumber - */ - public int getPageNumber() - { - return pageNumber; - } - - /** - * @return the pagedMessage - */ - public PagedMessage getPagedMessage() - { - return pagedMessage; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,109 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.journal.EncodingSupport; - -/** - * A ReplicationAddMessage - * - * @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * - */ -public class ReplicationPrepareMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long txId; - - /** 0 - Bindings, 1 - MessagesJournal */ - private byte journalID; - - private EncodingSupport encodingData; - - private byte[] recordData; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationPrepareMessage() - { - super(PacketImpl.REPLICATION_PREPARE); - } - - public ReplicationPrepareMessage(final byte journalID, final long txId, final EncodingSupport encodingData) - { - this(); - this.journalID = journalID; - this.txId = txId; - this.encodingData = encodingData; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeByte(journalID); - buffer.writeLong(txId); - buffer.writeInt(encodingData.getEncodeSize()); - encodingData.encode(buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - journalID = buffer.readByte(); - txId = buffer.readLong(); - int size = buffer.readInt(); - recordData = new byte[size]; - buffer.readBytes(recordData); - } - - public long getTxId() - { - return txId; - } - - /** - * @return the journalID - */ - public byte getJournalID() - { - return journalID; - } - - /** - * @return the recordData - */ - public byte[] getRecordData() - { - return recordData; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,44 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class ReplicationResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public ReplicationResponseMessage() - { - super(PacketImpl.REPLICATION_RESPONSE); - } - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A RollbackMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Feb 18, 2009 2:11:17 PM - * - * - */ -public class RollbackMessage extends PacketImpl -{ - - public RollbackMessage() - { - super(PacketImpl.SESS_ROLLBACK); - } - - public RollbackMessage(final boolean considerLastMessageAsDelivered) - { - super(PacketImpl.SESS_ROLLBACK); - - this.considerLastMessageAsDelivered = considerLastMessageAsDelivered; - } - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean considerLastMessageAsDelivered; - - /** - * @return the considerLastMessageAsDelivered - */ - public boolean isConsiderLastMessageAsDelivered() - { - return considerLastMessageAsDelivered; - } - - /** - * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set - */ - public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) - { - considerLastMessageAsDelivered = isLastMessageAsDelivered; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(considerLastMessageAsDelivered); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - considerLastMessageAsDelivered = buffer.readBoolean(); - } - - public boolean isAsyncExec() - { - return true; - } - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,112 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionAcknowledgeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long messageID; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) - { - super(PacketImpl.SESS_ACKNOWLEDGE); - - this.consumerID = consumerID; - - this.messageID = messageID; - - this.requiresResponse = requiresResponse; - } - - public SessionAcknowledgeMessage() - { - super(PacketImpl.SESS_ACKNOWLEDGE); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getMessageID() - { - return messageID; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - - buffer.writeLong(messageID); - - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - - messageID = buffer.readLong(); - - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionAcknowledgeMessage == false) - { - return false; - } - - SessionAcknowledgeMessage r = (SessionAcknowledgeMessage)other; - - return super.equals(other) && consumerID == r.consumerID && - messageID == r.messageID && - requiresResponse == r.requiresResponse; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,72 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionQueueQueryMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionBindingQueryMessage extends PacketImpl -{ - private SimpleString address; - - public SessionBindingQueryMessage(final SimpleString address) - { - super(PacketImpl.SESS_BINDINGQUERY); - - this.address = address; - } - - public SessionBindingQueryMessage() - { - super(PacketImpl.SESS_BINDINGQUERY); - } - - public SimpleString getAddress() - { - return address; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(address); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - address = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionBindingQueryMessage == false) - { - return false; - } - - SessionBindingQueryMessage r = (SessionBindingQueryMessage)other; - - return super.equals(other) && address.equals(r.address); - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,123 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import java.util.ArrayList; -import java.util.List; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionBindingQueryResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionBindingQueryResponseMessage extends PacketImpl -{ - private boolean exists; - - private List<SimpleString> queueNames; - - public SessionBindingQueryResponseMessage(final boolean exists, final List<SimpleString> queueNames) - { - super(PacketImpl.SESS_BINDINGQUERY_RESP); - - this.exists = exists; - - this.queueNames = queueNames; - } - - public SessionBindingQueryResponseMessage() - { - super(PacketImpl.SESS_BINDINGQUERY_RESP); - } - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isExists() - { - return exists; - } - - public List<SimpleString> getQueueNames() - { - return queueNames; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(exists); - buffer.writeInt(queueNames.size()); - for (SimpleString queueName : queueNames) - { - buffer.writeSimpleString(queueName); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - exists = buffer.readBoolean(); - int numQueues = buffer.readInt(); - queueNames = new ArrayList<SimpleString>(numQueues); - for (int i = 0; i < numQueues; i++) - { - queueNames.add(buffer.readSimpleString()); - } - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionBindingQueryResponseMessage == false) - { - return false; - } - - SessionBindingQueryResponseMessage r = (SessionBindingQueryResponseMessage)other; - - if (super.equals(other) && exists == r.exists) - { - if (queueNames.size() == r.queueNames.size()) - { - for (int i = 0; i < queueNames.size(); i++) - { - if (!queueNames.get(i).equals(r.queueNames.get(i))) - { - return false; - } - } - } - else - { - return false; - } - } - else - { - return false; - } - - return true; - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCloseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,61 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionCloseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionCloseMessage() - { - super(PacketImpl.SESS_CLOSE); - } - - // Public -------------------------------------------------------- - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCloseMessage == false) - { - return false; - } - - return super.equals(other); - } - - @Override - public boolean isAsyncExec() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,57 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -/** - * A SessionCommitMessage - * - * @author tim - * - * - */ -public class SessionCommitMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - /** - * @param type - */ - public SessionCommitMessage() - { - super(PacketImpl.SESS_COMMIT); - } - - public boolean isAsyncExec() - { - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,91 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionConsumerCloseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionConsumerCloseMessage(final long objectID) - { - super(PacketImpl.SESS_CONSUMER_CLOSE); - - consumerID = objectID; - } - - public SessionConsumerCloseMessage() - { - super(PacketImpl.SESS_CONSUMER_CLOSE); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - } - - @Override - public String toString() - { - return getParentString() + ", consumerID=" + consumerID + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionConsumerCloseMessage == false) - { - return false; - } - - SessionConsumerCloseMessage r = (SessionConsumerCloseMessage)other; - - return super.equals(other) && consumerID == r.consumerID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,103 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public class SessionConsumerFlowCreditMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private int credits; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) - { - super(PacketImpl.SESS_FLOWTOKEN); - - this.consumerID = consumerID; - - this.credits = credits; - } - - public SessionConsumerFlowCreditMessage() - { - super(PacketImpl.SESS_FLOWTOKEN); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public int getCredits() - { - return credits; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeInt(credits); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - credits = buffer.readInt(); - } - - @Override - public String toString() - { - return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionConsumerFlowCreditMessage == false) - { - return false; - } - - SessionConsumerFlowCreditMessage r = (SessionConsumerFlowCreditMessage)other; - - return super.equals(other) && credits == r.credits && consumerID == r.consumerID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.utils.DataConstants; - -/** - * A SessionContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 5, 2008 10:08:40 AM - * - * - */ -public abstract class SessionContinuationMessage extends PacketImpl -{ - - // Constants ----------------------------------------------------- - - public static final int SESSION_CONTINUATION_BASE_SIZE = PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT + - DataConstants.SIZE_BOOLEAN; - - // Attributes ---------------------------------------------------- - - protected byte[] body; - - protected boolean continues; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) - { - super(type); - this.body = body; - this.continues = continues; - } - - public SessionContinuationMessage(final byte type) - { - super(type); - } - - // Public -------------------------------------------------------- - - /** - * @return the body - */ - public byte[] getBody() - { - return body; - } - - /** - * @return the continues - */ - public boolean isContinues() - { - return continues; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(body.length); - buffer.writeBytes(body); - buffer.writeBoolean(continues); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int size = buffer.readInt(); - body = new byte[size]; - buffer.readBytes(body); - continues = buffer.readBoolean(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,142 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionCreateConsumerMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long id; - - private SimpleString queueName; - - private SimpleString filterString; - - private boolean browseOnly; - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionCreateConsumerMessage(final long id, - final SimpleString queueName, - final SimpleString filterString, - final boolean browseOnly, - final boolean requiresResponse) - { - super(PacketImpl.SESS_CREATECONSUMER); - - this.id = id; - this.queueName = queueName; - this.filterString = filterString; - this.browseOnly = browseOnly; - this.requiresResponse = requiresResponse; - } - - public SessionCreateConsumerMessage() - { - super(PacketImpl.SESS_CREATECONSUMER); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", queueName=" + queueName); - buff.append(", filterString=" + filterString); - buff.append("]"); - return buff.toString(); - } - - public long getID() - { - return id; - } - - public SimpleString getQueueName() - { - return queueName; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public boolean isBrowseOnly() - { - return browseOnly; - } - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(id); - buffer.writeSimpleString(queueName); - buffer.writeNullableSimpleString(filterString); - buffer.writeBoolean(browseOnly); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - id = buffer.readLong(); - queueName = buffer.readSimpleString(); - filterString = buffer.readNullableSimpleString(); - browseOnly = buffer.readBoolean(); - requiresResponse = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCreateConsumerMessage == false) - { - return false; - } - - SessionCreateConsumerMessage r = (SessionCreateConsumerMessage)other; - - return super.equals(other) && queueName.equals(r.queueName) && filterString == null ? r.filterString == null - : filterString.equals(r.filterString); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,96 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - - * @version <tt>$Revision$</tt> - */ -public class SessionDeleteQueueMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private SimpleString queueName; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionDeleteQueueMessage(final SimpleString queueName) - { - super(PacketImpl.DELETE_QUEUE); - - this.queueName = queueName; - } - - public SessionDeleteQueueMessage() - { - super(PacketImpl.DELETE_QUEUE); - } - - // Public -------------------------------------------------------- - - @Override - public String toString() - { - StringBuffer buff = new StringBuffer(getParentString()); - buff.append(", queueName=" + queueName); - buff.append("]"); - return buff.toString(); - } - - public SimpleString getQueueName() - { - return queueName; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(queueName); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - queueName = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionDeleteQueueMessage == false) - { - return false; - } - - SessionDeleteQueueMessage r = (SessionDeleteQueueMessage)other; - - return super.equals(other) && r.queueName.equals(queueName); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,97 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - */ -public class SessionExpiredMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long messageID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionExpiredMessage(final long consumerID, final long messageID) - { - super(PacketImpl.SESS_EXPIRED); - - this.consumerID = consumerID; - - this.messageID = messageID; - } - - public SessionExpiredMessage() - { - super(PacketImpl.SESS_EXPIRED); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getMessageID() - { - return messageID; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - - buffer.writeLong(messageID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - - messageID = buffer.readLong(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionExpiredMessage == false) - { - return false; - } - - SessionExpiredMessage r = (SessionExpiredMessage)other; - - return super.equals(other) && consumerID == r.consumerID && messageID == r.messageID; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,108 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * - * A SessionConsumerForceDelivery - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - */ -public class SessionForceConsumerDelivery extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private long sequence; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionForceConsumerDelivery(final long consumerID, final long sequence) - { - super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); - - this.consumerID = consumerID; - this.sequence = sequence; - } - - public SessionForceConsumerDelivery() - { - super(PacketImpl.SESS_FORCE_CONSUMER_DELIVERY); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public long getSequence() - { - return sequence; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeLong(sequence); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - sequence = buffer.readLong(); - } - - @Override - public String toString() - { - StringBuffer buf = new StringBuffer(getParentString()); - buf.append(", consumerID=" + consumerID); - buf.append(", sequence=" + sequence); - buf.append("]"); - return buf.toString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionForceConsumerDelivery == false) - { - return false; - } - - SessionForceConsumerDelivery r = (SessionForceConsumerDelivery)other; - - return super.equals(other) && consumerID == r.consumerID && sequence == r.sequence; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionProducerCreditsMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int credits; - - private SimpleString address; - - private int offset; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionProducerCreditsMessage(final int credits, final SimpleString address, final int offset) - { - super(PacketImpl.SESS_PRODUCER_CREDITS); - - this.credits = credits; - - this.address = address; - - this.offset = offset; - } - - public SessionProducerCreditsMessage() - { - super(PacketImpl.SESS_PRODUCER_CREDITS); - } - - // Public -------------------------------------------------------- - - public int getCredits() - { - return credits; - } - - public SimpleString getAddress() - { - return address; - } - - public int getOffset() - { - return offset; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(credits); - buffer.writeSimpleString(address); - buffer.writeInt(offset); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - credits = buffer.readInt(); - address = buffer.readSimpleString(); - offset = buffer.readInt(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,72 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * - * A SessionQueueQueryMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionQueueQueryMessage extends PacketImpl -{ - private SimpleString queueName; - - public SessionQueueQueryMessage(final SimpleString queueName) - { - super(PacketImpl.SESS_QUEUEQUERY); - - this.queueName = queueName; - } - - public SessionQueueQueryMessage() - { - super(PacketImpl.SESS_QUEUEQUERY); - } - - public SimpleString getQueueName() - { - return queueName; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeSimpleString(queueName); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - queueName = buffer.readSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionQueueQueryMessage == false) - { - return false; - } - - SessionQueueQueryMessage r = (SessionQueueQueryMessage)other; - - return super.equals(other) && r.queueName.equals(queueName); - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,175 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.server.QueueQueryResult; - -/** - * - * A SessionQueueQueryResponseMessage - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionQueueQueryResponseMessage extends PacketImpl -{ - private SimpleString name; - - private boolean exists; - - private boolean durable; - - private int consumerCount; - - private int messageCount; - - private SimpleString filterString; - - private SimpleString address; - - private boolean temporary; - - public SessionQueueQueryResponseMessage(final QueueQueryResult result) - { - this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), - result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists()); - } - - public SessionQueueQueryResponseMessage() - { - this(null, null, false, false, null, 0, 0, false); - } - - private SessionQueueQueryResponseMessage(final SimpleString name, - final SimpleString address, - final boolean durable, - final boolean temporary, - final SimpleString filterString, - final int consumerCount, - final int messageCount, - final boolean exists) - { - super(PacketImpl.SESS_QUEUEQUERY_RESP); - - this.durable = durable; - - this.temporary = temporary; - - this.consumerCount = consumerCount; - - this.messageCount = messageCount; - - this.filterString = filterString; - - this.address = address; - - this.name = name; - - this.exists = exists; - } - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isExists() - { - return exists; - } - - public boolean isDurable() - { - return durable; - } - - public int getConsumerCount() - { - return consumerCount; - } - - public int getMessageCount() - { - return messageCount; - } - - public SimpleString getFilterString() - { - return filterString; - } - - public SimpleString getAddress() - { - return address; - } - - public SimpleString getName() - { - return name; - } - - public boolean isTemporary() - { - return temporary; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(exists); - buffer.writeBoolean(durable); - buffer.writeBoolean(temporary); - buffer.writeInt(consumerCount); - buffer.writeInt(messageCount); - buffer.writeNullableSimpleString(filterString); - buffer.writeNullableSimpleString(address); - buffer.writeNullableSimpleString(name); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - exists = buffer.readBoolean(); - durable = buffer.readBoolean(); - temporary = buffer.readBoolean(); - consumerCount = buffer.readInt(); - messageCount = buffer.readInt(); - filterString = buffer.readNullableSimpleString(); - address = buffer.readNullableSimpleString(); - name = buffer.readNullableSimpleString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionQueueQueryResponseMessage == false) - { - return false; - } - - SessionQueueQueryResponseMessage r = (SessionQueueQueryResponseMessage)other; - - return super.equals(other) && exists == r.exists && - durable == r.durable && - consumerCount == r.consumerCount && - messageCount == r.messageCount && - filterString == null ? r.filterString == null - : filterString.equals(r.filterString) && address == null ? r.address == null - : address.equals(r.address); - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,95 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.utils.DataConstants; - -/** - * A SessionSendContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 4, 2008 12:25:14 PM - * - * - */ -public class SessionReceiveContinuationMessage extends SessionContinuationMessage -{ - - // Constants ----------------------------------------------------- - - public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SessionContinuationMessage.SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG; - - // Attributes ---------------------------------------------------- - - private long consumerID; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionReceiveContinuationMessage() - { - super(PacketImpl.SESS_RECEIVE_CONTINUATION); - } - - /** - * @param consumerID - * @param body - * @param continues - * @param requiresResponse - */ - public SessionReceiveContinuationMessage(final long consumerID, - final byte[] body, - final boolean continues, - final boolean requiresResponse) - { - super(PacketImpl.SESS_RECEIVE_CONTINUATION, body, continues); - this.consumerID = consumerID; - } - - /** - * @return the consumerID - */ - public long getConsumerID() - { - return consumerID; - } - - // Public -------------------------------------------------------- - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - super.encodeRest(buffer); - buffer.writeLong(consumerID); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - super.decodeRest(buffer); - consumerID = buffer.readLong(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,101 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A SessionReceiveLargeMessage - * - * @author Clebert Suconic - * - * - */ -public class SessionReceiveLargeMessage extends PacketImpl -{ - private byte[] largeMessageHeader; - - /** Since we receive the message before the entire message was received, */ - private long largeMessageSize; - - private long consumerID; - - private int deliveryCount; - - public SessionReceiveLargeMessage() - { - super(PacketImpl.SESS_RECEIVE_LARGE_MSG); - } - - public SessionReceiveLargeMessage(final long consumerID, - final byte[] largeMessageHeader, - final long largeMessageSize, - final int deliveryCount) - { - super(PacketImpl.SESS_RECEIVE_LARGE_MSG); - - this.consumerID = consumerID; - - this.largeMessageHeader = largeMessageHeader; - - this.deliveryCount = deliveryCount; - - this.largeMessageSize = largeMessageSize; - } - - public byte[] getLargeMessageHeader() - { - return largeMessageHeader; - } - - public long getConsumerID() - { - return consumerID; - } - - public int getDeliveryCount() - { - return deliveryCount; - } - - /** - * @return the largeMessageSize - */ - public long getLargeMessageSize() - { - return largeMessageSize; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeLong(consumerID); - buffer.writeInt(deliveryCount); - buffer.writeLong(largeMessageSize); - buffer.writeInt(largeMessageHeader.length); - buffer.writeBytes(largeMessageHeader); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - consumerID = buffer.readLong(); - deliveryCount = buffer.readInt(); - largeMessageSize = buffer.readLong(); - int size = buffer.readInt(); - largeMessageHeader = new byte[size]; - buffer.readBytes(largeMessageHeader); - } - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,119 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.client.impl.ClientMessageImpl; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionReceiveMessage extends MessagePacket -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(SessionReceiveMessage.class); - - // Attributes ---------------------------------------------------- - - private long consumerID; - - private int deliveryCount; - - public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) - { - super(PacketImpl.SESS_RECEIVE_MSG, message); - - this.consumerID = consumerID; - - this.deliveryCount = deliveryCount; - } - - public SessionReceiveMessage() - { - super(PacketImpl.SESS_RECEIVE_MSG, new ClientMessageImpl()); - } - - // Public -------------------------------------------------------- - - public long getConsumerID() - { - return consumerID; - } - - public int getDeliveryCount() - { - return deliveryCount; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = message.getEncodedBuffer(); - - // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { - throw new IllegalStateException("Wrong encode position"); - } - - buffer.writeLong(consumerID); - buffer.writeInt(deliveryCount); - - size = buffer.writerIndex(); - - // Write standard headers - - int len = size - DataConstants.SIZE_INT; - buffer.setInt(0, len); - buffer.setByte(DataConstants.SIZE_INT, type); - buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); - - // Position reader for reading by Netty - buffer.setIndex(0, size); - - return buffer; - } - - @Override - public void decode(final HornetQBuffer buffer) - { - channelID = buffer.readLong(); - - message.decodeFromBuffer(buffer); - - consumerID = buffer.readLong(); - - deliveryCount = buffer.readInt(); - - size = buffer.readerIndex(); - - // Need to position buffer for reading - - buffer.setIndex(PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT, message.getEndOfBodyPosition()); - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,89 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.SimpleString; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class SessionRequestProducerCreditsMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int credits; - - private SimpleString address; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) - { - super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); - - this.credits = credits; - - this.address = address; - } - - public SessionRequestProducerCreditsMessage() - { - super(PacketImpl.SESS_PRODUCER_REQUEST_CREDITS); - } - - // Public -------------------------------------------------------- - - public int getCredits() - { - return credits; - } - - public SimpleString getAddress() - { - return address; - } - - // public boolean isRequiresConfirmations() - // { - // return false; - // } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(credits); - buffer.writeSimpleString(address); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - credits = buffer.readInt(); - address = buffer.readSimpleString(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * A SessionSendContinuationMessage - * - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * - * Created Dec 4, 2008 12:25:14 PM - * - * - */ -public class SessionSendContinuationMessage extends SessionContinuationMessage -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendContinuationMessage() - { - super(PacketImpl.SESS_SEND_CONTINUATION); - } - - /** - * @param body - * @param continues - * @param requiresResponse - */ - public SessionSendContinuationMessage(final byte[] body, final boolean continues, final boolean requiresResponse) - { - super(PacketImpl.SESS_SEND_CONTINUATION, body, continues); - this.requiresResponse = requiresResponse; - } - - // Public -------------------------------------------------------- - - /** - * @return the requiresResponse - */ - public boolean isRequiresResponse() - { - return requiresResponse; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - super.encodeRest(buffer); - buffer.writeBoolean(requiresResponse); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - super.decodeRest(buffer); - requiresResponse = buffer.readBoolean(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,81 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:csuconic@redhat.com">Clebert Suconic</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionSendLargeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - /** Used only if largeMessage */ - private byte[] largeMessageHeader; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendLargeMessage(final byte[] largeMessageHeader) - { - super(PacketImpl.SESS_SEND_LARGE); - - this.largeMessageHeader = largeMessageHeader; - } - - public SessionSendLargeMessage() - { - super(PacketImpl.SESS_SEND_LARGE); - } - - // Public -------------------------------------------------------- - - public byte[] getLargeMessageHeader() - { - return largeMessageHeader; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(largeMessageHeader.length); - buffer.writeBytes(largeMessageHeader); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int largeMessageLength = buffer.readInt(); - - largeMessageHeader = new byte[largeMessageLength]; - - buffer.readBytes(largeMessageHeader); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,114 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.api.core.Message; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.message.impl.MessageInternal; -import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.server.impl.ServerMessageImpl; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionSendMessage extends MessagePacket -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(SessionSendMessage.class); - - // Attributes ---------------------------------------------------- - - private boolean requiresResponse; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionSendMessage(final MessageInternal message, final boolean requiresResponse) - { - super(PacketImpl.SESS_SEND, message); - - this.requiresResponse = requiresResponse; - } - - public SessionSendMessage() - { - super(PacketImpl.SESS_SEND, new ServerMessageImpl()); - } - - // Public -------------------------------------------------------- - - public boolean isRequiresResponse() - { - return requiresResponse; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - public HornetQBuffer encode(final RemotingConnection connection) - { - HornetQBuffer buffer = message.getEncodedBuffer(); - - // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { - throw new IllegalStateException("Wrong encode position"); - } - - buffer.writeBoolean(requiresResponse); - - size = buffer.writerIndex(); - - // Write standard headers - - int len = size - DataConstants.SIZE_INT; - buffer.setInt(0, len); - buffer.setByte(DataConstants.SIZE_INT, type); - buffer.setLong(DataConstants.SIZE_INT + DataConstants.SIZE_BYTE, channelID); - - // Position reader for reading by Netty - buffer.readerIndex(0); - - message.resetCopied(); - - return buffer; - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - // Buffer comes in after having read standard headers and positioned at Beginning of body part - - message.decodeFromBuffer(buffer); - - int ri = buffer.readerIndex(); - - requiresResponse = buffer.readBoolean(); - - buffer.readerIndex(ri); - - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,110 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXACommitMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean onePhase; - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXACommitMessage(final Xid xid, final boolean onePhase) - { - super(PacketImpl.SESS_XA_COMMIT); - - this.xid = xid; - this.onePhase = onePhase; - } - - public SessionXACommitMessage() - { - super(PacketImpl.SESS_XA_COMMIT); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - public boolean isOnePhase() - { - return onePhase; - } - - @Override - public boolean isAsyncExec() - { - return true; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - buffer.writeBoolean(onePhase); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - onePhase = buffer.readBoolean(); - } - - @Override - public String toString() - { - return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXACommitMessage == false) - { - return false; - } - - SessionXACommitMessage r = (SessionXACommitMessage)other; - - return super.equals(other) && xid.equals(r.xid) && onePhase == r.onePhase; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,105 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAEndMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - private boolean failed; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAEndMessage(final Xid xid, final boolean failed) - { - super(PacketImpl.SESS_XA_END); - - this.xid = xid; - - this.failed = failed; - } - - public SessionXAEndMessage() - { - super(PacketImpl.SESS_XA_END); - } - - // Public -------------------------------------------------------- - - public boolean isFailed() - { - return failed; - } - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - buffer.writeBoolean(failed); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - failed = buffer.readBoolean(); - } - - @Override - public String toString() - { - return getParentString() + ", xid=" + xid + ", failed=" + failed + "]"; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAEndMessage == false) - { - return false; - } - - SessionXAEndMessage r = (SessionXAEndMessage)other; - - return super.equals(other) && xid.equals(r.xid) && failed == r.failed; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAForgetMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAForgetMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_FORGET); - - this.xid = xid; - } - - public SessionXAForgetMessage() - { - super(PacketImpl.SESS_XA_FORGET); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAForgetMessage == false) - { - return false; - } - - SessionXAForgetMessage r = (SessionXAForgetMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,126 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import java.util.ArrayList; -import java.util.List; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private List<Xid> xids; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAGetInDoubtXidsResponseMessage(final List<Xid> xids) - { - super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); - - this.xids = xids; - } - - public SessionXAGetInDoubtXidsResponseMessage() - { - super(PacketImpl.SESS_XA_INDOUBT_XIDS_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public List<Xid> getXids() - { - return xids; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(xids.size()); - - for (Xid xid : xids) - { - XidCodecSupport.encodeXid(xid, buffer); - } - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - int len = buffer.readInt(); - xids = new ArrayList<Xid>(len); - for (int i = 0; i < len; i++) - { - Xid xid = XidCodecSupport.decodeXid(buffer); - - xids.add(xid); - } - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAGetInDoubtXidsResponseMessage == false) - { - return false; - } - - SessionXAGetInDoubtXidsResponseMessage r = (SessionXAGetInDoubtXidsResponseMessage)other; - - if (super.equals(other)) - { - if (xids.size() == r.xids.size()) - { - for (int i = 0; i < xids.size(); i++) - { - if (!xids.get(i).equals(r.xids.get(i))) - { - return false; - } - } - } - } - else - { - return false; - } - return true; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAGetTimeoutResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int timeoutSeconds; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) - { - super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); - - this.timeoutSeconds = timeoutSeconds; - } - - public SessionXAGetTimeoutResponseMessage() - { - super(PacketImpl.SESS_XA_GET_TIMEOUT_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public int getTimeoutSeconds() - { - return timeoutSeconds; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(timeoutSeconds); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - timeoutSeconds = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAGetTimeoutResponseMessage == false) - { - return false; - } - - SessionXAGetTimeoutResponseMessage r = (SessionXAGetTimeoutResponseMessage)other; - - return super.equals(other) && timeoutSeconds == r.timeoutSeconds; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAJoinMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAJoinMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_JOIN); - - this.xid = xid; - } - - public SessionXAJoinMessage() - { - super(PacketImpl.SESS_XA_JOIN); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAJoinMessage == false) - { - return false; - } - - SessionXAJoinMessage r = (SessionXAJoinMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,93 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAPrepareMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAPrepareMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_PREPARE); - - this.xid = xid; - } - - public SessionXAPrepareMessage() - { - super(PacketImpl.SESS_XA_PREPARE); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - public boolean isAsyncExec() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAPrepareMessage == false) - { - return false; - } - - SessionXAPrepareMessage r = (SessionXAPrepareMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,114 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean error; - - private int responseCode; - - private String message; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAResponseMessage(final boolean isError, final int responseCode, final String message) - { - super(PacketImpl.SESS_XA_RESP); - - error = isError; - - this.responseCode = responseCode; - - this.message = message; - } - - public SessionXAResponseMessage() - { - super(PacketImpl.SESS_XA_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isError() - { - return error; - } - - public int getResponseCode() - { - return responseCode; - } - - public String getMessage() - { - return message; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(error); - buffer.writeInt(responseCode); - buffer.writeNullableString(message); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - error = buffer.readBoolean(); - responseCode = buffer.readInt(); - message = buffer.readNullableString(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAResponseMessage == false) - { - return false; - } - - SessionXAResponseMessage r = (SessionXAResponseMessage)other; - - return super.equals(other) && error == r.error && responseCode == r.responseCode && message.equals(r.message); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAResumeMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAResumeMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_RESUME); - - this.xid = xid; - } - - public SessionXAResumeMessage() - { - super(PacketImpl.SESS_XA_RESUME); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAResumeMessage == false) - { - return false; - } - - SessionXAResumeMessage r = (SessionXAResumeMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,94 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXARollbackMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXARollbackMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_ROLLBACK); - - this.xid = xid; - } - - public SessionXARollbackMessage() - { - super(PacketImpl.SESS_XA_ROLLBACK); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - public boolean isAsyncExec() - { - return true; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXARollbackMessage == false) - { - return false; - } - - SessionXARollbackMessage r = (SessionXARollbackMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,86 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXASetTimeoutMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private int timeoutSeconds; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXASetTimeoutMessage(final int timeoutSeconds) - { - super(PacketImpl.SESS_XA_SET_TIMEOUT); - - this.timeoutSeconds = timeoutSeconds; - } - - public SessionXASetTimeoutMessage() - { - super(PacketImpl.SESS_XA_SET_TIMEOUT); - } - - // Public -------------------------------------------------------- - - public int getTimeoutSeconds() - { - return timeoutSeconds; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeInt(timeoutSeconds); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - timeoutSeconds = buffer.readInt(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXASetTimeoutMessage == false) - { - return false; - } - - SessionXASetTimeoutMessage r = (SessionXASetTimeoutMessage)other; - - return super.equals(other) && timeoutSeconds == r.timeoutSeconds; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXASetTimeoutResponseMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private boolean ok; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXASetTimeoutResponseMessage(final boolean ok) - { - super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); - - this.ok = ok; - } - - public SessionXASetTimeoutResponseMessage() - { - super(PacketImpl.SESS_XA_SET_TIMEOUT_RESP); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isResponse() - { - return true; - } - - public boolean isOK() - { - return ok; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - buffer.writeBoolean(ok); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - ok = buffer.readBoolean(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXASetTimeoutResponseMessage == false) - { - return false; - } - - SessionXASetTimeoutResponseMessage r = (SessionXASetTimeoutResponseMessage)other; - - return super.equals(other) && ok == r.ok; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,88 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @version <tt>$Revision$</tt> - */ -public class SessionXAStartMessage extends PacketImpl -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private Xid xid; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SessionXAStartMessage(final Xid xid) - { - super(PacketImpl.SESS_XA_START); - - this.xid = xid; - } - - public SessionXAStartMessage() - { - super(PacketImpl.SESS_XA_START); - } - - // Public -------------------------------------------------------- - - public Xid getXid() - { - return xid; - } - - @Override - public void encodeRest(final HornetQBuffer buffer) - { - XidCodecSupport.encodeXid(xid, buffer); - } - - @Override - public void decodeRest(final HornetQBuffer buffer) - { - xid = XidCodecSupport.decodeXid(buffer); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SessionXAStartMessage == false) - { - return false; - } - - SessionXAStartMessage r = (SessionXAStartMessage)other; - - return super.equals(other) && xid.equals(r.xid); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,73 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.impl.wireformat; - -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQBuffer; -import org.hornetq.core.transaction.impl.XidImpl; -import org.hornetq.utils.DataConstants; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -public class XidCodecSupport -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - public static void encodeXid(final Xid xid, final HornetQBuffer out) - { - out.writeInt(xid.getFormatId()); - out.writeInt(xid.getBranchQualifier().length); - out.writeBytes(xid.getBranchQualifier()); - out.writeInt(xid.getGlobalTransactionId().length); - out.writeBytes(xid.getGlobalTransactionId()); - } - - public static Xid decodeXid(final HornetQBuffer in) - { - int formatID = in.readInt(); - byte[] bq = new byte[in.readInt()]; - in.readBytes(bq); - byte[] gtxid = new byte[in.readInt()]; - in.readBytes(gtxid); - Xid xid = new XidImpl(bq, formatID, gtxid); - return xid; - } - - public static int getXidEncodeLength(final Xid xid) - { - return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length; - } - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/core/remoting/server/impl/CoreProtocolManager.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/server/impl/CoreProtocolManager.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/CoreProtocolManager.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,103 +0,0 @@ -/* - * Copyright 2010 Red Hat, Inc. - * Red Hat 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.hornetq.core.remoting.server.impl; - -import java.util.List; - -import org.hornetq.api.core.Interceptor; -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.Ping; -import org.hornetq.core.remoting.server.ConnectionEntry; -import org.hornetq.core.remoting.server.ProtocolManager; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.core.server.impl.HornetQPacketHandler; -import org.hornetq.spi.core.remoting.Connection; - -/** - * A CoreProtocolManager - * - * @author Tim Fox - * - * - */ -public class CoreProtocolManager implements ProtocolManager -{ - private final HornetQServer server; - - private final List<Interceptor> interceptors; - - public CoreProtocolManager(final HornetQServer server, - final List<Interceptor> interceptors) - { - this.server = server; - - this.interceptors = interceptors; - } - - public ConnectionEntry createConnectionEntry(final Connection connection) - { - final Configuration config = server.getConfiguration(); - - CoreRemotingConnection rc = new RemotingConnectionImpl(connection, - interceptors, - config.isAsyncConnectionExecutionEnabled() ? server.getExecutorFactory().getExecutor() - : null); - - Channel channel1 = rc.getChannel(1, -1); - - ChannelHandler handler = new HornetQPacketHandler(server, channel1, rc); - - channel1.setHandler(handler); - - long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; - - if (config.getConnectionTTLOverride() != -1) - { - ttl = config.getConnectionTTLOverride(); - } - - final ConnectionEntry entry = new ConnectionEntry(rc, System.currentTimeMillis(), ttl); - - final Channel channel0 = rc.getChannel(0, -1); - - channel0.setHandler(new ChannelHandler() - { - public void handlePacket(final Packet packet) - { - if (packet.getType() == PacketImpl.PING) - { - Ping ping = (Ping)packet; - - if (config.getConnectionTTLOverride() == -1) - { - // Allow clients to specify connection ttl - entry.ttl = ping.getConnectionTTL(); - } - - // Just send a ping back - channel0.send(packet); - } - } - }); - - return entry; - } -} Modified: trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -28,6 +28,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.CoreProtocolManager; import org.hornetq.core.remoting.ProtocolType; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.AbstractBufferHandler; Modified: trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -15,8 +15,8 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.JournalLoadInformation; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; import org.hornetq.core.server.HornetQComponent; /** Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -28,24 +28,24 @@ import org.hornetq.core.paging.impl.PagingManagerImpl; import org.hornetq.core.paging.impl.PagingStoreFactoryNIO; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationResponseMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.HornetQExceptionMessage; +import org.hornetq.core.protocol.core.wireformat.NullResponseMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationResponseMessage; import org.hornetq.core.replication.ReplicationEndpoint; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.LargeServerMessage; Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -29,24 +29,24 @@ import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.persistence.OperationContext; import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationAddTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCommitMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationCompareDataMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationDeleteTXMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageBeingMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargeMessageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationLargemessageEndMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageEventMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPageWriteMessage; -import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.ChannelHandler; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.CreateReplicationSessionMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationAddTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCommitMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationCompareDataMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationDeleteTXMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageBeingMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargeMessageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationLargemessageEndMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageEventMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPageWriteMessage; +import org.hornetq.core.protocol.core.wireformat.ReplicationPrepareMessage; import org.hornetq.core.replication.ReplicationManager; import org.hornetq.utils.ExecutorFactory; Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -23,10 +23,8 @@ import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.replication.ReplicationEndpoint; import org.hornetq.core.security.Role; @@ -70,24 +68,19 @@ void unregisterActivateCallback(ActivateCallback callback); - ReattachSessionResponseMessage reattachSession(CoreRemotingConnection connection, String name, int lastConfirmedCommandID) throws Exception; - /** The journal at the backup server has to be equivalent as the journal used on the live node. * Or else the backup node is out of sync. */ ReplicationEndpoint connectToReplicationEndpoint(Channel channel) throws Exception; - CreateSessionResponseMessage createSession(String name, - long channelID, - String username, - String password, - int minLargeMessageSize, - int incrementingVersion, - CoreRemotingConnection remotingConnection, - boolean autoCommitSends, - boolean autoCommitAcks, - boolean preAcknowledge, - boolean xa, - int confirmationWindowSize) throws Exception; + ServerSession createSession(String name, + String username, + String password, + int minLargeMessageSize, + CoreRemotingConnection remotingConnection, + boolean autoCommitSends, + boolean autoCommitAcks, + boolean preAcknowledge, + boolean xa) throws Exception; void removeSession(String name) throws Exception; @@ -136,4 +129,6 @@ void setGroupingHandler(GroupingHandler groupingHandler); GroupingHandler getGroupingHandler(); + + boolean checkActivate() throws Exception; } Modified: trunk/src/main/org/hornetq/core/server/ServerSession.java =================================================================== --- trunk/src/main/org/hornetq/core/server/ServerSession.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/ServerSession.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -18,8 +18,6 @@ import javax.transaction.xa.Xid; import org.hornetq.api.core.SimpleString; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CoreRemotingConnection; /** * @@ -109,10 +107,6 @@ void close() throws Exception; - int transferConnection(CoreRemotingConnection newConnection, int lastReceivedCommandID); - - Channel getChannel(); - void setTransferring(boolean transferring); void runConnectionFailureRunners(); Modified: trunk/src/main/org/hornetq/core/server/SessionCallback.java =================================================================== --- trunk/src/main/org/hornetq/core/server/SessionCallback.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/SessionCallback.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -24,12 +24,13 @@ */ public interface SessionCallback { - public void sendProducerCreditsMessage(int credits, SimpleString address, int offset); + void sendProducerCreditsMessage(int credits, SimpleString address, int offset); - public int sendMessage(ServerMessage message, long consumerID, int deliveryCount); + int sendMessage(ServerMessage message, long consumerID, int deliveryCount); - public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount); + int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount); - public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse); - + int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse); + + void closed(); } Deleted: trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,234 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.server.impl; - -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATESESSION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_REPLICATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateReplicationSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionMessage; -import org.hornetq.core.replication.ReplicationEndpoint; -import org.hornetq.core.server.HornetQServer; - -/** - * A packet handler for all packets that need to be handled at the server level - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> - */ -public class HornetQPacketHandler implements ChannelHandler -{ - private static final Logger log = Logger.getLogger(HornetQPacketHandler.class); - - private final HornetQServer server; - - private final Channel channel1; - - private final CoreRemotingConnection connection; - - public HornetQPacketHandler(final HornetQServer server, final Channel channel1, final CoreRemotingConnection connection) - { - this.server = server; - - this.channel1 = channel1; - - this.connection = connection; - } - - public void handlePacket(final Packet packet) - { - byte type = packet.getType(); - - // All these operations need to be idempotent since they are outside of the session - // reliability replay functionality - switch (type) - { - case CREATESESSION: - { - CreateSessionMessage request = (CreateSessionMessage)packet; - - handleCreateSession(request); - - break; - } - case REATTACH_SESSION: - { - ReattachSessionMessage request = (ReattachSessionMessage)packet; - - handleReattachSession(request); - - break; - } - case CREATE_QUEUE: - { - // Create queue can also be fielded here in the case of a replicated store and forward queue creation - - CreateQueueMessage request = (CreateQueueMessage)packet; - - handleCreateQueue(request); - - break; - } - case CREATE_REPLICATION: - { - // Create queue can also be fielded here in the case of a replicated store and forward queue creation - - CreateReplicationSessionMessage request = (CreateReplicationSessionMessage)packet; - - handleCreateReplication(request); - - break; - } - default: - { - HornetQPacketHandler.log.error("Invalid packet " + packet); - } - } - } - - private void handleCreateSession(final CreateSessionMessage request) - { - boolean incompatibleVersion = false; - Packet response; - try - { - response = server.createSession(request.getName(), - request.getSessionChannelID(), - request.getUsername(), - request.getPassword(), - request.getMinLargeMessageSize(), - request.getVersion(), - connection, - request.isAutoCommitSends(), - request.isAutoCommitAcks(), - request.isPreAcknowledge(), - request.isXA(), - request.getWindowSize()); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - - if (((HornetQException)e).getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS) - { - incompatibleVersion = true; - } - } - else - { - HornetQPacketHandler.log.error("Failed to create session", e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - // send the exception to the client and destroy - // the connection if the client and server versions - // are not compatible - if (incompatibleVersion) - { - channel1.sendAndFlush(response); - } - else - { - channel1.send(response); - } - } - - private void handleReattachSession(final ReattachSessionMessage request) - { - Packet response; - - try - { - response = server.reattachSession(connection, request.getName(), request.getLastConfirmedCommandID()); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - HornetQPacketHandler.log.error("Failed to reattach session", e); - - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - channel1.send(response); - } - - private void handleCreateQueue(final CreateQueueMessage request) - { - try - { - server.createQueue(request.getAddress(), - request.getQueueName(), - request.getFilterString(), - request.isDurable(), - request.isTemporary()); - } - catch (Exception e) - { - HornetQPacketHandler.log.error("Failed to handle create queue", e); - } - } - - private void handleCreateReplication(final CreateReplicationSessionMessage request) - { - Packet response; - - try - { - Channel channel = connection.getChannel(request.getSessionChannelID(), -1); - - ReplicationEndpoint endpoint = server.connectToReplicationEndpoint(channel); - - channel.setHandler(endpoint); - - response = new NullResponseMessage(); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - HornetQPacketHandler.log.warn(e.getMessage(), e); - response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR)); - } - } - - channel1.send(response); - } - -} \ No newline at end of file Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -68,10 +68,8 @@ import org.hornetq.core.postoffice.impl.DivertBinding; import org.hornetq.core.postoffice.impl.LocalQueueBinding; import org.hornetq.core.postoffice.impl.PostOfficeImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.ReattachSessionResponseMessage; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.server.RemotingService; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.replication.ReplicationEndpoint; @@ -341,12 +339,12 @@ managementService.removeNotificationListener(groupingHandler); groupingHandler = null; } - // Need to flush all sessions to make sure all confirmations get sent back to client - - for (ServerSession session : sessions.values()) - { - session.getChannel().flushConfirmations(); - } + // // Need to flush all sessions to make sure all confirmations get sent back to client + // + // for (ServerSession session : sessions.values()) + // { + // session.getChannel().flushConfirmations(); + // } } // we stop the remoting service outside a lock @@ -536,102 +534,21 @@ return clusterManager; } - public ReattachSessionResponseMessage reattachSession(final CoreRemotingConnection connection, - final String name, - final int lastConfirmedCommandID) throws Exception + public ServerSession createSession(final String name, + final String username, + final String password, + final int minLargeMessageSize, + final CoreRemotingConnection connection, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final boolean xa) throws Exception { - if (!started) - { - return new ReattachSessionResponseMessage(-1, false); - } - - ServerSession session = sessions.get(name); - - if (!checkActivate()) - { - return new ReattachSessionResponseMessage(-1, false); - } - - if (session == null) - { - return new ReattachSessionResponseMessage(-1, false); - } - else - { - if (session.getChannel().getConfirmationWindowSize() == -1) - { - // Even though session exists, we can't reattach since confi window size == -1, - // i.e. we don't have a resend cache for commands, so we just close the old session - // and let the client recreate - - try - { - session.close(); - } - catch (Exception e) - { - HornetQServerImpl.log.error("Failed to close session", e); - } - - sessions.remove(name); - - return new ReattachSessionResponseMessage(-1, false); - } - else - { - // Reconnect the channel to the new connection - int serverLastConfirmedCommandID = session.transferConnection(connection, lastConfirmedCommandID); - - return new ReattachSessionResponseMessage(serverLastConfirmedCommandID, true); - } - } - } - - public CreateSessionResponseMessage createSession(final String name, - final long channelID, - final String username, - final String password, - final int minLargeMessageSize, - final int incrementingVersion, - final CoreRemotingConnection connection, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final boolean xa, - final int sendWindowSize) throws Exception - { - if (!started) - { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, "Server not started"); - } - - if (version.getIncrementingVersion() != incrementingVersion) - { - HornetQServerImpl.log.warn("Client with version " + incrementingVersion + - " and address " + - connection.getRemoteAddress() + - " is not compatible with server version " + - version.getFullVersion() + - ". " + - "Please ensure all clients and servers are upgraded to the same version for them to " + - "interoperate properly"); - throw new HornetQException(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, - "Server and client versions incompatible"); - } - - if (!checkActivate()) - { - throw new HornetQException(HornetQException.SESSION_CREATION_REJECTED, - "Server will not accept create session requests"); - } - if (securityStore != null) { securityStore.authenticate(username, password); } - Channel channel = connection.getChannel(channelID, sendWindowSize); - final ServerSessionImpl session = new ServerSessionImpl(name, username, password, @@ -642,27 +559,17 @@ configuration.isPersistDeliveryCountBeforeDelivery(), xa, connection, - channel, storageManager, postOffice, resourceManager, - securityStore, + securityStore, managementService, this, configuration.getManagementAddress()); sessions.put(name, session); - ServerSessionPacketHandler handler = new ServerSessionPacketHandler(session, - storageManager.newContext(executorFactory.getExecutor()), - storageManager, - channel); - - session.setCallback(handler); - - channel.setHandler(handler); - - return new CreateSessionResponseMessage(version.getIncrementingVersion()); + return session; } public synchronized ReplicationEndpoint connectToReplicationEndpoint(final Channel channel) throws Exception @@ -937,7 +844,7 @@ } } - private synchronized boolean checkActivate() throws Exception + public synchronized boolean checkActivate() throws Exception { if (configuration.isBackup()) { @@ -1025,8 +932,7 @@ if (ConfigurationImpl.DEFAULT_CLUSTER_USER.equals(configuration.getClusterUser()) && ConfigurationImpl.DEFAULT_CLUSTER_PASSWORD.equals(configuration.getClusterPassword())) { - log.warn("Security risk! It has been detected that the cluster admin user and password " - + "have not been changed from the installation default. " + log.warn("Security risk! It has been detected that the cluster admin user and password " + "have not been changed from the installation default. " + "Please see the HornetQ user guide, cluster chapter, for instructions on how to do this."); } Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -21,7 +21,7 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.PagingStore; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.server.MessageReference; import org.hornetq.core.server.Queue; import org.hornetq.core.server.ServerMessage; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -42,9 +42,8 @@ import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.postoffice.QueueBinding; -import org.hornetq.core.remoting.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.CoreRemotingConnection; import org.hornetq.core.remoting.FailureListener; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.SecurityStore; @@ -102,8 +101,6 @@ private CoreRemotingConnection remotingConnection; - private Channel channel; - private final Map<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>(); private Transaction tx; @@ -131,8 +128,6 @@ // The current currentLargeMessage being processed private volatile LargeServerMessage currentLargeMessage; - // private ServerSessionPacketHandler handler; - private boolean closed; private final Map<SimpleString, CreditManagerHolder> creditManagerHolders = new HashMap<SimpleString, CreditManagerHolder>(); @@ -152,8 +147,7 @@ final boolean preAcknowledge, final boolean strictUpdateDeliveryCount, final boolean xa, - final CoreRemotingConnection remotingConnection, - final Channel channel, + final CoreRemotingConnection remotingConnection, final StorageManager storageManager, final PostOffice postOffice, final ResourceManager resourceManager, @@ -176,8 +170,6 @@ this.remotingConnection = remotingConnection; - this.channel = channel; - this.storageManager = storageManager; this.postOffice = postOffice; @@ -288,6 +280,8 @@ { holder.store.returnProducerCredits(holder.outstandingCredits); } + + callback.closed(); } public void createConsumer(final long consumerID, @@ -1037,52 +1031,6 @@ } } - public int transferConnection(final CoreRemotingConnection newConnection, final int lastReceivedCommandID) - { - // We need to disable delivery on all the consumers while the transfer is occurring- otherwise packets might get - // delivered - // after the channel has transferred but *before* packets have been replayed - this will give the client the wrong - // sequence of packets. - // It is not sufficient to just stop the session, since right after stopping the session, another session start - // might be executed - // before we have transferred the connection, leaving it in a started state - setTransferring(true); - - remotingConnection.removeFailureListener(this); - remotingConnection.removeCloseListener(this); - - // Note. We do not destroy the replicating connection here. In the case the live server has really crashed - // then the connection will get cleaned up anyway when the server ping timeout kicks in. - // In the case the live server is really still up, i.e. a split brain situation (or in tests), then closing - // the replicating connection will cause the outstanding responses to be be replayed on the live server, - // if these reach the client who then subsequently fails over, on reconnection to backup, it will have - // received responses that the backup did not know about. - - channel.transferConnection(newConnection); - - newConnection.syncIDGeneratorSequence(remotingConnection.getIDGeneratorSequence()); - - remotingConnection = newConnection; - - remotingConnection.addFailureListener(this); - remotingConnection.addCloseListener(this); - - int serverLastReceivedCommandID = channel.getLastConfirmedCommandID(); - - channel.replayCommands(lastReceivedCommandID); - - channel.setTransferring(false); - - setTransferring(false); - - return serverLastReceivedCommandID; - } - - public Channel getChannel() - { - return channel; - } - public void runConnectionFailureRunners() { for (Runnable runner : failureRunners.values()) Deleted: trunk/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionPacketHandler.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -1,602 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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.hornetq.core.server.impl; - -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.DELETE_QUEUE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ACKNOWLEDGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_BINDINGQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CONSUMER_CLOSE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_CREATECONSUMER; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_EXPIRED; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FLOWTOKEN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_FORCE_CONSUMER_DELIVERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_QUEUEQUERY; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_CONTINUATION; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_SEND_LARGE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_STOP; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_COMMIT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_END; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_FORGET; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_GET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_INDOUBT_XIDS; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_JOIN; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_PREPARE; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_RESUME; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_ROLLBACK; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SET_TIMEOUT; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_START; -import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SUSPEND; - -import java.util.List; - -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; - -import org.hornetq.api.core.HornetQException; -import org.hornetq.api.core.SimpleString; -import org.hornetq.core.exception.HornetQXAException; -import org.hornetq.core.journal.IOAsyncTask; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.persistence.OperationContext; -import org.hornetq.core.persistence.StorageManager; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.ChannelHandler; -import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.FailureListener; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage; -import org.hornetq.core.remoting.impl.wireformat.NullResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.RollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionAcknowledgeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerCloseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionConsumerFlowCreditMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionCreateConsumerMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionDeleteQueueMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionExpiredMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionForceConsumerDelivery; -import org.hornetq.core.remoting.impl.wireformat.SessionProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionRequestProducerCreditsMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXACommitMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAEndMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAForgetMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetInDoubtXidsResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAGetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAJoinMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAPrepareMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAResumeMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXARollbackMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionXAStartMessage; -import org.hornetq.core.server.BindingQueryResult; -import org.hornetq.core.server.QueueQueryResult; -import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.ServerSession; -import org.hornetq.core.server.SessionCallback; - -/** - * A ServerSessionPacketHandler - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a> - * @author <a href="mailto:clebert.suconic@jboss.org>Clebert Suconic</a> - */ -public class ServerSessionPacketHandler implements ChannelHandler, CloseListener, FailureListener, SessionCallback -{ - private static final Logger log = Logger.getLogger(ServerSessionPacketHandler.class); - - private final ServerSession session; - - private final OperationContext sessionContext; - - // Storagemanager here is used to set the Context - private final StorageManager storageManager; - - private final Channel channel; - - private volatile CoreRemotingConnection remotingConnection; - - public ServerSessionPacketHandler(final ServerSession session, - final OperationContext sessionContext, - final StorageManager storageManager, - final Channel channel) - { - this.session = session; - - this.storageManager = storageManager; - - this.sessionContext = sessionContext; - - this.channel = channel; - - this.remotingConnection = channel.getConnection(); - - addConnectionListeners(); - } - - public long getID() - { - return channel.getID(); - } - - public void connectionFailed(final HornetQException exception) - { - log.warn("Client connection failed, clearing up resources for session " + session.getName()); - - session.runConnectionFailureRunners(); - - try - { - session.close(); - } - catch (Exception e) - { - log.error("Failed to close session", e); - } - - log.warn("Cleared up resources for session " + session.getName()); - } - - public void close() - { - channel.flushConfirmations(); - - try - { - session.close(); - } - catch (Exception e) - { - log.error("Failed to close session", e); - } - } - - public void connectionClosed() - { - session.runConnectionFailureRunners(); - } - - private void addConnectionListeners() - { - remotingConnection.addFailureListener(this); - remotingConnection.addCloseListener(this); - } - - private void removeConnectionListeners() - { - remotingConnection.removeFailureListener(this); - remotingConnection.removeCloseListener(this); - } - - public Channel getChannel() - { - return channel; - } - - public void handlePacket(final Packet packet) - { - byte type = packet.getType(); - - storageManager.setContext(sessionContext); - - Packet response = null; - boolean flush = false; - boolean closeChannel = false; - boolean requiresResponse = false; - - try - { - try - { - switch (type) - { - case SESS_CREATECONSUMER: - { - SessionCreateConsumerMessage request = (SessionCreateConsumerMessage)packet; - requiresResponse = request.isRequiresResponse(); - session.createConsumer(request.getID(), - request.getQueueName(), - request.getFilterString(), - request.isBrowseOnly()); - if (requiresResponse) - { - // We send back queue information on the queue as a response- this allows the queue to - // be automaticall recreated on failover - response = new SessionQueueQueryResponseMessage(session.executeQueueQuery(request.getQueueName())); - } - - break; - } - case CREATE_QUEUE: - { - CreateQueueMessage request = (CreateQueueMessage)packet; - requiresResponse = request.isRequiresResponse(); - session.createQueue(request.getAddress(), - request.getQueueName(), - request.getFilterString(), - request.isTemporary(), - request.isDurable()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case DELETE_QUEUE: - { - requiresResponse = true; - SessionDeleteQueueMessage request = (SessionDeleteQueueMessage)packet; - session.deleteQueue(request.getQueueName()); - response = new NullResponseMessage(); - break; - } - case SESS_QUEUEQUERY: - { - requiresResponse = true; - SessionQueueQueryMessage request = (SessionQueueQueryMessage)packet; - QueueQueryResult result = session.executeQueueQuery(request.getQueueName()); - response = new SessionQueueQueryResponseMessage(result); - break; - } - case SESS_BINDINGQUERY: - { - requiresResponse = true; - SessionBindingQueryMessage request = (SessionBindingQueryMessage)packet; - BindingQueryResult result = session.executeBindingQuery(request.getAddress()); - response = new SessionBindingQueryResponseMessage(result.isExists(), result.getQueueNames()); - break; - } - case SESS_ACKNOWLEDGE: - { - SessionAcknowledgeMessage message = (SessionAcknowledgeMessage)packet; - requiresResponse = message.isRequiresResponse(); - session.acknowledge(message.getConsumerID(), message.getMessageID()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case SESS_EXPIRED: - { - SessionExpiredMessage message = (SessionExpiredMessage)packet; - session.expire(message.getConsumerID(), message.getMessageID()); - break; - } - case SESS_COMMIT: - { - requiresResponse = true; - session.commit(); - response = new NullResponseMessage(); - break; - } - case SESS_ROLLBACK: - { - requiresResponse = true; - session.rollback(((RollbackMessage)packet).isConsiderLastMessageAsDelivered()); - response = new NullResponseMessage(); - break; - } - case SESS_XA_COMMIT: - { - requiresResponse = true; - SessionXACommitMessage message = (SessionXACommitMessage)packet; - session.xaCommit(message.getXid(), message.isOnePhase()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_END: - { - requiresResponse = true; - SessionXAEndMessage message = (SessionXAEndMessage)packet; - session.xaEnd(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_FORGET: - { - requiresResponse = true; - SessionXAForgetMessage message = (SessionXAForgetMessage)packet; - session.xaForget(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_JOIN: - { - requiresResponse = true; - SessionXAJoinMessage message = (SessionXAJoinMessage)packet; - session.xaJoin(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_RESUME: - { - requiresResponse = true; - SessionXAResumeMessage message = (SessionXAResumeMessage)packet; - session.xaResume(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_ROLLBACK: - { - requiresResponse = true; - SessionXARollbackMessage message = (SessionXARollbackMessage)packet; - session.xaRollback(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_START: - { - requiresResponse = true; - SessionXAStartMessage message = (SessionXAStartMessage)packet; - session.xaStart(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_SUSPEND: - { - requiresResponse = true; - session.xaSuspend(); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_PREPARE: - { - requiresResponse = true; - SessionXAPrepareMessage message = (SessionXAPrepareMessage)packet; - session.xaPrepare(message.getXid()); - response = new SessionXAResponseMessage(false, XAResource.XA_OK, null); - break; - } - case SESS_XA_INDOUBT_XIDS: - { - requiresResponse = true; - List<Xid> xids = session.xaGetInDoubtXids(); - response = new SessionXAGetInDoubtXidsResponseMessage(xids); - break; - } - case SESS_XA_GET_TIMEOUT: - { - requiresResponse = true; - int timeout = session.xaGetTimeout(); - response = new SessionXAGetTimeoutResponseMessage(timeout); - break; - } - case SESS_XA_SET_TIMEOUT: - { - requiresResponse = true; - SessionXASetTimeoutMessage message = (SessionXASetTimeoutMessage)packet; - session.xaSetTimeout(message.getTimeoutSeconds()); - response = new SessionXASetTimeoutResponseMessage(true); - break; - } - case SESS_START: - { - session.start(); - break; - } - case SESS_STOP: - { - requiresResponse = true; - session.stop(); - response = new NullResponseMessage(); - break; - } - case SESS_CLOSE: - { - requiresResponse = true; - session.close(); - removeConnectionListeners(); - response = new NullResponseMessage(); - flush = true; - closeChannel = true; - break; - } - case SESS_CONSUMER_CLOSE: - { - requiresResponse = true; - SessionConsumerCloseMessage message = (SessionConsumerCloseMessage)packet; - session.closeConsumer(message.getConsumerID()); - response = new NullResponseMessage(); - break; - } - case SESS_FLOWTOKEN: - { - SessionConsumerFlowCreditMessage message = (SessionConsumerFlowCreditMessage)packet; - session.receiveConsumerCredits(message.getConsumerID(), message.getCredits()); - break; - } - case SESS_SEND: - { - SessionSendMessage message = (SessionSendMessage)packet; - requiresResponse = message.isRequiresResponse(); - session.send((ServerMessage)message.getMessage()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case SESS_SEND_LARGE: - { - SessionSendLargeMessage message = (SessionSendLargeMessage)packet; - session.sendLarge(message.getLargeMessageHeader()); - break; - } - case SESS_SEND_CONTINUATION: - { - SessionSendContinuationMessage message = (SessionSendContinuationMessage)packet; - requiresResponse = message.isRequiresResponse(); - session.sendContinuations(message.getPacketSize(), message.getBody(), message.isContinues()); - if (requiresResponse) - { - response = new NullResponseMessage(); - } - break; - } - case SESS_FORCE_CONSUMER_DELIVERY: - { - SessionForceConsumerDelivery message = (SessionForceConsumerDelivery)packet; - session.forceConsumerDelivery(message.getConsumerID(), message.getSequence()); - break; - } - case PacketImpl.SESS_PRODUCER_REQUEST_CREDITS: - { - SessionRequestProducerCreditsMessage message = (SessionRequestProducerCreditsMessage)packet; - session.requestProducerCredits(message.getAddress(), message.getCredits()); - break; - } - } - } - catch (HornetQXAException e) - { - if (requiresResponse) - { - response = new SessionXAResponseMessage(true, e.errorCode, e.getMessage()); - } - else - { - log.error("Caught XA exception", e); - } - } - catch (HornetQException e) - { - if (requiresResponse) - { - response = new HornetQExceptionMessage((HornetQException)e); - } - else - { - log.error("Caught exception", e); - } - } - catch (Throwable t) - { - log.error("Caught unexpected exception", t); - } - - sendResponse(packet, response, flush, closeChannel); - } - finally - { - storageManager.completeOperations(); - storageManager.clearContext(); - } - } - - private void sendResponse(final Packet confirmPacket, - final Packet response, - final boolean flush, - final boolean closeChannel) - { - storageManager.afterCompleteOperations(new IOAsyncTask() - { - public void onError(final int errorCode, final String errorMessage) - { - log.warn("Error processing IOCallback code = " + errorCode + " message = " + errorMessage); - - HornetQExceptionMessage exceptionMessage = new HornetQExceptionMessage(new HornetQException(errorCode, - errorMessage)); - - doConfirmAndResponse(confirmPacket, exceptionMessage, flush, closeChannel); - } - - public void done() - { - doConfirmAndResponse(confirmPacket, response, flush, closeChannel); - } - }); - } - - private void doConfirmAndResponse(final Packet confirmPacket, - final Packet response, - final boolean flush, - final boolean closeChannel) - { - if (confirmPacket != null) - { - channel.confirm(confirmPacket); - - if (flush) - { - channel.flushConfirmations(); - } - } - - if (response != null) - { - channel.send(response); - } - - if (closeChannel) - { - channel.close(); - } - } - - public int sendLargeMessage(long consumerID, byte[] headerBuffer, long bodySize, int deliveryCount) - { - Packet packet = new SessionReceiveLargeMessage(consumerID, headerBuffer, bodySize, deliveryCount); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public int sendLargeMessageContinuation(long consumerID, byte[] body, boolean continues, boolean requiresResponse) - { - Packet packet = new SessionReceiveContinuationMessage(consumerID, body, continues, requiresResponse); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public int sendMessage(ServerMessage message, long consumerID, int deliveryCount) - { - Packet packet = new SessionReceiveMessage(consumerID, message, deliveryCount); - - channel.send(packet); - - return packet.getPacketSize(); - } - - public void sendProducerCreditsMessage(int credits, SimpleString address, int offset) - { - Packet packet = new SessionProducerCreditsMessage(credits, address, offset); - - channel.send(packet); - } -} Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -24,11 +24,11 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; +import org.hornetq.core.protocol.core.wireformat.SessionSendMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -27,9 +27,9 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -11,11 +11,11 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; Modified: trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/client/InVMNonPersistentMessageBufferTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -20,7 +20,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -24,12 +24,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.FailoverManagerImpl; -import org.hornetq.core.remoting.Channel; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Channel; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.wireformat.CreateSessionMessage; +import org.hornetq.core.protocol.core.wireformat.CreateSessionResponseMessage; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage; -import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -25,9 +25,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -27,12 +27,12 @@ import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -19,9 +19,9 @@ import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveMessage; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage; /** * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -18,7 +18,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; /** Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -15,9 +15,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -16,9 +16,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor2 Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -16,9 +16,9 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; /** * A DelayInterceptor3 Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -26,7 +26,7 @@ import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -31,7 +31,7 @@ import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.impl.RemotingConnectionImpl; +import org.hornetq.core.protocol.core.RemotingConnectionImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -31,11 +31,11 @@ import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; +import org.hornetq.core.protocol.core.CoreRemotingConnection; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.CloseListener; -import org.hornetq.core.remoting.CoreRemotingConnection; -import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.remoting.server.impl.RemotingServiceImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -58,7 +58,7 @@ import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.OperationContextImpl; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.replication.impl.ReplicatedJournal; Modified: trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -24,9 +24,9 @@ import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; -import org.hornetq.core.remoting.Packet; +import org.hornetq.core.protocol.core.Packet; +import org.hornetq.core.protocol.core.PacketImpl; import org.hornetq.core.remoting.RemotingConnection; -import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.integration.remoting.PingTest; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-21 10:29:24 UTC (rev 8820) +++ trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-21 13:31:05 UTC (rev 8821) @@ -36,9 +36,9 @@ import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.client.impl.ClientMessageInternal; import org.hornetq.core.client.impl.LargeMessageBufferImpl; -import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; -import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; +import org.hornetq.core.protocol.core.wireformat.SessionQueueQueryResponseMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveContinuationMessage; +import org.hornetq.core.protocol.core.wireformat.SessionReceiveLargeMessage; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase;

16 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits January 2010