Return-Path: 
 <commits-return-7375-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 91831 invoked from network); 30 Oct 2007 14:45:09 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Oct 2007 14:45:09 -0000
Received: (qmail 14604 invoked by uid 500); 30 Oct 2007 14:44:56 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 14566 invoked by uid 500); 30 Oct 2007 14:44:56 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 14557 invoked by uid 99); 30 Oct 2007 14:44:56 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 07:44:56 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 14:44:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 618141A9832; Tue, 30 Oct 2007 07:44:38 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r590091 - in /activemq/activemq-dotnet/Apache.NMS/trunk:
 build-common.xml nant-common.xml nant.build
Date: Tue, 30 Oct 2007 14:44:32 -0000
To: commits@activemq.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071030144438.618141A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Tue Oct 30 07:44:28 2007
New Revision: 590091

URL: http://svn.apache.org/viewvc?rev=590091&view=rev
Log:
Factored out all the common nant stuff into nant-common.xml

Added:
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
Removed:
    activemq/activemq-dotnet/Apache.NMS/trunk/build-common.xml
Modified:
    activemq/activemq-dotnet/Apache.NMS/trunk/nant.build

Added: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=590091&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (added)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Oct 30 07:44:28 2007
@@ -0,0 +1,411 @@
+<?xml version="1.0" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    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.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
+  
+  <!-- ============================================================================================ -->
+  <!--    I N I T I A L I Z A T I O N    T A R G E T S                                              -->
+  <!-- ============================================================================================ -->
+
+  <!-- global project settings -->
+  <property name="project.release.type"  value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+  <property name="project.version.full"  value="${project.version + if(project.release.type == 'release', '', '-' + project.release.type)}" dynamic="true" />
+  <property name="build.dir"             value="${basedir}/build" />
+  <property name="doc.dir"               value="${build.dir}/doc" />
+  <property name="lib.dir"               value="${path::combine(basedir, 'lib')}" dynamic="true" />
+  <property name="lib.family.dir"        value="${path::combine(lib.dir, framework::get-family(framework::get-target-framework()))}" dynamic="true" />
+  <property name="lib.framework.dir"     value="${path::combine(lib.family.dir, version::to-string(framework::get-version(framework::get-target-framework())))}" dynamic="true" />
+
+  <!-- default configuration -->
+  <property name="build.defines"           value=""/>
+  <property name="build.noskip"            value="false"/>
+  <property name="build.skip"              value="false"/>
+  <property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}"/>
+  <property name="current.build.framework" value="${framework::get-target-framework()}"/>
+  <property name="current.build.defines"   value="${build.defines}" />
+
+  <!-- Helper targets used to enable build configurations -->
+  <target name="set-noskip-configuration" description="Disable skiping builds">
+    <property name="project.noskip"         value="true" />
+  </target>
+  
+  <target name="set-debug-configuration" description="Enabled 'debug' builds">
+    <property name="current.build.config"         value="debug" />
+    <property name="current.build.config.debug"   value="true" />
+    <property name="current.build.config.release" value="false" />
+    <property name="csc.debug"                    value="true" />
+  </target>
+  
+  <target name="set-release-configuration" description="Enabled 'release' builds">
+    <property name="current.build.config"         value="release" />
+    <property name="current.build.config.release" value="true" />
+    <property name="current.build.config.debug"   value="false" />
+    <property name="csc.debug"                    value="true" />
+  </target>
+  
+  <target name="set-net-1.0-framework-configuration">
+    <property name="current.build.framework" value="net-1.0" />
+    <property name="current.build.framework.name" value=".NET 1.0"/>
+    <property name="current.build.defines" value="${build.defines}NET,NET_1_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="true" />
+    <property name="link.sdkdoc.version" value="SDK_v1_0" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-net-1.1-framework-configuration">
+    <property name="current.build.framework" value="net-1.1" />
+    <property name="current.build.framework.name" value=".NET 1.1"/>
+    <property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
+    <property name="current.build.framework.sign" value="true" />
+    <property name="link.sdkdoc.version" value="SDK_v1_1" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-net-2.0-framework-configuration">
+    <property name="current.build.framework" value="net-2.0" />
+    <property name="current.build.framework.name" value=".NET 2.0"/>
+    <property name="current.build.defines" value="${build.defines}NET,NET_2_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="true"/>
+    <property name="link.sdkdoc.version" value="SDK_v1_1" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-netcf-1.0-framework-configuration">
+    <property name="current.build.framework" value="netcf-1.0" />
+    <property name="current.build.framework.name" value=".NET Compact Framework 1.0"/>
+    <property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_1_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="false" />
+    <property name="link.sdkdoc.version" value="SDK_v1_1" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-netcf-2.0-framework-configuration">
+    <property name="current.build.framework" value="netcf-2.0" />
+    <property name="current.build.framework.name" value=".NET Compact Framework 2.0"/>
+    <property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_2_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="false" />
+    <property name="link.sdkdoc.version" value="SDK_v1_1" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-mono-1.0-framework-configuration">
+    <property name="current.build.framework" value="mono-1.0" />
+    <property name="current.build.framework.name" value="Mono 1.0"/>
+    <property name="current.build.defines" value="${build.defines}MONO,MONO_1_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="true" />
+    <property name="link.sdkdoc.version" value="SDK_v1_1" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-mono-2.0-framework-configuration">
+    <property name="current.build.framework" value="mono-2.0" />
+    <property name="current.build.framework.name" value="Mono 2.0"/>
+    <property name="current.build.defines" value="${build.defines}MONO,MONO_2_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="true" />
+    <property name="link.sdkdoc.version" value="SDK_v1_1" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+  
+  <target name="set-sscli-1.0-framework-configuration">
+    <property name="current.build.framework" value="sscli-1.0" />
+    <property name="current.build.framework.name" value="sscli 1.0"/>
+    <property name="current.build.defines" value="${build.defines}SSCLI,SSCLI_1_0" dynamic="true" />
+    <property name="current.build.framework.sign" value="false" />
+    <property name="link.sdkdoc.version" value="SDK_v1_0" />
+    <property name="link.sdkdoc.web" value="true" />
+    <if test="${framework::exists(current.build.framework)}">
+      <property name="nant.settings.currentframework" value="${current.build.framework}" />
+    </if>
+  </target>
+
+  <target name="release-init" description="Initializes release build properties">
+    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" />
+    <if test="${not file::exists(snk.file)}">
+      <if test="${build.noskip}">
+    <fail message="Release key file not found. You can generate a key file by running 'sn -k ${snk.file}'." />
+      </if>
+      <if test="${not(build.noskip)}">
+        <echo message="Release key file not found. You can generate a key file by running 'sn -k ${snk.file}'." />
+        <echo message="The Release build will be skipped." />
+        <property name="build.skip.release" value="true"/>
+      </if>
+    </if>
+    <if test="${file::exists(snk.file)}">
+      <property name="build.skip.release" value="false" />
+    </if>
+  </target>
+
+  <target name="init" description="Initializes build properties">
+    <!-- enabled the release or debug configuration -->
+    <call target="set-${current.build.config}-configuration"/>
+
+    <!-- Check to see if our build setup for the target framework -->
+    <if test="${not(target::exists('set-'+current.build.framework+'-framework-configuration'))}">
+      <fail message="The '${current.build.framework}' framework is not supported by this version of ActiveMQ .NET" />
+    </if>
+    <call target="set-${current.build.framework}-framework-configuration" />
+
+    <!-- Check to see current platform supports the target framework -->
+    <if test="${framework::exists(current.build.framework)}">
+       <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
+       <if test="${current.build.config.release}">
+     <call target="release-init"/>
+     <property name="build.skip" value="${build.skip.release}" />
+       </if>
+       <if test="${not current.build.config.release}">
+         <property name="build.skip" value="false" />
+       </if>
+    </if>
+    <if test="${not framework::exists(current.build.framework)}">
+       <if test="${build.noskip}">
+      <fail message="${current.build.framework.name} is not available." />
+       </if>
+       <if test="${not(build.noskip)}">
+      <echo message="${current.build.framework.name} is not available. Build skipped." />
+          <property name="build.skip" value="true"/>
+       </if>
+    </if>
+
+    <if test="${not(build.skip)}">
+       <property name="current.build.keysign" value="${current.build.config=='release' and current.build.framework.sign}"/>
+       <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config} build for the ${current.build.framework.name} framework" />
+       <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}" />
+       <mkdir dir="${build.bin.dir}"/>
+       <call target="dependency-init"/>
+    </if>
+  </target>
+  
+  <!-- ============================================================================================ -->
+  <!--     C O M P I L E    T A R G E T S                                                           -->
+  <!-- ============================================================================================ -->
+  <target name="compile-all" depends="release-init" description="Compile all build configurations for all runtime configurations">
+    <echo message="Compiling all build configurations for all runtime configurations." />
+    <call target="set-debug-configuration" />
+    <call target="set-net-1.0-framework-configuration"  /><call target="conditional-compile" />
+    <call target="set-net-2.0-framework-configuration"  /><call target="conditional-compile" />
+    <call target="set-mono-1.0-framework-configuration" /><call target="conditional-compile" />
+    <call target="set-mono-2.0-framework-configuration" /><call target="conditional-compile" />
+    <call target="set-netcf-1.0-framework-configuration"/><call target="conditional-compile" />
+    <call target="set-netcf-2.0-framework-configuration"/><call target="conditional-compile" />
+
+    <!-- we can only do a release skip if the Key file is available -->
+    <if test="${not build.skip.release}">
+      <call target="set-release-configuration" />
+      <call target="set-net-1.0-framework-configuration"  /><call target="conditional-compile" />
+      <call target="set-net-2.0-framework-configuration"  /><call target="conditional-compile" />
+      <call target="set-mono-1.0-framework-configuration" /><call target="conditional-compile" />
+      <call target="set-mono-2.0-framework-configuration" /><call target="conditional-compile" />
+      <call target="set-netcf-1.0-framework-configuration"/><call target="conditional-compile" />
+      <call target="set-netcf-2.0-framework-configuration"/><call target="conditional-compile" />
+    </if>
+  </target>
+  
+  <target name="conditional-compile" depends="init" unless="${build.skip}"
+      description="Conditionaly compiles all the modules if build framework and type are supported">
+    <call target="compile" />
+  </target>  
+
+  <target name="compile" depends="compile-main,compile-test" description="Compile everything"/>
+
+  <target name="compile-main" depends="init" description="Build the main library">
+    <echo message="Building the ${project.name} library"/>
+    
+    <asminfo output="src/main/csharp/CommonAssemblyInfo.cs" language="CSharp">
+      <imports>
+        <import namespace="System" />
+        <import namespace="System.Reflection" />
+        <import namespace="System.Runtime.InteropServices" />
+      </imports>
+      <attributes>
+        <attribute type="ComVisibleAttribute"            value="false" />
+        <attribute type="CLSCompliantAttribute"          value="true" />
+        <attribute type="AssemblyTitleAttribute"         value="${project.short_description}" />
+        <attribute type="AssemblyDescriptionAttribute"   value="${project.description}" />
+        <attribute type="AssemblyConfigurationAttribute" value="${project.release.type}" />
+        <attribute type="AssemblyCompanyAttribute"       value="http://activemq.apache.org/nms" />
+        <attribute type="AssemblyProductAttribute"       value="${project.short_description}" />
+        <attribute type="AssemblyCopyrightAttribute"     value="Copyright (C) 2005-${datetime::get-year(datetime::now())} Apache Software Foundation" />
+        <attribute type="AssemblyTrademarkAttribute"     value="" />
+        <attribute type="AssemblyCultureAttribute"       value="" />
+        <attribute type="AssemblyVersionAttribute"       value="${project.version}" />
+        <attribute type="AssemblyInformationalVersionAttribute" value="${project.version}" />
+      </attributes>
+    </asminfo>
+
+    <csc if="${current.build.keysign}" keyfile="default.snk" target="library"
+      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
+      output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
+      <nowarn>
+        <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+        <warning number="0618" /> <!-- do not report deprecation warnings -->
+      </nowarn>
+      <sources failonempty="true">
+        <include name="src/main/csharp/**.cs" />
+      </sources>
+      <resources failonempty="true">
+        <include name="NOTICE.txt" />
+        <include name="LICENSE.txt" />
+      </resources>
+      <references refid="dependencies"/>
+    </csc>
+    <csc if="${not current.build.keysign}" target="library"
+      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
+      output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
+      <nowarn>
+    <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+    <warning number="0618" /> <!-- do not report deprecation warnings -->
+      </nowarn>
+      <sources failonempty="true">
+        <include name="src/main/csharp/**.cs" />
+      </sources>
+      <resources failonempty="true">
+        <include name="NOTICE.txt" />
+        <include name="LICENSE.txt" />
+      </resources>
+      <references refid="dependencies"/>
+    </csc>
+  </target>
+
+  <!-- Compile the nms-test module -->
+  <target name="compile-test" depends="compile-main" description="Build the test library">
+    <echo message="Building the ${project.name}.Test library" />
+
+    <asminfo output="src/test/csharp/CommonAssemblyInfo.cs" language="CSharp">
+      <imports>
+        <import namespace="System" />
+        <import namespace="System.Reflection" />
+        <import namespace="System.Runtime.InteropServices" />
+      </imports>
+      <attributes>
+        <attribute type="ComVisibleAttribute"            value="false" />
+        <attribute type="CLSCompliantAttribute"          value="true" />
+        <attribute type="AssemblyTitleAttribute"         value="${project.short_description}" />
+        <attribute type="AssemblyDescriptionAttribute"   value="${project.description}" />
+        <attribute type="AssemblyConfigurationAttribute" value="${project.release.type}" />
+        <attribute type="AssemblyCompanyAttribute"       value="http://activemq.apache.org/nms" />
+        <attribute type="AssemblyProductAttribute"       value="${project.short_description}" />
+        <attribute type="AssemblyCopyrightAttribute"     value="Copyright (C) 2005-${datetime::get-year(datetime::now())} Apache Software Foundation" />
+        <attribute type="AssemblyTrademarkAttribute"     value="" />
+        <attribute type="AssemblyCultureAttribute"       value="" />
+        <attribute type="AssemblyVersionAttribute"       value="${project.version}" />
+        <attribute type="AssemblyInformationalVersionAttribute" value="${project.version}" />
+      </attributes>
+    </asminfo>
+
+    <csc if="${current.build.keysign}" keyfile="default.snk" target="library"
+      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
+      output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
+      <nowarn>
+        <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+        <warning number="0618" /> <!-- do not report deprecation warnings -->
+      </nowarn>
+      <sources failonempty="true">
+          <include name="src/test/csharp/**.cs" />
+      </sources>
+      <resources failonempty="true">
+        <include name="NOTICE.txt" />
+        <include name="LICENSE.txt" />
+      </resources>
+      <references refid="test.dependencies"/>
+    </csc>
+    <csc if="${not current.build.keysign}" target="library"
+      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
+      output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
+      <nowarn>
+        <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+        <warning number="0618" /> <!-- do not report deprecation warnings -->
+      </nowarn>
+      <sources failonempty="true">
+        <include name="src/test/csharp/**.cs" />
+      </sources>
+      <resources failonempty="true">
+        <include name="NOTICE.txt" />
+        <include name="LICENSE.txt" />
+      </resources>
+      <references refid="test.dependencies"/>
+    </csc>
+  </target>
+
+    
+  <!-- ============================================================================================ -->
+  <!--      M I S C E L L A N E O U S    T A R G E T S                                              -->
+  <!-- ============================================================================================ -->
+
+  <target name="clean" description="Deletes build">
+    <delete dir="build" if="${directory::exists('build')}" />
+  </target>
+  
+  <target name="doc" depends="compile">
+    <mkdir dir="${doc.dir}"/>
+    <ndoc failonerror="false">
+      <assemblies basedir="${build.bin.dir}">
+        <include name="${project.name}.dll" />
+      </assemblies>
+      <summaries basedir="${basedir}/src/main/ndoc">
+        <include name="NamespaceSummary.xml" />
+      </summaries>
+      <documenters>
+        <documenter name="MSDN">
+        <property name="OutputDirectory" value="${doc.dir}" />
+          <property name="HtmlHelpName" value="${project.name}" />
+          <property name="HtmlHelpCompilerFilename" value="hhc.exe" />
+          <property name="IncludeFavorites" value="False" />
+          <property name="Title" value="${project.short_description}" />
+          <property name="SplitTOCs" value="False" />
+          <property name="DefaulTOC" value="" />
+          <!--
+            <property name="ShowVisualBasic" value="True" />
+            <property name="ShowMissingSummaries" value="True" />
+            <property name="ShowMissingRemarks" value="True" />
+            <property name="ShowMissingParams" value="True" />
+            <property name="ShowMissingReturns" value="True" />
+            <property name="ShowMissingValues" value="True" />
+          -->
+          <property name="DocumentInternals" value="False" />
+          <property name="DocumentProtected" value="True" />
+          <property name="DocumentPrivates" value="False" />
+          <property name="DocumentEmptyNamespaces" value="False" />
+          <property name="IncludeAssemblyVersion" value="False" />
+          <property name="CopyrightText" value="" />
+          <property name="CopyrightHref" value="" />
+        </documenter>
+      </documenters>
+    </ndoc>
+  </target>
+  
+</project>
\ No newline at end of file

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=590091&r1=590090&r2=590091&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Tue Oct 30 07:44:28 2007
@@ -15,7 +15,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project name="activemq-dotnet" default="compile-all" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
+<project name="Apache.NMS" default="compile-all" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
 
   <!-- ============================================================================================ -->
   <!--      I N I T I A L I Z A T I O N                                                             -->
@@ -30,146 +30,22 @@
            value="Apache NMS Class Library"/>
   <property name="project.description"
            value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers"/>
-  
-  <!-- Sets up all the different framework targets -->
-	<include buildfile="${basedir}/build-common.xml"/>
-
-  <target name="compile" depends="compile-nms,compile-nms-test" description="Compile everything"/>
-
-  <!-- Compile the nms module -->
-  <target name="compile-nms" depends="init" description="Build the Apache.NMS library">
-    <echo message="Building the Apache.NMS library"/>
-    
-    <asminfo output="src/main/csharp/CommonAssemblyInfo.cs" language="CSharp">
-      <imports>
-        <import namespace="System" />
-        <import namespace="System.Reflection" />
-        <import namespace="System.Runtime.InteropServices" />
-      </imports>
-      <attributes>
-        <attribute type="ComVisibleAttribute"            value="false" />
-        <attribute type="CLSCompliantAttribute"          value="true" />
-        <attribute type="AssemblyTitleAttribute"         value="${project.short_description}" />
-        <attribute type="AssemblyDescriptionAttribute"   value="${project.description}" />
-        <attribute type="AssemblyConfigurationAttribute" value="${project.release.type}" />
-        <attribute type="AssemblyCompanyAttribute"       value="http://activemq.apache.org/nms" />
-        <attribute type="AssemblyProductAttribute"       value="${project.short_description}" />
-        <attribute type="AssemblyCopyrightAttribute"     value="Copyright (C) 2005-${datetime::get-year(datetime::now())} Apache Software Foundation" />
-        <attribute type="AssemblyTrademarkAttribute"     value="" />
-        <attribute type="AssemblyCultureAttribute"       value="" />
-        <attribute type="AssemblyVersionAttribute"       value="${project.version}" />
-        <attribute type="AssemblyInformationalVersionAttribute" value="${project.version}" />
-      </attributes>
-    </asminfo>
-
-    <csc if="${current.build.keysign}" keyfile="default.snk" target="library"
-      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
-      output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
-      <nowarn>
-        <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
-        <warning number="0618" /> <!-- do not report deprecation warnings -->
-      </nowarn>
-      <sources failonempty="true">
-        <include name="src/main/csharp/**.cs" />
-      </sources>
-      <resources failonempty="true">
-        <include name="NOTICE.txt" />
-        <include name="LICENSE.txt" />
-      </resources>
-      <references failonempty="true">
-        <include name="mscorlib.dll" asis="true"/>
-        <include name="System.dll" asis="true"/>
-      </references>
-    </csc>
-    <csc if="${not current.build.keysign}" target="library"
-      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
-      output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
-      <nowarn>
-    <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
-    <warning number="0618" /> <!-- do not report deprecation warnings -->
-      </nowarn>
-      <sources failonempty="true">
-        <include name="src/main/csharp/**.cs" />
-      </sources>
-      <resources failonempty="true">
-        <include name="NOTICE.txt" />
-        <include name="LICENSE.txt" />
-      </resources>
-      <references failonempty="true">
-        <include name="mscorlib.dll" asis="true"/>
-        <include name="System.dll" asis="true"/>
-      </references>
-    </csc>
-  </target>
-
-  <!-- Compile the nms-test module -->
-  <target name="compile-nms-test" depends="compile-nms" description="Build the Apache.NMS.Test library">
-    <echo message="Building the Apache.NMS.Test library" />
-
-    <asminfo output="src/test/csharp/CommonAssemblyInfo.cs" language="CSharp">
-      <imports>
-        <import namespace="System" />
-        <import namespace="System.Reflection" />
-        <import namespace="System.Runtime.InteropServices" />
-      </imports>
-      <attributes>
-        <attribute type="ComVisibleAttribute"            value="false" />
-        <attribute type="CLSCompliantAttribute"          value="true" />
-        <attribute type="AssemblyTitleAttribute"         value="${project.short_description}" />
-        <attribute type="AssemblyDescriptionAttribute"   value="${project.description}" />
-        <attribute type="AssemblyConfigurationAttribute" value="${project.release.type}" />
-        <attribute type="AssemblyCompanyAttribute"       value="http://activemq.apache.org/nms" />
-        <attribute type="AssemblyProductAttribute"       value="${project.short_description}" />
-        <attribute type="AssemblyCopyrightAttribute"     value="Copyright (C) 2005-${datetime::get-year(datetime::now())} Apache Software Foundation" />
-        <attribute type="AssemblyTrademarkAttribute"     value="" />
-        <attribute type="AssemblyCultureAttribute"       value="" />
-        <attribute type="AssemblyVersionAttribute"       value="${project.version}" />
-        <attribute type="AssemblyInformationalVersionAttribute" value="${project.version}" />
-      </attributes>
-    </asminfo>
 
-    <csc if="${current.build.keysign}" keyfile="default.snk" target="library"
-      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
-      output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
-      <nowarn>
-        <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
-        <warning number="0618" /> <!-- do not report deprecation warnings -->
-      </nowarn>
-      <sources failonempty="true">
-          <include name="src/test/csharp/**.cs" />
-      </sources>
-      <resources failonempty="true">
-        <include name="NOTICE.txt" />
-        <include name="LICENSE.txt" />
-      </resources>
-      <references failonempty="true">
-        <include name="mscorlib.dll" asis="true"/>
-        <include name="System.dll" asis="true"/>
-        <include name="${lib.dir}/all/nunit/nunit.framework.dll"/>
-        <include name="${build.bin.dir}/${project.name}.dll"/>
-      </references>
-    </csc>
-    <csc if="${not current.build.keysign}" target="library"
-      define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"
-      output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
-      <nowarn>
-        <warning number="1591" /> <!-- do not report warnings for missing XML comments -->
-        <warning number="0618" /> <!-- do not report deprecation warnings -->
-      </nowarn>
-      <sources failonempty="true">
-        <include name="src/test/csharp/**.cs" />
-      </sources>
-      <resources failonempty="true">
-        <include name="NOTICE.txt" />
-        <include name="LICENSE.txt" />
-      </resources>
-      <references failonempty="true">
-        <include name="mscorlib.dll" asis="true"/>
-        <include name="System.dll" asis="true"/>
-        <include name="${lib.dir}/all/nunit/nunit.framework.dll"/>
-        <include name="${build.bin.dir}/${project.name}.dll"/>
-      </references>
-    </csc>
+  <!-- Sets up all the different framework targets -->
+	<include buildfile="${basedir}/nant-common.xml"/>
+	
+  <target name="dependency-init" description="Initializes build dependencies">
+  	<assemblyfileset failonempty="true" id="dependencies">
+      <include name="mscorlib.dll" asis="true"/>
+      <include name="System.dll" asis="true"/>
+  	</assemblyfileset>
+  	
+  	<assemblyfileset failonempty="true" id="test.dependencies">
+      <lib refid="dependencies"/>
+      <include name="${build.bin.dir}/${project.name}.dll"/>
+      <include name="${lib.dir}/all/nunit/nunit.framework.dll"/>
+  	</assemblyfileset>  
   </target>
+  
   
 </project>