From c98e70502fa588f4bb3df3a994fb84e2b8cd63f2 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Wed, 12 Oct 2011 17:02:46 +0200 Subject: [PATCH 01/12] Add all documentation output to .gitignore. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 80d62540..90f0d758 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ TIBCO.EMS.* # Office Temp Files ~$* + +#Documentation output +doc/reference/target/ From b331d9263b5fea5019b385c838354e455cf601f8 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Wed, 12 Oct 2011 17:20:34 +0200 Subject: [PATCH 02/12] Link to vsaddin project instead of amqp. --- doc/reference/src/overview.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/reference/src/overview.xml b/doc/reference/src/overview.xml index 10cbce67..9250e5ed 100644 --- a/doc/reference/src/overview.xml +++ b/doc/reference/src/overview.xml @@ -443,7 +443,7 @@ See http://springframework.net/vsaddin/ + ns6:href="http://springframework.net/vsaddin/">http://springframework.net/vsaddin/ for resources, downloads, and more information From 24e09c64aac2473434b2bd901fa1832008bc5f48 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Wed, 12 Oct 2011 17:29:32 +0200 Subject: [PATCH 03/12] Update source location in readme.txt. --- readme.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index ec8a1de6..b1a5c2e2 100644 --- a/readme.txt +++ b/readme.txt @@ -241,7 +241,8 @@ Bug and issue tracking can be found at http://jira.springframework.org/secure/Br A Fisheye repository browser is located at https://fisheye.springframework.org/browse/spring-net -To get the sources, check them out at the Subversion repository at https://src.springframework.org/svn/spring-net +To get the sources, fork us on github at https://github.com/SpringSource/spring-net + We are always happy to receive your feedback on the forums. If you think you found a bug, have an improvement suggestion or feature request, please submit a ticket in JIRA (see link above). A word on bug reports: If at all possible, try to download one of the nightly snapshots at http://www.springframework.net/downloads/nightly/ and see, if this bug has already been fixed. If the problem still persists, don't forget to mention the version of Spring.NET you are using (check the file versions of Spring.NET dlls), the .NET version you are running on and a description how to reproduce the problem. From 941a41ed0e5d408540cb830d79257d55683be99b Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Wed, 12 Oct 2011 21:00:59 +0200 Subject: [PATCH 04/12] html-help will be compiled last. Because many people won't have MS html help workshop installed. This way, we can still run a `build doc-reference` and get html and pdf output, before the build fails (non-fatal, btw). --- doc/reference/docbook.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/reference/docbook.build b/doc/reference/docbook.build index 2e06bf64..4f6255c2 100644 --- a/doc/reference/docbook.build +++ b/doc/reference/docbook.build @@ -17,7 +17,8 @@ - + + From 65fdb7b7c30ef2a410cb4e6324775a42aab5f104 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Thu, 13 Oct 2011 16:12:47 +0200 Subject: [PATCH 05/12] Add buildlog.txt to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 90f0d758..5555ee4a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ TIBCO.EMS.* #Documentation output doc/reference/target/ + +#Build log +buildlog.txt \ No newline at end of file From 2c501d8cf113556e55a49a6c64defb5b3f504415 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Thu, 13 Oct 2011 16:13:22 +0200 Subject: [PATCH 06/12] Add command file for building documentation --- doc/reference/Build.cmd | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/reference/Build.cmd diff --git a/doc/reference/Build.cmd b/doc/reference/Build.cmd new file mode 100644 index 00000000..aee9c212 --- /dev/null +++ b/doc/reference/Build.cmd @@ -0,0 +1,20 @@ +@echo off +@echo . +@echo .. +@echo ... +@echo Running reference documentation Build Script, capturing output to buildlog.txt ... +@echo Start Time: %time% +..\..\build-support\tools\nant\bin\nant %1 %2 %3 %4 %5 %6 %7 %8 %9 > buildlog.txt +@echo . +@echo .. +@echo ... +@echo Launching text file viewer to display buildlog.txt contents... +start "ignored but required placeholder window title argument" buildlog.txt +@echo . +@echo .. +@echo ... +@echo ************************ +@echo Build Complete! +@echo ************************ +@echo End Time: %time% +@echo    From 4f17abe6ffc702bb54f9da7773d92b549b350018 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Thu, 13 Oct 2011 16:14:27 +0200 Subject: [PATCH 07/12] Minor formatting change --- doc/reference/src/ado.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml index 4033a0e6..dd1fa659 100644 --- a/doc/reference/src/ado.xml +++ b/doc/reference/src/ado.xml @@ -1954,6 +1954,7 @@ public delegate T DataAdapterDelegate<T>(IDbDataAdapter dataAdapter);System.Transactions and ADO.NET 2.0 by ADO.NET guru Sahil Malik. Spring offers a @@ -2011,7 +2012,7 @@ public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider Database operations as Objects - The Spring.Data.Objects and Spring.Data.Objects.Generic + The Spring.Data.Objects and Spring.Data.Objects.Generic namespaces contains classes that allow one to access the database in a more object-oriented manner. By way of an example, one can execute queries and get the results back as a list containing business From cdd2564beb7c37fcfe813fdf2b3329236e7e8522 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Thu, 13 Oct 2011 16:39:10 +0200 Subject: [PATCH 08/12] Remove the errant paragraph and code listing The errant paragraph is removed, as well as the code listing. From the text it appears that an example should have been inserted here; that's commented out and replaced with a TODO note. --- doc/reference/src/ado.xml | 45 +++++++-------------------------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml index dd1fa659..52753d46 100644 --- a/doc/reference/src/ado.xml +++ b/doc/reference/src/ado.xml @@ -2052,50 +2052,21 @@ public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider MappingadoQueryWithParameters (See SDK docs for details). - The AdoNonQuery class encapsulates an - IDbCommand 's ExecuteNonQuery method functionality. Like the - AdoQuery object, an AdoNonQuery - object is reusable, and like all AdoOperation - classes, an AdoNonQuery can have parameters and is - defined in SQL. This class provides two execute methods - - - - IDictionary ExecuteNonQuery(params object[] - inParameterValues) - - - - IDictionary ExecuteNonQueryByNamedParam(IDictionary - inParams) - - - - This class is concrete. Although it can be subclassed (for example - to add a custom update method) it can easily be parameterized by setting - SQL and declaring parameters. + + From 58c259a79a7b38c094b8340fcb9690a9195f4afe Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Thu, 13 Oct 2011 20:33:51 +0300 Subject: [PATCH 09/12] Remove mistakenly copied line. --- doc/reference/src/ado.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml index dd1fa659..8a01a80f 100644 --- a/doc/reference/src/ado.xml +++ b/doc/reference/src/ado.xml @@ -1954,7 +1954,6 @@ public delegate T DataAdapterDelegate<T>(IDbDataAdapter dataAdapter);System.Transactions and ADO.NET 2.0 by ADO.NET guru Sahil Malik. Spring offers a From d4f67530c45ff95d8a7ff755f379714c51c748e2 Mon Sep 17 00:00:00 2001 From: Marijn van der Zee Date: Tue, 18 Oct 2011 17:10:11 +0200 Subject: [PATCH 10/12] Fix typo. --- doc/reference/src/ado.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/reference/src/ado.xml b/doc/reference/src/ado.xml index d08313ba..f9959399 100644 --- a/doc/reference/src/ado.xml +++ b/doc/reference/src/ado.xml @@ -2047,7 +2047,7 @@ public static void ApplyConnectionAndTx(object typedDataSetAdapter, IDbProvider AdoQuery class is rarely used directly since the MappingAdoQuery subclass provides a much more convenient implementation for mapping rows to .NET classes. Another - implementations that extends AdoQuery is + implementation that extends AdoQuery is MappingadoQueryWithParameters (See SDK docs for details). From c4b0bf255f8bc3da199fb1e0eb761d2ebf9f5f34 Mon Sep 17 00:00:00 2001 From: Bruno Baia Date: Thu, 20 Oct 2011 18:20:48 +0200 Subject: [PATCH 11/12] Fixed WCF Quickstart [Related to SPRNET-1475] --- .../Spring.WcfQuickStart.2008.sln | 4 +- ... Spring.WcfQuickStart.Aspects.2008.csproj} | 9 ++-- .../Spring.WcfQuickStart.Aspects.2010.csproj | 28 +++-------- .../Spring.WcfQuickStart.ClientApp/App.config | 12 ++++- ...Spring.WcfQuickStart.ClientApp.2008.csproj | 36 ++++--------- ...Spring.WcfQuickStart.ClientApp.2010.csproj | 50 ++++--------------- ...pring.WcfQuickStart.Contracts.2008.csproj} | 5 +- ...Spring.WcfQuickStart.Contracts.2010.csproj | 20 +------- ...Spring.WcfQuickStart.ServerApp.2008.csproj | 34 ++++--------- ...Spring.WcfQuickStart.ServerApp.2010.csproj | 48 ++++-------------- ...Spring.WcfQuickStart.ServerWeb.2008.csproj | 29 ++++++++--- ...Spring.WcfQuickStart.ServerWeb.2010.csproj | 25 ++++++---- 12 files changed, 110 insertions(+), 190 deletions(-) rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/{Spring.WcfQuickStart.Aspects.csproj => Spring.WcfQuickStart.Aspects.2008.csproj} (87%) rename examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/{Spring.WcfQuickStart.Contracts.csproj => Spring.WcfQuickStart.Contracts.2008.csproj} (90%) diff --git a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln index 69acd826..a7962996 100644 --- a/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln +++ b/examples/Spring/Spring.WcfQuickStart/Spring.WcfQuickStart.2008.sln @@ -10,9 +10,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Server EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.ServerWeb.2008", "src\Spring.WcfQuickStart.ServerWeb\Spring.WcfQuickStart.ServerWeb.2008.csproj", "{EEC5B531-104B-44E6-975B-44C0C8973405}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Contracts.2008", "src\Spring.WcfQuickStart.Contracts\Spring.WcfQuickStart.Contracts.2008.csproj", "{53263837-0643-45FE-96A2-46D425E1A36F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.WcfQuickStart.Aspects.2008", "src\Spring.WcfQuickStart.Aspects\Spring.WcfQuickStart.Aspects.2008.csproj", "{B52BBAA3-1B30-4905-827C-1D81EBA56A15}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj similarity index 87% rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj index 997028e9..89546754 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2008.csproj @@ -10,7 +10,7 @@ Properties Spring.WcfQuickStart Spring.WcfQuickStart.Aspects - v3.0 + v3.5 512 @@ -33,15 +33,18 @@ 4 - + False ..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll - + False ..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll + + 3.5 + diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj index ddfa05bd..3f46fc5b 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Aspects/Spring.WcfQuickStart.Aspects.2010.csproj @@ -10,7 +10,7 @@ Properties Spring.WcfQuickStart Spring.WcfQuickStart.Aspects - v3.0 + v4.0 512 @@ -31,6 +31,7 @@ false false true + true @@ -52,13 +53,13 @@ AllRules.ruleset - + False - ..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll + ..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll - + False - ..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll + ..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll @@ -68,23 +69,6 @@ - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - @@ -15,7 +18,11 @@ + + + + @@ -33,4 +40,5 @@ - + + diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj index 7c35e6d6..402ed7d9 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2008.csproj @@ -14,7 +14,7 @@ 2.0 - v3.0 + v3.5 http://localhost/Spring.WcfQuickStart.ClientApp/ true Web @@ -52,19 +52,22 @@ 4 - + False ..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll - + False ..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll - + False - ..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll + ..\..\..\..\..\bin\net\3.5\debug\Spring.Services.dll + + 3.5 + @@ -78,33 +81,14 @@ - - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - - + {B52BBAA3-1B30-4905-827C-1D81EBA56A15} Spring.WcfQuickStart.Aspects - + {53263837-0643-45FE-96A2-46D425E1A36F} Spring.WcfQuickStart.Contracts diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj index 24b0841c..58907b19 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.ClientApp/Spring.WcfQuickStart.ClientApp.2010.csproj @@ -15,7 +15,7 @@ 3.5 - v3.0 + v4.0 true http://localhost/Spring.WcfQuickStart.ClientApp/ true @@ -31,6 +31,7 @@ 1.0.0.%2a false true + true @@ -53,21 +54,21 @@ AllRules.ruleset - + False - ..\..\..\..\..\bin\net\2.0\debug\Spring.Aop.dll + ..\..\..\..\..\bin\net\4.0\debug\Spring.Aop.dll - + False - ..\..\..\..\..\bin\net\2.0\debug\Spring.Core.dll + ..\..\..\..\..\bin\net\4.0\debug\Spring.Core.dll - + False - ..\..\..\..\..\bin\net\3.0\debug\Spring.Services.dll + ..\..\..\..\..\bin\net\4.0\debug\Spring.Services.dll - + @@ -79,43 +80,14 @@ - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - + {B52BBAA3-1B30-4905-827C-1D81EBA56A15} Spring.WcfQuickStart.Aspects - + {53263837-0643-45FE-96A2-46D425E1A36F} Spring.WcfQuickStart.Contracts diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj similarity index 90% rename from examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj rename to examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj index a5b00d22..1139972e 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2008.csproj @@ -10,7 +10,7 @@ Properties Spring.WcfQuickStart Spring.WcfQuickStart.Contracts - v3.0 + v3.5 512 @@ -34,6 +34,9 @@ + + 3.5 + 3.0 diff --git a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj index 8a7e21d9..e7fea581 100644 --- a/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj +++ b/examples/Spring/Spring.WcfQuickStart/src/Spring.WcfQuickStart.Contracts/Spring.WcfQuickStart.Contracts.2010.csproj @@ -10,7 +10,7 @@ Properties Spring.WcfQuickStart Spring.WcfQuickStart.Contracts - v3.0 + v4.0 512 @@ -31,6 +31,7 @@ false false true + true @@ -64,23 +65,6 @@ - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - -