Yet another fix for licensing headers

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727904 13f79535-47bb-0310-9956-ffa450edef68

30 files changed, 1732 insertions, 1122 deletions

diff --git a/qpid/dotnet/Qpid.Buffer.Tests/default.build b/qpid/dotnet/Qpid.Buffer.Tests/default.build
index 688633fc11..77e95fb9d9 100644
--- a/qpid/dotnet/Qpid.Buffer.Tests/default.build
+++ b/qpid/dotnet/Qpid.Buffer.Tests/default.build
@@ -1,27 +1,48 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Buffer" default="test">

-

-   <target name="build">

-        <csc target="library" 

-			define="${build.defines}" 

-			warnaserror="true" debug="${build.debug}" 

-         output="${build.dir}/${project::get-name()}.Tests.dll">

-			

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-            <references>

-               <include name="${build.dir}/nunit.framework.dll" />

-               <include name="${build.dir}/${project::get-name()}.dll" />

-            </references>

-            

-        </csc>

-    </target>

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Buffer" default="test">
+
+   <target name="build">
+        <csc target="library" 
+			define="${build.defines}" 
+			warnaserror="true" debug="${build.debug}" 
+         output="${build.dir}/${project::get-name()}.Tests.dll">
+			
+            <sources>
+                <include name="**/*.cs" />
+            </sources>
+            <references>
+               <include name="${build.dir}/nunit.framework.dll" />
+               <include name="${build.dir}/${project::get-name()}.dll" />
+            </references>
+            
+        </csc>
+    </target>
+    <target name="test" depends="build">
+         <nunit2>
+            <formatter type="${nant.formatter}" usefile="false" />
+            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+         </nunit2>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/Qpid.Buffer/default.build b/qpid/dotnet/Qpid.Buffer/default.build
index c2d36d15e6..efb5a8fc89 100644
--- a/qpid/dotnet/Qpid.Buffer/default.build
+++ b/qpid/dotnet/Qpid.Buffer/default.build
@@ -1,25 +1,46 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Buffer" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Buffer" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="library" 
+				define="${build.defines}" 
+            debug="${build.debug}"
+            unsafe="true"
+				output="${build.dir}/${project::get-name()}.dll">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build
index 8dfc8a6f48..5116e651e1 100644
--- a/qpid/dotnet/Qpid.Client.Tests/default.build
+++ b/qpid/dotnet/Qpid.Client.Tests/default.build
@@ -1,4 +1,25 @@
 <?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 name="Apache.Qpid.Client" default="test">
 
     <target name="build">
diff --git a/qpid/dotnet/Qpid.Client/default.build b/qpid/dotnet/Qpid.Client/default.build
index 14e457203e..9a0ec2ea6d 100644
--- a/qpid/dotnet/Qpid.Client/default.build
+++ b/qpid/dotnet/Qpid.Client/default.build
@@ -1,4 +1,25 @@
 <?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 name="Apache.Qpid.Client" default="build">
     <!--
 		Properties that come from master build file
diff --git a/qpid/dotnet/Qpid.Codec/default.build b/qpid/dotnet/Qpid.Codec/default.build
index db9e8d1166..dd59df7d6a 100644
--- a/qpid/dotnet/Qpid.Codec/default.build
+++ b/qpid/dotnet/Qpid.Codec/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Codec" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Codec" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="library" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.dll">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/Apache.Qpid.Buffer.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/Qpid.Common.Tests/default.build b/qpid/dotnet/Qpid.Common.Tests/default.build
index 00658bdbe2..a97c0282c2 100644
--- a/qpid/dotnet/Qpid.Common.Tests/default.build
+++ b/qpid/dotnet/Qpid.Common.Tests/default.build
@@ -1,31 +1,52 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Common" default="test">

-

-   <target name="build">

-        <csc target="library" 

-			define="${build.defines}" 

-			warnaserror="true" debug="${build.debug}" 

-         output="${build.dir}/${project::get-name()}.Tests.dll">

-			

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-            <references>

-               <include name="${build.dir}/log4net.dll" />

-               <include name="${build.dir}/nunit.framework.dll" />

-               <include name="${build.dir}/${project::get-name()}.dll" />

-               <include name="${build.dir}/Apache.Qpid.Codec.dll" />

-               <include name="${build.dir}/Apache.Qpid.Messaging.dll" />

-               <include name="${build.dir}/Apache.Qpid.Buffer.dll" />

-            </references>

-            

-        </csc>

-    </target>

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Common" default="test">
+
+   <target name="build">
+        <csc target="library" 
+			define="${build.defines}" 
+			warnaserror="true" debug="${build.debug}" 
+         output="${build.dir}/${project::get-name()}.Tests.dll">
+			
+            <sources>
+                <include name="**/*.cs" />
+            </sources>
+            <references>
+               <include name="${build.dir}/log4net.dll" />
+               <include name="${build.dir}/nunit.framework.dll" />
+               <include name="${build.dir}/${project::get-name()}.dll" />
+               <include name="${build.dir}/Apache.Qpid.Codec.dll" />
+               <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
+               <include name="${build.dir}/Apache.Qpid.Buffer.dll" />
+            </references>
+            
+        </csc>
+    </target>
+    <target name="test" depends="build">
+         <nunit2>
+            <formatter type="${nant.formatter}" usefile="false" />
+            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+         </nunit2>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/Qpid.Common/build.xml b/qpid/dotnet/Qpid.Common/build.xml
index b6a8fb63b9..96dd877722 100644
--- a/qpid/dotnet/Qpid.Common/build.xml
+++ b/qpid/dotnet/Qpid.Common/build.xml
@@ -1,4 +1,26 @@
 <!--
+ 
+ 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.
+ 
+-->
+
+
+<!--
  This sole purpose of this build script is to generate the framing layer for the .net client from the AMQ spec.
  -->
 <project name="AMQ Dot Net Framing Layer" default="generate">
diff --git a/qpid/dotnet/Qpid.Common/default.build b/qpid/dotnet/Qpid.Common/default.build
index 36055b9ca9..df07397d0b 100644
--- a/qpid/dotnet/Qpid.Common/default.build
+++ b/qpid/dotnet/Qpid.Common/default.build
@@ -1,4 +1,25 @@
 <?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 name="Apache.Qpid.Common" default="build">
     <!--
 		Properties that come from master build file
diff --git a/qpid/dotnet/Qpid.Integration.Tests/default.build b/qpid/dotnet/Qpid.Integration.Tests/default.build
index 36c28dc1d7..187aa15894 100644
--- a/qpid/dotnet/Qpid.Integration.Tests/default.build
+++ b/qpid/dotnet/Qpid.Integration.Tests/default.build
@@ -1,48 +1,69 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Integration.Tests" default="test">

-

-    <!-- Creates a .dll for this module. -->

-    <target name="build">

-

-        <csc target="library"

-             define="${build.defines}"

-             warnaserror="false" 

-             debug="${build.debug}"

-             output="${build.dir}/${project::get-name()}.dll">

-            

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-

-            <references>

-                <include name="${build.dir}/log4net.dll" />

-                <include name="${build.dir}/nunit.framework.dll" />

-                <include name="${build.dir}/Apache.Qpid.Common.dll" />

-                <include name="${build.dir}/Apache.Qpid.Messaging.dll" />

-                <include name="${build.dir}/Apache.Qpid.Client.dll" />

-                <include name="${build.dir}/Apache.Qpid.Sasl.dll" />

-            </references>

-        </csc>

-

-        <!--<copy tofile="${build.dir}/${project::get-name()}.dll.config" file="App.config" />-->

-        <copy todir="${build.dir}" file="log4net.config"/>

-

-    </target>

-

-    <!-- Runs all of the tests in this module. -->

-    <target name="test" depends="build">

-        <nunit2 verbose="true">

-            <formatter type="${nant.formatter}" usefile="true" outputdir="${build.dir}/testresults/" extension="txt"/>

-            <formatter type="Plain" usefile="false"/>

-            <test>

-                <assemblies>

-                    <include name="${build.dir}/${project::get-name()}.dll"/>

-                </assemblies>

-                <categories>

-                    <include name="Integration"/>

-                </categories>

-            </test>

-        </nunit2>

-    </target>

-

-</project>

+<?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 name="Apache.Qpid.Integration.Tests" default="test">
+
+    <!-- Creates a .dll for this module. -->
+    <target name="build">
+
+        <csc target="library"
+             define="${build.defines}"
+             warnaserror="false" 
+             debug="${build.debug}"
+             output="${build.dir}/${project::get-name()}.dll">
+            
+            <sources>
+                <include name="**/*.cs" />
+            </sources>
+
+            <references>
+                <include name="${build.dir}/log4net.dll" />
+                <include name="${build.dir}/nunit.framework.dll" />
+                <include name="${build.dir}/Apache.Qpid.Common.dll" />
+                <include name="${build.dir}/Apache.Qpid.Messaging.dll" />
+                <include name="${build.dir}/Apache.Qpid.Client.dll" />
+                <include name="${build.dir}/Apache.Qpid.Sasl.dll" />
+            </references>
+        </csc>
+
+        <!--<copy tofile="${build.dir}/${project::get-name()}.dll.config" file="App.config" />-->
+        <copy todir="${build.dir}" file="log4net.config"/>
+
+    </target>
+
+    <!-- Runs all of the tests in this module. -->
+    <target name="test" depends="build">
+        <nunit2 verbose="true">
+            <formatter type="${nant.formatter}" usefile="true" outputdir="${build.dir}/testresults/" extension="txt"/>
+            <formatter type="Plain" usefile="false"/>
+            <test>
+                <assemblies>
+                    <include name="${build.dir}/${project::get-name()}.dll"/>
+                </assemblies>
+                <categories>
+                    <include name="Integration"/>
+                </categories>
+            </test>
+        </nunit2>
+    </target>
+
+</project>
diff --git a/qpid/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build
index 789258bfad..e351def886 100644
--- a/qpid/dotnet/Qpid.Messaging/default.build
+++ b/qpid/dotnet/Qpid.Messaging/default.build
@@ -1,24 +1,45 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Messaging" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-            output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Messaging" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="library" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+            output="${build.dir}/${project::get-name()}.dll">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/Qpid.Sasl.Tests/default.build b/qpid/dotnet/Qpid.Sasl.Tests/default.build
index eb0514d417..5b51c0a6fa 100644
--- a/qpid/dotnet/Qpid.Sasl.Tests/default.build
+++ b/qpid/dotnet/Qpid.Sasl.Tests/default.build
@@ -1,31 +1,52 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Sasl" default="test">

-

-   <target name="build">

-        <csc target="library" 

-			define="${build.defines}" 

-			warnaserror="true" debug="${build.debug}" 

-         output="${build.dir}/${project::get-name()}.Tests.dll">

-			

-            <sources>

-                <include name="**/*.cs" />

-            </sources>

-            <references>

-               <include name="${build.dir}/nunit.framework.dll" />

-               <include name="${build.dir}/${project::get-name()}.dll" />

-            </references>

-            

-         </csc>

-         <copy 

-            tofile="${build.dir}/${project::get-name()}.Tests.dll.config" 

-            file="App.config"

-         />

-    </target>

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Sasl" default="test">
+
+   <target name="build">
+        <csc target="library" 
+			define="${build.defines}" 
+			warnaserror="true" debug="${build.debug}" 
+         output="${build.dir}/${project::get-name()}.Tests.dll">
+			
+            <sources>
+                <include name="**/*.cs" />
+            </sources>
+            <references>
+               <include name="${build.dir}/nunit.framework.dll" />
+               <include name="${build.dir}/${project::get-name()}.dll" />
+            </references>
+            
+         </csc>
+         <copy 
+            tofile="${build.dir}/${project::get-name()}.Tests.dll.config" 
+            file="App.config"
+         />
+    </target>
+    <target name="test" depends="build">
+         <nunit2>
+            <formatter type="${nant.formatter}" usefile="false" />
+            <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+         </nunit2>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/Qpid.Sasl/default.build b/qpid/dotnet/Qpid.Sasl/default.build
index 5b44d6b9c4..57049ee2ee 100644
--- a/qpid/dotnet/Qpid.Sasl/default.build
+++ b/qpid/dotnet/Qpid.Sasl/default.build
@@ -1,24 +1,45 @@
-<?xml version="1.0"?>

-<project name="Apache.Qpid.Sasl" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="Apache.Qpid.Sasl" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="library" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.dll">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/TestClient/default.build b/qpid/dotnet/TestClient/default.build
index b7179106c2..ce1114425e 100644
--- a/qpid/dotnet/TestClient/default.build
+++ b/qpid/dotnet/TestClient/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="TestClient" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}\Apache.Qpid.Integration.Tests.dll"/>

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="TestClient" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+            debug="${build.debug}"
+            unsafe="true"
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}\Apache.Qpid.Integration.Tests.dll"/>
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/TopicListener/default.build b/qpid/dotnet/TopicListener/default.build
index afde4d6937..f9b0f97094 100644
--- a/qpid/dotnet/TopicListener/default.build
+++ b/qpid/dotnet/TopicListener/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="TopicListener" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="TopicListener" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+            debug="${build.debug}"
+            unsafe="true"
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/TopicPublisher/default.build b/qpid/dotnet/TopicPublisher/default.build
index 8991aae751..9b01c2a1bc 100644
--- a/qpid/dotnet/TopicPublisher/default.build
+++ b/qpid/dotnet/TopicPublisher/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="TopicPublisher" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-            debug="${build.debug}"

-            unsafe="true"

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="TopicPublisher" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+            debug="${build.debug}"
+            unsafe="true"
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/client/default.build b/qpid/dotnet/client-010/client/default.build
index 16b1532af9..139796a58d 100644
--- a/qpid/dotnet/client-010/client/default.build
+++ b/qpid/dotnet/client-010/client/default.build
@@ -1,25 +1,46 @@
-<?xml version="1.0"?>

-<project name="qpid.client" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="qpid.client" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="library" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.dll">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/default.build b/qpid/dotnet/client-010/default.build
index ee3e9387f9..75eadf0a0c 100644
--- a/qpid/dotnet/client-010/default.build
+++ b/qpid/dotnet/client-010/default.build
@@ -1,253 +1,274 @@
-<?xml version="1.0"?>

-<project name="Qpid.NET" default="build">

-

-    <!-- Determines the formatter to use to format output of test results. -->

-    <property name="nant.formatter" value="Plain" />

-

-    <!-- Determines whether a 'debug' or 'release' build is to be done. Defaults to 'debug' -->

-    <property name="build.config" value="debug" />

-

-    <!-- Sets build properties consistently accross all assemblies in the project. -->

-    <property name="build.version.major" value="0"/>

-    <property name="build.version.minor" value="10"/>

-    <property name="build.version.build" value="0"/>

-    <property name="build.version.revision" value="0"/>

-    <property name="build.company" value="Apache Software Foundation"/>

-    <property name="build.copyright" value="Apache Software Foundation"/>

-    <property name="build.description" value="Built from svn revision number: "/>

-

-    <!-- Fileset with build files for each 'core' assembly. -->

-    <fileset id="src.builds">

-        <include name="client/default.build" />

-        <include name="demo/default.build" />       

-    </fileset>

-

-    <!-- Fileset with build files for each 'core' assembly. -->

-    <fileset id="examples.builds">

-      <include name="examples/request-response/example-request-response-Client/default.build" />

-      <include name="examples/request-response/example-request-response-Server/default.build" />

-      <include name="examples/direct/example-direct-Listener/default.build" />

-      <include name="examples/direct/example-direct-producer/default.build" />

-      <include name="examples/fanout/example-fanout-Listener/default.build" />

-      <include name="examples/fanout/example-fanout-Producer/default.build" />

-      <include name="examples/pub-sub/example-pub-sub-Listener/default.build" />

-      <include name="examples/pub-sub/example-pub-sub-Publisher/default.build" />

-    </fileset>

-  

-    <!-- Fileset with build files for 'integration' test assemblies. -->

-    <fileset id="tests.builds">

-        <include name="test/default.build" />	

-    </fileset>	

-    

-     <!-- Fileset with build files for 'performence' test assemblies. -->

-    <fileset id="perftest.builds">

-        <include name="perftest/default.build" />	

-    </fileset>	

-

-    <!-- Prepare environment for a debug build. -->

-    <target name="debug">

-        <property name="build.debug" value="true" />

-        <property name="build.defines" value="DEBUG;TRACE"/>

-    </target>

-

-    <!-- Prepare environment for a release build. -->

-    <target name="release">

-        <property name="build.debug" value="false" />

-        <property name="build.defines" value=""/>

-    </target>

-    

-    <!-- Prepare environment for build. -->

-    <target name="init">

-        <property name="base.dir" value="${project::get-base-directory()}" />

-        <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />

-        <call target="${build.config}" />	

-    </target>   

-    

-    <!-- Cleans up the build output directory. -->

-    <target name="clean" depends="init">

-        <delete dir="${build.dir}" failonerror="false" />

-    </target>

-

-    <!-- Runs 'svnversion' to get the repository revision into the build property 'build.svnversion'. -->

-    <target name="svnversion" description="Runs svnversion to get the current repository version into a build script property.">

-        <exec program="svnversion" output="svnversion_tmp.txt">

-            <arg value="-n"/>

-        </exec>

-

-        <loadfile file="svnversion_tmp.txt" property="build.svnversion"/>

-        <delete file="svnversion_tmp.txt"/>       

-       

-        <!-- For some competely retarted reason the '-n' parameter to svnversion doesn't really work under windows... 

-             Here is some code to strip the unwanted newlines. -->

-        <script language="C#">

-            <code><![CDATA[

-            public static void ScriptMain(Project project)

-            {

-                project.Properties["build.svnversion"] = project.Properties["build.svnversion"].Trim("\n\r".ToCharArray());

-            }

-            ]]>

-            </code>

-        </script>

-

-    </target>

-

-    <!-- Performs a regex find-and-replace on assembly info files, substituting fields defined as build properties. -->

-    <target name="setversion" description="Stamp the version info onto assemblyinfo.cs files" depends="svnversion">

-

-        <echo>build.svnversion = ${build.svnversion}</echo>

-

-        <foreach item="File" property="filename">

-            <in>

-                <items basedir=".">

-                    <include name="**\AssemblyInfo.cs"></include>

-                </items>

-            </in>

-            <do>

-                <script language="C#">

-                    <code><![CDATA[

-                    public static void ScriptMain(Project project)

-                    {

-                        // Read in the entire file to perform the substitution in.

-                        StreamReader reader = new StreamReader(project.Properties["filename"]);

-                        string contents = reader.ReadToEnd();

-                        reader.Close();

-

-                        // Substitute the version numbers.

-                        string replacement = string.Format("[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",

-                                                           project.Properties["build.version.major"],

-                                                           project.Properties["build.version.minor"],

-                                                           project.Properties["build.version.build"],

-                                                           project.Properties["build.version.revision"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);

-

-                        // Substitute the company name and copyright.

-                        replacement = string.Format("[assembly: AssemblyCompany(\"{0}\")]",

-                                                    project.Properties["build.company"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);

-

-                        replacement = string.Format("[assembly: AssemblyCopyright(\"{0}\")]",

-                                                    project.Properties["build.copyright"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);

-

-                        // Update the description.

-                        //replacement = string.Format("[assembly: AssemblyDescription(\"{0} {1}\")]",

-                        //                            project.Properties["build.description"],

-                        //                            project.Properties["build.svnversion"]);

-                        replacement = string.Format("[assembly: AssemblyDescription(\"{0}\")]",

-                                                    project.Properties["build.description"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);

-

-                        // Write out the file with the substituted version.

-                        StreamWriter writer = new StreamWriter(project.Properties["filename"], false);

-                        writer.Write(contents);

-                        writer.Close();

-                    }

-                    ]]>

-                    </code>

-                </script>

-            </do>

-        </foreach>

-    </target>

-

-    <!-- Do the build. -->

-    <target name="build" depends="init, setversion">

-        <echo message="Building all modules including tests."/>

-

-        <!-- Make sure output folder exists. -->

-        <mkdir dir="${build.dir}" />

-

-				<echo message="Output folder: ${build.dir}"/>

-				

-        <!-- copy reference assemblies over to the output dir -->

-        <copy todir="${build.dir}" file="lib/log4net/log4net.dll"/>

-        <copy todir="${build.dir}" file="lib/nunit/nunit.framework.dll"/>

-        <copy todir="${build.dir}" file="lib/plossum/C5.dll"/>

-        <copy todir="${build.dir}" file="lib/plossum/Plossum CommandLine.dll"/>

-

-        <!-- Compile assemblies. -->

-        <nant target="build">

-            <buildfiles refid="src.builds" />

-        </nant>

-

-        <!-- Compile test assemblies. -->

-        <nant target="build">

-           <buildfiles refid="examples.builds" />

-        </nant>

-      

-        <!-- Compile test assemblies. -->

-        <nant target="build">

-            <buildfiles refid="tests.builds" />

-        </nant>

-        

-        <!-- Compile test assemblies. -->

-        <nant target="build">

-            <buildfiles refid="perftest.builds" />

-        </nant>

-      

-        <!-- copy config files over to the output dir -->

-        <copy todir="${build.dir}" file="test/test.config"/>

-        <copy todir="${build.dir}" file="log.xml"/>

-

-        

-    </target>

-    

-    <!-- Runs all 'pure unit' tests. -->

-    <target name="test" depends="build">

-        <echo message="Running all pure unit tests."/>

-        <nant target="test">

-            <buildfiles refid="tests.builds" />

-        </nant>

-    </target>

-

-    <!-- Creates a release package. -->

-    <target name="release-pkg">

-        <echo message="Building and packaging a release."/>

-

-        <call target="clean"/>

-        <call target="build"/>

-

-        <property name="build.date" value="${datetime::now()}"/>

-

-        <zip zipfile="${build.dir}/Qpid.NET-${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}.zip">

-            <fileset basedir="${build.dir}" prefix="qpid/lib">

-                <include name="**/*.*"/>

-                <exclude name="**/*.tests.*"/>

-                <exclude name="**/example*.*"/>

-                <exclude name="**/nunit.framework.dll"/>

-                <exclude name="**/*.exe"/>

-                <exclude name="**/*.pdb"/>

-            </fileset>

-

-            <fileset basedir="${build.dir}" prefix="qpid/examples/direct">

-               <include name="**/example*direct*.exe"/>            

-            </fileset>

-

-            <fileset basedir="${build.dir}" prefix="qpid/examples/fanout">

-              <include name="**/example*fanout*.exe"/>

-            </fileset>

-

-            <fileset basedir="${build.dir}" prefix="qpid/examples/pub-sub">

-              <include name="**/example*pub-sub*.exe"/>

-            </fileset>

-

-          <fileset basedir="${build.dir}" prefix="qpid/examples/request-response">

-            <include name="**/example*request-response*.exe"/>

-          </fileset>

-          

-          <fileset basedir="${base.dir}/.." prefix="qpid">

-              <include name="LICENSE.txt"/>

-              <include name="NOTICE.txt"/>

-              <include name="RELEASE_NOTES.txt"/>

-              <include name="DISCLAIMER"/>

-            </fileset>

-

-

-            <fileset basedir="${base.dir}" prefix="qpid">

-                <include name="README.txt"/>

-            </fileset>

-        </zip>

-    </target>

-    

-</project>

-

-

+<?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 name="Qpid.NET" default="build">
+
+    <!-- Determines the formatter to use to format output of test results. -->
+    <property name="nant.formatter" value="Plain" />
+
+    <!-- Determines whether a 'debug' or 'release' build is to be done. Defaults to 'debug' -->
+    <property name="build.config" value="debug" />
+
+    <!-- Sets build properties consistently accross all assemblies in the project. -->
+    <property name="build.version.major" value="0"/>
+    <property name="build.version.minor" value="10"/>
+    <property name="build.version.build" value="0"/>
+    <property name="build.version.revision" value="0"/>
+    <property name="build.company" value="Apache Software Foundation"/>
+    <property name="build.copyright" value="Apache Software Foundation"/>
+    <property name="build.description" value="Built from svn revision number: "/>
+
+    <!-- Fileset with build files for each 'core' assembly. -->
+    <fileset id="src.builds">
+        <include name="client/default.build" />
+        <include name="demo/default.build" />       
+    </fileset>
+
+    <!-- Fileset with build files for each 'core' assembly. -->
+    <fileset id="examples.builds">
+      <include name="examples/request-response/example-request-response-Client/default.build" />
+      <include name="examples/request-response/example-request-response-Server/default.build" />
+      <include name="examples/direct/example-direct-Listener/default.build" />
+      <include name="examples/direct/example-direct-producer/default.build" />
+      <include name="examples/fanout/example-fanout-Listener/default.build" />
+      <include name="examples/fanout/example-fanout-Producer/default.build" />
+      <include name="examples/pub-sub/example-pub-sub-Listener/default.build" />
+      <include name="examples/pub-sub/example-pub-sub-Publisher/default.build" />
+    </fileset>
+  
+    <!-- Fileset with build files for 'integration' test assemblies. -->
+    <fileset id="tests.builds">
+        <include name="test/default.build" />	
+    </fileset>	
+    
+     <!-- Fileset with build files for 'performence' test assemblies. -->
+    <fileset id="perftest.builds">
+        <include name="perftest/default.build" />	
+    </fileset>	
+
+    <!-- Prepare environment for a debug build. -->
+    <target name="debug">
+        <property name="build.debug" value="true" />
+        <property name="build.defines" value="DEBUG;TRACE"/>
+    </target>
+
+    <!-- Prepare environment for a release build. -->
+    <target name="release">
+        <property name="build.debug" value="false" />
+        <property name="build.defines" value=""/>
+    </target>
+    
+    <!-- Prepare environment for build. -->
+    <target name="init">
+        <property name="base.dir" value="${project::get-base-directory()}" />
+        <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />
+        <call target="${build.config}" />	
+    </target>   
+    
+    <!-- Cleans up the build output directory. -->
+    <target name="clean" depends="init">
+        <delete dir="${build.dir}" failonerror="false" />
+    </target>
+
+    <!-- Runs 'svnversion' to get the repository revision into the build property 'build.svnversion'. -->
+    <target name="svnversion" description="Runs svnversion to get the current repository version into a build script property.">
+        <exec program="svnversion" output="svnversion_tmp.txt">
+            <arg value="-n"/>
+        </exec>
+
+        <loadfile file="svnversion_tmp.txt" property="build.svnversion"/>
+        <delete file="svnversion_tmp.txt"/>       
+       
+        <!-- For some competely retarted reason the '-n' parameter to svnversion doesn't really work under windows... 
+             Here is some code to strip the unwanted newlines. -->
+        <script language="C#">
+            <code><![CDATA[
+            public static void ScriptMain(Project project)
+            {
+                project.Properties["build.svnversion"] = project.Properties["build.svnversion"].Trim("\n\r".ToCharArray());
+            }
+            ]]>
+            </code>
+        </script>
+
+    </target>
+
+    <!-- Performs a regex find-and-replace on assembly info files, substituting fields defined as build properties. -->
+    <target name="setversion" description="Stamp the version info onto assemblyinfo.cs files" depends="svnversion">
+
+        <echo>build.svnversion = ${build.svnversion}</echo>
+
+        <foreach item="File" property="filename">
+            <in>
+                <items basedir=".">
+                    <include name="**\AssemblyInfo.cs"></include>
+                </items>
+            </in>
+            <do>
+                <script language="C#">
+                    <code><![CDATA[
+                    public static void ScriptMain(Project project)
+                    {
+                        // Read in the entire file to perform the substitution in.
+                        StreamReader reader = new StreamReader(project.Properties["filename"]);
+                        string contents = reader.ReadToEnd();
+                        reader.Close();
+
+                        // Substitute the version numbers.
+                        string replacement = string.Format("[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",
+                                                           project.Properties["build.version.major"],
+                                                           project.Properties["build.version.minor"],
+                                                           project.Properties["build.version.build"],
+                                                           project.Properties["build.version.revision"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);
+
+                        // Substitute the company name and copyright.
+                        replacement = string.Format("[assembly: AssemblyCompany(\"{0}\")]",
+                                                    project.Properties["build.company"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);
+
+                        replacement = string.Format("[assembly: AssemblyCopyright(\"{0}\")]",
+                                                    project.Properties["build.copyright"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);
+
+                        // Update the description.
+                        //replacement = string.Format("[assembly: AssemblyDescription(\"{0} {1}\")]",
+                        //                            project.Properties["build.description"],
+                        //                            project.Properties["build.svnversion"]);
+                        replacement = string.Format("[assembly: AssemblyDescription(\"{0}\")]",
+                                                    project.Properties["build.description"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);
+
+                        // Write out the file with the substituted version.
+                        StreamWriter writer = new StreamWriter(project.Properties["filename"], false);
+                        writer.Write(contents);
+                        writer.Close();
+                    }
+                    ]]>
+                    </code>
+                </script>
+            </do>
+        </foreach>
+    </target>
+
+    <!-- Do the build. -->
+    <target name="build" depends="init, setversion">
+        <echo message="Building all modules including tests."/>
+
+        <!-- Make sure output folder exists. -->
+        <mkdir dir="${build.dir}" />
+
+				<echo message="Output folder: ${build.dir}"/>
+				
+        <!-- copy reference assemblies over to the output dir -->
+        <copy todir="${build.dir}" file="lib/log4net/log4net.dll"/>
+        <copy todir="${build.dir}" file="lib/nunit/nunit.framework.dll"/>
+        <copy todir="${build.dir}" file="lib/plossum/C5.dll"/>
+        <copy todir="${build.dir}" file="lib/plossum/Plossum CommandLine.dll"/>
+
+        <!-- Compile assemblies. -->
+        <nant target="build">
+            <buildfiles refid="src.builds" />
+        </nant>
+
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+           <buildfiles refid="examples.builds" />
+        </nant>
+      
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+            <buildfiles refid="tests.builds" />
+        </nant>
+        
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+            <buildfiles refid="perftest.builds" />
+        </nant>
+      
+        <!-- copy config files over to the output dir -->
+        <copy todir="${build.dir}" file="test/test.config"/>
+        <copy todir="${build.dir}" file="log.xml"/>
+
+        
+    </target>
+    
+    <!-- Runs all 'pure unit' tests. -->
+    <target name="test" depends="build">
+        <echo message="Running all pure unit tests."/>
+        <nant target="test">
+            <buildfiles refid="tests.builds" />
+        </nant>
+    </target>
+
+    <!-- Creates a release package. -->
+    <target name="release-pkg">
+        <echo message="Building and packaging a release."/>
+
+        <call target="clean"/>
+        <call target="build"/>
+
+        <property name="build.date" value="${datetime::now()}"/>
+
+        <zip zipfile="${build.dir}/Qpid.NET-${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}.zip">
+            <fileset basedir="${build.dir}" prefix="qpid/lib">
+                <include name="**/*.*"/>
+                <exclude name="**/*.tests.*"/>
+                <exclude name="**/example*.*"/>
+                <exclude name="**/nunit.framework.dll"/>
+                <exclude name="**/*.exe"/>
+                <exclude name="**/*.pdb"/>
+            </fileset>
+
+            <fileset basedir="${build.dir}" prefix="qpid/examples/direct">
+               <include name="**/example*direct*.exe"/>            
+            </fileset>
+
+            <fileset basedir="${build.dir}" prefix="qpid/examples/fanout">
+              <include name="**/example*fanout*.exe"/>
+            </fileset>
+
+            <fileset basedir="${build.dir}" prefix="qpid/examples/pub-sub">
+              <include name="**/example*pub-sub*.exe"/>
+            </fileset>
+
+          <fileset basedir="${build.dir}" prefix="qpid/examples/request-response">
+            <include name="**/example*request-response*.exe"/>
+          </fileset>
+          
+          <fileset basedir="${base.dir}/.." prefix="qpid">
+              <include name="LICENSE.txt"/>
+              <include name="NOTICE.txt"/>
+              <include name="RELEASE_NOTES.txt"/>
+              <include name="DISCLAIMER"/>
+            </fileset>
+
+
+            <fileset basedir="${base.dir}" prefix="qpid">
+                <include name="README.txt"/>
+            </fileset>
+        </zip>
+    </target>
+    
+</project>
+
+
diff --git a/qpid/dotnet/client-010/demo/default.build b/qpid/dotnet/client-010/demo/default.build
index 01cad35665..8c64f8c045 100644
--- a/qpid/dotnet/client-010/demo/default.build
+++ b/qpid/dotnet/client-010/demo/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="qpid.client.demo" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="qpid.client.demo" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
index f684a60990..f611fee6f6 100644
--- a/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-Listener/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-direct-Listener" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-direct-Listener" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build b/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
index 58ac97b0d0..3382349ae6 100644
--- a/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
+++ b/qpid/dotnet/client-010/examples/direct/example-direct-producer/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-direct-Producer" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-direct-Producer" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
index cbd5113ae1..bdf5cc80c5 100644
--- a/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Listener/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-fanout-Listener" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-fanout-Listener" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
index 0eec886470..874854a51b 100644
--- a/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
+++ b/qpid/dotnet/client-010/examples/fanout/example-fanout-Producer/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-fanout-Producer" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-fanout-Producer" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
index 564e099f55..ddd3168d08 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Listener/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-pub-sub-Listener" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-pub-sub-Listener" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
index c85b2672a4..0a9c574d6e 100644
--- a/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
+++ b/qpid/dotnet/client-010/examples/pub-sub/example-pub-sub-Publisher/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-pub-sub-Publisher" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-pub-sub-Publisher" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
index 760419b325..60713af386 100644
--- a/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Client/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-request-response-Client" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-request-response-Client" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
index d17410a7a9..1a1bea225d 100644
--- a/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
+++ b/qpid/dotnet/client-010/examples/request-response/example-request-response-Server/default.build
@@ -1,26 +1,47 @@
-<?xml version="1.0"?>

-<project name="example-request-response-Server" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-</project>

-

+<?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 name="example-request-response-Server" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/perftest/default.build b/qpid/dotnet/client-010/perftest/default.build
index a126a8bc86..756f6c6493 100644
--- a/qpid/dotnet/client-010/perftest/default.build
+++ b/qpid/dotnet/client-010/perftest/default.build
@@ -1,29 +1,50 @@
-<?xml version="1.0"?>

-<project name="perftest" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="exe" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.exe">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	            

-            <include name="${build.dir}/qpid.client.dll" />	                              

-            <include name="${build.dir}/C5.dll" />	

-            <include name="${build.dir}/Plossum CommandLine.dll" />	

-         </references>

-        </csc>

-    </target>

-        

-</project>

-

+<?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 name="perftest" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="exe" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.exe">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	            
+            <include name="${build.dir}/qpid.client.dll" />	                              
+            <include name="${build.dir}/C5.dll" />	
+            <include name="${build.dir}/Plossum CommandLine.dll" />	
+         </references>
+        </csc>
+    </target>
+        
+</project>
+
diff --git a/qpid/dotnet/client-010/test/default.build b/qpid/dotnet/client-010/test/default.build
index 76b1b3ea85..f9dadb174b 100644
--- a/qpid/dotnet/client-010/test/default.build
+++ b/qpid/dotnet/client-010/test/default.build
@@ -1,34 +1,55 @@
-<?xml version="1.0"?>

-<project name="qpid.client.tests" default="build">

-    <!--

-		Properties that come from master build file

-		- build.dir: root directory for build

-		- build.debug: true if building debug release

-		- build.defines: variables to define during build

-    -->

-

-    <target name="build">

-        <csc target="library" 

-				define="${build.defines}" 

-				debug="${build.debug}" 

-				output="${build.dir}/${project::get-name()}.dll">

-			

-			<sources>

-			   <include name="**/*.cs" />

-         </sources>

-         <references>

-            <include name="${build.dir}/log4net.dll" />	

-            <include name="${build.dir}/nunit.framework.dll" />	

-            <include name="${build.dir}/qpid.client.dll" />	

-         </references>

-        </csc>

-    </target>

-    

-    <target name="test" depends="build">

-         <nunit2>

-            <formatter type="${nant.formatter}" usefile="false" />

-            <test assemblyname="${build.dir}/qpid.client.tests.dll" />

-         </nunit2>

-    </target>

-</project>

-

+<?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 name="qpid.client.tests" default="build">
+    <!--
+		Properties that come from master build file
+		- build.dir: root directory for build
+		- build.debug: true if building debug release
+		- build.defines: variables to define during build
+    -->
+
+    <target name="build">
+        <csc target="library" 
+				define="${build.defines}" 
+				debug="${build.debug}" 
+				output="${build.dir}/${project::get-name()}.dll">
+			
+			<sources>
+			   <include name="**/*.cs" />
+         </sources>
+         <references>
+            <include name="${build.dir}/log4net.dll" />	
+            <include name="${build.dir}/nunit.framework.dll" />	
+            <include name="${build.dir}/qpid.client.dll" />	
+         </references>
+        </csc>
+    </target>
+    
+    <target name="test" depends="build">
+         <nunit2>
+            <formatter type="${nant.formatter}" usefile="false" />
+            <test assemblyname="${build.dir}/qpid.client.tests.dll" />
+         </nunit2>
+    </target>
+</project>
+
diff --git a/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
index 60e7e586be..96b6c90ad8 100644
--- a/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
+++ b/qpid/dotnet/client-010/wcf/demo/wcfHelloServer/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>

+<?xml version="1.0" encoding="utf-8" ?>

 <configuration>

   <system.serviceModel>

 

@@ -40,4 +40,4 @@
 

 

   </system.serviceModel>

-</configuration>
\ No newline at end of file
+</configuration>

diff --git a/qpid/dotnet/default.build b/qpid/dotnet/default.build
index fcbfafcb6b..b450c2481b 100644
--- a/qpid/dotnet/default.build
+++ b/qpid/dotnet/default.build
@@ -1,231 +1,252 @@
-<?xml version="1.0"?>

-<project name="Qpid.NET" default="build">

-

-    <!-- Determines the formatter to use to format output of test results. -->

-    <property name="nant.formatter" value="Plain" />

-

-    <!-- Determines whether a 'debug' or 'release' build is to be done. Defaults to 'debug' -->

-    <property name="build.config" value="debug" />

-

-    <!-- Sets build properties consistently accross all assemblies in the project. -->

-    <property name="build.version.major" value="0"/>

-    <property name="build.version.minor" value="3"/>

-    <property name="build.version.build" value="0"/>

-    <property name="build.version.revision" value="0"/>

-    <property name="build.company" value="Apache Software Foundation"/>

-    <property name="build.copyright" value="Apache Software Foundation"/>

-    <property name="build.description" value="Built from svn revision number: "/>

-

-    <!-- Fileset with build files for each 'core' assembly. -->

-    <fileset id="src.builds">

-        <include name="Qpid.Buffer/default.build" />

-        <include name="Qpid.Sasl/default.build" />

-        <include name="Qpid.Messaging/default.build" />

-        <include name="Qpid.Codec/default.build" />

-        <include name="Qpid.Common/default.build" />        

-        <include name="Qpid.Client/default.build" />	

-    </fileset>

-    

-    <!-- Fileset with build files for 'pure unit' test assemblies. -->

-    <fileset id="tests.pure.builds">

-        <include name="Qpid.Buffer.Tests/default.build" />

-        <include name="Qpid.Sasl.Tests/default.build" />

-        <include name="Qpid.Common.Tests/default.build" />        

-        <include name="Qpid.Client.Tests/default.build" />	

-    </fileset>

-

-    <!-- Fileset with build files for 'integration' test assemblies. -->

-    <fileset id="tests.integration.builds">

-        <include name="Qpid.Integration.Tests/default.build" />	

-    </fileset>

-

-    <!-- Other test or utility assemblies. -->

-    <fileset id='other.builds'>

-        <include name="TopicListener/default.build" />	

-        <include name="TopicPublisher/default.build" />	

-        <include name="TestClient/default.build" />	

-    </fileset>

-

-    <!-- Prepare environment for a debug build. -->

-    <target name="debug">

-        <property name="build.debug" value="true" />

-        <property name="build.defines" value="DEBUG;TRACE"/>

-    </target>

-

-    <!-- Prepare environment for a release build. -->

-    <target name="release">

-        <property name="build.debug" value="false" />

-        <property name="build.defines" value=""/>

-    </target>

-    

-    <!-- Prepare environment for build. -->

-    <target name="init">

-        <property name="base.dir" value="${project::get-base-directory()}" />

-        <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />

-        <call target="${build.config}" />	

-    </target>   

-    

-    <!-- Cleans up the build output directory. -->

-    <target name="clean" depends="init">

-        <delete dir="${build.dir}" failonerror="false" />

-    </target>

-

-    <!-- Runs 'svnversion' to get the repository revision into the build property 'build.svnversion'. -->

-    <target name="svnversion" description="Runs svnversion to get the current repository version into a build script property.">

-        <exec program="svnversion" output="svnversion_tmp.txt">

-            <arg value="-n"/>

-        </exec>

-

-        <loadfile file="svnversion_tmp.txt" property="build.svnversion"/>

-        <delete file="svnversion_tmp.txt"/>       

-

-        <!-- For some competely retarted reason the '-n' parameter to svnversion doesn't really work under windows... 

-             Here is some code to strip the unwanted newlines. -->

-        <script language="C#">

-            <code><![CDATA[

-            public static void ScriptMain(Project project)

-            {

-                project.Properties["build.svnversion"] = project.Properties["build.svnversion"].Trim("\n\r".ToCharArray());

-            }

-            ]]>

-            </code>

-        </script>

-

-    </target>

-

-    <!-- Performs a regex find-and-replace on assembly info files, substituting fields defined as build properties. -->

-    <target name="setversion" description="Stamp the version info onto assemblyinfo.cs files" depends="svnversion">

-

-        <echo>build.svnversion = ${build.svnversion}</echo>

-

-        <foreach item="File" property="filename">

-            <in>

-                <items basedir=".">

-                    <include name="**\AssemblyInfo.cs"></include>

-                </items>

-            </in>

-            <do>

-                <script language="C#">

-                    <code><![CDATA[

-                    public static void ScriptMain(Project project)

-                    {

-                        // Read in the entire file to perform the substitution in.

-                        StreamReader reader = new StreamReader(project.Properties["filename"]);

-                        string contents = reader.ReadToEnd();

-                        reader.Close();

-

-                        // Substitute the version numbers.

-                        string replacement = string.Format("[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",

-                                                           project.Properties["build.version.major"],

-                                                           project.Properties["build.version.minor"],

-                                                           project.Properties["build.version.build"],

-                                                           project.Properties["build.version.revision"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);

-

-                        // Substitute the company name and copyright.

-                        replacement = string.Format("[assembly: AssemblyCompany(\"{0}\")]",

-                                                    project.Properties["build.company"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);

-

-                        replacement = string.Format("[assembly: AssemblyCopyright(\"{0}\")]",

-                                                    project.Properties["build.copyright"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);

-

-                        // Update the description.

-                        //replacement = string.Format("[assembly: AssemblyDescription(\"{0} {1}\")]",

-                        //                            project.Properties["build.description"],

-                        //                            project.Properties["build.svnversion"]);

-                        replacement = string.Format("[assembly: AssemblyDescription(\"{0}\")]",

-                                                    project.Properties["build.description"]);

-                        contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);

-

-                        // Write out the file with the substituted version.

-                        StreamWriter writer = new StreamWriter(project.Properties["filename"], false);

-                        writer.Write(contents);

-                        writer.Close();

-                    }

-                    ]]>

-                    </code>

-                </script>

-            </do>

-        </foreach>

-    </target>

-

-    <!-- Do the build. -->

-    <target name="build" depends="init, setversion">

-        <echo message="Building all modules including tests."/>

-

-        <!-- Make sure output folder exists. -->

-        <mkdir dir="${build.dir}" />

-

-        <!-- copy reference assemblies over to the output dir -->

-        <copy todir="${build.dir}" file="Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll"/>

-        <copy todir="${build.dir}" file="Qpid.Common/lib/log4net/log4net.dll"/>

-        <copy todir="${build.dir}" file="Qpid.Client.Tests/lib/nunit/nunit.framework.dll"/>

-

-        <!-- Compile assemblies. -->

-        <nant target="build">

-            <buildfiles refid="src.builds" />

-        </nant>

-

-        <!-- Compile test assemblies. -->

-        <nant target="build">

-            <buildfiles refid="tests.pure.builds" />

-        </nant>

-        <nant target="build">

-            <buildfiles refid="tests.integration.builds" />

-        </nant>

-

-        <!-- Compile test assemblies. -->

-        <nant target="build">

-            <buildfiles refid="other.builds" />

-        </nant>

-    </target>

-    

-    <!-- Runs all 'pure unit' tests. -->

-    <target name="test" depends="build">

-        <echo message="Running all pure unit tests."/>

-        <nant target="test">

-            <buildfiles refid="tests.pure.builds" />

-        </nant>

-    </target>

-

-    <!-- Runs all 'integration' tests. -->

-    <target name="integrationtest" depends="build">

-        <echo message="Running all integration tests."/>

-        <nant target="test">

-            <buildfiles refid="tests.integration.builds" />

-        </nant>

-    </target>

-

-    <!-- Creates a release package. -->

-    <target name="release-pkg">

-        <echo message="Building and packaging a release."/>

-

-        <call target="clean"/>

-        <call target="build"/>

-

-        <property name="build.date" value="${datetime::now()}"/>

-        <property name="build.timestamp" value="${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}"/>

-

-        <zip zipfile="${build.dir}/Qpid.NET-${build.timestamp}.zip">

-            <fileset basedir="${build.dir}" prefix="Qpid.NET-${build.timestamp}">

-                <include name="**/*.*"/>

-                <exclude name="**/*.Tests.*"/>

-                <exclude name="**/nunit.framework.dll"/>

-                <exclude name="**/*.exe"/>            

-            </fileset>

-            

-            <fileset basedir="${base.dir}" prefix="Qpid.NET-${build.timestamp}">

-                <include name="LICENSE.txt"/>

-                <include name="NOTICE.txt"/>

-                <include name="README.txt"/>

-                <include name="RELEASE_NOTES.txt"/>

-                <include name="DISCLAIMER"/>                    

-            </fileset>

-        </zip>

-    </target>

-    

-</project>

-

-

+<?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 name="Qpid.NET" default="build">
+
+    <!-- Determines the formatter to use to format output of test results. -->
+    <property name="nant.formatter" value="Plain" />
+
+    <!-- Determines whether a 'debug' or 'release' build is to be done. Defaults to 'debug' -->
+    <property name="build.config" value="debug" />
+
+    <!-- Sets build properties consistently accross all assemblies in the project. -->
+    <property name="build.version.major" value="0"/>
+    <property name="build.version.minor" value="3"/>
+    <property name="build.version.build" value="0"/>
+    <property name="build.version.revision" value="0"/>
+    <property name="build.company" value="Apache Software Foundation"/>
+    <property name="build.copyright" value="Apache Software Foundation"/>
+    <property name="build.description" value="Built from svn revision number: "/>
+
+    <!-- Fileset with build files for each 'core' assembly. -->
+    <fileset id="src.builds">
+        <include name="Qpid.Buffer/default.build" />
+        <include name="Qpid.Sasl/default.build" />
+        <include name="Qpid.Messaging/default.build" />
+        <include name="Qpid.Codec/default.build" />
+        <include name="Qpid.Common/default.build" />        
+        <include name="Qpid.Client/default.build" />	
+    </fileset>
+    
+    <!-- Fileset with build files for 'pure unit' test assemblies. -->
+    <fileset id="tests.pure.builds">
+        <include name="Qpid.Buffer.Tests/default.build" />
+        <include name="Qpid.Sasl.Tests/default.build" />
+        <include name="Qpid.Common.Tests/default.build" />        
+        <include name="Qpid.Client.Tests/default.build" />	
+    </fileset>
+
+    <!-- Fileset with build files for 'integration' test assemblies. -->
+    <fileset id="tests.integration.builds">
+        <include name="Qpid.Integration.Tests/default.build" />	
+    </fileset>
+
+    <!-- Other test or utility assemblies. -->
+    <fileset id='other.builds'>
+        <include name="TopicListener/default.build" />	
+        <include name="TopicPublisher/default.build" />	
+        <include name="TestClient/default.build" />	
+    </fileset>
+
+    <!-- Prepare environment for a debug build. -->
+    <target name="debug">
+        <property name="build.debug" value="true" />
+        <property name="build.defines" value="DEBUG;TRACE"/>
+    </target>
+
+    <!-- Prepare environment for a release build. -->
+    <target name="release">
+        <property name="build.debug" value="false" />
+        <property name="build.defines" value=""/>
+    </target>
+    
+    <!-- Prepare environment for build. -->
+    <target name="init">
+        <property name="base.dir" value="${project::get-base-directory()}" />
+        <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />
+        <call target="${build.config}" />	
+    </target>   
+    
+    <!-- Cleans up the build output directory. -->
+    <target name="clean" depends="init">
+        <delete dir="${build.dir}" failonerror="false" />
+    </target>
+
+    <!-- Runs 'svnversion' to get the repository revision into the build property 'build.svnversion'. -->
+    <target name="svnversion" description="Runs svnversion to get the current repository version into a build script property.">
+        <exec program="svnversion" output="svnversion_tmp.txt">
+            <arg value="-n"/>
+        </exec>
+
+        <loadfile file="svnversion_tmp.txt" property="build.svnversion"/>
+        <delete file="svnversion_tmp.txt"/>       
+
+        <!-- For some competely retarted reason the '-n' parameter to svnversion doesn't really work under windows... 
+             Here is some code to strip the unwanted newlines. -->
+        <script language="C#">
+            <code><![CDATA[
+            public static void ScriptMain(Project project)
+            {
+                project.Properties["build.svnversion"] = project.Properties["build.svnversion"].Trim("\n\r".ToCharArray());
+            }
+            ]]>
+            </code>
+        </script>
+
+    </target>
+
+    <!-- Performs a regex find-and-replace on assembly info files, substituting fields defined as build properties. -->
+    <target name="setversion" description="Stamp the version info onto assemblyinfo.cs files" depends="svnversion">
+
+        <echo>build.svnversion = ${build.svnversion}</echo>
+
+        <foreach item="File" property="filename">
+            <in>
+                <items basedir=".">
+                    <include name="**\AssemblyInfo.cs"></include>
+                </items>
+            </in>
+            <do>
+                <script language="C#">
+                    <code><![CDATA[
+                    public static void ScriptMain(Project project)
+                    {
+                        // Read in the entire file to perform the substitution in.
+                        StreamReader reader = new StreamReader(project.Properties["filename"]);
+                        string contents = reader.ReadToEnd();
+                        reader.Close();
+
+                        // Substitute the version numbers.
+                        string replacement = string.Format("[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",
+                                                           project.Properties["build.version.major"],
+                                                           project.Properties["build.version.minor"],
+                                                           project.Properties["build.version.build"],
+                                                           project.Properties["build.version.revision"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);
+
+                        // Substitute the company name and copyright.
+                        replacement = string.Format("[assembly: AssemblyCompany(\"{0}\")]",
+                                                    project.Properties["build.company"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);
+
+                        replacement = string.Format("[assembly: AssemblyCopyright(\"{0}\")]",
+                                                    project.Properties["build.copyright"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);
+
+                        // Update the description.
+                        //replacement = string.Format("[assembly: AssemblyDescription(\"{0} {1}\")]",
+                        //                            project.Properties["build.description"],
+                        //                            project.Properties["build.svnversion"]);
+                        replacement = string.Format("[assembly: AssemblyDescription(\"{0}\")]",
+                                                    project.Properties["build.description"]);
+                        contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);
+
+                        // Write out the file with the substituted version.
+                        StreamWriter writer = new StreamWriter(project.Properties["filename"], false);
+                        writer.Write(contents);
+                        writer.Close();
+                    }
+                    ]]>
+                    </code>
+                </script>
+            </do>
+        </foreach>
+    </target>
+
+    <!-- Do the build. -->
+    <target name="build" depends="init, setversion">
+        <echo message="Building all modules including tests."/>
+
+        <!-- Make sure output folder exists. -->
+        <mkdir dir="${build.dir}" />
+
+        <!-- copy reference assemblies over to the output dir -->
+        <copy todir="${build.dir}" file="Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll"/>
+        <copy todir="${build.dir}" file="Qpid.Common/lib/log4net/log4net.dll"/>
+        <copy todir="${build.dir}" file="Qpid.Client.Tests/lib/nunit/nunit.framework.dll"/>
+
+        <!-- Compile assemblies. -->
+        <nant target="build">
+            <buildfiles refid="src.builds" />
+        </nant>
+
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+            <buildfiles refid="tests.pure.builds" />
+        </nant>
+        <nant target="build">
+            <buildfiles refid="tests.integration.builds" />
+        </nant>
+
+        <!-- Compile test assemblies. -->
+        <nant target="build">
+            <buildfiles refid="other.builds" />
+        </nant>
+    </target>
+    
+    <!-- Runs all 'pure unit' tests. -->
+    <target name="test" depends="build">
+        <echo message="Running all pure unit tests."/>
+        <nant target="test">
+            <buildfiles refid="tests.pure.builds" />
+        </nant>
+    </target>
+
+    <!-- Runs all 'integration' tests. -->
+    <target name="integrationtest" depends="build">
+        <echo message="Running all integration tests."/>
+        <nant target="test">
+            <buildfiles refid="tests.integration.builds" />
+        </nant>
+    </target>
+
+    <!-- Creates a release package. -->
+    <target name="release-pkg">
+        <echo message="Building and packaging a release."/>
+
+        <call target="clean"/>
+        <call target="build"/>
+
+        <property name="build.date" value="${datetime::now()}"/>
+        <property name="build.timestamp" value="${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}"/>
+
+        <zip zipfile="${build.dir}/Qpid.NET-${build.timestamp}.zip">
+            <fileset basedir="${build.dir}" prefix="Qpid.NET-${build.timestamp}">
+                <include name="**/*.*"/>
+                <exclude name="**/*.Tests.*"/>
+                <exclude name="**/nunit.framework.dll"/>
+                <exclude name="**/*.exe"/>            
+            </fileset>
+            
+            <fileset basedir="${base.dir}" prefix="Qpid.NET-${build.timestamp}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+                <include name="README.txt"/>
+                <include name="RELEASE_NOTES.txt"/>
+                <include name="DISCLAIMER"/>                    
+            </fileset>
+        </zip>
+    </target>
+    
+</project>
+
+