Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc edits in prep for 1.3.1 release

Browse Source
This commit is contained in:
sbohlen
2010-12-07 15:19:47 +00:00
parent 3dcbc88fa7
commit 76445f9665
7 changed files with 85 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Build.cmd
View File

@@ -3,7 +3,8 @@
@echo ..
@echo ...
@echo Running full Build Script, capturing output to buildlog.txt file...
build-support\tools\nant\bin\nant %1 %2 %3 %4 %5 %6 %7 %8 %9 > 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 ...
@@ -15,4 +16,5 @@ start "ignored but required placeholder window title argument" buildlog.txt
@echo ************************
@echo Build Complete!
@echo ************************
@echo   
@echo End Time: %time%
@echo   

3
Spring.build
View File

@@ -23,8 +23,7 @@ Build properties that may be set:
signs all assemblies. Requires the key file $/Spring.Net.snk to be in place
"mstest.exe":
value: bool: true:false
set to true to build Spring.Testing.Microsoft
value: string, fully-qualiifed location of mstest.exe, for example, C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\mstest.exe
"vs-net.mstest.bin.dir":
value: string: location of mstest.exe, for example C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE

26
build-support/install-schema.build
View File

@@ -4,6 +4,14 @@
<target name="locations"
descriptions="Shows directories where .xsd files will be copied">
<property name="vsXXXX.version" value="VS.NET 2010"/>
<property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\10.0\InstallDir"/>
<property name="vsXXXX.relative.dir" value="..\..\Xml\Schemas"/>
<!-- retrieve location of VS.NET 2010 schema store -->
<readregistry property="vs2010.xml.schemas" key="${vsXXXX.xml.schemas.install.dir}" hive="LocalMachine"
failonerror="false"/>
<echo message="VS.NET 2010 xsd install directory = ${vs2010.xml.schemas}${vsXXXX.relative.dir}"/>
<property name="vsXXXX.version" value="VS.NET 2008"/>
<property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir"/>
@@ -34,6 +42,24 @@
<target name="deploy-schema"
description="Deploys the Schema to VS.Net schemas dirs. Copies VS 7.0, 7.1, 8.0, 9.0">
<!-- deploy spring schema to the VS.NET 2010 schema store -->
<property name="vsXXXX.version" value="VS.NET 2010"/>
<property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\10.0\InstallDir"/>
<property name="vsXXXX.relative.dir" value="..\..\Xml\Schemas"/>
<!-- retrieve location of VS.NET 2010 schema store -->
<readregistry property="vs2010.xml.schemas" key="${vsXXXX.xml.schemas.install.dir}" hive="LocalMachine"
failonerror="false"/>
<property name="vsXXXX.xml.schemas.notinstalled" value="true"/>
<if test="${property::exists('vs2010.xml.schemas')}">
<property name="vsXXXX.xml.schemas" value="${vs2010.xml.schemas}"/>
<call target="_deploy-schema"/>
</if>
<if test="${vsXXXX.xml.schemas.notinstalled}">
<echo message=""/>
<echo message="Failed installing schema files for VS.NET 2010."/>
<echo message=""/>
</if>
<!-- deploy spring schema to the VS.NET 2008 schema store -->
<property name="vsXXXX.version" value="VS.NET 2008"/>
<property name="vsXXXX.xml.schemas.install.dir" value="SOFTWARE\Microsoft\VisualStudio\9.0\InstallDir"/>

4
doc/docx/Spring-1.3/net-2.0/Spring-1.3.0.dxp
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="False" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.3.0" HTMLHelpVersion="1" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.3.0" H2PlugIn="True" H2PlugInNamespace="MS.VSIPCC.v80,MS.VSIPCC.v90" LocaleID="0" ExcludeFiltersRegExp="False" OutputFileExtension=".html">
<OutputLocation OutputFolder="L:\release\Spring.Net\doc\sdk\Spring-1.3\net-2.0\web\" HelpFileName="L:\release\Spring.Net\doc\sdk\Spring-1.3\net-2.0\htmlhelp1and2\Spring.NET.chm" UseFilenameAliases="True" StripMetadata="False" ClearBeforeBuild="True" RemoveOutputFilesAfterCompile="False"/>
<DocumentXProject Version="5.0" CompileHelpFile="True" RefreshIfExists="False" DocumentSourceCode="False" AlwaysCopySupportFiles="True" PropertyCommentsFrom="0" RelationshipsFrom="2" DefaultRelsOnlyForCollections="True" ProjectGroupName="Spring-1.3.1" HTMLHelpVersion="1" HHNamespace="Spring.NET" HHIdentifier="Spring.NET-1.3.1" H2PlugIn="True" H2PlugInNamespace="MS.VSIPCC.v80,MS.VSIPCC.v90" LocaleID="0" ExcludeFiltersRegExp="False" OutputFileExtension=".html">
<OutputLocation OutputFolder="L:\release\Spring.Net\doc\sdk\Spring-1.3\net-2.0\web" HelpFileName="L:\release\Spring.Net\doc\sdk\Spring-1.3\net-2.0\htmlhelp1and2\Spring.NET.chm" UseFilenameAliases="True" StripMetadata="False" ClearBeforeBuild="True" RemoveOutputFilesAfterCompile="False"/>
<HTMLHelpOptions UseALinkMenus="False"/>
<OtherOptions CreateContextLinks="True" WriteHelpDescriptions="True" CopySourceCode="False" CreateWinHelpStub="False" Language="English"/>
<IncludeFilters IncludePrivate="False" IncludeFriend="False" IncludeProtected="True" IdentifyVisibility="False">

9
doc/reference/src/index.xml
View File

@@ -65,8 +65,8 @@
<info>
<title>The Spring.NET Framework</title>
<subtitle>Reference Documentation</subtitle>
<releaseinfo>Version 1.3.0</releaseinfo>
<pubdate>Last Updated December 17, 2009 <ulink url="http://www.springframework.net/doc-latest/reference/html/index.html">(Latest documentation)</ulink></pubdate>
<releaseinfo>Version 1.3.1</releaseinfo>
<pubdate>Last Updated December 10, 2010 <ulink url="http://www.springframework.net/doc-latest/reference/html/index.html">(Latest documentation)</ulink></pubdate>
<authorgroup>
<author>
<firstname>Mark</firstname>
@@ -112,6 +112,11 @@
<firstname>Erez</firstname>
<surname>Mazor</surname>
</author>
<author>
<author>
<firstname>Stephen</firstname>
<surname>Bohlen</surname>
</author>
<author>
<firstname>The Spring</firstname>
<surname>Java Team</surname>

67
readme.txt
View File

@@ -1,11 +1,11 @@
THE SPRING.NET FRAMEWORK, Release 1.3.0 (December 17, 2009)
THE SPRING.NET FRAMEWORK, Release 1.3.1 (December 10, 2010)
--------------------------------------------------------------------
http://www.springframework.net/
1. INTRODUCTION
The 1.3.0 release of Spring.NET contains
The 1.3.1 release of Spring.NET contains
* A full featured Inversion of Control container
* An Aspect Oriented Programming framework
@@ -20,7 +20,7 @@ The 1.3.0 release of Spring.NET contains
* Portable Service Abstractions
- Export plain .NET objects via .NET Remoting, Web Service or .NET Serviced Component and create client side proxies based on endpoint URL and service interface.
* NHibernate Integation
- NHibernate 1.0, 1.2, 2.0 and 2.1 integration to simplify use of NHibernate and participate in Spring's declarative transaction management functionality.
- NHibernate 1.0, 1.2, 2.0, 2.1, and 3.0 integration to simplify use of NHibernate and participate in Spring's declarative transaction management functionality.
* ASP.NET AJAX Integration
- Exporter to expose plain object on which Dependency Injection and AOP have been applied to JavaScript.
* NUnit and MSTest integration
@@ -44,7 +44,7 @@ Spring.NET is a port of the Java based Spring Framework. In turn, the Java/J2EE
2. SUPPORTED .NET FRAMEWORK VERSIONS
Spring.NET 1.3 supports .NET 1.1, 2.0, 3.0 and 3.5. Note, there are no specific .DLLs for .NET 3.5 as we do not use any features or libraries from that framework version. For .NET 3.0 in the directory bin\net\3.0 is the Spring.Services.dll that should be used if you are using .NET 3.0 or higher as contains Spring's WCF integration.
Spring.NET 1.3.1 supports .NET 1.1, 2.0, 3.0, 3.5, and 4.0. In the directories bin\net\3.0, bin\net\3.5, and bin\net\4.0 are framework-specific DLLs for each of .NET 3.0, 3.5, and 4.0 framework versions.
3. KNOWN ISSUES
@@ -64,6 +64,7 @@ Release contents:
* "lib/NHibernate12" contains NHibernate 1.2 dlls
* "lib/NHibernate20" contains NHibernate 2.0 dlls
* "lib/NHibernate21" contains NHibernate 2.1 dlls
* "lib/NHibernate30" contains NHibernate 3.0 dlls
* "doc" contains reference documentation, MSDN-style API help, and the Spring.NET xsd.
* "examples" contains sample applications.
* "build-support" contains additonal applications need to build using NAnt as some convenience
@@ -76,8 +77,6 @@ The VS.NET solution for the framework and examples are provided.
Latest info is available at the public website: http://www.springframework.net/
Project info at the SourceForge site: http://sourceforge.net/projects/springnet/
The Spring Framework is released under the terms of the Apache Software License (see license.txt).
@@ -85,7 +84,7 @@ The Spring Framework is released under the terms of the Apache Software License
The "bin" directory contains the following distinct dll files for use in applications. Dependencies are those other than on the .NET BCL.
* "Spring.Core" (~615 KB)
* "Spring.Core" (~765 KB)
- Contents: Inversion of control container. Collection classes.
- Dependencies: Common.Logging
@@ -109,6 +108,10 @@ The "bin" directory contains the following distinct dll files for use in applica
- Contents: NHibernate 2.1 integration
- Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate
* "Spring.Data.NHibernate30" (~90 KB)
- Contents: NHibernate 3.0 integration
- Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate
* "Spring.Services" (~70 KB)
- Contents: Web Services, Remoting, and Enterprise Component based services.
- Dependencies: Spring.Core, Spring.Aop
@@ -121,6 +124,10 @@ The "bin" directory contains the following distinct dll files for use in applica
- Contents: ASP.NET AJAX Integartion
- Dependencies: Spring.Core, Spring.Aop, System.Web.Extensions
* "Spring.Web.Mvc" (~8 KB)
- Contents: ASP.NET MVC Integartion
- Dependencies: Spring.Core
* "Spring.Testing.NUnit" (~24 KB)
- Contents: NUnit Integration
- Dependencies: Spring.Core, Spring.Data, NUnit
@@ -177,13 +184,13 @@ There are four solution file for different version of VS.NET
* Spring.Net.2003.sln for use with VS.NET 2003
* Spring.Net.2005.sln for use with VS.NET 2005
* Spring.Net.2008.sln for use with VS.NET 2008
* Spring.Net.2010.sln for use with VS.NET 2010
Note:
When building on Vista with activated UAC, you might get an error:
xcopy
"C:\Spring.Net\Spring.NET-1.3.0\Spring.NET\test\Spring\Spring.Co
re.Tests\Spring.Core.Tests.dll.config"
"C:\Spring.Net\Spring.NET-1.3.0\Spring.NET\test\Spring\Spring.Core.Tests\Spring.Core.Tests.dll.config"
..\..\..\..\build\VS.Net.2008\Spring.Core.Tests\Debug\ /y /s /q-Command exited with Code 9009. Spring.Core.Tests.2008
In this case you need to run Visual Studio with Administrator-permissions.
@@ -191,49 +198,35 @@ In this case you need to run Visual Studio with Administrator-permissions.
NAnt
----
A NAnt build script can be obtained via CVS or nightly builds. You will need to
get the supporting tools directory from CVS as well.
Build scripts are delivered with the download package.
To build the source and run the unit tests type
nant test
build test
If you want to run the build to create strongly
signed assemblies you can generate a key file by executing the following command
If you want to run the build to create strongly signed assemblies you can generate a key file by executing the following command
sn -k Spring.Net.snk
You need to place the Spring.NET.snk file into the root folder of the source tree. All builds are strongly named using this key file
when executing the following nant command:
You need to place the Spring.NET.snk file into the root folder of the source tree. All builds are strongly named using this key file when executing the following nant command:
nant -D:project.build.sign=true
The installation of the docbook toolchain is required to generate the reference
documentation and make a final release build. Refer to the Spring.NET Wiki at
http://opensource.atlassian.com/confluence/spring/display/NET/Docbook+Reference
for information on how to install the docbook toolchain.
NDoc3 and InnovaSys Document X! are used to generate the SDK documentation.
InnovaSys Document X! is used to generate the SDK documentation.
8. Support
The user forums at http://forum.springframework.net/ are available for you to submit questions, support requests,
and interact with other Spring.NET users.
The user forums at http://forum.springframework.net/ are available for you to submit questions, support requests, and interact with other Spring.NET users.
Bug and issue tracking can be found at http://jira.springframework.org/secure/BrowseProject.jspa?id=10020
The Spring.NET wiki is located at http://opensource.atlassian.com/confluence/spring/display/NET/Home
A Fisheye repository browser is located at https://fisheye.springframework.org/browse/spring-net
A Fisheye repository browser is located at http://fisheye1.cenqua.com/viewrep/springnet
To get the sources, check them out at the Subversion repository at https://src.springframework.org/svn/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).
To get the sources, check them out at the Subversion repository at https://src.springframework.org/svn/spring-net/trunk
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.
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.
Ideally attach some sample code reproducing the problem to the JIRA ticket.
@@ -242,10 +235,4 @@ Ideally attach some sample code reproducing the problem to the JIRA ticket.
InnovaSys Document X!
---------------------
InnovSys has kindly provided a license to generate the SDK documentation and supporting utilities for
integration with Visual Studio.
integration with Visual Studio.

23
src/Spring/CommonAssemblyInfo.cs
View File

@@ -14,8 +14,8 @@ using System.Reflection;
[assembly: AssemblyConfiguration("net-2.0.win32; Release")]
#endif
[assembly: AssemblyCompany("http://www.springframework.net")]
[assembly: AssemblyProduct("Spring.NET Framework 1.3.0")]
[assembly: AssemblyCopyright("Copyright 2002-2009 Spring.NET Framework Team.")]
[assembly: AssemblyProduct("Spring.NET Framework 1.3.1")]
[assembly: AssemblyCopyright("Copyright 2002-2010 Spring.NET Framework Team.")]
[assembly: AssemblyTrademark("Apache License, Version 2.0")]
[assembly: AssemblyCulture("")]
@@ -31,11 +31,24 @@ using System.Reflection;
//
// 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.3.0.11001")]
#else
[assembly: AssemblyVersion("1.3.0.20001")]
[assembly: AssemblyVersion("1.3.1.11001")]
#endif
#if NET_2_0
[assembly: AssemblyVersion("1.3.1.20001")]
#endif
#if NET_3_0
[assembly: AssemblyVersion("1.3.1.30001")]
#endif
#if NET_3_5
[assembly: AssemblyVersion("1.3.1.35001")]
#endif
#if NET_4_0
[assembly: AssemblyVersion("1.3.1.40001")]
#endif
//
// In order to sign your assembly you must specify a key to use. Refer to the
// Microsoft .NET Framework documentation for more information on assembly signing.