From 523d55a9a2f93ebd70557779722f9634afc2afcf Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Tue, 17 Apr 2012 17:40:23 -0400
Subject: [PATCH] SPRNET-1383 change test build script to copy proper .config
 file during build; removed outdated net-1.1 config file that was colliding
 with correct one during build

---
 .../Spring.Core.Tests/Spring.Core.Tests.build |  18 +-
 .../Spring.Core.Tests.dll-1.1.config          | 222 ------------------
 2 files changed, 2 insertions(+), 238 deletions(-)
 delete mode 100644 test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config

diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
index 04e2b304..2290ad36 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -92,22 +92,8 @@
 			</fileset>
 		</copy>
 
-		<copy file="${project::get-base-directory()}/${project::get-name()}.dll-1.1.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"
-                      if="${framework::get-target-framework() != 'net-2.0'}"/>
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"
-                      if="${framework::get-target-framework() == 'net-2.0'}"/>
-					  
-				<copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"
-                      if="${framework::get-target-framework() == 'net-4.0'}"/>
-					  
-
-                <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
-                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"
-                      if="${framework::get-target-framework() == 'mono-2.0'}"/>
+        <copy file="${project::get-base-directory()}/${project::get-name()}.dll.config"
+                      tofile="${current.bin.dir}/${project::get-name()}.dll.config"/>
 
         </target>
 
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config
deleted file mode 100644
index 02eab3a0..00000000
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll-1.1.config
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Copyright 2002-2005 the original author or authors.
-
-Licensed 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.
--->
-<configuration>
-
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-    <section name="objects" type="Spring.Objects.Factory.Xml.ObjectFactorySectionHandler, Spring.Core" />
-    
-    <section name="DaoConfiguration" type="System.Configuration.NameValueSectionHandler"/>
-    <section name="DatabaseConfiguration" type="System.Configuration.NameValueSectionHandler"/>
-
-    <sectionGroup name="common">
-      <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />      
-    </sectionGroup>
-
-    <section name="PropertyPlaceholderConfigurerSectionTest" type="System.Configuration.NameValueSectionHandler"/>
-
-    <section name="PropertyOverideSectionTest" type="System.Configuration.NameValueSectionHandler"/>
-    
-    <sectionGroup name='PropertyPlaceholderConfigurerSectionGroupTest'>
-        <section name="PropertyPlaceholderConfigurerSectionGroupTestSection" type="System.Configuration.NameValueSectionHandler"/>
-    </sectionGroup>    
-    
-    <sectionGroup name='spring'>
-      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
-      <section name='context' type='Spring.HookableContextHandler, Spring.Core.Tests'/>
-      <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
-      <sectionGroup name="child">
-        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
-      </sectionGroup>
-    </sectionGroup>
-
-    <!-- need a second section for another independent test as CongfigurationSettings.GetConfig will -->
-    <!-- not be called twice by .NET -->
-    <sectionGroup name='spring2'>
-      <section name="parsers" type="Spring.Context.Support.NamespaceParsersSectionHandler, Spring.Core"/>
-      <section name='context' type='Spring.Context.Support.ContextHandler, Spring.Core'/>
-      <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
-      <sectionGroup name="child">
-        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
-      </sectionGroup>
-      <sectionGroup name="grandchild">
-        <section name='objects' type='Spring.Context.Support.DefaultSectionHandler, Spring.Core' />
-      </sectionGroup>
-    </sectionGroup>
-  </configSections>
-
-  <PropertyPlaceholderConfigurerSectionTest>
-    <add key="test.name.1" value="name from section"/>
-    <add key="prop.override.section" value="PropertyOverideSectionTest"/>
-  </PropertyPlaceholderConfigurerSectionTest>
-
-  <PropertyOverideSectionTest>
-    <add key="testObject5.name" value="overide-name"/>
-  </PropertyOverideSectionTest>
-
-  <PropertyPlaceholderConfigurerSectionGroupTest>
-    <PropertyPlaceholderConfigurerSectionGroupTestSection>
-        <add key="test.name.2" value="name from sectiongroup/section"/>
-    </PropertyPlaceholderConfigurerSectionGroupTestSection>
-  </PropertyPlaceholderConfigurerSectionGroupTest>
-
-  <common>
-    <logging>
-      <factoryAdapter type="Common.Logging.Simple.NoOpLoggerFactoryAdapter, Common.Logging"/>
-    </logging>
-  </common>
-  
-  <spring>
-
-    <parsers>
-      <parser namespace="http://schemas.springframework.net/testobject" 
-              type="Spring.Context.Support.TestObjectConfigParser, Spring.Core.Tests"
-              schemaLocation="assembly://Spring.Core.Tests/Spring.Context.Support/testobject.xsd"/>
-    </parsers>
-
-    <!-- parent context -->
-    <context
-			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
-			name='Parent'>
-      <resource uri='config://spring/objects'/>
-      <!-- child context -->
-      <context name='Child'>
-        <resource uri='config://spring/child/objects'/>
-      </context>
-    </context>
-
-    <!-- parent context's objects -->
-    <objects xmlns='http://www.springframework.net' xmlns:to="http://schemas.springframework.net/testobject">
-      <object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
-        <property name='name' value='Parent'/>
-      </object>
-      <to:testobject>
-        <to:age>12</to:age>
-        <to:name>John</to:name>
-      </to:testobject>
-    </objects>
-
-
-    <!-- child context's objects -->
-    <child>
-      <objects xmlns='http://www.springframework.net'>
-        <object id='Child' type='Spring.Objects.TestObject,Spring.Core.Tests'>
-          <property name='name' value='Child'/>
-        </object>
-      </objects>
-    </child>
-  </spring>
-
-  <spring2>
-
-    <!-- parent context -->
-    <context
-			type='Spring.Context.Support.XmlApplicationContext, Spring.Core'
-			name='Parent'>
-      <resource uri='config://spring2/objects'/>
-      <!-- child context -->
-      <context name='Child'>
-        <resource uri='config://spring2/child/objects'/>
-        <!-- grandchild context -->
-        <context name='Grandchild'>
-          <resource uri='config://spring2/grandchild/objects'/>
-        </context>
-      </context>
-    </context>
-
-    <!-- parent context's objects -->
-    <objects xmlns='http://www.springframework.net'>
-      <object id='Parent' type='Spring.Objects.TestObject,Spring.Core.Tests'>
-        <property name='name' value='Parent'/>
-      </object>
-    </objects>
-
-    <!-- child context's objects -->
-    <child>
-      <objects xmlns='http://www.springframework.net'>
-        <object id='Child' type='Spring.Objects.TestObject, Spring.Core.Tests'>
-          <property name='name' value='Child'/>
-        </object>
-      </objects>
-    </child>
-
-    <!-- grandchild context's objects -->
-    <grandchild>
-      <objects xmlns='http://www.springframework.net'>
-        <object id='Grandchild' type='Spring.Objects.TestObject, Spring.Core.Tests'>
-          <property name='name' value='Grandchild'/>
-        </object>
-      </objects>
-    </grandchild>
-  </spring2>
-
-  <DaoConfiguration>
-    <add key="maxResults" value="1000"/>
-  </DaoConfiguration>
-
-  <DatabaseConfiguration>
-    <add key="connection.string" value="Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;"/>
-  </DatabaseConfiguration>
-
-  <objects xmlns='http://www.springframework.net'>
-    <object name="foo" type="Spring.Objects.TestObject, Spring.Core.Tests" />
-    <object id="rod" type="Spring.Objects.TestObject, Spring.Core.Tests">
-      <property name="name">
-        <value>Rod</value>
-      </property>
-      <property name="age">
-        <value>31</value>
-      </property>
-    </object>
-    <object id="roderick" parent="rod">
-      <property name="name">
-        <value>Roderick</value>
-      </property>
-    </object>
-    <object id="kerry" type="Spring.Objects.TestObject, Spring.Core.Tests">
-      <property name="name">
-        <value>Kerry</value>
-      </property>
-      <property name="age">
-        <value>34</value>
-      </property>
-      <property name="spouse">
-        <ref local="rod" />
-      </property>
-    </object>
-    <object id="bootstrapObjectFactory" type="Spring.MockObjectFactory, Spring.Core.Tests"/>
-    <object id="bootstrapNonObjectFactory" type="Spring.Objects.TestObject, Spring.Core.Tests"/>
-  </objects>
-
-  <log4net>
-    <appender name="NullAppender" type="Spring.Objects.Factory.Xml.NullAppender, Spring.Core.Tests"/>
-    <root>
-      <level value="ALL" />
-      <appender-ref ref="NullAppender" />
-    </root>
-  </log4net>
-
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
-        <bindingRedirect oldVersion="2.5.2.9222" newVersion="2.5.7.10213" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-
-</configuration>