Author: jgomes
Date: Fri Oct 17 12:39:20 2008
New Revision: 705737
URL: http://svn.apache.org/viewvc?rev=705737&view=rev
Log:
Adding deploy folder for external referencing of official builds.
Added:
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/deploy/ (props changed)
- copied from r705713,
activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/deploy/
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/lib/ (props changed)
- copied from r705300, activemq/activemq-dotnet/Apache.NMS/trunk/lib/
activemq/activemq-dotnet/Apache.NMS.MSMQ/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.MSMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vendor/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.sln
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/deploy/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/lib/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build?rev=705737&r1=705736&r2=705737&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Fri Oct 17
12:39:20 2008
@@ -6,9 +6,9 @@
The ASF licenses this file to You 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.
@@ -19,52 +19,28 @@
<!--
============================================================================================
-->
<!-- 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.MSMQ"/>
- <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 MSMQ Class Library"/>
- <property name="project.description"
- value="Apache NMS for MSMQ Class Library (.Net Messaging Library
Implementation): An implementation of the NMS API for MSMQ"/>
-
+ <!--
============================================================================================
-->
+ <property name="basedir" value="${project::get-base-directory()}"/>
+ <property name="project.name" value="Apache.NMS.MSMQ"/>
+ <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 MSMQ Class
Library"/>
+ <property name="project.description" value="Apache NMS for MSMQ Class
Library (.Net Messaging Library Implementation): An implementation of the NMS
API for MSMQ"/>
+
<!-- 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"/>
+ <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.xml"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.xml"
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"/>
+ <property name="Apache.NMS.Test.xml"
value="${basedir}/vendor/Apache.NMS/${current.build.framework}/Apache.NMS.Test.xml"
dynamic="true"/>
<!-- Skip certain frameworks, since MSMQ is not supported on those
platforms. -->
<property name="build.netcf-2.0.skip" value="true"/>
<property name="build.mono-2.0.skip" value="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>
<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"/>
@@ -72,7 +48,7 @@
<include name="${lib.framework.dir}/System.Messaging.dll" />
<include name="${Apache.NMS.dll}"/>
</assemblyfileset>
-
+
<assemblyfileset failonempty="true" id="test.dependencies">
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
@@ -82,8 +58,7 @@
<include name="${Apache.NMS.Test.dll}"/>
<include name="${build.bin.dir}/${project.name}.dll"/>
<include name="${nunit.dll}"/>
- <include name="${nunit.extensions.dll}"/>
- </assemblyfileset>
+ </assemblyfileset>
<fileset id="content.filenames">
<include name="LICENSE.txt"/>
@@ -106,15 +81,18 @@
</fileset>
<fileset id="deploy.filenames">
- <include name="${project.name}.dll"/>
- <include name="${project.name}.xml"/>
- <include name="${project.name}.Test.dll"/>
- <include name="${project.name}.Test.xml"/>
- <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"/>
-
+ <!-- Load the common target definitions -->
+ <include buildfile="${basedir}/nant-common.xml"/>
</project>
Modified:
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs?rev=705737&r1=705736&r2=705737&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/CommonAssemblyInfo.cs
Fri Oct 17 12:39:20 2008
@@ -23,6 +23,6 @@
[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0")]
+[assembly: AssemblyVersionAttribute("1.1.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
Modified:
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs?rev=705737&r1=705736&r2=705737&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/test/csharp/CommonAssemblyInfo.cs
Fri Oct 17 12:39:20 2008
@@ -23,6 +23,6 @@
[assembly: AssemblyCopyrightAttribute("Copyright (C) 2005-2008 Apache Software
Foundation")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
-[assembly: AssemblyVersionAttribute("1.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0")]
+[assembly: AssemblyVersionAttribute("1.1.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.0")]
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Oct 17 12:39:20 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.MSMQ/trunk/vs2008-msmq-test.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj?rev=705737&r1=705736&r2=705737&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj Fri
Oct 17 12:39:20 2008
@@ -56,13 +56,21 @@
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Apache.NMS, Version=1.1.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.1.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.Messaging" />
@@ -76,14 +84,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="vendor\Apache.NMS\vs2008-nms-test.csproj">
- <Project>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</Project>
- <Name>vs2008-nms-test</Name>
- </ProjectReference>
- <ProjectReference Include="vendor\Apache.NMS\vs2008-nms.csproj">
- <Project>{300C1716-0674-4D01-8F5D-151E59A504FE}</Project>
- <Name>vs2008-nms</Name>
- </ProjectReference>
<ProjectReference Include="vs2008-msmq.csproj">
<Project>{A5FCA129-991B-4CB2-987A-B25E43B0F5EC}</Project>
<Name>vs2008-msmq</Name>
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj?rev=705737&r1=705736&r2=705737&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj Fri Oct
17 12:39:20 2008
@@ -56,6 +56,10 @@
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Apache.NMS, Version=1.1.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.Messaging" />
<Reference Include="System.Xml" />
@@ -85,12 +89,6 @@
</None>
</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.MSMQ/trunk/vs2008-msmq.sln
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.sln?rev=705737&r1=705736&r2=705737&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.sln (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.sln Fri Oct 17
12:39:20 2008
@@ -5,10 +5,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2008-msmq-test",
"vs2008-msmq-test.csproj", "{2F31ED5C-44A2-464A-BD55-2B5B010654E8}"
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 @@
{2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Debug|Any CPU.Build.0 =
Debug|Any CPU
{2F31ED5C-44A2-464A-BD55-2B5B010654E8}.Release|Any
CPU.ActiveCfg = Release|Any CPU
{2F31ED5C-44A2-464A-BD55-2B5B010654E8}.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
