[jboss-cvs] JBoss Messaging SVN: r3829 - in trunk: src/main/org/jboss/messaging/core/client and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 28 05:58:16 EST 2008
Author: timfox
Date: 2008-02-28 05:58:16 -0500 (Thu, 28 Feb 2008)
New Revision: 3829
Added:
trunk/src/main/org/jboss/messaging/core/exception/
trunk/src/main/org/jboss/messaging/core/exception/MessagingException.java
Removed:
trunk/src/main/org/jboss/messaging/core/server/MessagingException.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java
trunk/src/main/org/jboss/messaging/core/client/ClientConnection.java
trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java
trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java
trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java
trunk/src/main/org/jboss/messaging/core/client/ClientSession.java
trunk/src/main/org/jboss/messaging/core/client/FailureListener.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java
trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java
trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/Interceptor.java
trunk/src/main/org/jboss/messaging/core/remoting/RemotingException.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/MessagingExceptionMessageCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FailureNotifier.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaKeepAliveFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ConnectionManagerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java
trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java
trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java
trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
trunk/tests/src/org/jboss/messaging/core/filter/impl/test/unit/FilterTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptor.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptorB.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaKeepAliveFactoryTest.java
trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java
trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java
Log:
A few more moves
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientBrowser.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -7,8 +7,8 @@
package org.jboss.messaging.core.client;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientConnection.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientConnection.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -7,7 +7,7 @@
package org.jboss.messaging.core.client;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientConnectionFactory.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.client;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.version.Version;
/**
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientConsumer.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -7,8 +7,8 @@
package org.jboss.messaging.core.client;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientProducer.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -7,8 +7,8 @@
package org.jboss.messaging.core.client;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientSession.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientSession.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -9,9 +9,9 @@
import javax.transaction.xa.XAResource;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/FailureListener.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/FailureListener.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/FailureListener.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -21,7 +21,7 @@
*/
package org.jboss.messaging.core.client;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientBrowserImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -22,6 +22,7 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.client.ClientBrowser;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageMessage;
@@ -31,7 +32,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserResetMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionFactoryImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -25,13 +25,13 @@
import org.jboss.messaging.core.client.ClientConnection;
import org.jboss.messaging.core.client.ClientConnectionFactory;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.version.Version;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConnectionImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -28,13 +28,13 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionStartMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionStopMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
* The client-side Connection connectionFactory class.
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -26,6 +26,7 @@
import java.util.concurrent.TimeUnit;
import org.jboss.messaging.core.client.MessageHandler;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.list.PriorityLinkedList;
import org.jboss.messaging.core.list.impl.PriorityLinkedListImpl;
import org.jboss.messaging.core.logging.Logger;
@@ -33,7 +34,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.CloseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -7,8 +7,8 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -22,11 +22,11 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.client.AcknowledgementHandler;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
* The client-side Producer connectionFactory class.
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -36,6 +36,7 @@
import org.jboss.messaging.core.client.ClientBrowser;
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
@@ -75,7 +76,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASuspendMessage;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.jms.client.SelectorTranslator;
/**
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionInternal.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -8,7 +8,7 @@
import org.jboss.messaging.core.client.ClientBrowser;
import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnection.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -1,9 +1,9 @@
package org.jboss.messaging.core.client.impl;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/RemotingConnectionImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -25,6 +25,7 @@
import static org.jboss.messaging.core.remoting.ConnectorRegistrySingleton.REGISTRY;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.NIOConnector;
import org.jboss.messaging.core.remoting.NIOSession;
@@ -32,7 +33,6 @@
import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Copied: trunk/src/main/org/jboss/messaging/core/exception/MessagingException.java (from rev 3826, trunk/src/main/org/jboss/messaging/core/server/MessagingException.java)
===================================================================
--- trunk/src/main/org/jboss/messaging/core/exception/MessagingException.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/exception/MessagingException.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -0,0 +1,90 @@
+/*
+ * 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.messaging.core.exception;
+
+/**
+ *
+ * A MessagingException
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ */
+public class MessagingException extends Exception
+{
+ private static final long serialVersionUID = -4802014152804997417L;
+
+ // Error codes -------------------------------------------------
+
+ public static final int INTERNAL_ERROR = 000;
+
+ public static final int UNSUPPORTED_PACKET = 001;
+
+ public static final int NOT_CONNECTED = 002;
+
+ public static final int CONNECTION_TIMEDOUT = 003;
+
+
+ public static final int QUEUE_DOES_NOT_EXIST = 100;
+
+ public static final int QUEUE_EXISTS = 101;
+
+ public static final int OBJECT_CLOSED = 102;
+
+ public static final int INVALID_FILTER_EXPRESSION = 103;
+
+ public static final int ILLEGAL_STATE = 104;
+
+ public static final int SECURITY_EXCEPTION = 105;
+
+ public static final int ADDRESS_DOES_NOT_EXIST = 106;
+
+ public static final int ADDRESS_EXISTS = 107;
+
+ private int code;
+
+ public MessagingException()
+ {
+ }
+
+ public MessagingException(int code)
+ {
+ this.code = code;
+ }
+
+ public MessagingException(int code, String msg)
+ {
+ super(msg);
+
+ this.code = code;
+ }
+
+ public int getCode()
+ {
+ return code;
+ }
+
+ public String toString()
+ {
+ return "MessagingException[errorCode=" + code + " message=" + getMessage() + "]";
+ }
+
+}
Modified: trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/filter/impl/FilterImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -24,10 +24,10 @@
import java.util.HashMap;
import java.util.Map;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.server.MessagingException;
/**
* This class implements a JBoss Messaging filter
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerManagementImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -35,6 +35,7 @@
import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.messaging.core.client.ClientConnectionFactory;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.management.MessagingServerManagement;
@@ -43,7 +44,6 @@
import org.jboss.messaging.core.messagecounter.MessageCounter;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.server.MessagingComponent;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.MessagingServer;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerConnection;
Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -30,6 +30,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
@@ -37,7 +38,6 @@
import org.jboss.messaging.core.persistence.PersistenceManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.PostOffice;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.QueueFactory;
import org.jboss.messaging.util.ConcurrentHashSet;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/Interceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/Interceptor.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/Interceptor.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -7,8 +7,8 @@
package org.jboss.messaging.core.remoting;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/RemotingException.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/RemotingException.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/RemotingException.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -6,7 +6,7 @@
*/
package org.jboss.messaging.core.remoting;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/MessagingExceptionMessageCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/MessagingExceptionMessageCodec.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/codec/MessagingExceptionMessageCodec.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -8,8 +8,8 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.EXCEPTION;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FailureNotifier.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FailureNotifier.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/FailureNotifier.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -6,7 +6,7 @@
*/
package org.jboss.messaging.core.remoting.impl.mina;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnector.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -30,6 +30,7 @@
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
import org.jboss.messaging.core.remoting.NIOConnector;
@@ -39,7 +40,6 @@
import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaHandler.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -9,6 +9,7 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.reqres.Response;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.PacketSender;
@@ -16,7 +17,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.AbstractPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaKeepAliveFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaKeepAliveFactory.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaKeepAliveFactory.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -8,12 +8,12 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.keepalive.KeepAliveMessageFactory;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
import org.jboss.messaging.core.remoting.RemotingException;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -28,6 +28,7 @@
import org.jboss.beans.metadata.api.annotations.Install;
import org.jboss.beans.metadata.api.annotations.Uninstall;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.PacketDispatcher;
import org.jboss.messaging.core.remoting.Interceptor;
@@ -35,7 +36,6 @@
import org.jboss.messaging.core.remoting.RemotingService;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/MessagingExceptionMessage.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -8,7 +8,7 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.EXCEPTION;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -27,11 +27,11 @@
import javax.security.auth.Subject;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.security.CheckType;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.core.security.SecurityStore;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.ServerConnection;
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.HierarchicalRepositoryChangeListener;
Deleted: trunk/src/main/org/jboss/messaging/core/server/MessagingException.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/MessagingException.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/MessagingException.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -1,90 +0,0 @@
-/*
- * 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.messaging.core.server;
-
-/**
- *
- * A MessagingException
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public class MessagingException extends Exception
-{
- private static final long serialVersionUID = -4802014152804997417L;
-
- // Error codes -------------------------------------------------
-
- public static final int INTERNAL_ERROR = 000;
-
- public static final int UNSUPPORTED_PACKET = 001;
-
- public static final int NOT_CONNECTED = 002;
-
- public static final int CONNECTION_TIMEDOUT = 003;
-
-
- public static final int QUEUE_DOES_NOT_EXIST = 100;
-
- public static final int QUEUE_EXISTS = 101;
-
- public static final int OBJECT_CLOSED = 102;
-
- public static final int INVALID_FILTER_EXPRESSION = 103;
-
- public static final int ILLEGAL_STATE = 104;
-
- public static final int SECURITY_EXCEPTION = 105;
-
- public static final int ADDRESS_DOES_NOT_EXIST = 106;
-
- public static final int ADDRESS_EXISTS = 107;
-
- private int code;
-
- public MessagingException()
- {
- }
-
- public MessagingException(int code)
- {
- this.code = code;
- }
-
- public MessagingException(int code, String msg)
- {
- super(msg);
-
- this.code = code;
- }
-
- public int getCode()
- {
- return code;
- }
-
- public String toString()
- {
- return "MessagingException[errorCode=" + code + " message=" + getMessage() + "]";
- }
-
-}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ConnectionManagerImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ConnectionManagerImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -31,10 +31,10 @@
import org.jboss.messaging.core.client.FailureListener;
import org.jboss.messaging.core.client.impl.JMSClientVMIdentifier;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.RemotingException;
import org.jboss.messaging.core.server.ConnectionManager;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.ServerConnection;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerPacketHandler.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -25,11 +25,11 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.core.client.impl.ClientConnectionFactoryImpl;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.MessagingServer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerBrowserImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.UUID;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.logging.Logger;
@@ -43,7 +44,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserHasNextMessageResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBrowserNextMessageResponseMessage;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerSession;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConnectionPacketHandler.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -26,12 +26,12 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_START;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONN_STOP;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.ConnectionCreateSessionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.ServerConnection;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerPacketHandler.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -24,12 +24,12 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CONS_FLOWTOKEN;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerFlowTokenMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.ServerConsumer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerPacketHandlerSupport.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -22,11 +22,11 @@
package org.jboss.messaging.core.server.impl;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketHandler;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.MessagingExceptionMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerProducerPacketHandler.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -24,12 +24,12 @@
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.CLOSE;
import static org.jboss.messaging.core.remoting.impl.wireformat.PacketType.PROD_SEND;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
import org.jboss.messaging.core.remoting.impl.wireformat.PacketType;
import org.jboss.messaging.core.remoting.impl.wireformat.ProducerSendMessage;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.ServerProducer;
/**
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -36,6 +36,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.logging.Logger;
@@ -58,7 +59,6 @@
import org.jboss.messaging.core.security.SecurityStore;
import org.jboss.messaging.core.server.Delivery;
import org.jboss.messaging.core.server.FlowController;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.Queue;
import org.jboss.messaging.core.server.ServerConnection;
import org.jboss.messaging.core.server.ServerConsumer;
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionPacketHandler.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -50,6 +50,7 @@
import javax.transaction.xa.Xid;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.PacketSender;
import org.jboss.messaging.core.remoting.impl.wireformat.NullPacket;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
@@ -77,7 +78,6 @@
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXASetTimeoutResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionXAStartMessage;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.server.ServerSession;
/**
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -47,8 +47,8 @@
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.FailureListener;
import org.jboss.messaging.core.client.impl.ClientConnectionInternal;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.core.version.Version;
/**
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -41,8 +41,8 @@
import org.jboss.messaging.core.client.ClientConnection;
import org.jboss.messaging.core.client.ClientConnectionFactory;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.jms.referenceable.SerializableObjectRefAddr;
/**
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -39,9 +39,9 @@
import javax.jms.MessageNotWriteableException;
import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessageConsumer.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -34,8 +34,8 @@
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.MessageHandler;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessageProducer.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -41,8 +41,8 @@
import javax.jms.TopicPublisher;
import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.jms.JBossDestination;
/**
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossQueueBrowser.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -28,9 +28,9 @@
import javax.jms.QueueBrowser;
import org.jboss.messaging.core.client.ClientBrowser;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -61,10 +61,10 @@
import org.jboss.messaging.core.client.ClientConsumer;
import org.jboss.messaging.core.client.ClientProducer;
import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.messaging.jms.JBossDestination;
import org.jboss.messaging.jms.JBossQueue;
import org.jboss.messaging.jms.JBossTemporaryQueue;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JMSExceptionHelper.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -26,7 +26,7 @@
import javax.jms.JMSException;
import javax.jms.JMSSecurityException;
-import org.jboss.messaging.core.server.MessagingException;
+import org.jboss.messaging.core.exception.MessagingException;
/**
*
Modified: trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -25,9 +25,9 @@
import javax.jms.Session;
import org.jboss.messaging.core.client.MessageHandler;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
-import org.jboss.messaging.core.server.MessagingException;
/**
*
Modified: trunk/tests/src/org/jboss/messaging/core/filter/impl/test/unit/FilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/filter/impl/test/unit/FilterTest.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/messaging/core/filter/impl/test/unit/FilterTest.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -21,11 +21,11 @@
*/
package org.jboss.messaging.core.filter.impl.test.unit;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.test.messaging.JBMBaseTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptor.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptor.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptor.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -9,11 +9,11 @@
import java.util.concurrent.atomic.AtomicInteger;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Interceptor;
import org.jboss.messaging.core.remoting.impl.wireformat.ConsumerDeliverMessage;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.server.MessagingException;
public class DummyInterceptor implements Interceptor
{
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptorB.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptorB.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/integration/DummyInterceptorB.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -9,10 +9,10 @@
import java.util.concurrent.atomic.AtomicInteger;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.Interceptor;
import org.jboss.messaging.core.remoting.impl.wireformat.Packet;
-import org.jboss.messaging.core.server.MessagingException;
public class DummyInterceptorB implements Interceptor
{
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ClientKeepAliveTest.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.RemotingException;
@@ -33,7 +34,6 @@
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaKeepAliveFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaKeepAliveFactoryTest.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/MinaKeepAliveFactoryTest.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -17,11 +17,11 @@
import junit.framework.TestCase;
import org.apache.mina.common.IoSession;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.KeepAliveFactory;
import org.jboss.messaging.core.remoting.impl.mina.FailureNotifier;
import org.jboss.messaging.core.remoting.impl.mina.MinaKeepAliveFactory;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/ServerKeepAliveTest.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -17,6 +17,7 @@
import junit.framework.TestCase;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.NIOSession;
import org.jboss.messaging.core.remoting.RemotingException;
import org.jboss.messaging.core.remoting.impl.PacketDispatcherImpl;
@@ -26,7 +27,6 @@
import org.jboss.messaging.core.remoting.impl.mina.ServerKeepAliveFactory;
import org.jboss.messaging.core.remoting.impl.wireformat.Ping;
import org.jboss.messaging.core.remoting.impl.wireformat.Pong;
-import org.jboss.messaging.core.server.MessagingException;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java 2008-02-28 10:55:34 UTC (rev 3828)
+++ trunk/tests/src/org/jboss/test/messaging/jms/network/ClientNetworkFailureTest.java 2008-02-28 10:58:16 UTC (rev 3829)
@@ -33,9 +33,9 @@
import javax.jms.QueueConnection;
import org.jboss.messaging.core.client.FailureListener;
+import org.jboss.messaging.core.exception.MessagingException;
import org.jboss.messaging.core.remoting.impl.RemotingConfiguration;
import org.jboss.messaging.core.remoting.impl.mina.MinaService;
-import org.jboss.messaging.core.server.MessagingException;
import org.jboss.test.messaging.jms.JMSTestCase;
/**
More information about the jboss-cvs-commits
mailing list