springnet-commits — Automatic mailing when changes are committed to CVS

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes MyRequiredAttribute.cs, NONE, 1.1 RequiredAttributeObjectPostProcessorTests.cs, NONE, 1.1 RequiredTestObject.cs, NONE, 1.1 RequiredWithAllRequiredPropertiesProvided.xml, NONE, 1.1 RequiredWithCustomAttribute.xml, NONE, 1.1 RequiredWithOneRequiredPropertyOmitted.xml, NONE, 1.1 RequiredWithThreeRequiredPropertiesOmitted.xml, NONE, 1.1

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27670/Objects/Factory/Attributes

Added Files:
	MyRequiredAttribute.cs 
	RequiredAttributeObjectPostProcessorTests.cs 
	RequiredTestObject.cs 
	RequiredWithAllRequiredPropertiesProvided.xml 
	RequiredWithCustomAttribute.xml 
	RequiredWithOneRequiredPropertyOmitted.xml 
	RequiredWithThreeRequiredPropertiesOmitted.xml 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

--- NEW FILE: MyRequiredAttribute.cs ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredWithAllRequiredPropertiesProvided.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredWithOneRequiredPropertyOmitted.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredAttributeObjectPostProcessorTests.cs ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredWithCustomAttribute.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredWithThreeRequiredPropertiesOmitted.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredTestObject.cs ---
(This appears to be a binary file; contents omitted.)

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests Spring.Core.Tests.2005.csproj, 1.79, 1.80

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27670

Modified Files:
	Spring.Core.Tests.2005.csproj 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

Index: Spring.Core.Tests.2005.csproj
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2005.csproj,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** Spring.Core.Tests.2005.csproj	25 Mar 2008 22:33:04 -0000	1.79
--- Spring.Core.Tests.2005.csproj	2 Apr 2008 18:02:31 -0000	1.80
***************
*** 301,304 ****
--- 301,307 ----
      <Compile Include="HookableContextHandler.cs" />
      <Compile Include="Objects\ExpressionTestObject.cs" />
+     <Compile Include="Objects\Factory\Attributes\MyRequiredAttribute.cs" />
+     <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessorTests.cs" />
+     <Compile Include="Objects\Factory\Attributes\RequiredTestObject.cs" />
      <Compile Include="Objects\Factory\Config\CommandLineArgsVariableSourceTests.cs" />
      <Compile Include="Objects\Factory\Config\ConfigSectionVariableSourceTests.cs" />
***************
*** 801,804 ****
--- 804,811 ----
      <Content Include="Data\Spring\Objects\Factory\Xml\unsatisfiedsimpledependencycheck.xml" />
      <Content Include="Data\Spring\Objects\Factory\Xml\wellformed-but-bad.xml" />
+     <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithOneRequiredPropertyOmitted.xml" />
+     <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithThreeRequiredPropertiesOmitted.xml" />
+     <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithAllRequiredPropertiesProvided.xml" />
+     <EmbeddedResource Include="Objects\Factory\Attributes\RequiredWithCustomAttribute.xml" />
      <Content Include="Spring.Core.Tests.dll.config" />
      <EmbeddedResource Include="Context\contextlifecycle.xml" />

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Objects/Factory/Attributes RequiredAttribute.cs, NONE, 1.1 RequiredAttributeObjectPostProcessor.cs, NONE, 1.1

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Attributes
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27636/Objects/Factory/Attributes

Added Files:
	RequiredAttribute.cs RequiredAttributeObjectPostProcessor.cs 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

--- NEW FILE: RequiredAttribute.cs ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: RequiredAttributeObjectPostProcessor.cs ---
(This appears to be a binary file; contents omitted.)

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Objects/Factory/Config InstantiationAwareObjectPostProcessorAdapter.cs, NONE, 1.1 SmartInstantiationAwareObjectPostProcessor.cs, NONE, 1.1

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Config
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27636/Objects/Factory/Config

Added Files:
	InstantiationAwareObjectPostProcessorAdapter.cs 
	SmartInstantiationAwareObjectPostProcessor.cs 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

--- NEW FILE: InstantiationAwareObjectPostProcessorAdapter.cs ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: SmartInstantiationAwareObjectPostProcessor.cs ---
(This appears to be a binary file; contents omitted.)

[Springnet-commits] Spring.Net/src/Spring/Spring.Core Spring.Core.2005.csproj, 1.120, 1.121

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27636

Modified Files:
	Spring.Core.2005.csproj 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

Index: Spring.Core.2005.csproj
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Spring.Core.2005.csproj,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** Spring.Core.2005.csproj	25 Mar 2008 22:33:04 -0000	1.120
--- Spring.Core.2005.csproj	2 Apr 2008 18:02:24 -0000	1.121
***************
*** 44,47 ****
--- 44,48 ----
      <DebugType>full</DebugType>
      <ErrorReport>prompt</ErrorReport>
+     <WarningsAsErrors>1591</WarningsAsErrors>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
***************
*** 536,539 ****
--- 537,542 ----
        <SubType>Code</SubType>
      </Compile>
+     <Compile Include="Objects\Factory\Attributes\RequiredAttribute.cs" />
+     <Compile Include="Objects\Factory\Attributes\RequiredAttributeObjectPostProcessor.cs" />
      <Compile Include="Objects\Factory\Config\AbstractConfigurer.cs" />
      <Compile Include="Objects\Factory\Config\CommandLineArgsVariableSource.cs" />
***************
*** 541,547 ****
--- 544,552 ----
      <Compile Include="Objects\Factory\Config\ConnectionStringsVariableSource.cs" />
      <Compile Include="Objects\Factory\Config\IConfigurableFactoryObject.cs" />
+     <Compile Include="Objects\Factory\Config\InstantiationAwareObjectPostProcessorAdapter.cs" />
      <Compile Include="Objects\Factory\Config\ObjectDefinitionHolder.cs" />
      <Compile Include="Objects\Factory\Config\ObjectDefinitionVisitor.cs" />
      <Compile Include="Objects\Factory\Config\ResourceHandlerConfigurer.cs" />
+     <Compile Include="Objects\Factory\Config\SmartInstantiationAwareObjectPostProcessor.cs" />
      <Compile Include="Objects\Factory\Config\TypeAliasConfigurer.cs" />
      <Compile Include="Objects\Factory\Config\PropertyFileVariableSource.cs" />

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support AbstractAutowireCapableObjectFactory.cs, 1.85, 1.86 AutowireUtils.cs, 1.6, 1.7

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27636/Objects/Factory/Support

Modified Files:
	AbstractAutowireCapableObjectFactory.cs AutowireUtils.cs 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

Index: AutowireUtils.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AutowireUtils.cs	31 Jul 2007 03:47:39 -0000	1.6
--- AutowireUtils.cs	2 Apr 2008 18:02:24 -0000	1.7
***************
*** 24,27 ****
--- 24,28 ----
  using System.Collections;
  using System.Reflection;
+ using Spring.Collections;
  using Spring.Core;
  using Spring.Objects.Factory.Config;
***************
*** 169,172 ****
--- 170,185 ----
  		}
  
+         /// <summary>
+         /// Determines whether the given object property is excluded from dependency checks.
+         /// </summary>
+         /// <param name="pi">The PropertyInfo of the object property.</param>
+         /// <returns>
+         /// 	<c>true</c> if is excluded from dependency check; otherwise, <c>false</c>.
+         /// </returns>
+         public static Boolean IsExcludedFromDependencyCheck(PropertyInfo pi)
+         {
+             return (pi.GetSetMethod() == null) ? false : true;
+         }
+ 
  		/// <summary>
  		/// Sorts the supplied <paramref name="constructors"/>, preferring
***************
*** 244,247 ****
--- 257,286 ----
  
  		#endregion
+ 
+         /// <summary>
+         /// Determines whether the setter property is defined in any of the given interfaces.
+         /// </summary>
+         /// <param name="propertyInfo">The PropertyInfo of the object property</param>
+         /// <param name="interfaces">The ISet of interfaces.</param>
+         /// <returns>
+         /// 	<c>true</c> if setter property is defined in interface; otherwise, <c>false</c>.
+         /// </returns>
+ 	    public static bool IsSetterDefinedInInterface(PropertyInfo propertyInfo, ISet interfaces)
+ 	    {
+ 	        MethodInfo setter = propertyInfo.GetSetMethod();
+             if (setter != null)
+             {
+                 Type targetType = setter.DeclaringType;
+                 foreach (Type interfaceType in interfaces)
+                 {
+                     if (interfaceType.IsAssignableFrom(targetType) &&
+                         ReflectionUtils.GetMethod(interfaceType, setter.Name, ReflectionUtils.GetParameterTypes(setter)) != null)                    
+                     {
+                         return true;
+                     }
+                 }
+             }
+             return false;
+ 	    }
  	}
  }
\ No newline at end of file

Index: AbstractAutowireCapableObjectFactory.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** AbstractAutowireCapableObjectFactory.cs	20 Mar 2008 10:35:54 -0000	1.85
--- AbstractAutowireCapableObjectFactory.cs	2 Apr 2008 18:02:24 -0000	1.86
***************
*** 113,117 ****
          /// <param name="parentFactory">The parent object factory, or <see langword="null"/> if none.</param>
          protected AbstractAutowireCapableObjectFactory(bool caseSensitive, IObjectFactory parentFactory) : base(caseSensitive, parentFactory)
!         {}
  
          #endregion
--- 113,120 ----
          /// <param name="parentFactory">The parent object factory, or <see langword="null"/> if none.</param>
          protected AbstractAutowireCapableObjectFactory(bool caseSensitive, IObjectFactory parentFactory) : base(caseSensitive, parentFactory)
!         {
!             this.IgnoreDependencyInterface(typeof(IObjectFactoryAware));
!             this.IgnoreDependencyInterface(typeof(IObjectNameAware));
!         }
  
          #endregion
***************
*** 500,504 ****
              {
                  PropertyInfo[] filteredPropInfo = FilterPropertyInfoForDependencyCheck(wrapper);
!                 if (HasInstantiationAwareBeanPostProcessors)
                  {
                      foreach (IObjectPostProcessor processor in ObjectPostProcessors)
--- 503,507 ----
              {
                  PropertyInfo[] filteredPropInfo = FilterPropertyInfoForDependencyCheck(wrapper);
!                 if (hasInstAwareOpps)
                  {
                      foreach (IObjectPostProcessor processor in ObjectPostProcessors)
***************
*** 706,709 ****
--- 709,728 ----
  
          /// <summary>
+         /// Ignore the given dependency type for autowiring
+         /// </summary>
+         /// <remarks>
+         /// This will typically be used by application contexts to register
+         /// dependencies that are resolved in other ways, like IOjbectFactory through
+         /// IObjectFactoryAware or IApplicationContext through IApplicationContextAware.
+         /// By default, IObjectFactoryAware and IObjectName interfaces are ignored.
+         /// For further types to ignore, invoke this method for each type.
+         /// </remarks>
+         /// <seealso cref="Spring.Objects.Factory.Config.IConfigurableObjectFactory.IgnoreDependencyType"/>.
+         public void IgnoreDependencyInterface(Type type)
+         {
+             ignoredDependencyInterfaces.Add(type);
+         }
+ 
+         /// <summary>
          /// Create an object instance for the given object definition.
          /// </summary>
***************
*** 1484,1487 ****
--- 1503,1507 ----
                          }
                      }
+                    
                      filtered = (PropertyInfo[]) list.ToArray(typeof(PropertyInfo));
                      filteredPropertyDescriptorsCache.Add(wrapper.WrappedType, filtered);
***************
*** 1494,1498 ****
          private bool IsExcludedFromDependencyCheck(PropertyInfo pi)
          {
!             return IgnoredDependencyTypes.Contains(pi.PropertyType);
          }
  
--- 1514,1526 ----
          private bool IsExcludedFromDependencyCheck(PropertyInfo pi)
          {
!             bool b1 = !pi.CanWrite; //AutowireUtils.IsExcludedFromDependencyCheck(pi);
!             bool b2 = IgnoredDependencyTypes.Contains(pi.PropertyType);
!             bool b3 = AutowireUtils.IsSetterDefinedInInterface(pi, ignoredDependencyInterfaces);
!             return b1 || b2 || b3;
!             /*
!             return AutowireUtils.IsExcludedFromDependencyCheck(pi) ||
!                    IgnoredDependencyTypes.Contains(pi.PropertyType) ||
!                    AutowireUtils.IsSetterDefinedInInterface(pi, ignoredDependencyInterfaces);
!              */
          }
  
***************
*** 2325,2328 ****
--- 2353,2363 ----
          private IDictionary filteredPropertyDescriptorsCache = new Hashtable();
  
+         /// <summary>
+         /// Dependency interfaces to ignore on dependency check and autowire, as Set of
+         /// Class objects. By default, only the IObjectFactoryAware and IObjectNameAware 
+         /// interfaces are ignored.
+         /// </summary>
+         private ISet ignoredDependencyInterfaces = new HybridSet();
+ 
          #endregion
      }

[Springnet-commits] Spring.Net/doc/reference/src objects.xml, 1.119, 1.120

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/doc/reference/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27260

Modified Files:
	objects.xml 
Log Message:
SPRNET-907 - Add Required attribute and RequiredObjectFactoryPostProcessor, allowing to enforce required object properties

Index: objects.xml
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/doc/reference/src/objects.xml,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** objects.xml	26 Feb 2008 02:04:32 -0000	1.119
--- objects.xml	2 Apr 2008 18:02:11 -0000	1.120
***************
*** 3878,3883 ****
        this registration is effected), for each object instance that is created
        by the container, the post-processor will get a callback from the
!       container both before any initialization methods (such as the
!       <methodname>AfterPropertiesSet</methodname> method of the
        <classname>IInitializingObject</classname> interface and any declared
        init method) are called, and also afterwards. The post-processor is free
--- 3878,3883 ----
        this registration is effected), for each object instance that is created
        by the container, the post-processor will get a callback from the
!       container both <emphasis>before</emphasis> any initialization methods
!       (such as the <methodname>AfterPropertiesSet</methodname> method of the
        <classname>IInitializingObject</classname> interface and any declared
        init method) are called, and also afterwards. The post-processor is free
***************
*** 3981,3985 ****
        <para></para>
  
!       <sect3>
          <title>Example: Hello World, IObjectPostProcessor-style</title>
  
--- 3981,3985 ----
        <para></para>
  
!       <sect3 id="object-factory-extension-opp-examples-hw">
          <title>Example: Hello World, IObjectPostProcessor-style</title>
  
***************
*** 4055,4059 ****
          program will be:</para>
  
!         <programlisting>INFO  - Object 'Spring.IocQuickStart.MovieFinder.TracingObjectPostProcessor' is not eligible for being processed by all IObjectPostProcessors (for example: not eligible for auto-proxying).
  Object 'MyMovieFinder' created : Spring.IocQuickStart.MovieFinder.SimpleMovieFinder
  Object 'MyMovieLister' created : Spring.IocQuickStart.MovieFinder.MovieLister
--- 4055,4060 ----
          program will be:</para>
  
!         <programlisting>INFO  - Object 'Spring.IocQuickStart.MovieFinder.TracingObjectPostProcessor' is not eligible for being processed by all IObjectPostProcessors 
!        (for example: not eligible for auto-proxying).
  Object 'MyMovieFinder' created : Spring.IocQuickStart.MovieFinder.SimpleMovieFinder
  Object 'MyMovieLister' created : Spring.IocQuickStart.MovieFinder.MovieLister
***************
*** 4062,4065 ****
--- 4063,4150 ----
  DEBUG - MovieApp Done.</programlisting>
        </sect3>
+ 
+       <sect3 id="object-factory-extension-opp-examplesrapp">
+         <title>Example: the RequiredAttributeObjectPostProcessor</title>
+ 
+         <para>Using callback interfaces or annotations in conjunction with a
+         custom IObjectPostProcessor implementation is a common means of
+         extending the Spring IoC container. The <literal>[Required]</literal>
+         attribute in the <literal>Spring.Objects.Factory.Attributes</literal>
+         namespace can be used to <emphasis>mark</emphasis> a property as
+         being<emphasis> 'required-to-be-set' </emphasis>(i.e. an setter
+         property with this attribute applied must be configured to be
+         dependency injected with a value), else an
+         <classname>ObjectInitializationException</classname> will be thrown by
+         the container at runtime.</para>
+ 
+         <para>The best way to illustrate the usage of this attribute is with
+         an example.</para>
+ 
+         <programlisting>public class MovieLister
+ {
+   // the MovieLister has a dependency on the MovieFinder
+   private IMovieFinder _movieFinder;
+ 
+   // a setter property so that the Spring container can 'inject' a MovieFinder
+   [Required]
+   public IMovieFinder MovieFinder
+   {
+     set { _movieFinder = value; }  
+   }
+ 
+   // business logic that actually 'uses' the injected MovieFinder is omitted...
+ 
+ }</programlisting>
+ 
+         <para>Hopefully the above class definition reads easy on the eye. Any
+         and all <literal>IObjectDefinitions</literal> for the
+         <classname>MovieLister</classname> class must be provided with a
+         value.</para>
+ 
+         <para>Let's look at an example of some XML configuraiton that will not
+         pass validation.</para>
+ 
+         <programlisting>  &lt;object id="MyMovieLister" 
+           type="Spring.IocQuickStart.MovieFinder.MovieLister, Spring.IocQuickStart.MovieFinder"&gt;
+       &lt;!-- whoops, no MovieFinder is set (and this property is [Required]) --&gt;
+   &lt;/object&gt;</programlisting>
+ 
+         <para>At runtime the following message will be generated by the Spring
+         container</para>
+ 
+         <programlisting>Error creating context 'spring.root': Property 'MovieFinder' required for object 'MyMovieLister'</programlisting>
+ 
+         <para>There is one last little piece of Spring configuration that is
+         required to actually 'switch on' this behavior. Simply annotating the
+         'setter' properties of your classes is not enough to get this
+         behavior. You need to enable a component that is aware of the
+         <literal>[Required]</literal> attribute and that can process it
+         appropriately.</para>
+ 
+         <para>This component is the
+         <classname>RequiredAttributeObjectPostProcessor</classname> class.
+         This is a special <literal>IObjectPostProcessor</literal>
+         implementation that is <literal>[Required]</literal>-aware and
+         actually provides the 'blow up if this required property has not been
+         set' logic. It is very easy to configure; simply drop the following
+         object definition into your Spring XML configuration.</para>
+ 
+         <programlisting>&lt;object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"/&gt;</programlisting>
+ 
+         <para>Finally, one can configure an instance of the
+         <classname>RequiredAttributeObjectPostProcessor</classname> class to
+         look for another <literal>Attribute</literal> type. This is great if
+         you already have your own <literal>[Required]</literal>-style
+         attribute. Simply plug it into the definition of a
+         <classname>RequiredAttributeObjectPostProcessor</classname> and you
+         are good to go. By way of an example, let's suppose you (or your
+         organization / team) have defined an attribute called [Mandatory]. You
+         can make a <classname>RequiredAttributeObjectPostProcessor</classname>
+         instance <literal>[Mandatory]</literal>-aware like so: </para>
+ 
+         <programlisting>&lt;object type="Spring.Objects.Factory.Attributes.RequiredAttributeObjectPostProcessor, Spring.Core"&gt;
+   &lt;property name="RequiredAttributeType" value="MyApp.Attributes.MandatoryAttribute, MyApp"/&gt;
+ &lt;/object&gt;</programlisting>
+       </sect3>
      </sect2>
  
***************
*** 4170,4174 ****
  
        <sect3 id="objects-factory-placeholderconfigurer">
!         <title>The
          <classname>PropertyPlaceholderConfigurer</classname></title>
  
--- 4255,4259 ----
  
        <sect3 id="objects-factory-placeholderconfigurer">
!         <title>Example: The
          <classname>PropertyPlaceholderConfigurer</classname></title>
  
***************
*** 4351,4355 ****
  
        <sect3 id="objects-factory-overrideconfigurer">
!         <title>The <classname>PropertyOverrideConfigurer</classname></title>
  
          <para>The <classname>PropertyOverrideConfigurer</classname>, another
--- 4436,4441 ----
  
        <sect3 id="objects-factory-overrideconfigurer">
!         <title>Example: The
!         <classname>PropertyOverrideConfigurer</classname></title>
  
          <para>The <classname>PropertyOverrideConfigurer</classname>, another

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Util ReflectionUtilsTests.cs, 1.21, 1.22

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18826

Modified Files:
	ReflectionUtilsTests.cs 
Log Message:
SPRNET-908 : ReflectionUtils.MethodIsOnOneOfTheseInterfaces does not correctly iterate over multiple interface types

Index: ReflectionUtilsTests.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Util/ReflectionUtilsTests.cs,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ReflectionUtilsTests.cs	24 Jan 2008 04:10:44 -0000	1.21
--- ReflectionUtilsTests.cs	2 Apr 2008 16:21:49 -0000	1.22
***************
*** 33,36 ****
--- 33,37 ----
  using Spring.Objects;
  using Spring.Objects.Factory;
+ using Spring.Objects.Factory.Attributes;
  
  #endregion
***************
*** 203,206 ****
--- 204,216 ----
  		}
  
+         [Test]
+         public void MethodIsOnOneOfTheseInterfacesMultiple()
+         {
+             MethodInfo method = typeof(RequiredTestObject).GetMethod("set_ObjectFactory");
+             Assert.IsNotNull(method, "Could not get setter property for ObjectFactory");
+             Assert.IsTrue(ReflectionUtils.MethodIsOnOneOfTheseInterfaces(method, new Type[] { typeof (IObjectNameAware), typeof(IObjectFactoryAware)}));
+         }
+ 
+ 
  		[Test]
  		[ExpectedException(typeof (ArgumentNullException))]

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Util ReflectionUtils.cs, 1.57, 1.58

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv18800

Modified Files:
	ReflectionUtils.cs 
Log Message:
SPRNET-908 : ReflectionUtils.MethodIsOnOneOfTheseInterfaces does not correctly iterate over multiple interface types

Index: ReflectionUtils.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Util/ReflectionUtils.cs,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** ReflectionUtils.cs	24 Jan 2008 04:11:44 -0000	1.57
--- ReflectionUtils.cs	2 Apr 2008 16:21:22 -0000	1.58
***************
*** 83,86 ****
--- 83,87 ----
  		}
  
+ 
  		/// <summary>
  		/// Returns method for the specified <see cref="System.Type"/>, method
***************
*** 88,91 ****
--- 89,93 ----
  		/// <see cref="System.Type"/>s.
  		/// </summary>
+ 		/// <remarks>Searches with BindingFlags  </remarks>
  		/// <param name="targetType">
  		/// The target <see cref="System.Type"/> to find the method on.
***************
*** 100,103 ****
--- 102,106 ----
  			Type targetType, string method, Type[] argumentTypes)
  		{
+             AssertUtils.ArgumentNotNull(targetType, "Type must not be null");
  			// try method exactly as specified first...
  			MethodInfo retMethod = targetType.GetMethod(
***************
*** 434,442 ****
  				try
  				{
! 					method = interfaceType.GetMethod(
  						method.Name,
  						BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly,
  						null, paramTypes, null);
! 					if (method != null)
  					{
  						// found it...
--- 437,445 ----
  				try
  				{
! 					MethodInfo mi = interfaceType.GetMethod(
  						method.Name,
  						BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly,
  						null, paramTypes, null);
! 					if (mi != null)
  					{
  						// found it...

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes - New directory

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25639/Attributes

Log Message:
Directory /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Objects/Factory/Attributes added to the repository

[Springnet-commits] Spring.Net/src/Spring/Spring.Core/Objects/Factory/Attributes - New directory

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Attributes
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24878/Attributes

Log Message:
Directory /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Attributes added to the repository

[Springnet-commits] Spring.Net/src/Spring/Spring.Services Spring.Services.build, 1.16, 1.17

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Services
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Services

Modified Files:
	Spring.Services.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Services.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Services/Spring.Services.build,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Spring.Services.build	19 Mar 2007 09:26:22 -0000	1.16
--- Spring.Services.build	1 Apr 2008 19:51:05 -0000	1.17
***************
*** 25,29 ****
        <sources failonempty="true">
          <include name="**/*.cs" />
!         <include name="../CommonAssemblyInfo.cs" />
          <exclude name="**/WindowsService/**" />
        </sources>
--- 25,29 ----
        <sources failonempty="true">
          <include name="**/*.cs" />
!         <include name="../GenCommonAssemblyInfo.cs" />
          <exclude name="**/WindowsService/**" />
        </sources>

[Springnet-commits] Spring.Net/src/Spring/Spring.Data.NHibernate12 Spring.Data.NHibernate12.build, 1.4, 1.5

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data.NHibernate12
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Data.NHibernate12

Modified Files:
	Spring.Data.NHibernate12.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Data.NHibernate12.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data.NHibernate12/Spring.Data.NHibernate12.build,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Spring.Data.NHibernate12.build	4 Feb 2008 22:42:49 -0000	1.4
--- Spring.Data.NHibernate12.build	1 Apr 2008 19:51:04 -0000	1.5
***************
*** 27,31 ****
  				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateAccessor.cs" />
  				<exclude name="./Data/NHibernate/Generic/*.cs" if="${nant.settings.currentframework == 'net-1.1'}"/>
! 				<include name="../CommonAssemblyInfo.cs" />
  			</sources>
  			<references basedir="${current.bin.dir}">
--- 27,31 ----
  				<exclude name="../Spring.Data.NHibernate/Data/**/HibernateAccessor.cs" />
  				<exclude name="./Data/NHibernate/Generic/*.cs" if="${nant.settings.currentframework == 'net-1.1'}"/>
! 				<include name="../GenCommonAssemblyInfo.cs" />
  			</sources>
  			<references basedir="${current.bin.dir}">

[Springnet-commits] Spring.Net Spring.build, 1.195, 1.196 Spring.include, 1.9, 1.10

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841

Modified Files:
	Spring.build Spring.include 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/Spring.build,v
retrieving revision 1.195
retrieving revision 1.196
diff -C2 -d -r1.195 -r1.196
*** Spring.build	4 Feb 2008 22:42:48 -0000	1.195
--- Spring.build	1 Apr 2008 19:51:01 -0000	1.196
***************
*** 4,7 ****
--- 4,8 ----
    <!-- global project settings -->
    <property name="project.name" value="Spring.NET"/>
+   <property name="project.name.full" value="Spring.NET Framework"/>
    <property name="spring.basedir" value="${project::get-base-directory()}"/>
    <property name="nant.nunit2outproc.nunitpath" value="${project::get-base-directory()}/tools/nunit/" />
***************
*** 13,17 ****
    <include buildfile="${spring.basedir}/Spring.include"/>
  
!   <property name="package.version" value="1.1.0" unless="${property::exists('project.version')}"/>
    <property name="using-clover" value="false"/>
    <!-- change this to sync the sdk doc version generated -->
--- 14,18 ----
    <include buildfile="${spring.basedir}/Spring.include"/>
  
!   <property name="package.version" value="1.1.1" unless="${property::exists('project.version')}"/>
    <property name="using-clover" value="false"/>
    <!-- change this to sync the sdk doc version generated -->
***************
*** 20,24 ****
--- 21,29 ----
    <sysinfo/>
  
+   <property name="project.company" value="SpringSource"/>
+   <property name="project.copyright" value="Copyright 2002-2008 Spring.NET Framework Team."/>
  
+   <property name="key.file" value="Spring.Net.snk"/>
+   <property name="project.year" value="2008"/>
  
    <!-- Targets that are always executed -->
***************
*** 161,168 ****
      <property name="current.package.dir" value="${package.dir}/${project::get-name()}"/>
  
! 
!     <!-- for docs packaging MLP 
      <property name="current.package.dir" value="l:/release/${project::get-name()}"/>
- 
      <property name="current.package.dir" value="L:/projects/Spring.Net/build/package-docs/${project::get-name()}"/>
      -->
--- 166,172 ----
      <property name="current.package.dir" value="${package.dir}/${project::get-name()}"/>
  
!     <!-- for docs packaging MLP -->
!     <!--
      <property name="current.package.dir" value="l:/release/${project::get-name()}"/>
      <property name="current.package.dir" value="L:/projects/Spring.Net/build/package-docs/${project::get-name()}"/>
      -->
***************
*** 342,345 ****
--- 346,351 ----
            depends="set-net-1.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
      <!-- initialize the temp.build.skip property to false -->
+     <call target="common.generate-assemblyinfo"/>
+ 
      <property name="temp.build.skip" value="false"/>
      <!-- configure build -->
***************
*** 356,359 ****
--- 362,366 ----
    <target name="compile-net-1.1" description="Builds .NET Framework 1.1 version"
            depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+     <call target="common.generate-assemblyinfo"/>
      <!-- initialize the temp.build.skip property to false -->
      <property name="temp.build.skip" value="false"/>
***************
*** 366,369 ****
--- 373,377 ----
    <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version"
            depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit">
+     <call target="common.generate-assemblyinfo"/>
      <!-- initialize the temp.build.skip property to false -->
      <property name="temp.build.skip" value="false"/>

Index: Spring.include
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/Spring.include,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Spring.include	3 Dec 2007 16:11:30 -0000	1.9
--- Spring.include	1 Apr 2008 19:51:02 -0000	1.10
***************
*** 164,167 ****
--- 164,258 ----
          <call target="set-${current.build.config}-build-configuration"/>
      </target>
+ 
+     <target name="generate-build-number">
+ 
+     <script language="C#">
+         <imports>
+             <import name="System.Globalization" />
+             <import name="System.Threading" />
+         </imports>
+ 
+         <code>
+ 	<!-- format for assembly revision is RRXXX where RR = framework number (1.0=10; 1.1=11; 2.0=20 etc) and 
+              XXX is the number of days from the year the project 'started', property project.year.  -->
+             <![CDATA[
+                 public static void ScriptMain(Project project) {
+ 		    int frameworkRevision = Convert.ToInt32(project.Properties["nant.settings.currentframework.revisionnumber"]);
+                     Version version = new Version(project.Properties["package.version"]);
+                     int major = version.Major;
+                     int minor = version.Minor;
+                     int build = version.Build;
+                     int revision = version.Revision;
+  
+                     int startYear = Convert.ToInt32(project.Properties["project.year"]);
+                     DateTime start = new DateTime(startYear, 1, 1);
+ 		    TimeSpan ts = DateTime.Now - start;
+                     revision = ts.Days;
+                     revision = revision + (frameworkRevision*10000);
+ 		    
+ 
+                     version = new Version(major, minor, build, revision);
+                     project.Properties["project.version.numeric"] = version.ToString();
+                 }
+             ]]>
+         </code>
+ 
+     </script>
+     </target>
+ 
+     <target name="common.set-assembly-attribute-values" depends="generate-build-number">
+         <property name="assembly.is-cls-compliant" value="false" />
+ 	<property name="assembly.configuration" value="${nant.settings.currentframework}.win32; ${current.build.config}"/>
+ 	<property name="assembly.product" value="${project.name.full} ${package.version} for .NET ${nant.settings.currentframework.number}" />
+ 	<property name="assembly.company" value="${project.company}" />
+ 	<property name="assembly.copyright" value="${project.copyright}" />
+ 	<property name="assembly.trademark" value="Apache License, Version 2.0" />
+         <property name="assembly.culture" value=""/>
+ 	<property name="assembly.version" value="${project.version.numeric}" />
+ 	<property name="assembly.delay.sign" value="false" />
+ 	<property name="assembly.keyfile" value="${key.file}" />
+ 
+         <!--
+ 	<property name="assembly.title" value="${project::get-name()}" />
+ 	<property name="assembly.description" value="" />
+ 	<property name="assembly.version.informational" value="${project.version.numeric}" />
+ 	-->
+ 
+     </target>
+ 
+     <target name="common.generate-assemblyinfo"
+             depends="common.set-assembly-attribute-values"
+             description="Generate AssemblyInfo.cs using assembly.* properties."
+ 	    >
+ 	<asminfo output="src/Spring/GenCommonAssemblyInfo.cs" language="CSharp">
+ 	    <imports>
+ 	        <import namespace="System" />
+ 	        <import namespace="System.Reflection" />
+ 	    </imports>
+ 	    <attributes>
+ 	        <attribute type="CLSCompliantAttribute" value="${assembly.is-cls-compliant}" />
+ 		<attribute type="AssemblyConfigurationAttribute" value="${assembly.configuration}" />
+ 		<attribute type="AssemblyProductAttribute" value="${assembly.product}" />
+ 		<attribute type="AssemblyCompanyAttribute" value="${assembly.company}" />
+ 		<attribute type="AssemblyCopyrightAttribute" value="${assembly.copyright}" />
+ 		<attribute type="AssemblyTrademarkAttribute" value="${assembly.trademark}" />
+ 		<attribute type="AssemblyCultureAttribute" value="${assembly.culture}" />
+ 		<attribute type="AssemblyVersionAttribute" value="${assembly.version}" />
+ 
+ 		<attribute type="AssemblyDelaySignAttribute" value="false" if="${current.build.config == 'release'}" />
+ 		<attribute type="AssemblyKeyFileAttribute" value="${assembly.keyfile}" if="${current.build.config == 'release' and (nant.settings.currentframework == 'net-1.0' or nant.settings.currentframework == 'net-1.1')}" />
+ 		
+ 			
+ 		<!--
+ 		<attribute type="AssemblyTitleAttribute" value="${assembly.title}" />
+ 		<attribute type="AssemblyDescriptionAttribute" value="${assembly.description}" />
+ 		<attribute type="AssemblyInformationalVersionAttribute" value="${assembly.version.informational}" />
+ 		<attribute type="AssemblyFileVersionAttribute" value="${assembly.version.file}" />
+ 		-->
+             </attributes>
+ 	</asminfo>
+     </target>
+     
+ 
      <target name="set-debug-build-configuration">
          <property name="compiler.args" value=""/>
***************
*** 204,207 ****
--- 295,300 ----
              depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
          <property name="nant.settings.currentframework" value="net-1.0"/>
+         <property name="nant.settings.currentframework.number" value="1.0"/>
+         <property name="nant.settings.currentframework.revisionnumber" value="0"/>
          <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
          <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_1_0" dynamic="true"/>
***************
*** 217,224 ****
--- 310,320 ----
          <property name="link.sdkdoc.version" value="SDK_v1_0"/>
          <property name="nowarn.numbers.test" value="${nowarn.numbers.test.default}"/>
+ 
      </target>
      <target name="set-net-1.1-runtime-configuration"
              depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
          <property name="nant.settings.currentframework" value="net-1.1"/>
+         <property name="nant.settings.currentframework.number" value="1.1"/>
+         <property name="nant.settings.currentframework.revisionnumber" value="1"/>
          <property name="current.build.debug" value="${build.debug}" dynamic="true"/>
          <property name="current.build.defines.csc" value="${build.defines.csc},NET,NET_1_1" dynamic="true"/>
***************
*** 238,241 ****
--- 334,339 ----
              depends="check-bin-dir, check-sdkdoc-dir, check-sdkdoc-debug, check-current-build-config, check-build-debug, check-build-defines">
          <property name="nant.settings.currentframework" value="net-2.0"/>
+         <property name="nant.settings.currentframework.number" value="2.0"/>
+         <property name="nant.settings.currentframework.revisionnumber" value="2"/>
          <property name="net-2.0" value="true"/>
          <property name="current.build.debug" value="${build.debug}" dynamic="true"/>

[Springnet-commits] Spring.Net/src/Spring/Spring.Aop Spring.Aop.build, 1.12, 1.13

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Aop

Modified Files:
	Spring.Aop.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Aop.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Aop/Spring.Aop.build,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Spring.Aop.build	7 Aug 2007 09:38:58 -0000	1.12
--- Spring.Aop.build	1 Apr 2008 19:51:04 -0000	1.13
***************
*** 21,25 ****
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../CommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="Resources">
--- 21,25 ----
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../GenCommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="Resources">

[Springnet-commits] Spring.Net/src/Spring/Spring.Web.Extensions Spring.Web.Extensions.build, 1.1, 1.2

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web.Extensions
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Web.Extensions

Modified Files:
	Spring.Web.Extensions.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Web.Extensions.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Spring.Web.Extensions.build	31 May 2007 18:34:55 -0000	1.1
--- Spring.Web.Extensions.build	1 Apr 2008 19:51:05 -0000	1.2
***************
*** 21,25 ****
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../CommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="Resources">
--- 21,25 ----
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../GenCommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="Resources">

[Springnet-commits] Spring.Net/src/Spring/Spring.Core Spring.Core.build, 1.32, 1.33

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Core

Modified Files:
	Spring.Core.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Core.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Spring.Core.build,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Spring.Core.build	27 Aug 2007 09:38:12 -0000	1.32
--- Spring.Core.build	1 Apr 2008 19:51:04 -0000	1.33
***************
*** 25,29 ****
              <sources failonempty="true">
                  <include name="**/*.cs" />
!                 <include name="../CommonAssemblyInfo.cs" />
  <!-- not needed, but produces a lot of 1591 warnings: exclude it -->
                  <exclude name="Expressions/Parser/ExpressionParserTokenTypes.cs" />
--- 25,29 ----
              <sources failonempty="true">
                  <include name="**/*.cs" />
!                 <include name="../GenCommonAssemblyInfo.cs" />
  <!-- not needed, but produces a lot of 1591 warnings: exclude it -->
                  <exclude name="Expressions/Parser/ExpressionParserTokenTypes.cs" />

[Springnet-commits] Spring.Net/src/Spring CommonAssemblyInfo.cs, 1.23, 1.24

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring

Modified Files:
	CommonAssemblyInfo.cs 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: CommonAssemblyInfo.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/CommonAssemblyInfo.cs,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CommonAssemblyInfo.cs	6 Dec 2007 21:40:37 -0000	1.23
--- CommonAssemblyInfo.cs	1 Apr 2008 19:51:04 -0000	1.24
***************
*** 25,38 ****
  //      Major Version
  //      Minor Version 
! //      Revision
! //      .NET Framework Version
  //
! // This is as good a convention as any for supporting side-by-side deployment of 
! // .NET 1.1 and .NET 2.0 versions of the assembly.
! 
  #if !NET_2_0
! [assembly: AssemblyVersion("1.1.0.1")]
  #else
! [assembly: AssemblyVersion("1.1.0.2")]
  #endif
  
--- 25,38 ----
  //      Major Version
  //      Minor Version 
! //      .NET Framework Version (RR)
! //      Revision = "1" for builds with VS.NET, nant build is # of days since 'project.year' 
! //      property
  //
! //
! // This is to support side-by-side deployment of .NET 1.1 and .NET 2.0 versions of the assembly.
  #if !NET_2_0
! [assembly: AssemblyVersion("1.1.1.11001")]
  #else
! [assembly: AssemblyVersion("1.1.1.20001")]
  #endif
  

[Springnet-commits] Spring.Net/src/Spring/Spring.Testing.NUnit Spring.Testing.NUnit.build, 1.2, 1.3

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Testing.NUnit
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Testing.NUnit

Modified Files:
	Spring.Testing.NUnit.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Testing.NUnit.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Spring.Testing.NUnit.build	16 Aug 2007 05:42:33 -0000	1.2
--- Spring.Testing.NUnit.build	1 Apr 2008 19:51:05 -0000	1.3
***************
*** 22,26 ****
              <sources failonempty="true">
                  <include name="**/*.cs" />
!                 <include name="../CommonAssemblyInfo.cs" />
              </sources>
  		        <references basedir="${current.bin.dir}">
--- 22,26 ----
              <sources failonempty="true">
                  <include name="**/*.cs" />
!                 <include name="../GenCommonAssemblyInfo.cs" />
              </sources>
  		        <references basedir="${current.bin.dir}">

[Springnet-commits] Spring.Net/src/Spring/Spring.Data.NHibernate Spring.Data.NHibernate.build, 1.5, 1.6

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data.NHibernate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Data.NHibernate

Modified Files:
	Spring.Data.NHibernate.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Data.NHibernate.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data.NHibernate/Spring.Data.NHibernate.build,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Spring.Data.NHibernate.build	3 Dec 2007 16:11:31 -0000	1.5
--- Spring.Data.NHibernate.build	1 Apr 2008 19:51:04 -0000	1.6
***************
*** 21,25 ****
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../CommonAssemblyInfo.cs" />
  			</sources>
  			<references basedir="${current.bin.dir}">
--- 21,25 ----
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../GenCommonAssemblyInfo.cs" />
  			</sources>
  			<references basedir="${current.bin.dir}">

[Springnet-commits] Spring.Net/src/Spring/Spring.Data Spring.Data.build, 1.19, 1.20

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Data

Modified Files:
	Spring.Data.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Data.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Data/Spring.Data.build,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Spring.Data.build	3 Dec 2007 16:11:31 -0000	1.19
--- Spring.Data.build	1 Apr 2008 19:51:05 -0000	1.20
***************
*** 20,24 ****
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../CommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="." prefix="Spring.Data.Common" failonempty="true">
--- 20,24 ----
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../GenCommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="." prefix="Spring.Data.Common" failonempty="true">

[Springnet-commits] Spring.Net/test/Spring CommonAssemblyInfo.cs, 1.2, 1.3

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/test/Spring

Modified Files:
	CommonAssemblyInfo.cs 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: CommonAssemblyInfo.cs
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/CommonAssemblyInfo.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CommonAssemblyInfo.cs	16 May 2007 08:32:33 -0000	1.2
--- CommonAssemblyInfo.cs	1 Apr 2008 19:51:09 -0000	1.3
***************
*** 25,29 ****
  // by using the '*' as shown below:
  
! [assembly: AssemblyVersion("0.1.0.0")]
  
  //
--- 25,29 ----
  // by using the '*' as shown below:
  
! [assembly: AssemblyVersion("1.1.1.0")]
  
  //

[Springnet-commits] Spring.Net/src/Spring/Spring.Web Spring.Web.build, 1.10, 1.11

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/src/Spring/Spring.Web

Modified Files:
	Spring.Web.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Web.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Web/Spring.Web.build,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Spring.Web.build	13 Nov 2006 07:04:51 -0000	1.10
--- Spring.Web.build	1 Apr 2008 19:51:06 -0000	1.11
***************
*** 21,25 ****
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../CommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="Resources">
--- 21,25 ----
  			<sources failonempty="true">
  				<include name="**/*.cs" />
! 				<include name="../GenCommonAssemblyInfo.cs" />
  			</sources>
  			<resources basedir="Resources">

[Springnet-commits] Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests Spring.Data.NHibernate.Integration.Tests.build, 1.4, 1.5

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/test/Spring/Spring.Data.NHibernate.Integration.Tests

Modified Files:
	Spring.Data.NHibernate.Integration.Tests.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Data.NHibernate.Integration.Tests.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Data.NHibernate.Integration.Tests/Spring.Data.NHibernate.Integration.Tests.build,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Spring.Data.NHibernate.Integration.Tests.build	16 Aug 2007 05:42:33 -0000	1.4
--- Spring.Data.NHibernate.Integration.Tests.build	1 Apr 2008 19:51:09 -0000	1.5
***************
*** 24,28 ****
  			<references basedir="${current.bin.dir}">
  				<lib>
! 					<include name="${nh.lib.dir}"/>
  				</lib>
  				<include name="System.Data.dll" />
--- 24,28 ----
  			<references basedir="${current.bin.dir}">
  				<lib>
! 					<include name="${nh12.lib.dir}"/>
  				</lib>
  				<include name="System.Data.dll" />

[Springnet-commits] Spring.Net/test/Spring/Spring.Core.Tests Spring.Core.Tests.build, 1.28, 1.29

[Mark P. <mar...@us...>]

Update of /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15841/test/Spring/Spring.Core.Tests

Modified Files:
	Spring.Core.Tests.build 
Log Message:
SPRNET-906 Build scripts generate unique revision numbers for assemblies

Index: Spring.Core.Tests.build
===================================================================
RCS file: /cvsroot/springnet/Spring.Net/test/Spring/Spring.Core.Tests/Spring.Core.Tests.build,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Spring.Core.Tests.build	16 Aug 2007 05:42:33 -0000	1.28
--- Spring.Core.Tests.build	1 Apr 2008 19:51:09 -0000	1.29
***************
*** 33,36 ****
--- 33,37 ----
  				<include name="**/*.properties" />
  				<include name="**/SimpleAppContext.xml" />
+ 				<include name="**/Factory/Attributes/*.xml" />
  				<include name="**/Context/Support/*.xml" />
  				<include name="**/aliasedObjects.xml" />