You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2008/05/28 20:18:03 UTC

svn commit: r661036 - in /activemq/activemq-dotnet/Apache.NMS.EMS/trunk: ./ src/main/csharp/

Author: jgomes
Date: Wed May 28 11:18:03 2008
New Revision: 661036

URL: http://svn.apache.org/viewvc?rev=661036&view=rev
Log:
Add common utility functions that all providers can use.
Updated Visual Studio project defines to be the same as the NAnt defines.

Added:
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/EMSConvert.cs
      - copied, changed from r661033, activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/TibcoUtil.cs
Removed:
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/AtomicBoolean.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/TibcoUtil.cs
Modified:
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Message.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems-test.csproj
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems.csproj

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/
------------------------------------------------------------------------------
    bugtraq:label = Issue #:

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/
------------------------------------------------------------------------------
--- bugtraq:message (added)
+++ bugtraq:message Wed May 28 11:18:03 2008
@@ -0,0 +1 @@
+Fixes [AMQNET-%BUGID%]. (See https://issues.apache.org/activemq/browse/AMQNET-%BUGID%)

Propchange: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/
------------------------------------------------------------------------------
    bugtraq:url = https://issues.apache.org/activemq/browse/AMQNET-%BUGID%

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Wed May 28 11:18:03 2008
@@ -237,7 +237,7 @@
   <target name="set-net-3.5-framework-configuration">
     <property name="current.build.framework" value="net-3.5" />
     <property name="current.build.framework.name" value=".NET 3.5"/>
-    <property name="current.build.defines" value="${build.defines}NET,NET_3_5" dynamic="true" />
+    <property name="current.build.defines" value="${build.defines}NET,NET_2_0,NET_3_5" dynamic="true" />
     <property name="current.build.framework.sign" value="true"/>
     <property name="link.sdkdoc.version" value="SDK_v6_0a" />
     <property name="link.sdkdoc.web" value="true" />

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs Wed May 28 11:18:03 2008
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 using System;
+using Apache.NMS.Util;
 
 namespace Apache.NMS.EMS
 {
@@ -92,8 +93,8 @@
 		public Apache.NMS.ISession CreateSession(Apache.NMS.AcknowledgementMode mode)
         {
 			bool isTransacted = (Apache.NMS.AcknowledgementMode.Transactional == mode);
-			return TibcoUtil.ToNMSSession(this.tibcoConnection.CreateSession(isTransacted,
-			                                                  TibcoUtil.ToSessionMode(mode)));
+			return EMSConvert.ToNMSSession(this.tibcoConnection.CreateSession(isTransacted,
+			                                                  EMSConvert.ToSessionMode(mode)));
 		}
 
 		public void Close()

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/ConnectionFactory.cs Wed May 28 11:18:03 2008
@@ -98,7 +98,7 @@
 		/// </summary>
 		public Apache.NMS.IConnection CreateConnection()
         {
-			return TibcoUtil.ToNMSConnection(this.tibcoConnectionFactory.CreateConnection());
+			return EMSConvert.ToNMSConnection(this.tibcoConnectionFactory.CreateConnection());
         }
 
 		/// <summary>
@@ -106,7 +106,7 @@
 		/// </summary>
 		public Apache.NMS.IConnection CreateConnection(string userName, string password)
         {
-			return TibcoUtil.ToNMSConnection(this.tibcoConnectionFactory.CreateConnection(userName, password));
+			return EMSConvert.ToNMSConnection(this.tibcoConnectionFactory.CreateConnection(userName, password));
 		}
 
 		#endregion

Copied: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/EMSConvert.cs (from r661033, activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/TibcoUtil.cs)
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/EMSConvert.cs?p2=activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/EMSConvert.cs&p1=activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/TibcoUtil.cs&r1=661033&r2=661036&rev=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/TibcoUtil.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/EMSConvert.cs Wed May 28 11:18:03 2008
@@ -18,14 +18,8 @@
 
 namespace Apache.NMS.EMS
 {
-	public class TibcoUtil
+	public class EMSConvert
 	{
-		static TibcoUtil()
-		{
-			epochDiff = (javaEpoch.ToFileTimeUtc() - windowsEpoch.ToFileTimeUtc())
-							/ TimeSpan.TicksPerMillisecond;
-		}
-
 		public static Apache.NMS.IConnection ToNMSConnection(TIBCO.EMS.Connection tibcoConnection)
 		{
 			return (null != tibcoConnection
@@ -239,47 +233,5 @@
 		{
 			return (TIBCO.EMS.MessageDeliveryMode.NonPersistent != deliveryMode);
 		}
-
-		#region DateUtils
-		// This secton of utility functions was taken from the ActiveMQ.DateUtils class.
-		// These functions should be merged into a common code area that can be shared
-		// between all provider implementations.
-		
-		/// <summary>
-		/// The start of the Windows epoch
-		/// </summary>
-		public static readonly DateTime windowsEpoch = new DateTime(1601, 1, 1, 0, 0, 0, 0);
-		/// <summary>
-		/// The start of the Java epoch
-		/// </summary>
-		public static readonly DateTime javaEpoch = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-
-		/// <summary>
-		/// The difference between the Windows epoch and the Java epoch
-		/// in milliseconds.
-		/// </summary>
-		public static readonly long epochDiff; /* = 1164447360000L; */
-
-		public static long ToJavaTime(DateTime dateTime)
-		{
-			return (dateTime.ToFileTime() / TimeSpan.TicksPerMillisecond) - epochDiff;
-		}
-
-		public static DateTime ToDateTime(long javaTime)
-		{
-			return DateTime.FromFileTime((javaTime + epochDiff) * TimeSpan.TicksPerMillisecond);
-		}
-
-		public static long ToJavaTimeUtc(DateTime dateTime)
-		{
-			return (dateTime.ToFileTimeUtc() / TimeSpan.TicksPerMillisecond) - epochDiff;
-		}
-
-		public static DateTime ToDateTimeUtc(long javaTime)
-		{
-			return DateTime.FromFileTimeUtc((javaTime + epochDiff) * TimeSpan.TicksPerMillisecond);
-		}
-		#endregion
-
 	}
 }
\ No newline at end of file

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Message.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Message.cs?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Message.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Message.cs Wed May 28 11:18:03 2008
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 using System;
+using Apache.NMS.Util;
 
 namespace Apache.NMS.EMS
 {
@@ -43,7 +44,7 @@
 		/// </summary>
 		public Apache.NMS.IPrimitiveMap Properties
 		{
-			get { return TibcoUtil.ToMessageProperties(this.tibcoMessage); }
+			get { return EMSConvert.ToMessageProperties(this.tibcoMessage); }
 		}
 
 		/// <summary>
@@ -60,7 +61,7 @@
 		/// </summary>
 		public Apache.NMS.IDestination NMSDestination
 		{
-			get { return TibcoUtil.ToNMSDestination(this.tibcoMessage.Destination); }
+			get { return EMSConvert.ToNMSDestination(this.tibcoMessage.Destination); }
 		}
 
 		protected TimeSpan timeToLive;
@@ -110,8 +111,8 @@
 		/// </summary>
 		public bool NMSPersistent
 		{
-			get { return TibcoUtil.ToPersistent(this.tibcoMessage.MsgDeliveryMode); }
-			set { this.tibcoMessage.MsgDeliveryMode = TibcoUtil.ToMessageDeliveryMode(value); }
+			get { return EMSConvert.ToPersistent(this.tibcoMessage.MsgDeliveryMode); }
+			set { this.tibcoMessage.MsgDeliveryMode = EMSConvert.ToMessageDeliveryMode(value); }
 		}
 
 		/// <summary>
@@ -136,7 +137,7 @@
 		/// </summary>
 		public Apache.NMS.IDestination NMSReplyTo
 		{
-			get { return TibcoUtil.ToNMSDestination(this.tibcoMessage.ReplyTo); }
+			get { return EMSConvert.ToNMSDestination(this.tibcoMessage.ReplyTo); }
 			set { this.tibcoMessage.ReplyTo = ((Apache.NMS.EMS.Destination) value).tibcoDestination; }
 		}
 
@@ -146,7 +147,7 @@
 		/// </summary>
 		public DateTime NMSTimestamp
 		{
-			get { return TibcoUtil.ToDateTime(this.tibcoMessage.Timestamp); }
+			get { return DateUtils.ToDateTime(this.tibcoMessage.Timestamp); }
 		}
 
 		/// <summary>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageConsumer.cs?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageConsumer.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageConsumer.cs Wed May 28 11:18:03 2008
@@ -145,7 +145,7 @@
 
 		private void HandleTibcoMsg(object sender, TIBCO.EMS.EMSMessageEventArgs arg)
 		{
-			Apache.NMS.IMessage message = TibcoUtil.ToNMSMessage(arg.Message);
+			Apache.NMS.IMessage message = EMSConvert.ToNMSMessage(arg.Message);
 
 			if(null != message)
 			{

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs Wed May 28 11:18:03 2008
@@ -68,7 +68,7 @@
 
 			this.tibcoMessageProducer.Send(
 						msg.tibcoMessage,
-						TibcoUtil.ToMessageDeliveryMode(persistent),
+						EMSConvert.ToMessageDeliveryMode(persistent),
 						priority,
 						(long) timeToLive.TotalMilliseconds);
 		}
@@ -107,15 +107,15 @@
 			this.tibcoMessageProducer.Send(
 						dest.tibcoDestination,
 						msg.tibcoMessage,
-						TibcoUtil.ToMessageDeliveryMode(persistent),
+						EMSConvert.ToMessageDeliveryMode(persistent),
 						priority,
 						(long) timeToLive.TotalMilliseconds);
 		}
 
 		public bool Persistent
 		{
-			get { return TibcoUtil.ToPersistent(this.tibcoMessageProducer.MsgDeliveryMode); }
-			set { this.tibcoMessageProducer.MsgDeliveryMode = TibcoUtil.ToMessageDeliveryMode(value); }
+			get { return EMSConvert.ToPersistent(this.tibcoMessageProducer.MsgDeliveryMode); }
+			set { this.tibcoMessageProducer.MsgDeliveryMode = EMSConvert.ToMessageDeliveryMode(value); }
 		}
 
 		public TimeSpan TimeToLive

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs Wed May 28 11:18:03 2008
@@ -48,80 +48,80 @@
         {
 			Apache.NMS.EMS.Destination destinationObj = (Apache.NMS.EMS.Destination) destination;
 
-			return TibcoUtil.ToNMSMessageProducer(this, this.tibcoSession.CreateProducer(destinationObj.tibcoDestination));
+			return EMSConvert.ToNMSMessageProducer(this, this.tibcoSession.CreateProducer(destinationObj.tibcoDestination));
         }
 
 		public Apache.NMS.IMessageConsumer CreateConsumer(Apache.NMS.IDestination destination)
         {
 			Apache.NMS.EMS.Destination destinationObj = (Apache.NMS.EMS.Destination) destination;
 
-			return TibcoUtil.ToNMSMessageConsumer(this, this.tibcoSession.CreateConsumer(destinationObj.tibcoDestination));
+			return EMSConvert.ToNMSMessageConsumer(this, this.tibcoSession.CreateConsumer(destinationObj.tibcoDestination));
         }
 
 		public Apache.NMS.IMessageConsumer CreateConsumer(Apache.NMS.IDestination destination, string selector)
         {
 			Apache.NMS.EMS.Destination destinationObj = (Apache.NMS.EMS.Destination) destination;
 
-			return TibcoUtil.ToNMSMessageConsumer(this, this.tibcoSession.CreateConsumer(destinationObj.tibcoDestination, selector));
+			return EMSConvert.ToNMSMessageConsumer(this, this.tibcoSession.CreateConsumer(destinationObj.tibcoDestination, selector));
 		}
 
 		public Apache.NMS.IMessageConsumer CreateConsumer(Apache.NMS.IDestination destination, string selector, bool noLocal)
         {
 			Apache.NMS.EMS.Destination destinationObj = (Apache.NMS.EMS.Destination) destination;
 
-			return TibcoUtil.ToNMSMessageConsumer(this, this.tibcoSession.CreateConsumer(destinationObj.tibcoDestination, selector, noLocal));
+			return EMSConvert.ToNMSMessageConsumer(this, this.tibcoSession.CreateConsumer(destinationObj.tibcoDestination, selector, noLocal));
         }
 
 		public Apache.NMS.IMessageConsumer CreateDurableConsumer(Apache.NMS.ITopic destination, string name, string selector, bool noLocal)
         {
 			Apache.NMS.EMS.Topic topicObj = (Apache.NMS.EMS.Topic) destination;
 
-			return TibcoUtil.ToNMSMessageConsumer(this, this.tibcoSession.CreateDurableSubscriber(topicObj.tibcoTopic, name, selector, noLocal));
+			return EMSConvert.ToNMSMessageConsumer(this, this.tibcoSession.CreateDurableSubscriber(topicObj.tibcoTopic, name, selector, noLocal));
         }
 
 		public Apache.NMS.IQueue GetQueue(string name)
         {
-			return TibcoUtil.ToNMSQueue(this.tibcoSession.CreateQueue(name));
+			return EMSConvert.ToNMSQueue(this.tibcoSession.CreateQueue(name));
         }
 
 		public Apache.NMS.ITopic GetTopic(string name)
         {
-			return TibcoUtil.ToNMSTopic(this.tibcoSession.CreateTopic(name));
+			return EMSConvert.ToNMSTopic(this.tibcoSession.CreateTopic(name));
         }
 
 		public Apache.NMS.ITemporaryQueue CreateTemporaryQueue()
         {
-			return TibcoUtil.ToNMSTemporaryQueue(this.tibcoSession.CreateTemporaryQueue());
+			return EMSConvert.ToNMSTemporaryQueue(this.tibcoSession.CreateTemporaryQueue());
         }
 
 		public Apache.NMS.ITemporaryTopic CreateTemporaryTopic()
         {
-			return TibcoUtil.ToNMSTemporaryTopic(this.tibcoSession.CreateTemporaryTopic());
+			return EMSConvert.ToNMSTemporaryTopic(this.tibcoSession.CreateTemporaryTopic());
         }
 
 		public Apache.NMS.IMessage CreateMessage()
         {
-			return TibcoUtil.ToNMSMessage(this.tibcoSession.CreateMessage());
+			return EMSConvert.ToNMSMessage(this.tibcoSession.CreateMessage());
         }
 
 		public Apache.NMS.ITextMessage CreateTextMessage()
         {
-			return TibcoUtil.ToNMSTextMessage(this.tibcoSession.CreateTextMessage());
+			return EMSConvert.ToNMSTextMessage(this.tibcoSession.CreateTextMessage());
         }
 
 		public Apache.NMS.ITextMessage CreateTextMessage(string text)
         {
-			return TibcoUtil.ToNMSTextMessage(this.tibcoSession.CreateTextMessage(text));
+			return EMSConvert.ToNMSTextMessage(this.tibcoSession.CreateTextMessage(text));
         }
 
 		public Apache.NMS.IMapMessage CreateMapMessage()
         {
-			return TibcoUtil.ToNMSMapMessage(this.tibcoSession.CreateMapMessage());
+			return EMSConvert.ToNMSMapMessage(this.tibcoSession.CreateMapMessage());
         }
 
 		public Apache.NMS.IBytesMessage CreateBytesMessage()
         {
-			return TibcoUtil.ToNMSBytesMessage(this.tibcoSession.CreateBytesMessage());
+			return EMSConvert.ToNMSBytesMessage(this.tibcoSession.CreateBytesMessage());
         }
 
 		public Apache.NMS.IBytesMessage CreateBytesMessage(byte[] body)
@@ -138,7 +138,7 @@
 
 		public Apache.NMS.IObjectMessage CreateObjectMessage(Object body)
 		{
-			return TibcoUtil.ToNMSObjectMessage(this.tibcoSession.CreateObjectMessage(body));
+			return EMSConvert.ToNMSObjectMessage(this.tibcoSession.CreateObjectMessage(body));
 		}
 		
         public void Commit()
@@ -160,7 +160,7 @@
 
 		public Apache.NMS.AcknowledgementMode AcknowledgementMode
         {
-            get { return TibcoUtil.ToAcknowledgementMode(this.tibcoSession.SessionAcknowledgeMode); }
+            get { return EMSConvert.ToAcknowledgementMode(this.tibcoSession.SessionAcknowledgeMode); }
         }
 
         public void Close()

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems-test.csproj?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems-test.csproj Wed May 28 11:18:03 2008
@@ -17,14 +17,14 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>build\net-2.0\debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
     <Optimize>true</Optimize>
     <OutputPath>build\net-2.0\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems.csproj?rev=661036&r1=661035&r2=661036&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2005-ems.csproj Wed May 28 11:18:03 2008
@@ -14,7 +14,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>build\net-2.0\debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>build\net-2.0\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
     <ErrorReport>none</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -36,13 +36,13 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\main\csharp\AtomicBoolean.cs" />
     <Compile Include="src\main\csharp\BytesMessage.cs" />
     <Compile Include="src\main\csharp\CommonAssemblyInfo.cs" />
     <Compile Include="src\main\csharp\Connection.cs" />
     <Compile Include="src\main\csharp\ConnectionFactory.cs" />
     <Compile Include="src\main\csharp\Destination.cs" />
     <Compile Include="src\main\csharp\Dispatcher.cs" />
+    <Compile Include="src\main\csharp\EMSConvert.cs" />
     <Compile Include="src\main\csharp\MapMessage.cs" />
     <Compile Include="src\main\csharp\Message.cs" />
     <Compile Include="src\main\csharp\MessageConsumer.cs" />
@@ -56,7 +56,6 @@
     </Compile>
     <Compile Include="src\main\csharp\TemporaryTopic.cs" />
     <Compile Include="src\main\csharp\TextMessage.cs" />
-    <Compile Include="src\main\csharp\TibcoUtil.cs" />
     <Compile Include="src\main\csharp\Topic.cs" />
   </ItemGroup>
   <ItemGroup>