Author: jgomes
Date: Fri Oct 17 12:30:47 2008
New Revision: 705735
URL: http://svn.apache.org/viewvc?rev=705735&view=rev
Log:
Adding deploy folder for external referencing of official builds.
Added:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/deploy/ (props changed)
- copied from r705677,
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/deploy/
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/lib/ (props changed)
- copied from r705300, activemq/activemq-dotnet/Apache.NMS/trunk/lib/
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (props
changed)
- copied unchanged from r705677,
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant-common.xml
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vendor/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/deploy/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/lib/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=705735&r1=705734&r2=705735&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Fri Oct 17
12:30:47 2008
@@ -20,47 +20,21 @@
<!--
============================================================================================
-->
<!-- I N I T I A L I Z A T I O N
-->
<!--
============================================================================================
-->
- <property name="basedir"
- value="${project::get-base-directory()}"/>
- <property name="project.name"
- value="Apache.NMS.ActiveMQ"/>
- <property name="project.group"
- value="org.apache.activemq"/>
- <property name="project.version"
- value="1.0" unless="${property::exists('project.version')}"/>
- <property name="project.short_description"
- value="Apache NMS for ActiveMQ Class Library"/>
- <property name="project.description"
- value="Apache NMS for ActiveMQ Class Library (.Net Messaging
Library Implementation): An implementation of the NMS API for ActiveMQ"/>
+ <property name="basedir" value="${project::get-base-directory()}"/>
+ <property name="project.name" value="Apache.NMS.ActiveMQ"/>
+ <property name="project.group" value="org.apache.activemq"/>
+ <property name="project.version" value="1.1.0"
unless="${property::exists('project.version')}"/>
+ <property name="project.short_description" value="Apache NMS for ActiveMQ
Class Library"/>
+ <property name="project.description" value="Apache NMS for ActiveMQ Class
Library (.Net Messaging Library Implementation): An implementation of the NMS
API for ActiveMQ"/>
<!-- Repository organized as: organization/module/version/plaform/artifact,
platform might be something like 'all' or 'net-2.0/release' -->
- <property name="nunit.dll"
value="${basedir}/vendor/Apache.NMS/lib/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
- <property name="nunit.extensions.dll"
value="${basedir}/vendor/Apache.NMS/lib/${current.build.framework}/nunit.framework.extensions.dll"
dynamic="true"/>
- <property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.dll"
dynamic="true"/>
- <property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.pdb"
dynamic="true"/>
- <property name="Apache.NMS.xml"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.xml"
dynamic="true"/>
- <property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.Test.dll"
dynamic="true"/>
- <property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.Test.pdb"
dynamic="true"/>
- <property name="Apache.NMS.Test.xml"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.Test.xml"
dynamic="true"/>
-
- <target name="vendor-init" description="Initializes the vendor libraries.">
- <nant buildfile="${basedir}/vendor/Apache.NMS/nant.build"/>
- </target>
-
- <target name="vendor-clean" description="Cleans the vendor libraries.">
- <nant buildfile="${basedir}/vendor/Apache.NMS/nant.build" target="clean"/>
- </target>
-
- <target name="clean-init" depends="vendor-clean" description="Initialize the
clean target.">
- </target>
+ <property name="nunit.dll"
value="${basedir}/lib/${current.build.framework}/nunit.framework.dll"
dynamic="true"/>
+ <property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.dll"
dynamic="true"/>
+ <property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.pdb"
dynamic="true"/>
+ <property name="Apache.NMS.Test.dll"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll"
dynamic="true"/>
+ <property name="Apache.NMS.Test.pdb"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb"
dynamic="true"/>
<target name="dependency-init" description="Initializes build dependencies">
-
- <!-- Build the vendor dependent assemblies first. -->
- <if test="${not target::has-executed('vendor-init')}">
- <call target="vendor-init"/>
- </if>
-
<assemblyfileset failonempty="true" id="dependencies">
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
@@ -76,7 +50,6 @@
<include name="${Apache.NMS.Test.dll}"/>
<include name="${build.bin.dir}/${project.name}.dll"/>
<include name="${nunit.dll}"/>
- <include name="${nunit.extensions.dll}"/>
</assemblyfileset>
<fileset id="content.filenames">
@@ -85,12 +58,9 @@
<include name="nmsprovider-*.config"/>
<include name="${Apache.NMS.dll}"/>
<include name="${Apache.NMS.pdb}"/>
- <include name="${Apache.NMS.xml}"/>
<include name="${Apache.NMS.Test.dll}"/>
<include name="${Apache.NMS.Test.pdb}"/>
- <include name="${Apache.NMS.Test.xml}"/>
<include name="${nunit.dll}"/>
- <include name="${nunit.extensions.dll}"/>
</fileset>
<fileset id="install.filenames">
@@ -99,12 +69,19 @@
</fileset>
<fileset id="deploy.filenames">
- <include name="${project.name}.dll"/>
- <include name="nmsprovider-*.config"/>
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ <include name="${build.bin.dir}/${project.name}.dll"/>
+ <include name="${build.bin.dir}/${project.name}.?db"/>
+ <include name="${build.bin.dir}/${project.name}.xml"/>
+ <include name="${build.bin.dir}/${project.name}.Test.dll"/>
+ <include name="${build.bin.dir}/${project.name}.Test.?db"/>
+ <include name="${build.bin.dir}/${project.name}.Test.xml"/>
+ <include name="${build.bin.dir}/nmsprovider-*.config"/>
</fileset>
</target>
<!-- Load the common target definitions -->
- <include buildfile="${basedir}/vendor/Apache.NMS/nant-common.xml"/>
+ <include buildfile="${basedir}/nant-common.xml"/>
</project>
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs?rev=705735&r1=705734&r2=705735&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
Fri Oct 17 12:30:47 2008
@@ -151,9 +151,7 @@
// (IPv4, IPv6 and whatever else may be available).
#if NET_1_1 || NET_1_0
// The following GetHostByName() API has been obsoleted
in .NET 2.0. It has been
- // superceded by GetHostEntry(). At some point, it
will probably be removed
- // from the Mono class library, and this #if statement
can be modified.
-
+ // superceded by GetHostEntry().
IPHostEntry hostEntry = Dns.GetHostByName(host);
#else
IPHostEntry hostEntry = Dns.GetHostEntry(host);
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Oct 17 12:30:47 2008
@@ -1 +1 @@
-Apache.NMS
https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk
+Apache.NMS
https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk/deploy
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj?rev=705735&r1=705734&r2=705735&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
Fri Oct 17 12:30:47 2008
@@ -41,13 +41,21 @@
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ </Reference>
+ <Reference Include="Apache.NMS.Test, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.Test.dll</HintPath>
+ </Reference>
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral,
PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\lib\net-3.5\nunit.framework.dll</HintPath>
+ <HintPath>lib\net-3.5\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework.extensions, Version=2.4.8.0,
Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
-
<HintPath>vendor\Apache.NMS\lib\net-3.5\nunit.framework.extensions.dll</HintPath>
+ <HintPath>lib\net-3.5\nunit.framework.extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -73,23 +81,15 @@
<Compile Include="src\test\csharp\StompHelperTest.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="vendor\Apache.NMS\vs2008-nms-test.csproj">
- <Project>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</Project>
- <Name>vs2005-nms-test</Name>
- </ProjectReference>
- <ProjectReference Include="vendor\Apache.NMS\vs2008-nms.csproj">
- <Project>{300C1716-0674-4D01-8F5D-151E59A504FE}</Project>
- <Name>vs2005-nms</Name>
- </ProjectReference>
- <ProjectReference Include="vs2008-activemq.csproj">
- <Project>{08321F42-4B3D-4815-B592-95962BAC3B9F}</Project>
- <Name>vs2005-activemq</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<Content Include="nmsprovider-test.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="vs2008-activemq.csproj">
+ <Project>{08321F42-4B3D-4815-B592-95962BAC3B9F}</Project>
+ <Name>vs2008-activemq</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
\ No newline at end of file
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj?rev=705735&r1=705734&r2=705735&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
Fri Oct 17 12:30:47 2008
@@ -56,6 +56,10 @@
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Apache.NMS, Version=1.0.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>vendor\Apache.NMS\net-3.5\Apache.NMS.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
@@ -743,12 +747,6 @@
</Content>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="vendor\Apache.NMS\vs2008-nms.csproj">
- <Project>{300C1716-0674-4D01-8F5D-151E59A504FE}</Project>
- <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>
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln?rev=705735&r1=705734&r2=705735&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.sln Fri
Oct 17 12:30:47 2008
@@ -5,10 +5,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-activemq-test",
"vs2008-activemq-test.csproj", "{EB943C69-2C9B-45E7-B95B-FB916E7057ED}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-nms",
"vendor\Apache.NMS\vs2008-nms.csproj", "{300C1716-0674-4D01-8F5D-151E59A504FE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-nms-test",
"vendor\Apache.NMS\vs2008-nms-test.csproj",
"{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}"
-EndProject
Global
GlobalSection(SubversionScc) = preSolution
Svn-Managed = True
@@ -27,14 +23,6 @@
{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.Build.0 =
Debug|Any CPU
{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any
CPU.ActiveCfg = Release|Any CPU
{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.Build.0
= Release|Any CPU
- {300C1716-0674-4D01-8F5D-151E59A504FE}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {300C1716-0674-4D01-8F5D-151E59A504FE}.Debug|Any CPU.Build.0 =
Debug|Any CPU
- {300C1716-0674-4D01-8F5D-151E59A504FE}.Release|Any
CPU.ActiveCfg = Release|Any CPU
- {300C1716-0674-4D01-8F5D-151E59A504FE}.Release|Any CPU.Build.0
= Release|Any CPU
- {2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Debug|Any CPU.ActiveCfg
= Debug|Any CPU
- {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
