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:58:03 UTC
svn commit: r577227 - in
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache:
qpid/client/ qpidity/naming/
Author: arnaudsimon
Date: Wed Sep 19 02:58:02 2007
New Revision: 577227
URL: http://svn.apache.org/viewvc?rev=577227&view=rev
Log:
renamed qpidity.jms to qpidity.njms and qpidity.client to qpidity.nclient
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java Wed Sep 19 02:58:02 2007
@@ -10,7 +10,7 @@
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.jms.Session;
-import org.apache.qpidity.client.Client;
+import org.apache.qpidity.nclient.Client;
import org.apache.qpidity.QpidException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +30,7 @@
/**
* The QpidConeection instance that is mapped with thie JMS connection.
*/
- org.apache.qpidity.client.Connection _qpidConnection;
+ org.apache.qpidity.nclient.Connection _qpidConnection;
//--- constructor
public AMQConnectionDelegate_0_10(AMQConnection conn)
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Wed Sep 19 02:58:02 2007
@@ -1388,7 +1388,7 @@
//
// if (_dispatcher != null && !_dispatcher.connectionStopped())
// {
- // throw new javax.jms.IllegalStateException("Attempt to set listener while session is started.");
+ // throw new javax.njms.IllegalStateException("Attempt to set listener while session is started.");
// }
//
// // We are stopped
@@ -1398,7 +1398,7 @@
//
// if (consumer.isReceiving())
// {
- // throw new javax.jms.IllegalStateException("Another thread is already receiving synchronously.");
+ // throw new javax.njms.IllegalStateException("Another thread is already receiving synchronously.");
// }
// }
//
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Wed Sep 19 02:58:02 2007
@@ -24,8 +24,8 @@
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.message.MessageFactoryRegistry;
-import org.apache.qpidity.client.Session;
-import org.apache.qpidity.client.util.MessagePartListenerAdapter;
+import org.apache.qpidity.nclient.Session;
+import org.apache.qpidity.nclient.util.MessagePartListenerAdapter;
import org.apache.qpidity.QpidException;
import org.apache.qpidity.transport.RangeSet;
import org.apache.qpidity.transport.Option;
@@ -81,7 +81,7 @@
* @param defaultPrefetchLowMark The number of prefetched messages at which to resume the session.
* @param qpidConnection The qpid connection
*/
- AMQSession_0_10(org.apache.qpidity.client.Connection qpidConnection, AMQConnection con, int channelId,
+ AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
boolean transacted, int acknowledgeMode, MessageFactoryRegistry messageFactoryRegistry,
int defaultPrefetchHighMark, int defaultPrefetchLowMark)
{
@@ -110,7 +110,7 @@
* @param defaultPrefetchLow The number of prefetched messages at which to resume the session.
* @param qpidConnection The connection
*/
- AMQSession_0_10(org.apache.qpidity.client.Connection qpidConnection, AMQConnection con, int channelId,
+ AMQSession_0_10(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
boolean transacted, int acknowledgeMode, int defaultPrefetchHigh, int defaultPrefetchLow)
{
@@ -416,7 +416,7 @@
*
* @return The associated Qpid Session.
*/
- protected org.apache.qpidity.client.Session getQpidSession()
+ protected org.apache.qpidity.nclient.Session getQpidSession()
{
return _qpidSession;
}
@@ -442,7 +442,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/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Wed Sep 19 02:58:02 2007
@@ -45,7 +45,7 @@
* This is a 0.10 message consumer.
*/
public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], ByteBuffer>
- implements org.apache.qpidity.client.util.MessageListener
+ implements org.apache.qpidity.nclient.util.MessageListener
{
/**
* This class logger
@@ -174,7 +174,7 @@
}
/**
- * This is invoked just before a message is delivered to the jms consumer
+ * This is invoked just before a message is delivered to the njms consumer
*/
void postDeliver(AbstractJMSMessage msg) throws JMSException
{
@@ -302,7 +302,7 @@
ranges.add(message.getMessageTransferId());
_0_10session.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);
_0_10session.getQpidSession().sync();
RangeSet acquired = _0_10session.getQpidSession().getAccquiredMessages();
if (acquired.size() > 0)
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java Wed Sep 19 02:58:02 2007
@@ -19,14 +19,12 @@
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.ExchangeDeclareBody;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.url.AMQBindingURL;
import org.apache.qpid.url.URLSyntaxException;
-import org.apache.qpidity.jms.ExceptionHelper;
-import org.apache.qpidity.client.util.ByteBufferMessage;
+import org.apache.qpidity.njms.ExceptionHelper;
+import org.apache.qpidity.nclient.util.ByteBufferMessage;
import org.apache.qpidity.transport.ReplyTo;
import javax.jms.Message;
@@ -127,8 +125,8 @@
{
((AMQSession_0_10) getSession()).getQpidSession().messageTransfer(destination.getExchangeName().toString(),
qpidityMessage,
- 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/qpid/client/XAConnectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java Wed Sep 19 02:58:02 2007
@@ -23,7 +23,7 @@
import javax.jms.*;
/**
- * This class implements the javax.jms.XAConnection interface
+ * This class implements the javax.njms.XAConnection interface
*/
public class XAConnectionImpl extends AMQConnection implements XAConnection, XAQueueConnection, XATopicConnection
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java Wed Sep 19 02:58:02 2007
@@ -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/qpid/client/XASessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java Wed Sep 19 02:58:02 2007
@@ -17,14 +17,14 @@
*/
package org.apache.qpid.client;
-import org.apache.qpidity.client.DtxSession;
+import org.apache.qpidity.nclient.DtxSession;
import org.apache.qpid.client.message.MessageFactoryRegistry;
import javax.jms.*;
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 AMQSession_0_10 implements XASession, XATopicSession, XAQueueSession
{
@@ -48,7 +48,7 @@
/**
* Create a JMS XASession
*/
- public XASessionImpl(org.apache.qpidity.client.Connection qpidConnection, AMQConnection con, int channelId,
+ public XASessionImpl(org.apache.qpidity.nclient.Connection qpidConnection, AMQConnection con, int channelId,
int defaultPrefetchHigh, int defaultPrefetchLow)
{
super(qpidConnection, con, channelId, false, // this is not a transacted session
@@ -58,7 +58,7 @@
_xaResource = new XAResourceImpl(this);
}
- //--- javax.jms.XASEssion API
+ //--- javax.njms.XASEssion API
/**
* Gets the session associated with this XASession.
@@ -115,7 +115,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/naming/PropertiesFileInitialContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java?rev=577227&r1=577226&r2=577227&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/naming/PropertiesFileInitialContextFactory.java Wed Sep 19 02:58:02 2007
@@ -19,10 +19,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpidity.jms.ConnectionFactoryImpl;
-import org.apache.qpidity.jms.DestinationImpl;
-import org.apache.qpidity.jms.QueueImpl;
-import org.apache.qpidity.jms.TopicImpl;
+import org.apache.qpidity.njms.ConnectionFactoryImpl;
+import org.apache.qpidity.njms.DestinationImpl;
+import org.apache.qpidity.njms.QueueImpl;
+import org.apache.qpidity.njms.TopicImpl;
import org.apache.qpidity.url.BindingURLImpl;
import org.apache.qpidity.url.URLSyntaxException;
import org.apache.qpidity.url.BindingURL;