You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2007/09/19 11:57:01 UTC
svn commit: r577226 - in
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms:
./ message/
Author: arnaudsimon
Date: Wed Sep 19 02:56:58 2007
New Revision: 577226
URL: http://svn.apache.org/viewvc?rev=577226&view=rev
Log:
added njms
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionFactoryImpl.java Wed Sep 19 02:56:58 2007
@@ -1,4 +1,4 @@
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.*;
import javax.naming.*;
@@ -9,7 +9,6 @@
import org.apache.qpidity.url.QpidURLImpl;
import org.apache.qpidity.url.QpidURL;
import org.apache.qpidity.url.BindingURLImpl;
-import org.apache.qpidity.url.URLSyntaxException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import java.util.Vector;
@@ -35,13 +35,13 @@
import org.apache.qpidity.QpidException;
import org.apache.qpidity.url.QpidURL;
-import org.apache.qpidity.client.Client;
+import org.apache.qpidity.nclient.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Implements javax.jms.Connection, javax.jms.QueueConnection and javax.jms.TopicConnection
+ * Implements javax.njms.Connection, javax.njms.QueueConnection and javax.njms.TopicConnection
*/
public class ConnectionImpl implements Connection
{
@@ -75,7 +75,7 @@
* set to true if this Connection has been closed.
* <p/>
* A closed Connection cannot accept invocations to any of its methods with the exception
- * of close(). All other methods should throw javax.jms.IllegalStateExceptions if the
+ * of close(). All other methods should throw javax.njms.IllegalStateExceptions if the
* Connection has been closed.
* <p/>
* A Connection is open after creation, but not started. Once it has been closed, a Connection
@@ -87,11 +87,11 @@
/**
* The QpidConeection instance that is mapped with thie JMS connection
*/
- org.apache.qpidity.client.Connection _qpidConnection;
+ org.apache.qpidity.nclient.Connection _qpidConnection;
/**
* This is the exception listener for this qpid connection.
- * The jms exception listener is registered with this listener.
+ * The njms exception listener is registered with this listener.
*/
QpidExceptionListenerImpl _qpidExceptionListener;
@@ -125,7 +125,7 @@
_qpidConnection.connect(qpidURL);
}
- //---- Interface javax.jms.Connection ---//
+ //---- Interface javax.njms.Connection ---//
/**
* Creates a Session
*
@@ -496,7 +496,7 @@
*
* @return This JMS connection underlying Qpid Connection.
*/
- protected org.apache.qpidity.client.Connection getQpidConnection()
+ protected org.apache.qpidity.nclient.Connection getQpidConnection()
{
return _qpidConnection;
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ConnectionMetaDataImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpid.common.QpidProperties;
@@ -24,7 +24,7 @@
import java.util.Enumeration;
/**
- * Implements javax.jms.ConnectionMetaData
+ * Implements javax.njms.ConnectionMetaData
* A ConnectionMetaDataImpl provides information describing the JMS <code>Connection</code>.
*/
public class ConnectionMetaDataImpl implements ConnectionMetaData
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/CustomJMSXProperty.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import java.util.Enumeration;
import java.util.ArrayList;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/DestinationImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
import org.apache.qpidity.url.BindingURL;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/ExceptionHelper.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageActor.java Wed Sep 19 02:56:58 2007
@@ -15,11 +15,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpidity.QpidException;
import javax.jms.IllegalStateException;
import javax.jms.JMSException;
@@ -75,7 +74,7 @@
_messageActorID = messageActorID;
}
- //--- public methods (part of the jms public API)
+ //--- public methods (part of the njms public API)
/**
* Closes the MessageActor and deregister it from its session.
*
@@ -119,7 +118,7 @@
/**
* Check if this MessageActor is not closed.
- * <p> If the MessageActor is closed, throw a javax.jms.IllegalStateException.
+ * <p> If the MessageActor is closed, throw a javax.njms.IllegalStateException.
* <p> The method is not synchronized, since MessageProducers can only be used by a single thread.
*
* @throws IllegalStateException if the MessageActor is closed
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -27,13 +27,13 @@
import javax.jms.Queue;
import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.MessagePartListener;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
import org.apache.qpidity.exchange.ExchangeDefaults;
import org.apache.qpidity.filter.JMSSelectorFilter;
import org.apache.qpidity.filter.MessageFilter;
-import org.apache.qpidity.jms.message.MessageFactory;
-import org.apache.qpidity.jms.message.QpidMessage;
+import org.apache.qpidity.njms.message.MessageFactory;
+import org.apache.qpidity.njms.message.QpidMessage;
import org.apache.qpidity.transport.Option;
import org.apache.qpidity.transport.RangeSet;
@@ -41,7 +41,7 @@
* Implementation of JMS message consumer
*/
public class MessageConsumerImpl extends MessageActor
- implements MessageConsumer, org.apache.qpidity.client.util.MessageListener
+ implements MessageConsumer, org.apache.qpidity.nclient.util.MessageListener
{
// we can receive up to 100 messages for an asynchronous listener
public static final int MAX_MESSAGE_TRANSFERRED = 100;
@@ -127,9 +127,9 @@
getSession().getQpidSession()
.messageSubscribe(destination.getQpidQueueName(), // queue
getMessageActorID(), // destination
- org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+ org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
// When the message selctor is set we do not acquire the messages
- _messageSelector != null ? org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE : org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
+ _messageSelector != null ? org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE : org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
messageAssembler, null, _noLocal ? Option.NO_LOCAL : Option.NO_OPTION);
if (_messageSelector != null)
{
@@ -162,9 +162,9 @@
// subscribe to this topic
getSession().getQpidSession()
.messageSubscribe(queueName, getMessageActorID(),
- org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+ org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
// We always acquire the messages
- org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
+ org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE,
messageAssembler, null, _noLocal ? Option.NO_LOCAL : Option.NO_OPTION,
// Request exclusive subscription access, meaning only this subscription
// can access the queue.
@@ -173,7 +173,7 @@
}
// set the flow mode
getSession().getQpidSession()
- .messageFlowMode(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_MODE_CREDIT);
+ .messageFlowMode(getMessageActorID(), org.apache.qpidity.nclient.Session.MESSAGE_FLOW_MODE_CREDIT);
// this will prevent the broker from sending more than one message
// When a messageListener is set the flow will be adjusted.
@@ -381,7 +381,7 @@
private void requestCredit(int value)
{
getSession().getQpidSession()
- .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE, value);
+ .messageFlow(getMessageActorID(), org.apache.qpidity.nclient.Session.MESSAGE_FLOW_UNIT_MESSAGE, value);
}
/**
@@ -631,7 +631,7 @@
ranges.add(message.getMessageTransferId());
getSession().getQpidSession()
- .messageAcquire(ranges, org.apache.qpidity.client.Session.MESSAGE_ACQUIRE_ANY_AVAILABLE_MESSAGE);
+ .messageAcquire(ranges, org.apache.qpidity.nclient.Session.MESSAGE_ACQUIRE_ANY_AVAILABLE_MESSAGE);
getSession().getQpidSession().sync();
RangeSet acquired = getSession().getQpidSession().getAccquiredMessages();
if (acquired.size() > 0)
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageProducerImpl.java Wed Sep 19 02:56:58 2007
@@ -15,10 +15,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
-import org.apache.qpidity.jms.message.MessageHelper;
-import org.apache.qpidity.jms.message.MessageImpl;
+import org.apache.qpidity.njms.message.MessageHelper;
+import org.apache.qpidity.njms.message.MessageImpl;
import org.apache.qpidity.QpidException;
import javax.jms.*;
@@ -61,7 +61,7 @@
super(session, destination,"");
}
- //--- Interface javax.jms.MessageProducer
+ //--- Interface javax.njms.MessageProducer
/**
* Sets whether message IDs are disabled.
*
@@ -153,7 +153,7 @@
/**
* Sets the producer's message priority.
- * <p> The jms spec says:
+ * <p> The njms spec says:
* <p> The JMS API defines ten levels of priority value, with 0 as the
* lowest priority and 9 as the highest. Clients should consider priorities
* 0-4 as gradations of normal priority and priorities 5-9 as gradations
@@ -373,8 +373,8 @@
{
getSession().getQpidSession().messageTransfer(qpidMessage.getExchangeName(),
qpidMessage.getQpidityMessage(),
- org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
- org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE);
+ org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+ org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE);
}
catch (IOException e)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidBrowserListener.java Wed Sep 19 02:56:58 2007
@@ -15,12 +15,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpidity.api.Message;
-import org.apache.qpidity.client.util.MessageListener;
+import org.apache.qpidity.nclient.util.MessageListener;
/**
* This listener idspatches messaes to its browser.
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidExceptionListenerImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
@@ -42,7 +42,7 @@
{
// convert this exception in a JMS exception
JMSException jmsException = ExceptionHelper.convertQpidExceptionToJMSException(exception);
- // propagate to the jms exception listener
+ // propagate to the njms exception listener
if (_jmsExceptionListener != null)
{
_jmsExceptionListener.onException(jmsException);
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueBrowserImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import java.util.Enumeration;
import java.util.NoSuchElementException;
@@ -25,8 +25,8 @@
import javax.jms.Queue;
import javax.jms.QueueBrowser;
-import org.apache.qpidity.client.MessagePartListener;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.MessagePartListener;
+import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
import org.apache.qpidity.filter.JMSSelectorFilter;
import org.apache.qpidity.filter.MessageFilter;
@@ -94,13 +94,13 @@
// this is a queue we expect that this queue exists
getSession().getQpidSession()
.messageSubscribe(queue.getQueueName(), getMessageActorID(),
- org.apache.qpidity.client.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
+ org.apache.qpidity.nclient.Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED,
// We do not acquire those messages
- org.apache.qpidity.client.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE, messageAssembler, null);
+ org.apache.qpidity.nclient.Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE, messageAssembler, null);
}
- //--- javax.jms.QueueBrowser API
+ //--- javax.njms.QueueBrowser API
/**
* Get an enumeration for browsing the current queue messages in the order they would be received.
*
@@ -169,7 +169,7 @@
// request messages
int received = 0;
getSession().getQpidSession()
- .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE,
+ .messageFlow(getMessageActorID(), org.apache.qpidity.nclient.Session.MESSAGE_FLOW_UNIT_MESSAGE,
_maxbatchlength);
_batchLength = 0; //getSession().getQpidSession().messageFlush(getMessageActorID());
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueConnectionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,17 +15,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
-import org.apache.qpidity.jms.ConnectionImpl;
+import org.apache.qpidity.njms.ConnectionImpl;
import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.Client;
import javax.jms.QueueConnection;
/**
*
- * Implements javax.jms.QueueConnection
+ * Implements javax.njms.QueueConnection
*/
public class QueueConnectionImpl extends ConnectionImpl implements QueueConnection
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
import org.apache.qpidity.transport.Option;
@@ -93,7 +93,7 @@
_isExclusive = false;
}
- //---- Interface javax.jms.Queue
+ //---- Interface javax.njms.Queue
/**
* Gets the name of this queue.
*
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueReceiverImpl.java Wed Sep 19 02:56:58 2007
@@ -15,14 +15,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.QueueReceiver;
import javax.jms.JMSException;
import javax.jms.Queue;
/**
- * Implements javax.jms.QueueReceiver
+ * Implements javax.njms.QueueReceiver
*/
public class QueueReceiverImpl extends MessageConsumerImpl implements QueueReceiver
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSenderImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.QueueSender;
import javax.jms.JMSException;
@@ -23,7 +23,7 @@
import javax.jms.Message;
/**
- * Implements javax.jms.QueueSender
+ * Implements javax.njms.QueueSender
*/
public class QueueSenderImpl extends MessageProducerImpl implements QueueSender
{
@@ -40,7 +40,7 @@
super(session, queue);
}
- //--- Interface javax.jms.QueueSender
+ //--- Interface javax.njms.QueueSender
/**
* Get the queue associated with this QueueSender.
*
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QueueSessionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.*;
import javax.jms.IllegalStateException;
@@ -23,7 +23,7 @@
import org.apache.qpidity.QpidException;
/**
- * Implementation of javax.jms.QueueSession
+ * Implementation of javax.njms.QueueSession
*/
public class QueueSessionImpl extends SessionImpl implements QueueSession
{
@@ -96,7 +96,7 @@
throw new IllegalStateException("Cannot invoke unsubscribe from QueueSession");
}
- //--- Interface javax.jms.QueueSession
+ //--- Interface javax.njms.QueueSession
/**
* Create a QueueReceiver to receive messages from the specified queue.
*
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/SessionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,11 +15,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpidity.jms.message.*;
+import org.apache.qpidity.njms.message.*;
import org.apache.qpidity.QpidException;
import org.apache.qpidity.transport.RangeSet;
@@ -106,7 +106,7 @@
/**
* The underlying QpidSession
*/
- private org.apache.qpidity.client.Session _qpidSession;
+ private org.apache.qpidity.nclient.Session _qpidSession;
/**
* The latest qpid Exception that has been reaised.
@@ -166,7 +166,7 @@
initMessageDispatcherThread();
}
- //--- javax.jms.Session API
+ //--- javax.njms.Session API
/**
* Creates a <CODE>BytesMessage</CODE> object used to send a message
* containing a stream of uninterpreted bytes.
@@ -374,7 +374,7 @@
* <P>Closing a transacted session must roll back the transaction in progress.
* <P>This method is the only <code>Session</code> method that can be called concurrently.
* <P>Invoking any other <code>Session</code> method on a closed session
- * must throw a <code>javax.jms.IllegalStateException</code>.
+ * must throw a <code>javax.njms.IllegalStateException</code>.
* <p> Closing a closed session must <I>not</I> throw an exception.
*
* @throws JMSException If closing the session fails due to some internal error.
@@ -1100,7 +1100,7 @@
*
* @return The associated Qpid Session.
*/
- protected org.apache.qpidity.client.Session getQpidSession()
+ protected org.apache.qpidity.nclient.Session getQpidSession()
{
return _qpidSession;
}
@@ -1160,7 +1160,7 @@
/**
* Lstener for qpid protocol exceptions
*/
- private class QpidSessionExceptionListener implements org.apache.qpidity.client.ExceptionListener
+ private class QpidSessionExceptionListener implements org.apache.qpidity.nclient.ExceptionListener
{
public void onException(QpidException exception)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryDestination.java Wed Sep 19 02:56:58 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.JMSException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryQueueImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TemporaryTopicImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicConnectionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,14 +15,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
import javax.jms.TopicConnection;
/**
- * Implements javax.jms.TopicConnection
+ * Implements javax.njms.TopicConnection
*/
public class TopicConnectionImpl extends ConnectionImpl implements TopicConnection
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
import org.apache.qpidity.exchange.ExchangeDefaults;
@@ -26,7 +26,7 @@
import java.util.UUID;
/**
- * Implementation of the javax.jms.Topic interface.
+ * Implementation of the javax.njms.Topic interface.
*/
public class TopicImpl extends DestinationImpl implements Topic
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicPublisherImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.*;
@@ -37,7 +37,7 @@
super(session, (DestinationImpl) topic);
}
- //--- Interface javax.jms.TopicPublisher
+ //--- Interface javax.njms.TopicPublisher
/**
* Get the topic associated with this TopicPublisher.
*
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSessionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.*;
import javax.jms.IllegalStateException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/TopicSubscriberImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.jms.TopicSubscriber;
import javax.jms.Topic;
@@ -44,7 +44,7 @@
super(session, (DestinationImpl) topic, messageSelector, noLocal, subscriptionName,consumerTag);
}
- //--- javax.jms.TopicSubscriber interface
+ //--- javax.njms.TopicSubscriber interface
/**
* Get the Topic associated with this subscriber.
*
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAConnectionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
@@ -24,7 +24,7 @@
import javax.jms.XASession;
/**
- * This class implements the javax.jms.XAConnection interface
+ * This class implements the javax.njms.XAConnection interface
*/
public class XAConnectionImpl extends ConnectionImpl implements XAConnection
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueConnectionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAQueueSessionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
@@ -24,7 +24,7 @@
import javax.jms.XAQueueSession;
/**
- * Imeplements javax.jms.XAQueueSessionImpl
+ * Imeplements javax.njms.XAQueueSessionImpl
*/
public class XAQueueSessionImpl extends XASessionImpl implements XAQueueSession
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XAResourceImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
@@ -29,7 +29,7 @@
import org.slf4j.LoggerFactory;
/**
- * This is an implementation of javax.jms.XAResource.
+ * This is an implementation of javax.njms.XAResource.
*/
public class XAResourceImpl implements XAResource
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XASessionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,10 +15,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.DtxSession;
+import org.apache.qpidity.nclient.DtxSession;
import javax.jms.XASession;
import javax.jms.Session;
@@ -27,7 +27,7 @@
import javax.transaction.xa.XAResource;
/**
- * This is an implementation of the javax.jms.XASEssion interface.
+ * This is an implementation of the javax.njms.XASEssion interface.
*/
public class XASessionImpl extends SessionImpl implements XASession
{
@@ -62,7 +62,7 @@
_xaResource = new XAResourceImpl(this);
}
- //--- javax.jms.XASEssion API
+ //--- javax.njms.XASEssion API
/**
* Gets the session associated with this XASession.
@@ -119,7 +119,7 @@
*
* @return The associated Qpid Session.
*/
- protected org.apache.qpidity.client.DtxSession getQpidSession()
+ protected org.apache.qpidity.nclient.DtxSession getQpidSession()
{
return _qpidDtxSession;
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicConnectionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
@@ -24,7 +24,7 @@
import javax.jms.XATopicSession;
/**
- * implements javax.jms.XATopicConnection
+ * implements javax.njms.XATopicConnection
*/
public class XATopicConnectionImpl extends XAConnectionImpl implements XATopicConnection
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/XATopicSessionImpl.java Wed Sep 19 02:56:58 2007
@@ -15,14 +15,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms;
+package org.apache.qpidity.njms;
import org.apache.qpidity.QpidException;
import javax.jms.*;
/**
- * Implements javax.jms.XATopicSession and javax.jms.TopicSession
+ * Implements javax.njms.XATopicSession and javax.njms.TopicSession
*/
public class XATopicSessionImpl extends XASessionImpl implements XATopicSession
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/BytesMessageImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@
import java.nio.ByteBuffer;
/**
- * Implements javax.jms.BytesMessage
+ * Implements javax.njms.BytesMessage
*/
public class BytesMessageImpl extends MessageImpl implements BytesMessage
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MapMessageImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import org.apache.qpidity.QpidException;
@@ -30,7 +30,7 @@
import java.nio.ByteBuffer;
/**
- * Implements javax.jms.MapMessage
+ * Implements javax.njms.MapMessage
*/
public class MapMessageImpl extends MessageImpl implements MapMessage
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageFactory.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import org.apache.qpidity.QpidException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageHelper.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import javax.jms.*;
import java.math.BigDecimal;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/MessageImpl.java Wed Sep 19 02:56:58 2007
@@ -15,23 +15,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
-import org.apache.qpidity.jms.ExceptionHelper;
-import org.apache.qpidity.jms.MessageConsumerImpl;
+import org.apache.qpidity.njms.ExceptionHelper;
+import org.apache.qpidity.njms.MessageConsumerImpl;
import org.apache.qpidity.QpidException;
import javax.jms.*;
import java.util.Enumeration;
import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CoderResult;
/**
- * Implementation of javax.jms.Message
+ * Implementation of javax.njms.Message
*/
public class MessageImpl extends QpidMessage implements Message
{
@@ -90,7 +85,7 @@
super(message);
}
- //---- javax.jms.Message interface
+ //---- javax.njms.Message interface
/**
* Get the message ID.
* <p> The JMS sprec says:
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/ObjectMessageImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,7 +28,7 @@
import java.nio.ByteBuffer;
/**
- * Implemetns javax.jms.ObjectMessage
+ * Implemetns javax.njms.ObjectMessage
*/
public class ObjectMessageImpl extends MessageImpl implements ObjectMessage
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java Wed Sep 19 02:56:58 2007
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import java.nio.ByteBuffer;
import java.util.Enumeration;
@@ -29,7 +29,7 @@
import org.apache.qpidity.ErrorCode;
import org.apache.qpidity.QpidException;
-import org.apache.qpidity.client.util.ByteBufferMessage;
+import org.apache.qpidity.nclient.util.ByteBufferMessage;
import org.apache.qpidity.transport.ReplyTo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/StreamMessageImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import org.apache.qpidity.QpidException;
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java?rev=577226&r1=577225&r2=577226&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/TextMessageImpl.java Wed Sep 19 02:56:58 2007
@@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpidity.jms.message;
+package org.apache.qpidity.njms.message;
import org.apache.qpidity.QpidException;
@@ -27,7 +27,7 @@
import java.io.UnsupportedEncodingException;
/**
- * Implements the interface javax.jms.TextMessage
+ * Implements the interface javax.njms.TextMessage
*/
public class TextMessageImpl extends MessageImpl implements TextMessage
{