[jboss-cvs] JBoss Messaging SVN: r3380 - in branches/Branch_JBMESSAGING-544: src/main/org/jboss/jms/client/remoting and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 28 09:37:24 EST 2007
Author: jmesnil
Date: 2007-11-28 09:37:24 -0500 (Wed, 28 Nov 2007)
New Revision: 3380
Added:
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketSender.java
Removed:
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketReplier.java
Modified:
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/container/ConsumerAspect.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/internal/ClientHandler.java
branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/server/ServerHandler.java
branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/RemoteDispatcherTest.java
branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TargetHandlerTest.java
branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestSupport.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-544: Replace client-server transport with NIO based transport
* renamed PacketReplier to PacketSender
* simplified & strengthened out packet handling
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -39,7 +39,7 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.DeliverMessage;
import org.jboss.messaging.core.remoting.wireformat.PacketType;
@@ -130,7 +130,7 @@
return consumerID;
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender sender)
{
try
{
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -21,8 +21,6 @@
*/
package org.jboss.jms.client.remoting;
-import static org.jboss.messaging.core.remoting.Constants.PORT;
-
import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
@@ -31,7 +29,6 @@
import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.wireformat.JMSWireFormat;
import org.jboss.logging.Logger;
-import org.jboss.messaging.core.remoting.Constants;
import org.jboss.messaging.core.remoting.TransportType;
import org.jboss.messaging.util.GUIDGenerator;
import org.jboss.remoting.Client;
@@ -305,7 +302,7 @@
});
newClient = new org.jboss.messaging.core.remoting.Client();
- newClient.connect(serverLocator.getHost(), PORT, TransportType.TCP);
+ newClient.connect(serverLocator.getHost(), serverLocator.getPort() + 1000, TransportType.TCP);
// We explicitly set the Marshaller since otherwise remoting tries to resolve the marshaller
// every time which is very slow - see org.jboss.remoting.transport.socket.ProcessInvocation
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.jms.server.endpoint;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_BROWSER_RESET;
@@ -35,6 +35,7 @@
import javax.jms.Message;
import org.jboss.jms.delegate.BrowserEndpoint;
+import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.jms.message.JBossMessage;
import org.jboss.jms.server.selector.Selector;
import org.jboss.jms.wireformat.Dispatcher;
@@ -43,7 +44,7 @@
import org.jboss.messaging.core.contract.Filter;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.BrowserHasNextMessageResponse;
import org.jboss.messaging.core.remoting.wireformat.BrowserNextMessageResponse;
@@ -60,7 +61,7 @@
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
- *
+ *
* $Id$
*/
public class ServerBrowserEndpoint implements BrowserEndpoint
@@ -273,55 +274,57 @@
return id;
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender sender)
{
try
{
+ AbstractPacket response = null;
+
PacketType type = packet.getType();
if (type == REQ_BROWSER_HASNEXTMESSAGE)
{
- BrowserHasNextMessageResponse response = new BrowserHasNextMessageResponse(hasNextMessage());
- response.normalize(packet);
- replier.reply(response);
+ response = new BrowserHasNextMessageResponse(hasNextMessage());
} else if (type == REQ_BROWSER_NEXTMESSAGE)
{
JBossMessage message = nextMessage();
- BrowserNextMessageResponse response = new BrowserNextMessageResponse(message);
- response.normalize(packet);
- replier.reply(response);
+ response = new BrowserNextMessageResponse(message);
} else if (type == MSG_BROWSER_RESET)
{
reset();
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
+
+ response = new NullPacket();
} else if (type == REQ_CLOSING)
{
ClosingRequest request = (ClosingRequest) packet;
long id = closing(request.getSequence());
-
- ClosingResponse response = new ClosingResponse(id);
- response.normalize(request);
- replier.reply(response);
+
+ response = new ClosingResponse(id);
} else if (type == MSG_CLOSE)
- {
- close();
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
- } else {
- log.error("Unsupported packet for browser: " + packet);
+ {
+ close();
+
+ response = new NullPacket();
+ } else
+ {
+ response = new JMSExceptionMessage(new MessagingJMSException(
+ "Unsupported packet for browser: " + packet));
}
+
+ // reply if necessary
+ if (response != null)
+ {
+ response.normalize(packet);
+ sender.send(response);
+ }
+
} catch (JMSException e)
{
JMSExceptionMessage message = new JMSExceptionMessage(e);
message.normalize(packet);
- replier.reply(message);
+ sender.send(message);
}
- }
-
+ }
+
@Override
public String toString()
{
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -31,6 +31,7 @@
import org.jboss.jms.delegate.ConsumerEndpoint;
import org.jboss.jms.destination.JBossDestination;
+import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.jms.message.JBossMessage;
import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.destination.ManagedDestination;
@@ -50,9 +51,10 @@
import org.jboss.messaging.core.impl.SimpleDelivery;
import org.jboss.messaging.core.impl.tx.Transaction;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.ChangeRateMessage;
+import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
import org.jboss.messaging.core.remoting.wireformat.DeliverMessage;
import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
@@ -644,21 +646,22 @@
{
sessionEndpoint.promptDelivery(messageQueue);
}
-
- private PacketReplier replier;
- private void setReplier(PacketReplier replier)
+ private PacketSender replier;
+
+ private void setReplier(PacketSender replier)
{
this.replier = replier;
- }
+ }
public void deliver(DeliverMessage message)
{
if (replier != null)
{
message.setTargetID(id);
- replier.reply(message);
- } else {
+ replier.send(message);
+ } else
+ {
log.error("No replier to deliver message to consumer");
}
}
@@ -672,41 +675,48 @@
return id;
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender sender)
{
try
{
+ AbstractPacket response = null;
+
PacketType type = packet.getType();
if (type == MSG_CHANGERATE)
{
- setReplier(replier);
+ setReplier(sender);
ChangeRateMessage message = (ChangeRateMessage) packet;
changeRate(message.getRate());
} else if (type == REQ_CLOSING)
{
- org.jboss.messaging.core.remoting.wireformat.ClosingRequest request = (org.jboss.messaging.core.remoting.wireformat.ClosingRequest) packet;
+ ClosingRequest request = (ClosingRequest) packet;
long id = closing(request.getSequence());
- ClosingResponse response = new ClosingResponse(id);
- response.normalize(request);
- replier.reply(response);
+
+ response = new ClosingResponse(id);
} else if (type == MSG_CLOSE)
{
close();
+ setReplier(null);
- NullPacket response = new NullPacket();
+ response = new NullPacket();
+ } else
+ {
+ response = new JMSExceptionMessage(new MessagingJMSException(
+ "Unsupported packet for browser: " + packet));
+ }
+
+ // reply if necessary
+ if (response != null)
+ {
response.normalize(packet);
- replier.reply(response);
-
- setReplier(null);
- } else {
- log.error("unsupported packet by server consumer endpoint: " + packet);
+ sender.send(response);
}
} catch (JMSException e)
{
JMSExceptionMessage message = new JMSExceptionMessage(e);
message.normalize(packet);
- replier.reply(message);
+ sender.send(message);
}
}
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.jms.server.endpoint.advised;
import static org.jboss.messaging.core.remoting.Assert.assertValidID;
@@ -39,11 +39,13 @@
import org.jboss.jms.delegate.ConnectionEndpoint;
import org.jboss.jms.delegate.IDBlock;
import org.jboss.jms.delegate.SessionDelegate;
+import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
import org.jboss.messaging.core.remoting.wireformat.CreateSessionRequest;
import org.jboss.messaging.core.remoting.wireformat.CreateSessionResponse;
@@ -176,86 +178,91 @@
return id;
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender sender)
{
try
{
+ AbstractPacket response = null;
+
PacketType type = packet.getType();
if (type == REQ_CREATESESSION)
{
CreateSessionRequest request = (CreateSessionRequest) packet;
- ClientSessionDelegate sessionDelegate = (ClientSessionDelegate) createSessionDelegate(request.isTransacted(), request.getAcknowledgementMode(), request.isXA());
- CreateSessionResponse response = new CreateSessionResponse(sessionDelegate.getID(), sessionDelegate.getDupsOKBatchSize(), sessionDelegate.isStrictTck());
- response.normalize(request);
- replier.reply(response);
+ ClientSessionDelegate sessionDelegate = (ClientSessionDelegate) createSessionDelegate(
+ request.isTransacted(), request.getAcknowledgementMode(),
+ request.isXA());
+
+ response = new CreateSessionResponse(sessionDelegate.getID(),
+ sessionDelegate.getDupsOKBatchSize(), sessionDelegate
+ .isStrictTck());
} else if (type == REQ_IDBLOCK)
{
IDBlockRequest request = (IDBlockRequest) packet;
IDBlock idBlock = getIdBlock(request.getSize());
- IDBlockResponse response = new IDBlockResponse(idBlock.getLow(), idBlock.getHigh());
- response.normalize(request);
- replier.reply(response);
+
+ response = new IDBlockResponse(idBlock.getLow(), idBlock
+ .getHigh());
} else if (type == MSG_STARTCONNECTION)
{
start();
} else if (type == MSG_STOPCONNECTION)
{
stop();
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
+
+ response = new NullPacket();
} else if (type == REQ_CLOSING)
{
- org.jboss.messaging.core.remoting.wireformat.ClosingRequest request = (org.jboss.messaging.core.remoting.wireformat.ClosingRequest) packet;
+ ClosingRequest request = (ClosingRequest) packet;
long id = closing(request.getSequence());
- ClosingResponse response = new ClosingResponse(id);
- response.normalize(request);
- replier.reply(response);
+
+ response = new ClosingResponse(id);
} else if (type == MSG_CLOSE)
{
close();
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
+
+ response = new NullPacket();
} else if (type == MSG_SENDTRANSACTION)
{
SendTransactionMessage message = (SendTransactionMessage) packet;
- sendTransaction(message.getTransactionRequest(), message.checkForDuplicates());
- NullPacket response = new NullPacket();
- response.normalize(message);
- replier.reply(response);
+ sendTransaction(message.getTransactionRequest(), message
+ .checkForDuplicates());
+
+ response = new NullPacket();
} else if (type == REQ_GETPREPAREDTRANSACTIONS)
{
MessagingXid[] xids = getPreparedTransactions();
- GetPreparedTransactionsResponse response = new GetPreparedTransactionsResponse(xids);
- response.normalize(packet);
- replier.reply(response);
+
+ response = new GetPreparedTransactionsResponse(xids);
} else if (type == REQ_GETCLIENTID)
{
- GetClientIDResponse response = new GetClientIDResponse(getClientID());
- response.normalize(packet);
- replier.reply(response);
+ response = new GetClientIDResponse(getClientID());
} else if (type == MSG_SETCLIENTID)
{
SetClientIDMessage message = (SetClientIDMessage) packet;
setClientID(message.getClientID());
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
- } else
+
+ response = new NullPacket();
+ } else
{
- System.err.println("Unsupported packet for connection: " + packet);
+ response = new JMSExceptionMessage(new MessagingJMSException(
+ "Unsupported packet for browser: " + packet));
}
+
+ // reply if necessary
+ if (response != null)
+ {
+ response.normalize(packet);
+ sender.send(response);
+ }
+
} catch (JMSException e)
{
JMSExceptionMessage message = new JMSExceptionMessage(e);
message.normalize(packet);
- replier.reply(message);
+ sender.send(message);
}
}
-
+
@Override
public String toString()
{
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -1,24 +1,24 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.jms.server.endpoint.advised;
import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATECONNECTION;
@@ -30,11 +30,12 @@
import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.delegate.TopologyResult;
+import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.jms.server.endpoint.ConnectionFactoryInternalEndpoint;
import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
import org.jboss.messaging.core.remoting.Assert;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.wireformat.CreateConnectionResponse;
@@ -45,7 +46,7 @@
import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
/**
- *
+ *
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -82,7 +83,8 @@
int failedNodeId)
throws JMSException
{
- return endpoint.createConnectionDelegate(username, password, failedNodeId);
+ return endpoint
+ .createConnectionDelegate(username, password, failedNodeId);
}
public byte[] getClientAOPStack() throws JMSException
@@ -165,46 +167,54 @@
return id;
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender sender)
{
try
{
+ AbstractPacket response = null;
+
PacketType type = packet.getType();
if (type == REQ_CREATECONNECTION)
{
CreateConnectionRequest request = (CreateConnectionRequest) packet;
- CreateConnectionResult del =
- createConnectionDelegate(request.getUsername(), request.getPassword(), request.getFailedNodeID(), request.getRemotingSessionID(), request.getClientVMID(), request.getVersion(), null);
+ CreateConnectionResult del = createConnectionDelegate(request
+ .getUsername(), request.getPassword(), request
+ .getFailedNodeID(), request.getRemotingSessionID(),
+ request.getClientVMID(), request.getVersion(), null);
- CreateConnectionResponse response = new CreateConnectionResponse(del.getDelegate().getID(), del.getDelegate().getServerID());
- response.normalize(request);
- replier.reply(response);
+ response = new CreateConnectionResponse(del.getDelegate()
+ .getID(), del.getDelegate().getServerID());
} else if (type == REQ_GETCLIENTAOPSTACK)
{
byte[] stack = getClientAOPStack();
- GetClientAOPStackResponse response = new GetClientAOPStackResponse(stack);
- response.normalize(packet);
- replier.reply(response);
+ response = new GetClientAOPStackResponse(stack);
} else if (type == REQ_GETTOPOLOGY)
{
TopologyResult topology = getTopology();
- GetTopologyResponse response = new GetTopologyResponse(topology);
- response.normalize(packet);
- replier.reply(response);
+ response = new GetTopologyResponse(topology);
} else
{
- System.err.println("unhandled packet:" + packet);
+ response = new JMSExceptionMessage(new MessagingJMSException(
+ "Unsupported packet for browser: " + packet));
}
+
+ // reply if necessary
+ if (response != null)
+ {
+ response.normalize(packet);
+ sender.send(response);
+ }
+
} catch (JMSException e)
{
JMSExceptionMessage message = new JMSExceptionMessage(e);
message.normalize(packet);
- replier.reply(message);
+ sender.send(message);
}
}
-
+
@Override
public String toString()
{
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -51,11 +51,12 @@
import org.jboss.jms.destination.JBossDestination;
import org.jboss.jms.destination.JBossQueue;
import org.jboss.jms.destination.JBossTopic;
+import org.jboss.jms.exception.MessagingJMSException;
import org.jboss.jms.message.JBossMessage;
import org.jboss.jms.server.endpoint.ServerSessionEndpoint;
import org.jboss.jms.server.endpoint.SessionInternalEndpoint;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveriesMessage;
import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryRequest;
@@ -63,6 +64,7 @@
import org.jboss.messaging.core.remoting.wireformat.AddTemporaryDestinationMessage;
import org.jboss.messaging.core.remoting.wireformat.CancelDeliveriesMessage;
import org.jboss.messaging.core.remoting.wireformat.CancelDeliveryMessage;
+import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
import org.jboss.messaging.core.remoting.wireformat.CreateBrowserRequest;
import org.jboss.messaging.core.remoting.wireformat.CreateBrowserResponse;
@@ -89,7 +91,8 @@
*
* $Id$
*/
-public class SessionAdvised extends AdvisedSupport implements SessionInternalEndpoint
+public class SessionAdvised extends AdvisedSupport implements
+ SessionInternalEndpoint
{
// Constants -----------------------------------------------------
@@ -118,7 +121,8 @@
return endpoint.closing(sequence);
}
- public void send(JBossMessage msg, boolean checkForDuplicates) throws JMSException
+ public void send(JBossMessage msg, boolean checkForDuplicates)
+ throws JMSException
{
throw new IllegalStateException("Invocation should not be handle here");
}
@@ -180,7 +184,7 @@
{
endpoint.cancelDeliveries(ackInfos);
}
-
+
public void cancelDelivery(Cancel cancel) throws JMSException
{
endpoint.cancelDelivery(cancel);
@@ -227,26 +231,31 @@
return id;
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender sender)
{
try
{
+ AbstractPacket response = null;
+
PacketType type = packet.getType();
if (type == MSG_SENDMESSAGE)
{
SendMessage message = (SendMessage) packet;
- send(message.getMessage(), message.checkForDuplicates(), message.getSequence());
+ send(message.getMessage(), message.checkForDuplicates(), message
+ .getSequence());
- NullPacket response = new NullPacket();
- response.normalize(message);
- replier.reply(response);
+ response = new NullPacket();
} else if (type == REQ_CREATECONSUMER)
{
CreateConsumerRequest request = (CreateConsumerRequest) packet;
- ClientConsumerDelegate consumer = (ClientConsumerDelegate) createConsumerDelegate(request.getDestination(), request.getSelector(), request.isNoLocal(), request.getSubscriptionName(), request.isConnectionConsumer(), request.isAutoFlowControl());
- CreateConsumerResponse response = new CreateConsumerResponse(consumer.getID(), consumer.getBufferSize(), consumer.getMaxDeliveries(), consumer.getRedeliveryDelay());
- response.normalize(request);
- replier.reply(response);
+ ClientConsumerDelegate consumer = (ClientConsumerDelegate) createConsumerDelegate(
+ request.getDestination(), request.getSelector(), request
+ .isNoLocal(), request.getSubscriptionName(), request
+ .isConnectionConsumer(), request.isAutoFlowControl());
+
+ response = new CreateConsumerResponse(consumer.getID(), consumer
+ .getBufferSize(), consumer.getMaxDeliveries(), consumer
+ .getRedeliveryDelay());
} else if (type == REQ_CREATEDESTINATION)
{
CreateDestinationRequest request = (CreateDestinationRequest) packet;
@@ -258,101 +267,94 @@
{
destination = createTopic(request.getName());
}
- CreateDestinationResponse response = new CreateDestinationResponse(destination);
- response.normalize(request);
- replier.reply(response);
+
+ response = new CreateDestinationResponse(destination);
} else if (type == REQ_CREATEBROWSER)
{
CreateBrowserRequest request = (CreateBrowserRequest) packet;
- ClientBrowserDelegate browser = (ClientBrowserDelegate) createBrowserDelegate(request.getDestination(), request.getSelector());
- CreateBrowserResponse response = new CreateBrowserResponse(browser.getID());
- response.normalize(request);
- replier.reply(response);
+ ClientBrowserDelegate browser = (ClientBrowserDelegate) createBrowserDelegate(
+ request.getDestination(), request.getSelector());
+
+ response = new CreateBrowserResponse(browser.getID());
} else if (type == REQ_ACKDELIVERY)
{
AcknowledgeDeliveryRequest request = (AcknowledgeDeliveryRequest) packet;
- boolean acknowledged = acknowledgeDelivery(new DefaultAck(request.getDeliveryID()));
- AcknowledgeDeliveryResponse response = new AcknowledgeDeliveryResponse(acknowledged);
- response.normalize(request);
- replier.reply(response);
+ boolean acknowledged = acknowledgeDelivery(new DefaultAck(
+ request.getDeliveryID()));
+
+ response = new AcknowledgeDeliveryResponse(acknowledged);
} else if (type == MSG_ACKDELIVERIES)
{
AcknowledgeDeliveriesMessage message = (AcknowledgeDeliveriesMessage) packet;
acknowledgeDeliveries(message.getAcks());
-
- NullPacket p = new NullPacket();
- p.normalize(message);
- replier.reply(p);
+
+ response = new NullPacket();
} else if (type == MSG_RECOVERDELIVERIES)
{
RecoverDeliveriesMessage message = (RecoverDeliveriesMessage) packet;
- recoverDeliveries(message.getDeliveries(), message.getSessionID());
+ recoverDeliveries(message.getDeliveries(), message
+ .getSessionID());
- NullPacket p = new NullPacket();
- p.normalize(message);
- replier.reply(p);
+ response = new NullPacket();
} else if (type == MSG_CANCELDELIVERY)
{
CancelDeliveryMessage message = (CancelDeliveryMessage) packet;
cancelDelivery(message.getCancel());
-
- NullPacket p = new NullPacket();
- p.normalize(message);
- replier.reply(p);
+
+ response = new NullPacket();
} else if (type == MSG_CANCELDELIVERIES)
{
CancelDeliveriesMessage message = (CancelDeliveriesMessage) packet;
cancelDeliveries(message.getCancels());
-
- NullPacket p = new NullPacket();
- p.normalize(message);
- replier.reply(p);
+
+ response = new NullPacket();
} else if (type == REQ_CLOSING)
{
- org.jboss.messaging.core.remoting.wireformat.ClosingRequest request = (org.jboss.messaging.core.remoting.wireformat.ClosingRequest) packet;
+ ClosingRequest request = (ClosingRequest) packet;
long id = closing(request.getSequence());
- ClosingResponse response = new ClosingResponse(id);
- response.normalize(request);
- replier.reply(response);
+
+ response = new ClosingResponse(id);
} else if (type == MSG_CLOSE)
{
close();
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
+
+ response = new NullPacket();
} else if (type == MSG_UNSUBSCRIBE)
{
UnsubscribeMessage message = (UnsubscribeMessage) packet;
unsubscribe(message.getSubscriptionName());
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
+
+ response = new NullPacket();
} else if (type == MSG_ADDTEMPORARYDESTINATION)
{
AddTemporaryDestinationMessage message = (AddTemporaryDestinationMessage) packet;
addTemporaryDestination(message.getDestination());
-
- NullPacket response = new NullPacket();
- response.normalize(packet);
- replier.reply(response);
+
+ response = new NullPacket();
} else if (type == MSG_DELETETEMPORARYDESTINATION)
{
DeleteTemporaryDestinationMessage message = (DeleteTemporaryDestinationMessage) packet;
deleteTemporaryDestination(message.getDestination());
-
- NullPacket response = new NullPacket();
+
+ response = new NullPacket();
+ } else
+ {
+ response = new JMSExceptionMessage(new MessagingJMSException(
+ "Unsupported packet for browser: " + packet));
+ }
+
+ // reply if necessary
+ if (response != null)
+ {
response.normalize(packet);
- replier.reply(response);
- } else {
- //log.error("Unsupported packet for session: " + packet);
+ sender.send(response);
}
+
} catch (JMSException e)
{
JMSExceptionMessage message = new JMSExceptionMessage(e);
message.normalize(packet);
- replier.reply(message);
+ sender.send(message);
}
}
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/AbstractPacketHandler.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -54,7 +54,7 @@
return id;
}
- public abstract void handle(AbstractPacket packet, PacketReplier replier);
+ public abstract void handle(AbstractPacket packet, PacketSender sender);
// Package protected ---------------------------------------------
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/Constants.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -23,8 +23,6 @@
public static final String NO_ID_SET = "NO_ID_SET";
- public static final int PORT = 9090;
-
public static final String PACKET_TYPE_HEADER = "PACKET_TYPE";
public static final String TARGET_ID_HEADER = "TARGET_ID";
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketHandler.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -35,5 +35,5 @@
*/
String getID();
- void handle(AbstractPacket packet, PacketReplier replier);
+ void handle(AbstractPacket packet, PacketSender sender);
}
Deleted: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketReplier.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketReplier.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketReplier.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -1,20 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting;
-
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public interface PacketReplier
-{
- void reply(AbstractPacket packet);
-}
Copied: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketSender.java (from rev 3378, branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketReplier.java)
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketSender.java (rev 0)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/PacketSender.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -0,0 +1,20 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting;
+
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public interface PacketSender
+{
+ void send(AbstractPacket packet);
+}
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/internal/ClientHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/internal/ClientHandler.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/internal/ClientHandler.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -11,7 +11,7 @@
import org.apache.mina.filter.reqres.Response;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
/**
@@ -46,8 +46,8 @@
if (handler != null)
{
System.err.println("ClientHandler.messageReceived() handler: " + handler);
- handler.handle(packet, new PacketReplier() {
- public void reply(AbstractPacket p)
+ handler.handle(packet, new PacketSender() {
+ public void send(AbstractPacket p)
{
session.write(p);
}
Modified: branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/server/ServerHandler.java
===================================================================
--- branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/server/ServerHandler.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/src/main/org/jboss/messaging/core/remoting/server/ServerHandler.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -11,7 +11,7 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
/**
@@ -57,8 +57,8 @@
PacketHandler handler = PacketDispatcher.server.getHandler(targetID);
if (handler != null)
{
- handler.handle(packet, new PacketReplier() {
- public void reply(AbstractPacket p)
+ handler.handle(packet, new PacketSender() {
+ public void send(AbstractPacket p)
{
session.write(p);
}
Modified: branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/RemoteDispatcherTest.java
===================================================================
--- branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/RemoteDispatcherTest.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/RemoteDispatcherTest.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -8,7 +8,6 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jboss.messaging.core.remoting.Constants.PORT;
import java.util.ArrayList;
import java.util.List;
@@ -16,7 +15,7 @@
import org.jboss.messaging.core.remoting.AbstractPacketHandler;
import org.jboss.messaging.core.remoting.Client;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.NullPacket;
import org.jboss.messaging.core.remoting.wireformat.TextPacket;
@@ -145,8 +144,8 @@
@Override
protected void setUp() throws Exception
{
- startServer(PORT, TRANSPORT);
- startClient(PORT, TRANSPORT);
+ startServer(TestSupport.PORT, TRANSPORT);
+ startClient(TestSupport.PORT, TRANSPORT);
}
@Override
@@ -173,7 +172,7 @@
packets = new ArrayList<TextPacket>();
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender replier)
{
packets.add((TextPacket) packet);
}
Modified: branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TargetHandlerTest.java
===================================================================
--- branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TargetHandlerTest.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TargetHandlerTest.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -6,7 +6,6 @@
*/
package org.jboss.test.messaging.core.remoting;
-import static org.jboss.messaging.core.remoting.Constants.PORT;
import java.util.ArrayList;
import java.util.List;
@@ -14,7 +13,7 @@
import org.apache.mina.common.IoSession;
import org.jboss.messaging.core.remoting.AbstractPacketHandler;
import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketReplier;
+import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.wireformat.TextPacket;
@@ -96,7 +95,7 @@
packets = new ArrayList<TextPacket>();
}
- public void handle(AbstractPacket packet, PacketReplier replier)
+ public void handle(AbstractPacket packet, PacketSender replier)
{
packets.add((TextPacket) packet);
}
Modified: branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestSupport.java
===================================================================
--- branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestSupport.java 2007-11-28 13:40:50 UTC (rev 3379)
+++ branches/Branch_JBMESSAGING-544/tests/src/org/jboss/test/messaging/core/remoting/TestSupport.java 2007-11-28 14:37:24 UTC (rev 3380)
@@ -47,6 +47,8 @@
Client client;
+ public static final int PORT = 9090;
+
// Static --------------------------------------------------------
static
More information about the jboss-cvs-commits
mailing list