activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r676700 - in /activemq/activemq-dotnet/Apache.NMS/trunk: ./ src/main/csharp/ src/main/csharp/Util/
Date Mon, 14 Jul 2008 19:40:36 GMT
Author: jgomes
Date: Mon Jul 14 12:40:35 2008
New Revision: 676700

URL: http://svn.apache.org/viewvc?rev=676700&view=rev
Log:
Upgrade to VS2008 build scripts.

Added:
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj   (contents, props changed)
      - copied, changed from r676695, activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-cf20.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj   (contents, props changed)
      - copied, changed from r676695, activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-test.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj   (contents, props changed)
      - copied, changed from r676695, activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms.csproj
Removed:
    activemq/activemq-dotnet/Apache.NMS/trunk/build-xbuild.sh
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-cf20.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-test.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms.sln
Modified:
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConnectionFactory.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/CountDownLatch.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.sln

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConnectionFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConnectionFactory.cs?rev=676700&r1=676699&r2=676700&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConnectionFactory.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConnectionFactory.cs Mon
Jul 14 12:40:35 2008
@@ -65,9 +65,13 @@
                 // If an implementation was found, try to instantiate it.
 				if(factoryType != null)
                 {
-                    object[] parameters = MakeParameterArray(uriProvider, constructorParams);
+#if NETCF
+					connectionFactory = (IConnectionFactory) Activator.CreateInstance(factoryType);
+#else
+					object[] parameters = MakeParameterArray(uriProvider, constructorParams);
 					connectionFactory = (IConnectionFactory) Activator.CreateInstance(factoryType, parameters);
-                }
+#endif
+				}
 
 				if(null == connectionFactory)
                 {
@@ -103,7 +107,11 @@
 
 				if(null != assembly)
 				{
+#if NETCF
+					factoryType = assembly.GetType(factoryClassName, true);
+#else
 					factoryType = assembly.GetType(factoryClassName, true, true);
+#endif
 				}
 			}
 

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/CountDownLatch.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/CountDownLatch.cs?rev=676700&r1=676699&r2=676700&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/CountDownLatch.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/CountDownLatch.cs Mon Jul
14 12:40:35 2008
@@ -57,7 +57,7 @@
 
 		public bool await(TimeSpan timeout)
 		{
-			return mutex.WaitOne(timeout, false);
+			return mutex.WaitOne((int) timeout.TotalMilliseconds, false);
 		}
 
 		public WaitHandle AsyncWaitHandle

Copied: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj (from r676695, activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-cf20.csproj)
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj?p2=activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj&p1=activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-cf20.csproj&r1=676695&r2=676700&rev=676700&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-cf20.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj Mon Jul 14 12:40:35 2008
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9C67B162-803E-4765-8A1C-041871E6928C}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -17,6 +17,12 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FormFactorID>
     </FormFactorID>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <NativePlatformName>Pocket PC 2003</NativePlatformName>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,32 +55,39 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\main\csharp\NMS\CommonAssemblyInfo.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\InvalidDestinationException.cs" />
-    <Compile Include="src\main\csharp\NMS\IObjectMessage.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\ITrace.cs" />
-    <Compile Include="src\main\csharp\NMS\NMSConnectionException.cs" />
-    <Compile Include="src\main\csharp\NMS\NMSConstants.cs" />
-    <Compile Include="src\main\csharp\NMS\NMSException.cs" />
-    <Compile Include="src\main\csharp\NMS\NMSSecurityException.cs" />
-    <Compile Include="src\main\csharp\NMS\Tracer.cs" />
+    <Compile Include="src\main\csharp\CommonAssemblyInfo.cs" />
+    <Compile Include="src\main\csharp\IBytesMessage.cs" />
+    <Compile Include="src\main\csharp\IConnection.cs" />
+    <Compile Include="src\main\csharp\IConnectionFactory.cs" />
+    <Compile Include="src\main\csharp\IDestination.cs" />
+    <Compile Include="src\main\csharp\IMapMessage.cs" />
+    <Compile Include="src\main\csharp\IMessage.cs" />
+    <Compile Include="src\main\csharp\IMessageConsumer.cs" />
+    <Compile Include="src\main\csharp\IMessageProducer.cs" />
+    <Compile Include="src\main\csharp\InvalidDestinationException.cs" />
+    <Compile Include="src\main\csharp\IObjectMessage.cs" />
+    <Compile Include="src\main\csharp\IPrimitiveMap.cs" />
+    <Compile Include="src\main\csharp\IQueue.cs" />
+    <Compile Include="src\main\csharp\ISession.cs" />
+    <Compile Include="src\main\csharp\IStartable.cs" />
+    <Compile Include="src\main\csharp\IStoppable.cs" />
+    <Compile Include="src\main\csharp\ITemporaryQueue.cs" />
+    <Compile Include="src\main\csharp\ITemporaryTopic.cs" />
+    <Compile Include="src\main\csharp\ITextMessage.cs" />
+    <Compile Include="src\main\csharp\ITopic.cs" />
+    <Compile Include="src\main\csharp\ITrace.cs" />
+    <Compile Include="src\main\csharp\NMSConnectionException.cs" />
+    <Compile Include="src\main\csharp\NMSConnectionFactory.cs" />
+    <Compile Include="src\main\csharp\NMSConstants.cs" />
+    <Compile Include="src\main\csharp\NMSException.cs" />
+    <Compile Include="src\main\csharp\NMSSecurityException.cs" />
+    <Compile Include="src\main\csharp\Tracer.cs" />
+    <Compile Include="src\main\csharp\Util\Atomic.cs" />
+    <Compile Include="src\main\csharp\Util\AtomicBoolean.cs" />
+    <Compile Include="src\main\csharp\Util\Convert.cs" />
+    <Compile Include="src\main\csharp\Util\CountDownLatch.cs" />
+    <Compile Include="src\main\csharp\Util\DateUtils.cs" />
+    <Compile Include="src\main\csharp\Util\URISupport.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="activemq-dotnet.snk" />
@@ -95,4 +108,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets"
/>
 </Project>
\ No newline at end of file

Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-cf20.csproj
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj (from r676695, activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-test.csproj)
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj?p2=activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj&p1=activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-test.csproj&r1=676695&r2=676700&rev=676700&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj Mon Jul 14 12:40:35 2008
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -11,6 +11,26 @@
     <WarningLevel>4</WarningLevel>
     <StartupObject>
     </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,10 +92,27 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="vs2005-nms.csproj">
+    <ProjectReference Include="vs2008-nms.csproj">
       <Project>{300C1716-0674-4D01-8F5D-151E59A504FE}</Project>
-      <Name>vs2005-nms</Name>
+      <Name>vs2008-nms</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file

Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj (from r676695, activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms.csproj)
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj?p2=activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj&p1=activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms.csproj&r1=676695&r2=676700&rev=676700&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2005-nms.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj Mon Jul 14 12:40:35 2008
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +13,11 @@
     </StartupObject>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>activemq-dotnet.snk</AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.sln
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.sln?rev=676700&r1=676699&r2=676700&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.sln (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.sln Mon Jul 14 12:40:35 2008
@@ -1,9 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms", "vs2005-nms.csproj", "{300C1716-0674-4D01-8F5D-151E59A504FE}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-nms", "vs2008-nms.csproj", "{300C1716-0674-4D01-8F5D-151E59A504FE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms-test", "vs2005-nms-test.csproj",
"{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-nms-test", "vs2008-nms-test.csproj",
"{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-nms-cf20", "vs2008-nms-cf20.csproj",
"{9C67B162-803E-4765-8A1C-041871E6928C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,6 +21,10 @@
 		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C67B162-803E-4765-8A1C-041871E6928C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C67B162-803E-4765-8A1C-041871E6928C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C67B162-803E-4765-8A1C-041871E6928C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C67B162-803E-4765-8A1C-041871E6928C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE



Mime
View raw message