diff --git a/Spring.build b/Spring.build index d7b25ba0..583170fb 100644 --- a/Spring.build +++ b/Spring.build @@ -99,6 +99,8 @@ Commandline Examples: --> + + @@ -131,7 +133,7 @@ Commandline Examples: that we are not allowed to redistribute --> - + @@ -591,6 +593,7 @@ Commandline Examples: + - + - + @@ -661,10 +664,13 @@ Commandline Examples: - + + + + @@ -1010,14 +1016,15 @@ Commandline Examples: - - + - + @@ -1112,7 +1119,7 @@ Commandline Examples: - + @@ -1177,11 +1184,12 @@ Commandline Examples: - + + @@ -1206,7 +1214,7 @@ Commandline Examples: - + @@ -1218,7 +1226,7 @@ Commandline Examples: - + @@ -1246,7 +1254,7 @@ Commandline Examples: - + @@ -1258,7 +1266,7 @@ Commandline Examples: - + @@ -1270,7 +1278,7 @@ Commandline Examples: - + @@ -1282,7 +1290,7 @@ Commandline Examples: - + @@ -1293,7 +1301,7 @@ Commandline Examples: - + @@ -1303,7 +1311,7 @@ Commandline Examples: - + @@ -1311,7 +1319,7 @@ Commandline Examples: - + @@ -1320,7 +1328,7 @@ Commandline Examples: - + @@ -1385,12 +1393,12 @@ Commandline Examples: - + - + @@ -1398,7 +1406,7 @@ Commandline Examples: - + @@ -1412,7 +1420,7 @@ Commandline Examples: - + @@ -1448,6 +1456,10 @@ Commandline Examples: + + + + @@ -1493,7 +1505,7 @@ Commandline Examples: - + @@ -1504,7 +1516,7 @@ Commandline Examples: - + @@ -1573,7 +1585,7 @@ Commandline Examples: - + @@ -1589,7 +1601,7 @@ Commandline Examples: - + @@ -1695,10 +1707,12 @@ Commandline Examples: + + @@ -1719,6 +1733,7 @@ Commandline Examples: + diff --git a/common-project.include b/common-project.include index 38b1a12c..c2ae6f75 100644 --- a/common-project.include +++ b/common-project.include @@ -106,28 +106,28 @@ ${current.build.defines} - + - + - + - + @@ -166,7 +166,7 @@ ${current.build.defines} tofile="${current.bin.dir}/${project::get-name()}.dll.config" failonerror="false"/> - + diff --git a/doc/reference/src/index.xml b/doc/reference/src/index.xml index 4ea294db..e4f4c255 100644 --- a/doc/reference/src/index.xml +++ b/doc/reference/src/index.xml @@ -112,7 +112,6 @@ Erez Mazor - Stephen Bohlen diff --git a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs index 1b513b4f..58d73f98 100644 --- a/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs +++ b/src/Spring/Spring.Scheduling.Quartz/Scheduling/Quartz/SpringObjectJobFactory.cs @@ -19,102 +19,102 @@ using Spring.Objects; namespace Spring.Scheduling.Quartz { - /// - /// Subclass of AdaptableJobFactory that also supports Spring-style - /// dependency injection on object properties. This is essentially the direct - /// equivalent of Spring's QuartzJobObject in the shape of a - /// Quartz JobFactory. - /// - /// - /// Applies scheduler context, job data map and trigger data map entries - /// as object property values. If no matching object property is found, the entry - /// is by default simply ignored. This is analogous to QuartzJobObject's behavior. - /// - /// Juergen Hoeller - /// - /// - public class SpringObjectJobFactory : AdaptableJobFactory, ISchedulerContextAware - { + /// + /// Subclass of AdaptableJobFactory that also supports Spring-style + /// dependency injection on object properties. This is essentially the direct + /// equivalent of Spring's QuartzJobObject in the shape of a + /// Quartz JobFactory. + /// + /// + /// Applies scheduler context, job data map and trigger data map entries + /// as object property values. If no matching object property is found, the entry + /// is by default simply ignored. This is analogous to QuartzJobObject's behavior. + /// + /// Juergen Hoeller + /// + /// + public class SpringObjectJobFactory : AdaptableJobFactory, ISchedulerContextAware + { private string[] ignoredUnknownProperties; private SchedulerContext schedulerContext; - /// - /// Specify the unknown properties (not found in the object) that should be ignored. - /// - /// - /// Default is null, indicating that all unknown properties - /// should be ignored. Specify an empty array to throw an exception in case - /// of any unknown properties, or a list of property names that should be - /// ignored if there is no corresponding property found on the particular - /// job class (all other unknown properties will still trigger an exception). - /// - public virtual string[] IgnoredUnknownProperties - { - set { ignoredUnknownProperties = value; } - } + /// + /// Specify the unknown properties (not found in the object) that should be ignored. + /// + /// + /// Default is null, indicating that all unknown properties + /// should be ignored. Specify an empty array to throw an exception in case + /// of any unknown properties, or a list of property names that should be + /// ignored if there is no corresponding property found on the particular + /// job class (all other unknown properties will still trigger an exception). + /// + public virtual string[] IgnoredUnknownProperties + { + set { ignoredUnknownProperties = value; } + } /// /// Set the SchedulerContext of the current Quartz Scheduler. /// /// /// - public virtual SchedulerContext SchedulerContext - { - set { schedulerContext = value; } - } + public virtual SchedulerContext SchedulerContext + { + set { schedulerContext = value; } + } - /// - /// Create the job instance, populating it with property values taken - /// from the scheduler context, job data map and trigger data map. - /// - protected override object CreateJobInstance(TriggerFiredBundle bundle) - { - ObjectWrapper ow = new ObjectWrapper(bundle.JobDetail.JobType); - if (IsEligibleForPropertyPopulation(ow.WrappedInstance)) - { - MutablePropertyValues pvs = new MutablePropertyValues(); - if (schedulerContext != null) - { - pvs.AddAll(schedulerContext); - } - pvs.AddAll(bundle.JobDetail.JobDataMap); - pvs.AddAll(bundle.Trigger.JobDataMap); - if (ignoredUnknownProperties != null) - { - for (int i = 0; i < ignoredUnknownProperties.Length; i++) - { - string propName = ignoredUnknownProperties[i]; - if (pvs.Contains(propName)) - { - pvs.Remove(propName); - } - } - ow.SetPropertyValues(pvs); - } - else - { - ow.SetPropertyValues(pvs, true); - } - } - return ow.WrappedInstance; - } + /// + /// Create the job instance, populating it with property values taken + /// from the scheduler context, job data map and trigger data map. + /// + protected override object CreateJobInstance(TriggerFiredBundle bundle) + { + ObjectWrapper ow = new ObjectWrapper(bundle.JobDetail.JobType); + if (IsEligibleForPropertyPopulation(ow.WrappedInstance)) + { + MutablePropertyValues pvs = new MutablePropertyValues(); + if (schedulerContext != null) + { + pvs.AddAll(schedulerContext); + } + pvs.AddAll(bundle.JobDetail.JobDataMap); + pvs.AddAll(bundle.Trigger.JobDataMap); + if (ignoredUnknownProperties != null) + { + for (int i = 0; i < ignoredUnknownProperties.Length; i++) + { + string propName = ignoredUnknownProperties[i]; + if (pvs.Contains(propName)) + { + pvs.Remove(propName); + } + } + ow.SetPropertyValues(pvs); + } + else + { + ow.SetPropertyValues(pvs, true); + } + } + return ow.WrappedInstance; + } - /// - /// Return whether the given job object is eligible for having - /// its object properties populated. - ///

- /// The default implementation ignores QuartzJobObject instances, - /// which will inject object properties themselves. - ///

- /// - /// - /// The job object to introspect. - /// - /// - protected virtual bool IsEligibleForPropertyPopulation(object jobObject) - { - return (!(jobObject is QuartzJobObject)); - } - } + /// + /// Return whether the given job object is eligible for having + /// its object properties populated. + ///

+ /// The default implementation ignores QuartzJobObject instances, + /// which will inject object properties themselves. + ///

+ /// + /// + /// The job object to introspect. + /// + /// + protected virtual bool IsEligibleForPropertyPopulation(object jobObject) + { + return (!(jobObject is QuartzJobObject)); + } + } } \ No newline at end of file diff --git a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj index 595bddb2..e04a2d97 100644 --- a/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj +++ b/src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.2010.csproj @@ -10,11 +10,12 @@ Properties Spring Spring.Scheduling.Quartz - v2.0 + v3.5 3.5 + true @@ -40,9 +41,8 @@ False ..\..\..\lib\net\2.0\Common.Logging.dll - - False - ..\..\..\lib\net\2.0\Quartz.dll + + ..\..\..\lib\Net\3.5\Quartz.dll diff --git a/src/Spring/Spring.Services/Spring.Services.build b/src/Spring/Spring.Services/Spring.Services.build index 00def53d..ccf1ef18 100644 --- a/src/Spring/Spring.Services/Spring.Services.build +++ b/src/Spring/Spring.Services/Spring.Services.build @@ -14,11 +14,13 @@ - + + + @@ -27,11 +29,13 @@ - + + + diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs index aae11532..d2756fc0 100644 --- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs +++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs @@ -82,11 +82,42 @@ namespace Spring.Context.Support { } + /// + /// An array of resource locations, referring to the XML object + /// definition files that this context is to be built with. + /// + /// + /// + ///

+ /// Examples of the format of the various strings that would be + /// returned by accessing this property can be found in the overview + /// documentation of with the + /// class. + ///

+ /// + /// + /// An array of resource locations, or if none. + /// protected override string[] ConfigurationLocations { get { return _configurationLocations; } } + /// + /// An array of resources that this context is to be built with. + /// + /// + /// + ///

+ /// Examples of the format of the various strings that would be + /// returned by accessing this property can be found in the overview + /// documentation of with the + /// class. + ///

+ /// + /// + /// An array of s, or if none. + /// protected override IResource[] ConfigurationResources { get { return _configurationResources; } diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs index 9cc2c353..24146ebd 100644 --- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs +++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs @@ -11,12 +11,12 @@ namespace Spring.Context.Support /// public class MvcContextHandler : ContextHandler { + /// /// The of /// created if no type attribute is specified on a context element. /// - /// - /// + /// protected override Type DefaultApplicationContextType { get { return typeof(MvcApplicationContext); } diff --git a/src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs b/src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs deleted file mode 100644 index 89ac954d..00000000 --- a/src/Spring/Spring.Web.Mvc/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Spring.Web.Mvc")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Spring.Web.Mvc")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4e7f33fc-585f-44cb-b8b9-500223e9b760")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj index 18a108b9..35d65ad9 100644 --- a/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj +++ b/src/Spring/Spring.Web.Mvc/Spring.Web.Mvc.2010.csproj @@ -10,17 +10,20 @@ Properties Spring.Web.Mvc Spring.Web.Mvc - v3.5 + v4.0 512 + true full false - ..\..\..\bin\net\3.5\debug\ - DEBUG;TRACE + ..\..\..\build\VS.Net.2010\Spring.Web.Mvc\Debug\ + TRACE;DEBUG;NET_3_5;NET_4_0 prompt 4 + true + Spring.Web.Mvc.xml pdbonly @@ -33,6 +36,7 @@ ..\..\..\lib\Net\3.5\Common.Logging.dll + True @@ -46,10 +50,12 @@ + + CommonAssemblyInfo.cs + - @@ -57,8 +63,12 @@ {710961A3-0DF4-49E4-A26E-F5B9C044AC84} Spring.Core.2010 + True + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - diff --git a/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs b/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs index 77d8f017..5fdd5000 100644 --- a/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs +++ b/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs @@ -17,6 +17,10 @@ namespace Spring.Web.Mvc { private static IApplicationContext _context; + /// + /// Gets the application context. + /// + /// The application context. public static IApplicationContext ApplicationContext { get @@ -37,6 +41,9 @@ namespace Spring.Web.Mvc } } + + + /// /// Creates the specified controller by using the specified request context. /// diff --git a/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs b/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs index 2eee8da2..15ec4b62 100644 --- a/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs +++ b/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs @@ -12,8 +12,16 @@ using Spring.Context.Support; namespace Spring.Web.Mvc { + /// + /// Spring.NET-specific HttpApplication for ASP.NET MVC integration. + /// public abstract class SpringMvcApplication : HttpApplication { + /// + /// Handles the Start event of the Application control. + /// + /// The source of the event. + /// The instance containing the event data. protected virtual void Application_Start(object sender, EventArgs e) { RegisterAreas(); @@ -21,18 +29,21 @@ namespace Spring.Web.Mvc } /// - /// Configures the instance. + /// Configures the instance. /// /// /// You must override this method in a derived class to control the manner in which the - /// is configured. + /// is configured. /// protected virtual void ConfigureApplicationContext() { - + } + /// + /// Executes custom initialization code after all event handler modules have been added. + /// public override void Init() { base.Init(); diff --git a/test/Spring/CommonAssemblyInfo.cs b/test/Spring/CommonAssemblyInfo.cs index edeb7b1f..c24d192e 100644 --- a/test/Spring/CommonAssemblyInfo.cs +++ b/test/Spring/CommonAssemblyInfo.cs @@ -24,7 +24,19 @@ using System.Runtime.CompilerServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.3.0.0")] +#if NET_4_0 +[assembly: AssemblyVersion("1.3.1.40001")] +#elif NET_3_5 +[assembly: AssemblyVersion("1.3.1.35001")] +#elif NET_3_0 +[assembly: AssemblyVersion("1.3.1.30001")] +#elif NET_2_0 +[assembly: AssemblyVersion("1.3.1.20001")] +#elif NET_1_1 +[assembly: AssemblyVersion("1.3.1.11001")] +#elif NET_1_0 +[assembly: AssemblyVersion("1.3.1.10001")] +#endif // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj index 09d9d0eb..c3110ffa 100644 --- a/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj +++ b/test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.2010.csproj @@ -42,9 +42,8 @@ False ..\..\..\lib\net\2.0\nunit.framework.dll - - False - ..\..\..\lib\net\2.0\Quartz.dll + + ..\..\..\lib\Net\3.5\Quartz.dll False diff --git a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build index e967c398..4c4eff1e 100644 --- a/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build +++ b/test/Spring/Spring.Services.Tests/Spring.Services.Tests.build @@ -12,7 +12,7 @@ - + @@ -22,7 +22,9 @@ - + + + @@ -57,14 +59,14 @@ - + - + diff --git a/test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs b/test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index f03211a9..00000000 --- a/test/Spring/Spring.Web.Mvc.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Spring.Web.Mvc.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Spring.Web.Mvc.Tests")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3f96ac7b-cd25-4d07-8b1c-ee2eb77cf5eb")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj index f8f0e19d..d4946bb0 100644 --- a/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj +++ b/test/Spring/Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests.2010.csproj @@ -10,17 +10,19 @@ Properties Spring.Web.Mvc.Tests Spring.Web.Mvc.Tests - v3.5 + v4.0 512 + true full false - bin\Debug\ - DEBUG;TRACE + ..\..\..\build\VS.Net.2010\Spring.Web.Mvc.Tests\Debug\ + TRACE;DEBUG;NET_3_5;NET_4_0 prompt 4 + true pdbonly @@ -33,6 +35,7 @@ ..\..\..\lib\Net\2.0\nunit.framework.dll + True @@ -45,18 +48,21 @@ + + CommonAssemblyInfo.cs + - {710961A3-0DF4-49E4-A26E-F5B9C044AC84} Spring.Core.2010 + True {5166CE3A-14BE-478A-88DA-729A39DE1E29} @@ -64,13 +70,22 @@ - + + Always + - + + Always + - + + Always + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + diff --git a/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs b/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs index ed13307a..7add004b 100644 --- a/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs +++ b/test/Spring/Spring.Web.Mvc.Tests/SpringControllerFactoryTests.cs @@ -28,8 +28,8 @@ namespace Spring.Web.Mvc.Tests public void _TestSetup() { ContextRegistry.Clear(); - _context = new MvcApplicationContext("assembly://Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests/objects.xml"); - _mvcNamedContext = new MvcApplicationContext("named", false, "assembly://Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests/namedContextObjects.xml"); + _context = new MvcApplicationContext("file://objects.xml"); + _mvcNamedContext = new MvcApplicationContext("named", false, "file://namedContextObjects.xml"); ContextRegistry.RegisterContext(_context); ContextRegistry.RegisterContext(_mvcNamedContext); @@ -68,7 +68,7 @@ namespace Spring.Web.Mvc.Tests [Test] public void CanRevertToTypeMatchIfIdMatchUnsuccessful() { - MvcApplicationContext context = new MvcApplicationContext("assembly://Spring.Web.Mvc.Tests/Spring.Web.Mvc.Tests/objectsMatchByType.xml"); + MvcApplicationContext context = new MvcApplicationContext("file://objectsMatchByType.xml"); ContextRegistry.Clear(); ContextRegistry.RegisterContext(context); diff --git a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj index 3b043738..bbdd070b 100644 --- a/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj +++ b/test/Spring/Spring.Web.Tests/Spring.Web.Tests.2010.csproj @@ -169,13 +169,19 @@ - + + ASPXCodeBehind + ASPXCodeBehind - - + + ASPXCodeBehind + + + ASPXCodeBehind + Designer