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

packaging improvements

Browse Source
This commit is contained in:
markpollack
2009-08-02 03:41:44 +00:00
parent 972da2f0e5
commit 5c7cb53dd1
4 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Spring.build
View File

@@ -387,7 +387,7 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
<nant buildfile="src/Spring/Spring.Services/Spring.Services.build" target="build" if="${build-services and not net-3.5}"/>
<nant buildfile="src/Spring/Spring.Testing.NUnit/Spring.Testing.NUnit.build" target="build" if="${build-testing-nunit and not net-3.0}"/>
<nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
<nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems and not net-3.0}"/>
<nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
<nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms and not net-3.0}"/>
<nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz and not net-3.0}"/>
<nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq and not net-3.0}"/>
@@ -416,7 +416,9 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
<nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${build-testing-microsoft and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and not net-3.0}"/>
<!--
<nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems and (nant.settings.currentframework == 'net-2.0') and not net-3.0}"/>
-->
<nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Scheduling.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="build" if="${build-quartz and not net-3.0}"/>
<nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq and not net-3.0}"/>
@@ -1044,7 +1046,7 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
<include name="Spring.build"/>
<include name="Spring.include"/>
<include name="common-project.include"/>
<include name="BreakingChanges-1.3.txt"/>
<include name="BreakingChanges.txt"/>
<!-- exclude VS.Net stuff -->
<exclude name="**/sdk-web/**"/>
<exclude name="**/*.suo"/>
@@ -1311,6 +1313,12 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
<copy todir="${current.package.dir}/doc/schema"
file="src/Spring/Spring.Messaging.Nms/Messaging/Nms/Config/spring-nms-1.2.xsd"/>
<copy todir="${current.package.dir}/doc/schema"
file="src/Spring/Spring.Messaging.Ems/Messaging/Ems/Config/spring-ems-1.3.xsd"/>
<copy todir="${current.package.dir}/doc/schema"
file="src/Spring/Spring.Template.Velocity/Template/Velocity/Config/spring-nvelocity-1.3.xsd"/>
<copy todir="${current.package.dir}/doc/schema"
file="build-support/install-schema.build"/>
@@ -1321,13 +1329,21 @@ if you want to build Spring.Testing.Microsoft (MSTest Support), you need to copy
<fileset refid="src.to.copy"/>
</copy>
<copy todir="${current.package.dir}/examples">
<!-- copy examples -->
<copy todir="${current.package.dir}/examples">
<fileset basedir="examples">
<include name="**/*.refresh"/>
<include name="**/*.refresh"/>
</fileset>
</copy>
</copy>
<!-- copy templates -->
<copy todir="${current.package.dir}/dev-support">
<fileset basedir="dev-support">
<include name="resharper/**"/>
<include name="vs.net-2008/**"/>
</fileset>
</copy>

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

@@ -116,10 +116,10 @@
<!-- deploy schema to VS.NET XXXX schema store -->
<echo message="-------------------------------------------------------"/>
<echo message="Copying spring-objects-1.1.xsd to ${vsXXXX.version} installation."/>
<echo message="Copying spring-objects-1.3.xsd to ${vsXXXX.version} installation."/>
<echo message="-------------------------------------------------------"/>
<echo message=""/>
<copy file="spring-objects-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
<copy file="spring-objects-1.3.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
verbose="true"
overwrite="true"/>
@@ -132,10 +132,10 @@
overwrite="true"/>
<echo message="----------------------------------------------------------"/>
<echo message="Copying spring-validation-1.1.xsd to ${vsXXXX.version} installation."/>
<echo message="Copying spring-validation-1.3.xsd to ${vsXXXX.version} installation."/>
<echo message="----------------------------------------------------------"/>
<echo message=""/>
<copy file="spring-validation-1.1.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
<copy file="spring-validation-1.3.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
verbose="true"
overwrite="true"/>
@@ -179,6 +179,22 @@
verbose="true"
overwrite="true"/>
<echo message="----------------------------------------------------------"/>
<echo message="Copying spring-nms-1.3.xsd to ${vsXXXX.version} installation."/>
<echo message="----------------------------------------------------------"/>
<echo message=""/>
<copy file="spring-nms-1.3.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
verbose="true"
overwrite="true"/>
<echo message="----------------------------------------------------------"/>
<echo message="Copying spring-nvelocity-1.3.xsd to ${vsXXXX.version} installation."/>
<echo message="----------------------------------------------------------"/>
<echo message=""/>
<copy file="spring-nvelocity-1.3.xsd" todir="${vsXXXX.xml.schemas}${vsXXXX.relative.dir}"
verbose="true"
overwrite="true"/>
<property name="vsXXXX.xml.schemas.notinstalled" value="false"/>
</target>
@@ -194,4 +210,4 @@
</fileset>
</delete>
</target>
</project>
</project>

3
examples/Spring/Spring.Data.NHibernate.Northwind/src/Spring.Northwind.Dao.NHibernate/Dao/NHibernate/HibernateOrderDao.cs
View File

@@ -33,6 +33,9 @@ using Spring.Transaction.Interceptor;
namespace Spring.Northwind.Dao.NHibernate
{
/// <summary>
/// Data access object for Orders
/// </summary>
[Repository]
public class HibernateOrderDao : HibernateDao, IOrderDao
{

20
test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build
View File

@@ -27,9 +27,14 @@
<include name="**/*.xml" />
</resources>
<references basedir="${current.bin.dir}">
<include name="Spring.Core.dll" />
<include name="Spring.Data.dll" />
<include name="Spring.Core.Tests.dll" />
<include name="Spring.Data.Tests.dll" />
<include name="${vs-net.mstest.bin.dir}\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
<include name="*.dll" />
<include name="Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll" />
<exclude name="${project::get-name()}.dll" />
<exclude name="CloverRuntime.dll" />
</references>
</csc>
@@ -39,16 +44,7 @@
<target name="test" depends="build">
<!-- property name="test.assemblyname" value="${project::get-name()}" / -->
<call target="common.run-tests" />
<call target="common.run-tests.mstest" />
</target>
<!--
<target name="test" depends="build">
<nunit2outproc>
<formatter type="Plain" />
<formatter type="Xml" usefile="true" extension=".xml"
outputdir="${current.bin.dir}/results" />
<test assemblyname="${current.bin.dir}/${project::get-name()}.dll" />
</nunit2outproc>
</target>
-->
</project>