fixes to build mono

clean up some extraneous TODO's
2009-06-20 01:36:54 +00:00
parent 8d5c858dde
commit d4a1ea8194
12 changed files with 22 additions and 15 deletions
--- a/src/Spring/Spring.Core/Spring.Core.2005.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2005.csproj
@@ -568,6 +568,7 @@
    <Compile Include="Objects\Factory\Config\VariableAccessor.cs" />
    <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurer.cs" />
    <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
+    <Compile Include="Objects\Factory\Support\GenericObjectDefinition.cs" />
    <Compile Include="Objects\Factory\Support\IAutowireCandidateResolver.cs" />
    <Compile Include="Objects\Factory\Support\ConstructorResolver.cs" />
    <Compile Include="Objects\Factory\Support\DefaultObjectNameGenerator.cs" />
@@ -579,6 +580,8 @@
    <Compile Include="Objects\Factory\Xml\AbstractObjectDefinitionParser.cs" />
    <Compile Include="Objects\Factory\Xml\AbstractSimpleObjectDefinitionParser.cs" />
    <Compile Include="Objects\Factory\Xml\AbstractSingleObjectDefinitionParser.cs" />
+    <Compile Include="Objects\Factory\Xml\DefaultNamespaceHandlerResolver.cs" />
+    <Compile Include="Objects\Factory\Xml\INamespaceParserResolver.cs" />
    <Compile Include="Objects\Factory\Xml\NamespaceParserAttribute.cs" />
    <Compile Include="Objects\Factory\Xml\ObjectFactorySectionHandler.cs" />
    <Compile Include="Objects\Factory\Xml\DocumentDefaultsDefinition.cs" />
@@ -987,10 +990,12 @@
    <Compile Include="Util\ConfigXmlDocument.cs" />
    <Compile Include="Util\ConfigXmlElement.cs" />
    <Compile Include="Util\FatalReflectionException.cs" />
+    <Compile Include="Util\IChainableConfigSystem.cs" />
    <Compile Include="Util\IoUtils.cs" />
    <Compile Include="Util\ITextPosition.cs" />
    <Compile Include="Util\ObjectUtils.cs" />
    <Compile Include="Util\ReflectionException.cs" />
+    <Compile Include="Util\SecurityCritical.cs" />
    <Compile Include="Util\SystemUtils.cs" />
    <Compile Include="Util\DynamicCodeManager.cs" />
    <Compile Include="Util\Generic\CollectionUtils.cs" />
--- a/src/Spring/Spring.Core/Spring.Core.build
+++ b/src/Spring/Spring.Core/Spring.Core.build
@@ -20,7 +20,7 @@
                <warning number="219" />
                <warning number="162" />
                <warning number="618" /> <!-- disable deprecation warnings (due to deprecated code generated by antlr ) -->
-		<warning number="${nowarn.numbers},0612,1570" if="${nant.settings.currentframework=='mono-2.0'}"/>
+		<warning number="${nowarn.numbers},0612,1570,1584,1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
            </nowarn>
            <sources failonempty="true">
                <include name="**/*.cs" />
--- a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
+++ b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs
@@ -134,7 +134,6 @@ namespace Spring.Data.Common
            this.dataAdapterType = dataAdapterType;
            this.commandBuilderType = commandBuilderType;

-            //TODO consider support for derive parameters via a stored procedure.
            if (commandBuilderDeriveParametersMethod.ToLower().Trim().Equals("not supported"))
            {
                supportsDeriveParametersMethod = false;
--- a/src/Spring/Spring.Data/Data/Common/DbParameters.cs
+++ b/src/Spring/Spring.Data/Data/Common/DbParameters.cs
@@ -171,7 +171,6 @@ namespace Spring.Data.Common
        public int Add(object parameterValue)
        {
            IDbDataParameter parameter = dbCommand.CreateParameter();
-            //TODO investigate default behavior of values.
            parameter.Value = (parameterValue == null) ? DBNull.Value : parameterValue;
            dataParameterCollection.Add(parameter);
            return dataParameterCollection.Count - 1;
@@ -297,7 +296,6 @@ namespace Spring.Data.Common
            {
                propertyInfo.SetValue(parameter, isNullable, null);
            }
-            //TODO investigate default behavior.
            if (parameter.Value == null)
            {
                parameter.Value = DBNull.Value;
--- a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
+++ b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs
@@ -135,7 +135,8 @@ namespace Spring.Data.Common
        /// For providers that allow you to choose between binding parameters
        /// to a command by name (true) or by position (false).
        /// </summary>
-        bool BindByName { get;
+        bool BindByName { 
+            get;
            //TODO will go away when make all of this fully configuration driven.
            set; 
        }
--- a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
+++ b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs
@@ -109,7 +109,7 @@ namespace Spring.Data.Core
        /// Prepare the command setting the transaction timeout.
        /// </summary>
        /// <param name="command"></param>
-        protected void ApplyCommandSettings(IDbCommand command)
+        protected virtual void ApplyCommandSettings(IDbCommand command)
        {
            ConnectionUtils.ApplyTransactionTimeout(command, DbProvider, CommandTimeout );
        }
--- a/src/Spring/Spring.Services/AssemblyInfo.cs
+++ b/src/Spring/Spring.Services/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 using System;
 using System.Reflection;

-[assembly: AssemblyTitle("Spring.Net Portable Service Abstractions support")]
+[assembly: AssemblyTitle("Spring.Services")]
 [assembly: AssemblyDescription("Interfaces and classes that provide portable service abstractions in Spring.Net")]
--- a/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
+++ b/src/Spring/Spring.Services/EnterpriseServices/ExeConfigurationSystem.cs
@@ -20,7 +20,7 @@

 namespace Spring.EnterpriseServices
 {
-#if NET_2_0
+#if (NET_2_0 && !MONO)
    using System;
    using System.Configuration;
    using System.Reflection;
--- a/src/Spring/Spring.Web/Spring.Web.build
+++ b/src/Spring/Spring.Web/Spring.Web.build
@@ -17,6 +17,7 @@
 			<arg line="${compiler.args}"/>	
 			<nowarn>
 				<warning number="${nowarn.numbers},0108,0114,0612,0109" />
+				<warning number="${nowarn.numbers},1591" if="${nant.settings.currentframework=='mono-2.0'}"/>
 			</nowarn>
 			<sources failonempty="true">
 				<include name="**/*.cs" />
--- a/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
+++ b/test/Spring/Spring.Core.Tests/SecurityTemplate.cs
@@ -26,7 +26,6 @@ using System.Data.SqlClient;
 using System.Drawing.Printing;
 using System.IO;
 using System.Net;
-//using System.Net.Mail;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Permissions;
@@ -260,6 +259,7 @@ namespace Spring
            return null;
        }

+#if !MONO
        /// <summary>
        /// Loads the policy configuration from app.config configuration section
        /// </summary>
@@ -311,7 +311,7 @@ namespace Spring
            PolicyLevel domainPolicy = LoadDomainPolicyFromUri(new Uri(policyFileExpanded), appDirectory, trustSection.OriginUrl);
            return domainPolicy;
        }
-
+#endif
        /// <summary>
        /// Loads a policy from a file (<see cref="SecurityManager.LoadPolicyLevelFromFile"/>), 
        /// replacing placeholders  
@@ -398,7 +398,7 @@ namespace Spring
            }
            return SecurityManager.LoadPolicyLevelFromString(strXmlPolicy, PolicyLevelType.AppDomain);
        }
-
+#if !MONO
        private static string GetPolicyFilenameExpanded(TrustLevel trustLevel)
        {
            bool isRelative = true;
@@ -424,7 +424,7 @@ namespace Spring
            }
            return trustLevel.PolicyFile;
        }
-
+#endif
        [DllImport("mscorwks.dll", CharSet = CharSet.Unicode)]
        private static extern int GetCachePath(int dwCacheFlags, StringBuilder pwzCachePath, ref int pcchPath);

--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj
@@ -648,6 +648,7 @@
    <Compile Include="Reflection\Dynamic\DynamicPropertyTests.cs" />
    <Compile Include="Reflection\Dynamic\SafeFieldTests.cs" />
    <Compile Include="Reflection\Dynamic\SafePropertyTests.cs" />
+    <Compile Include="SecurityTemplate.cs" />
    <Compile Include="StandardsComplianceTest.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -655,6 +656,7 @@
    <Compile Include="StreamHelperDecorator.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="TestResourceLoader.cs" />
    <Compile Include="Threading\AsyncTestMethod.cs" />
    <Compile Include="Threading\AsyncTestTask.cs" />
    <Compile Include="Threading\CallContextStorageTests.cs" />
@@ -671,6 +673,7 @@
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Util\CollectionUtilsTests.cs" />
+    <Compile Include="Util\ConfigXmlDocumentTests.cs" />
    <Compile Include="Util\ObjectUtilsTests.cs" />
    <Compile Include="Util\PatternMatchUtilsTests.cs" />
    <Compile Include="Util\DefensiveEventRaiserTests.cs">
@@ -710,9 +713,6 @@
    <Compile Include="Validation\ExclusiveValidatorGroupTests.cs" />
    <Compile Include="Validation\HelperClasses.cs" />
    <Compile Include="Validation\ValidationExceptionTests.cs" />
-    <Compile Include="Validation\ValidationConfigParserTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Validation\ValidationErrorsTests.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -827,6 +827,7 @@
    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml" />
    <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithCustomAttribute.xml" />
    <Content Include="Spring.Core.Tests.dll.config" />
+    <Content Include="Util\ConfigXmlDocumentTests_SampleConfig.xml" />
    <EmbeddedResource Include="Context\contextlifecycle.xml" />
    <EmbeddedResource Include="Context\Support\objects.xml" />
    <EmbeddedResource Include="Objects\Factory\TestResource.txt" />
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build
@@ -19,6 +19,7 @@
 			doc="${current.bin.dir}/${project::get-name()}.xml">
 			<nowarn>
 				<warning number="${nowarn.numbers.test},0219,0169,0612" /> <!-- add 0414 for mono 2.0 -->
+				<warning number="${nowarn.numbers},1574" if="${nant.settings.currentframework=='mono-2.0'}"/>
 			</nowarn>
 			<sources failonempty="true">
 				<include name="**/*.cs" />
@@ -48,6 +49,7 @@
 				<include name="System.Data.dll" />
 				<include name="System.Configuration.dll" />
 				<include name="System.Web.Services.dll" />
+				<include name="System.Web.dll" />
 				<include name="System.Runtime.Serialization.Formatters.Soap.dll" />
 				<include name="System.Windows.Forms.dll" />
 				<include name="Rhino.Mocks.dll" />