You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/09 08:11:55 UTC
svn commit: r384452 [1/2] - in /incubator/activemq/trunk: ./ activecluster/
activemq-console/ activemq-core/ activemq-dotnet/
activemq-dotnet/src/main/csharp/ActiveMQ/
activemq-dotnet/src/main/csharp/ActiveMQ/Commands/
activemq-dotnet/src/main/csharp/A...
Author: chirino
Date: Wed Mar 8 23:11:37 2006
New Revision: 384452
URL: http://svn.apache.org/viewcvs?rev=384452&view=rev
Log:
Refactored the .NET client so that all the JMS references are NMS. Figured Sun would not be happy if we called this JMS.
also tweeked the m2 poms a little
Added:
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IBytesMessage.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnection.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnection.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnectionFactory.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IDestination.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IDestination.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMapMessage.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessage.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageConsumer.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageProducer.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IPrimitiveMap.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IQueue.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IQueue.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ISession.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ISession.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStartable.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStartable.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStoppable.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStoppable.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryQueue.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryTopic.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs
- copied, changed from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITopic.cs
Removed:
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnection.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IDestination.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IQueue.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ISession.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStartable.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStoppable.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITopic.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/JMSConnectionException.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/JMSException.cs
Modified:
incubator/activemq/trunk/activecluster/pom.xml
incubator/activemq/trunk/activemq-console/pom.xml
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs
incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MessageTest.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TextMessage.cs
incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs
incubator/activemq/trunk/activemq-jaas/pom.xml
incubator/activemq/trunk/activemq-optional/pom.xml
incubator/activemq/trunk/activemq-ra/pom.xml
incubator/activemq/trunk/activemq-systest/pom.xml
incubator/activemq/trunk/activemq-web/pom.xml
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/jmeter/pom.xml
incubator/activemq/trunk/pom.xml
Modified: incubator/activemq/trunk/activecluster/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/pom.xml (original)
+++ incubator/activemq/trunk/activecluster/pom.xml Wed Mar 8 23:11:37 2006
@@ -38,6 +38,12 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
Modified: incubator/activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-console/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-console/pom.xml Wed Mar 8 23:11:37 2006
@@ -69,6 +69,12 @@
<artifactId>xbean-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Wed Mar 8 23:11:37 2006
@@ -175,6 +175,12 @@
<artifactId>xbean-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj (original)
+++ incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj Wed Mar 8 23:11:37 2006
@@ -182,25 +182,25 @@
<Compile Include="src\main\csharp\ActiveMQ\Transport\Tcp\TcpTransport.cs"/>
<Compile Include="src\main\csharp\ActiveMQ\Transport\Tcp\TcpTransportFactory.cs"/>
<Compile Include="src\main\csharp\ActiveMQ\Transport\TransportFilter.cs"/>
- <Compile Include="src\main\csharp\JMS\IBytesMessage.cs"/>
- <Compile Include="src\main\csharp\JMS\IConnection.cs"/>
- <Compile Include="src\main\csharp\JMS\IConnectionFactory.cs"/>
- <Compile Include="src\main\csharp\JMS\IDestination.cs"/>
- <Compile Include="src\main\csharp\JMS\IMapMessage.cs"/>
- <Compile Include="src\main\csharp\JMS\IMessage.cs"/>
- <Compile Include="src\main\csharp\JMS\IMessageConsumer.cs"/>
- <Compile Include="src\main\csharp\JMS\IMessageProducer.cs"/>
- <Compile Include="src\main\csharp\JMS\IPrimitiveMap.cs"/>
- <Compile Include="src\main\csharp\JMS\IQueue.cs"/>
- <Compile Include="src\main\csharp\JMS\ISession.cs"/>
- <Compile Include="src\main\csharp\JMS\IStartable.cs"/>
- <Compile Include="src\main\csharp\JMS\IStoppable.cs"/>
- <Compile Include="src\main\csharp\JMS\ITemporaryQueue.cs"/>
- <Compile Include="src\main\csharp\JMS\ITemporaryTopic.cs"/>
- <Compile Include="src\main\csharp\JMS\ITextMessage.cs"/>
- <Compile Include="src\main\csharp\JMS\ITopic.cs"/>
- <Compile Include="src\main\csharp\JMS\JMSConnectionException.cs"/>
- <Compile Include="src\main\csharp\JMS\JMSException.cs"/>
+ <Compile Include="src\main\csharp\NMS\IBytesMessage.cs"/>
+ <Compile Include="src\main\csharp\NMS\IConnection.cs"/>
+ <Compile Include="src\main\csharp\NMS\IConnectionFactory.cs"/>
+ <Compile Include="src\main\csharp\NMS\IDestination.cs"/>
+ <Compile Include="src\main\csharp\NMS\IMapMessage.cs"/>
+ <Compile Include="src\main\csharp\NMS\IMessage.cs"/>
+ <Compile Include="src\main\csharp\NMS\IMessageConsumer.cs"/>
+ <Compile Include="src\main\csharp\NMS\IMessageProducer.cs"/>
+ <Compile Include="src\main\csharp\NMS\IPrimitiveMap.cs"/>
+ <Compile Include="src\main\csharp\NMS\IQueue.cs"/>
+ <Compile Include="src\main\csharp\NMS\ISession.cs"/>
+ <Compile Include="src\main\csharp\NMS\IStartable.cs"/>
+ <Compile Include="src\main\csharp\NMS\IStoppable.cs"/>
+ <Compile Include="src\main\csharp\NMS\ITemporaryQueue.cs"/>
+ <Compile Include="src\main\csharp\NMS\ITemporaryTopic.cs"/>
+ <Compile Include="src\main\csharp\NMS\ITextMessage.cs"/>
+ <Compile Include="src\main\csharp\NMS\ITopic.cs"/>
+ <Compile Include="src\main\csharp\NMS\NMSConnectionException.cs"/>
+ <Compile Include="src\main\csharp\NMS\NMSException.cs"/>
<Compile Include="src\test\csharp\ActiveMQ\Commands\CommandTest.cs"/>
<Compile Include="src\test\csharp\ActiveMQ\OpenWire\BooleanStreamTest.cs"/>
<Compile Include="src\test\csharp\ActiveMQ\OpenWire\EndianTest.cs"/>
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs Wed Mar 8 23:11:37 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using JMS;
+using NMS;
namespace ActiveMQ
{
@@ -23,7 +23,7 @@
/// <summary>
/// Exception thrown when the broker returns an error
/// </summary>
- public class BrokerException : JMSException
+ public class BrokerException : NMSException
{
private BrokerError brokerError;
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
namespace ActiveMQ.Commands
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ.Commands
{
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
using ActiveMQ.OpenWire;
-using JMS;
+using NMS;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs Wed Mar 8 23:11:37 2006
@@ -1,295 +1,295 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using ActiveMQ.OpenWire;
-using JMS;
-
-
-namespace ActiveMQ.Commands
-{
- public delegate void AcknowledgeHandler(ActiveMQMessage message);
-}
-
-namespace ActiveMQ.Commands
-{
- public class ActiveMQMessage : Message, IMessage, MarshallAware
- {
- public const byte ID_ActiveMQMessage = 23;
-
- protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
-
- private PrimitiveMap properties;
-
- public event AcknowledgeHandler Acknowledger;
-
- public static ActiveMQMessage Transform(IMessage message)
- {
- return (ActiveMQMessage) message;
- }
-
- // TODO generate Equals method
- // TODO generate GetHashCode method
-
-
- public override byte GetDataStructureType()
- {
- return ID_ActiveMQMessage;
- }
-
- public void Acknowledge()
- {
- if (Acknowledger == null)
- {
- throw new JMSException("No Acknowledger has been associated with this message: " + this);
- }
- else
- {
- Acknowledger(this);
- }
- }
-
-
- // Properties
-
- public IPrimitiveMap Properties
- {
- get {
- if (properties == null)
- {
- properties = PrimitiveMap.Unmarshal(MarshalledProperties);
- }
- return properties;
- }
- }
-
- public IDestination FromDestination
- {
- get { return Destination; }
- set { this.Destination = ActiveMQDestination.Transform(value); }
- }
-
-
- // IMessage interface
-
- // JMS headers
-
- /// <summary>
- /// The correlation ID used to correlate messages with conversations or long running business processes
- /// </summary>
- public string JMSCorrelationID
- {
- get {
- return CorrelationId;
- }
- set {
- CorrelationId = value;
- }
- }
-
- /// <summary>
- /// The destination of the message
- /// </summary>
- public IDestination JMSDestination
- {
- get {
- return OriginalDestination;
- }
- }
-
- /// <summary>
- /// The time in milliseconds that this message should expire in
- /// </summary>
- public long JMSExpiration
- {
- get {
- return Expiration;
- }
- set {
- Expiration = value;
- }
- }
-
- /// <summary>
- /// The message ID which is set by the provider
- /// </summary>
- public string JMSMessageId
- {
- get {
- return BaseDataStreamMarshaller.ToString(MessageId);
- }
- }
-
- /// <summary>
- /// Whether or not this message is persistent
- /// </summary>
- public bool JMSPersistent
- {
- get {
- return Persistent;
- }
- set {
- Persistent = value;
- }
- }
-
- /// <summary>
- /// The Priority on this message
- /// </summary>
- public byte JMSPriority
- {
- get {
- return Priority;
- }
- set {
- Priority = value;
- }
- }
-
- /// <summary>
- /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
- /// </summary>
- public bool JMSRedelivered
- {
- get {
- return RedeliveryCounter > 0;
- }
- }
-
-
- /// <summary>
- /// The destination that the consumer of this message should send replies to
- /// </summary>
- public IDestination JMSReplyTo
- {
- get {
- return ReplyTo;
- }
- set {
- ReplyTo = ActiveMQDestination.Transform(value);
- }
- }
-
-
- /// <summary>
- /// The timestamp the broker added to the message
- /// </summary>
- public long JMSTimestamp
- {
- get {
- return Timestamp;
- }
- }
-
- /// <summary>
- /// The type name of this message
- /// </summary>
- public string JMSType
- {
- get {
- return Type;
- }
- set {
- Type = value;
- }
- }
-
-
- // JMS Extension headers
-
- /// <summary>
- /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
- /// </summary>
- public int JMSXDeliveryCount
- {
- get {
- return RedeliveryCounter + 1;
- }
- }
-
-
- /// <summary>
- /// The Message Group ID used to group messages together to the same consumer for the same group ID value
- /// </summary>
- public string JMSXGroupID
- {
- get {
- return GroupID;
- }
- set {
- GroupID = value;
- }
- }
- /// <summary>
- /// The Message Group Sequence counter to indicate the position in a group
- /// </summary>
- public int JMSXGroupSeq
- {
- get {
- return GroupSequence;
- }
- set {
- GroupSequence = value;
- }
- }
-
- /// <summary>
- /// Returns the ID of the producers transaction
- /// </summary>
- public string JMSXProducerTXID
- {
- get {
- TransactionId txnId = OriginalTransactionId;
- if (txnId == null)
- {
- txnId = TransactionId;
- }
- if (txnId != null)
- {
- return BaseDataStreamMarshaller.ToString(txnId);
- }
- return null;
- }
- }
-
- public object GetObjectProperty(string name)
- {
- return propertyHelper.GetObjectProperty(this, name);
- }
-
- public void SetObjectProperty(string name, object value)
- {
- propertyHelper.SetObjectProperty(this, name, value);
- }
-
- // MarshallAware interface
- public override bool IsMarshallAware()
- {
- return true;
- }
-
- public override void BeforeMarshall(OpenWireFormat wireFormat)
- {
- MarshalledProperties = null;
- if (properties != null)
- {
- MarshalledProperties = properties.Marshal();
- }
- }
-
-
- }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using ActiveMQ.OpenWire;
+using NMS;
+
+
+namespace ActiveMQ.Commands
+{
+ public delegate void AcknowledgeHandler(ActiveMQMessage message);
+}
+
+namespace ActiveMQ.Commands
+{
+ public class ActiveMQMessage : Message, IMessage, MarshallAware
+ {
+ public const byte ID_ActiveMQMessage = 23;
+
+ protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
+
+ private PrimitiveMap properties;
+
+ public event AcknowledgeHandler Acknowledger;
+
+ public static ActiveMQMessage Transform(IMessage message)
+ {
+ return (ActiveMQMessage) message;
+ }
+
+ // TODO generate Equals method
+ // TODO generate GetHashCode method
+
+
+ public override byte GetDataStructureType()
+ {
+ return ID_ActiveMQMessage;
+ }
+
+ public void Acknowledge()
+ {
+ if (Acknowledger == null)
+ {
+ throw new NMSException("No Acknowledger has been associated with this message: " + this);
+ }
+ else
+ {
+ Acknowledger(this);
+ }
+ }
+
+
+ // Properties
+
+ public IPrimitiveMap Properties
+ {
+ get {
+ if (properties == null)
+ {
+ properties = PrimitiveMap.Unmarshal(MarshalledProperties);
+ }
+ return properties;
+ }
+ }
+
+ public IDestination FromDestination
+ {
+ get { return Destination; }
+ set { this.Destination = ActiveMQDestination.Transform(value); }
+ }
+
+
+ // IMessage interface
+
+ // JMS headers
+
+ /// <summary>
+ /// The correlation ID used to correlate messages with conversations or long running business processes
+ /// </summary>
+ public string NMSCorrelationID
+ {
+ get {
+ return CorrelationId;
+ }
+ set {
+ CorrelationId = value;
+ }
+ }
+
+ /// <summary>
+ /// The destination of the message
+ /// </summary>
+ public IDestination NMSDestination
+ {
+ get {
+ return OriginalDestination;
+ }
+ }
+
+ /// <summary>
+ /// The time in milliseconds that this message should expire in
+ /// </summary>
+ public long NMSExpiration
+ {
+ get {
+ return Expiration;
+ }
+ set {
+ Expiration = value;
+ }
+ }
+
+ /// <summary>
+ /// The message ID which is set by the provider
+ /// </summary>
+ public string NMSMessageId
+ {
+ get {
+ return BaseDataStreamMarshaller.ToString(MessageId);
+ }
+ }
+
+ /// <summary>
+ /// Whether or not this message is persistent
+ /// </summary>
+ public bool NMSPersistent
+ {
+ get {
+ return Persistent;
+ }
+ set {
+ Persistent = value;
+ }
+ }
+
+ /// <summary>
+ /// The Priority on this message
+ /// </summary>
+ public byte NMSPriority
+ {
+ get {
+ return Priority;
+ }
+ set {
+ Priority = value;
+ }
+ }
+
+ /// <summary>
+ /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
+ /// </summary>
+ public bool NMSRedelivered
+ {
+ get {
+ return RedeliveryCounter > 0;
+ }
+ }
+
+
+ /// <summary>
+ /// The destination that the consumer of this message should send replies to
+ /// </summary>
+ public IDestination NMSReplyTo
+ {
+ get {
+ return ReplyTo;
+ }
+ set {
+ ReplyTo = ActiveMQDestination.Transform(value);
+ }
+ }
+
+
+ /// <summary>
+ /// The timestamp the broker added to the message
+ /// </summary>
+ public long NMSTimestamp
+ {
+ get {
+ return Timestamp;
+ }
+ }
+
+ /// <summary>
+ /// The type name of this message
+ /// </summary>
+ public string NMSType
+ {
+ get {
+ return Type;
+ }
+ set {
+ Type = value;
+ }
+ }
+
+
+ // JMS Extension headers
+
+ /// <summary>
+ /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
+ /// </summary>
+ public int JMSXDeliveryCount
+ {
+ get {
+ return RedeliveryCounter + 1;
+ }
+ }
+
+
+ /// <summary>
+ /// The Message Group ID used to group messages together to the same consumer for the same group ID value
+ /// </summary>
+ public string JMSXGroupID
+ {
+ get {
+ return GroupID;
+ }
+ set {
+ GroupID = value;
+ }
+ }
+ /// <summary>
+ /// The Message Group Sequence counter to indicate the position in a group
+ /// </summary>
+ public int JMSXGroupSeq
+ {
+ get {
+ return GroupSequence;
+ }
+ set {
+ GroupSequence = value;
+ }
+ }
+
+ /// <summary>
+ /// Returns the ID of the producers transaction
+ /// </summary>
+ public string JMSXProducerTXID
+ {
+ get {
+ TransactionId txnId = OriginalTransactionId;
+ if (txnId == null)
+ {
+ txnId = TransactionId;
+ }
+ if (txnId != null)
+ {
+ return BaseDataStreamMarshaller.ToString(txnId);
+ }
+ return null;
+ }
+ }
+
+ public object GetObjectProperty(string name)
+ {
+ return propertyHelper.GetObjectProperty(this, name);
+ }
+
+ public void SetObjectProperty(string name, object value)
+ {
+ propertyHelper.SetObjectProperty(this, name, value);
+ }
+
+ // MarshallAware interface
+ public override bool IsMarshallAware()
+ {
+ return true;
+ }
+
+ public override void BeforeMarshall(OpenWireFormat wireFormat)
+ {
+ MarshalledProperties = null;
+ if (properties != null)
+ {
+ MarshalledProperties = properties.Marshal();
+ }
+ }
+
+
+ }
+}
+
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ.Commands
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ.Commands
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ.Commands
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs Wed Mar 8 23:11:37 2006
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ.Commands
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs Wed Mar 8 23:11:37 2006
@@ -15,12 +15,8 @@
* limitations under the License.
*/
-using System;
-using System.Collections;
-
using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-using JMS;
+using NMS;
namespace ActiveMQ.Commands
{
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs Wed Mar 8 23:11:37 2006
@@ -1,6 +1,6 @@
using ActiveMQ.Commands;
using ActiveMQ.Transport;
-using JMS;
+using NMS;
using System;
using System.Collections;
@@ -105,7 +105,7 @@
set {
if (connected)
{
- throw new JMSException("You cannot change the ClientId once the Connection is connected");
+ throw new NMSException("You cannot change the ClientId once the Connection is connected");
}
info.ClientId = value;
}
@@ -145,7 +145,7 @@
{
ExceptionResponse exceptionResponse = (ExceptionResponse) response;
// TODO include stack trace
- throw new JMSException("Request failed: " + exceptionResponse);
+ throw new NMSException("Request failed: " + exceptionResponse);
}
return response;
}
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
namespace ActiveMQ
{
/// <summary>
/// Exception thrown when a connection is used that it already closed
/// </summary>
- public class ConnectionClosedException : JMSException {
+ public class ConnectionClosedException : NMSException {
public ConnectionClosedException() : base("The connection is already closed!") {
}
}
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs Wed Mar 8 23:11:37 2006
@@ -17,7 +17,7 @@
using ActiveMQ.Commands;
using ActiveMQ.Transport;
using ActiveMQ.Transport.Tcp;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
namespace ActiveMQ
{
/// <summary>
/// Exception thrown when a consumer is used that it already closed
/// </summary>
- public class ConsumerClosedException : JMSException {
+ public class ConsumerClosedException : NMSException {
public ConsumerClosedException() : base("The consumer is already closed!") {
}
}
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs Wed Mar 8 23:11:37 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
using System.Collections;
using System.Threading;
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs Wed Mar 8 23:11:37 2006
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using ActiveMQ;
using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System.Threading;
namespace ActiveMQ
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs Wed Mar 8 23:11:37 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using JMS;
+using NMS;
namespace ActiveMQ
{
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
using System.Collections;
@@ -219,7 +219,7 @@
{
if (! type.IsInstanceOfType(value))
{
- throw new JMSException("Expected type: " + type.Name + " but was: " + value);
+ throw new NMSException("Expected type: " + type.Name + " but was: " + value);
}
}
@@ -230,7 +230,7 @@
Type type = value.GetType();
if (! type.IsPrimitive && !type.IsValueType && !type.IsAssignableFrom(typeof(string)))
{
- throw new JMSException("Invalid type: " + type.Name + " for value: " + value);
+ throw new NMSException("Invalid type: " + type.Name + " for value: " + value);
}
}
}
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs Wed Mar 8 23:11:37 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
using System.Collections;
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs Wed Mar 8 23:11:37 2006
@@ -15,8 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using ActiveMQ.Transport;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ.Transport
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IBytesMessage.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IBytesMessage.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IBytesMessage.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IBytesMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// Represents a binary based message
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Represents a binary based message
- /// </summary>
public interface IBytesMessage : IMessage
{
@@ -32,4 +33,5 @@
}
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnection.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnection.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnection.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnection.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnection.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnection.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnection.cs Wed Mar 8 23:11:37 2006
@@ -14,19 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
-namespace JMS
+
+namespace NMS
{
public enum AcknowledgementMode
{
Unknown, AutoAcknowledge, ClientAcknowledge, Transactional
}
+}
- /// <summary>
- /// Represents a connection with a message broker
- /// </summary>
+/// <summary>
+/// Represents a connection with a message broker
+/// </summary>
+namespace NMS
+{
public interface IConnection : IDisposable, IStartable, IStoppable
{
@@ -58,4 +62,5 @@
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnectionFactory.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnectionFactory.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnectionFactory.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IConnectionFactory.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// A Factory of IConnection objects
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// A Factory of IConnection objects
- /// </summary>
public interface IConnectionFactory
{
@@ -36,4 +37,5 @@
IConnection CreateConnection(string userName, string password);
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IDestination.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IDestination.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IDestination.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IDestination.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IDestination.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IDestination.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IDestination.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-namespace JMS
+
+
+/// <summary>
+/// Summary description for Destination.
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Summary description for Destination.
- /// </summary>
public interface IDestination
{
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMapMessage.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMapMessage.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMapMessage.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMapMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// Represents a Map message which contains key and value pairs which are
+/// of primitive types
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Represents a Map message which contains key and value pairs which are
- /// of primitive types
- /// </summary>
public interface IMapMessage : IMessage
{
IPrimitiveMap Body
@@ -31,5 +32,6 @@
}
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessage.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessage.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessage.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessage.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessage.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// Represents a message either to be sent to a message broker or received from a message broker
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Represents a message either to be sent to a message broker or received from a message broker
- /// </summary>
public interface IMessage
{
@@ -42,7 +43,7 @@
/// <summary>
/// The correlation ID used to correlate messages from conversations or long running business processes
/// </summary>
- string JMSCorrelationID
+ string NMSCorrelationID
{
get;
set;
@@ -51,7 +52,7 @@
/// <summary>
/// The destination of the message
/// </summary>
- IDestination JMSDestination
+ IDestination NMSDestination
{
get;
}
@@ -59,7 +60,7 @@
/// <summary>
/// The time in milliseconds that this message should expire in
/// </summary>
- long JMSExpiration
+ long NMSExpiration
{
get;
set;
@@ -68,7 +69,7 @@
/// <summary>
/// The message ID which is set by the provider
/// </summary>
- string JMSMessageId
+ string NMSMessageId
{
get;
}
@@ -76,7 +77,7 @@
/// <summary>
/// Whether or not this message is persistent
/// </summary>
- bool JMSPersistent
+ bool NMSPersistent
{
get;
set;
@@ -85,7 +86,7 @@
/// <summary>
/// The Priority on this message
/// </summary>
- byte JMSPriority
+ byte NMSPriority
{
get;
set;
@@ -94,7 +95,7 @@
/// <summary>
/// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
/// </summary>
- bool JMSRedelivered
+ bool NMSRedelivered
{
get;
}
@@ -103,7 +104,7 @@
/// <summary>
/// The destination that the consumer of this message should send replies to
/// </summary>
- IDestination JMSReplyTo
+ IDestination NMSReplyTo
{
get;
set;
@@ -113,7 +114,7 @@
/// <summary>
/// The timestamp the broker added to the message
/// </summary>
- long JMSTimestamp
+ long NMSTimestamp
{
get;
}
@@ -121,49 +122,13 @@
/// <summary>
/// The type name of this message
/// </summary>
- string JMSType
- {
- get;
- set;
- }
-
-
- // JMS Extension headers
-
- /// <summary>
- /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
- /// </summary>
- int JMSXDeliveryCount
- {
- get;
- }
-
-
- /// <summary>
- /// The Message Group ID used to group messages together to the same consumer for the same group ID value
- /// </summary>
- string JMSXGroupID
- {
- get;
- set;
- }
- /// <summary>
- /// The Message Group Sequence counter to indicate the position in a group
- /// </summary>
- int JMSXGroupSeq
+ string NMSType
{
get;
set;
}
-
- /// <summary>
- /// Returns the ID of the producers transaction
- /// </summary>
- string JMSXProducerTXID
- {
- get;
- }
-
+
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageConsumer.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageConsumer.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageConsumer.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageConsumer.cs Wed Mar 8 23:11:37 2006
@@ -14,16 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
-namespace JMS
+
+namespace NMS
{
public delegate void MessageListener(IMessage message);
+}
- /// <summary>
- /// A consumer of messages
- /// </summary>
+/// <summary>
+/// A consumer of messages
+/// </summary>
+namespace NMS
+{
public interface IMessageConsumer : IDisposable
{
@@ -48,4 +52,5 @@
event MessageListener Listener;
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageProducer.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageProducer.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageProducer.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IMessageProducer.cs Wed Mar 8 23:11:37 2006
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
-namespace JMS
+
+
+/// <summary>
+/// An object capable of sending messages to some destination
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// An object capable of sending messages to some destination
- /// </summary>
public interface IMessageProducer : IDisposable
{
@@ -68,4 +69,5 @@
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IPrimitiveMap.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IPrimitiveMap.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IPrimitiveMap.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IPrimitiveMap.cs Wed Mar 8 23:11:37 2006
@@ -16,13 +16,14 @@
*/
using System.Collections;
-namespace JMS
+
+
+/// <summary>
+/// Represents a Map of primitive types where the keys are all string instances
+/// and the values are strings or numbers.
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Represents a Map of primitive types where the keys are all string instances
- /// and the values are strings or numbers.
- /// </summary>
public interface IPrimitiveMap
{
@@ -82,4 +83,5 @@
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IQueue.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IQueue.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IQueue.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IQueue.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IQueue.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IQueue.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IQueue.cs Wed Mar 8 23:11:37 2006
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
-namespace JMS
+
+
+/// <summary>
+/// Summary description for IQueue.
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Summary description for IQueue.
- /// </summary>
public interface IQueue : IDestination
{
@@ -32,4 +33,5 @@
}
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ISession.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ISession.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ISession.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ISession.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ISession.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ISession.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ISession.cs Wed Mar 8 23:11:37 2006
@@ -14,16 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
-namespace JMS
+
+
+/// <summary>
+/// Represents a single unit of work on an IConnection.
+/// So the ISession can be used to perform transactional receive and sends
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Represents a single unit of work on an IConnection.
- /// So the ISession can be used to perform transactional receive and sends
- /// </summary>
public interface ISession : IDisposable
{
@@ -123,4 +124,5 @@
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStartable.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStartable.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStartable.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStartable.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStartable.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStartable.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStartable.cs Wed Mar 8 23:11:37 2006
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-namespace JMS
+
+namespace NMS
{
public interface IStartable
{
void Start();
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStoppable.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStoppable.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStoppable.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStoppable.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStoppable.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/IStoppable.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/IStoppable.cs Wed Mar 8 23:11:37 2006
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-namespace JMS
+
+namespace NMS
{
public interface IStoppable
{
void Stop();
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryQueue.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryQueue.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryQueue.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryQueue.cs Wed Mar 8 23:11:37 2006
@@ -14,16 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// Summary description for ITemporaryQueue.
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Summary description for ITemporaryQueue.
- /// </summary>
public interface ITemporaryQueue : IDestination
{
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryTopic.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryTopic.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryTopic.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryTopic.cs Wed Mar 8 23:11:37 2006
@@ -14,16 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// Summary description for TemporaryTopic.
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Summary description for TemporaryTopic.
- /// </summary>
public interface ITemporaryTopic : IDestination
{
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
-namespace JMS
+
+
+/// <summary>
+/// Represents a text based message
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Represents a text based message
- /// </summary>
public interface ITextMessage : IMessage
{
@@ -32,4 +33,5 @@
}
}
}
+
Copied: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs (from r384274, incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITopic.cs)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs?p2=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs&p1=incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITopic.cs&r1=384274&r2=384452&rev=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/JMS/ITopic.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs Wed Mar 8 23:11:37 2006
@@ -14,15 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using System;
-namespace JMS
+
+
+/// <summary>
+/// Summary description for ITopic.
+/// </summary>
+namespace NMS
{
-
- /// <summary>
- /// Summary description for ITopic.
- /// </summary>
public interface ITopic : IDestination
{
@@ -32,4 +33,5 @@
}
}
}
+
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs Wed Mar 8 23:11:37 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using ActiveMQ.Commands;
-using JMS;
+using NMS;
using System;
namespace ActiveMQ
@@ -47,8 +47,8 @@
// lets send a message
ITextMessage request = session.CreateTextMessage("Hello World!");
- request.JMSCorrelationID = "abc";
- request.JMSXGroupID = "cheese";
+ request.NMSCorrelationID = "abc";
+ request.Properties["JMSXGroupID"] = "cheese";
request.Properties["myHeader"] = "James";
producer.Send(request);
@@ -61,7 +61,7 @@
}
else
{
- Console.WriteLine("Received message with ID: " + message.JMSMessageId);
+ Console.WriteLine("Received message with ID: " + message.NMSMessageId);
Console.WriteLine("Received message with text: " + message.Text);
}
}
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
using System.Threading;
@@ -53,8 +53,8 @@
// now lets send a message
IMessageProducer producer = CreateProducer();
IMessage request = CreateMessage();
- request.JMSCorrelationID = "abc";
- request.JMSType = "Test";
+ request.NMSCorrelationID = "abc";
+ request.NMSType = "Test";
producer.Send(request);
WaitForMessageToArrive();
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs Wed Mar 8 23:11:37 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*/
//using ActiveMQ;
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
@@ -68,13 +68,13 @@
replyTo = session.CreateTemporaryQueue();
// lets set the headers
- message.JMSCorrelationID = correlationID;
- message.JMSReplyTo = replyTo;
- message.JMSPersistent = persistent;
- message.JMSPriority = priority;
- message.JMSType = type;
- message.JMSXGroupID = groupID;
- message.JMSXGroupSeq = groupSeq;
+ message.NMSCorrelationID = correlationID;
+ message.NMSReplyTo = replyTo;
+ message.NMSPersistent = persistent;
+ message.NMSPriority = priority;
+ message.NMSType = type;
+ message.Properties["JMSXGroupID"] = groupID;
+ message.Properties["JMSXGroupSeq"] = groupSeq;
// lets set the custom headers
message.Properties["customText"] = customText;
@@ -99,13 +99,13 @@
Assert.AreEqual(expectedText, text, "the message text");
// compare standard JMS headers
- Assert.AreEqual(correlationID, message.JMSCorrelationID, "JMSCorrelationID");
- Assert.AreEqual(replyTo, message.JMSReplyTo, "JMSReplyTo");
- Assert.AreEqual(persistent, message.JMSPersistent, "JMSPersistent");
- Assert.AreEqual(priority, message.JMSPriority, "JMSPriority");
- Assert.AreEqual(type, message.JMSType, "JMSType");
- Assert.AreEqual(groupID, message.JMSXGroupID, "JMSXGroupID");
- Assert.AreEqual(groupSeq, message.JMSXGroupSeq, "JMSXGroupSeq");
+ Assert.AreEqual(correlationID, message.NMSCorrelationID, "JMSCorrelationID");
+ Assert.AreEqual(replyTo, message.NMSReplyTo, "JMSReplyTo");
+ Assert.AreEqual(persistent, message.NMSPersistent, "JMSPersistent");
+ Assert.AreEqual(priority, message.NMSPriority, "JMSPriority");
+ Assert.AreEqual(type, message.NMSType, "JMSType");
+ Assert.AreEqual(groupID, message.Properties["JMSXGroupID"], "JMSXGroupID");
+ Assert.AreEqual(groupSeq, message.Properties["JMSXGroupSeq"], "JMSXGroupSeq");
// compare custom headers
Assert.AreEqual(customText, message.Properties["customText"], "customText");
@@ -125,12 +125,12 @@
Assert.AreEqual(custom6, message.Properties.GetChar("custom6"), "custom6");
// lets now look at some standard JMS headers
- Console.WriteLine("JMSExpiration: " + message.JMSExpiration);
- Console.WriteLine("JMSMessageId: " + message.JMSMessageId);
- Console.WriteLine("JMSRedelivered: " + message.JMSRedelivered);
- Console.WriteLine("JMSTimestamp: " + message.JMSTimestamp);
- Console.WriteLine("JMSXDeliveryCount: " + message.JMSXDeliveryCount);
- Console.WriteLine("JMSXProducerTXID: " + message.JMSXProducerTXID);
+ Console.WriteLine("JMSExpiration: " + message.NMSExpiration);
+ Console.WriteLine("JMSMessageId: " + message.NMSMessageId);
+ Console.WriteLine("JMSRedelivered: " + message.NMSRedelivered);
+ Console.WriteLine("JMSTimestamp: " + message.NMSTimestamp);
+ Console.WriteLine("JMSXDeliveryCount: " + message.Properties["JMSXDeliveryCount"]);
+ Console.WriteLine("JMSXProducerTXID: " + message.Properties["JMSXProducerTXID"]);
}
}
}
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MessageTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MessageTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MessageTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/MessageTest.cs Wed Mar 8 23:11:37 2006
@@ -15,6 +15,7 @@
* limitations under the License.
*/
using JMS;
+using NMS;
using NUnit.Framework;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TextMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TextMessage.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TextMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TextMessage.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs Wed Mar 8 23:11:37 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using JMS;
+using NMS;
using NUnit.Framework;
using System;
using System.Collections;
Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Wed Mar 8 23:11:37 2006
@@ -141,6 +141,12 @@
<version>0.9.2</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/pom.xml (original)
+++ incubator/activemq/trunk/activemq-optional/pom.xml Wed Mar 8 23:11:37 2006
@@ -97,6 +97,12 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Wed Mar 8 23:11:37 2006
@@ -46,6 +46,28 @@
<groupId>activemq</groupId>
<artifactId>jmdns</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock-cglib</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: incubator/activemq/trunk/activemq-systest/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/pom.xml?rev=384452&r1=384451&r2=384452&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/pom.xml (original)
+++ incubator/activemq/trunk/activemq-systest/pom.xml Wed Mar 8 23:11:37 2006
@@ -84,6 +84,12 @@
<artifactId>ant</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>