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

renaming project to identify specifically as NHibernate4

Browse Source
This commit is contained in:
Steve Bohlen
2015-03-27 17:41:37 -04:00
parent 0da57da488
commit 45e67d88dd
17 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Spring.Net.2010.sln
View File

@@ -105,7 +105,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.Tes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.Integration.Tests.2010", "test\Spring\Spring.Data.NHibernate4.Integration.Tests\Spring.Data.NHibernate4.Integration.Tests.2010.csproj", "{46F8B5E9-ABCF-4306-BC05-FF05B0FAC151}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests", "test\Spring\Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests\Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests", "test\Spring\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests\Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj", "{DE276F7C-4564-49EC-AABC-B964EC3D1626}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

8
Spring.build
View File

@@ -540,7 +540,7 @@ Commandline Examples:
<nant buildfile="test/Spring/Spring.Data.NHibernate3.Integration.Tests/Spring.Data.NHibernate3.Integration.Tests.build" target="test" if="${build-data}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate4.Tests/Spring.Data.NHibernate4.Tests.build" target="test" if="${build-data}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate4.Integration.Tests/Spring.Data.NHibernate4.Integration.Tests.build" target="test" if="${build-data}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
<nant buildfile="test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build" target="test" if="${build-data and (nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
<nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="test" if="${build-services}"/>
<nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web}"/>
@@ -905,8 +905,8 @@ Commandline Examples:
<delete dir="test/Spring/Spring.Data.NHibernate4.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate4.Integration.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate4.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Services.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Services.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Messaging.Nms.Tests/obj" failonerror="false"/>
@@ -1861,7 +1861,7 @@ Commandline Examples:
<include name="test/Spring/Spring.Data.NHibernate3.Integration.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate4.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate4.Integration.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/**"/>
<include name="test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>

4
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/App.config → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/App.config
View File

@@ -15,8 +15,8 @@
<spring>
<context>
<resource uri="config://spring/objects"/>
<resource uri="assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml"/>
<resource uri="assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml"/>
<resource uri="assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml"/>
<resource uri="assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml"/>
</context>
<parsers>
<parser type="Spring.Data.Config.DatabaseNamespaceParser, Spring.Data"/>

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Container.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Container.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
public class Container : IContainer
{

8
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs
View File

@@ -2,7 +2,7 @@
using Spring.Testing.NUnit;
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
[TestFixture]
public class HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests : AbstractTransactionalSpringContextTests
@@ -21,9 +21,9 @@ namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
return new[]
{
"config://spring/objects",
"assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml",
"assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml",
"assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml"
"assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml",
"assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml",
"assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml"
};
}
}

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IContainer.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IContainer.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
public interface IContainer
{

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService1.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IService1.cs
View File

@@ -1,4 +1,4 @@
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
public interface IService1
{

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/IService2.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IService2.cs
View File

@@ -1,4 +1,4 @@
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
public interface IService2
{

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" namespace="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests">
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" default-lazy="true" assembly="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests" namespace="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests">
<class name="Container" proxy="IContainer">
<id name="Id">

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs
View File

@@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyTitle("Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests")]
[assembly: AssemblyTitle("Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests")]
[assembly: AssemblyDescription("Integration tests for HibernteTxScopeTransactionManager suspension of transactions")]

4
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service1.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Service1.cs
View File

@@ -1,14 +1,14 @@
using Spring.Data.NHibernate.Generic;
using Spring.Transaction;
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
[Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)]
public class Service1 : IService1
{
#region DI
public Generic.HibernateTemplate HibernateTemplate { get; set; }
public HibernateTemplate HibernateTemplate { get; set; }
#endregion

4
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Service2.cs → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Service2.cs
View File

@@ -1,14 +1,14 @@
using Spring.Data.NHibernate.Generic;
using Spring.Transaction;
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
{
[Transaction.Interceptor.Transaction(TransactionPropagation.Supports, ReadOnly = true)]
public class Service2 : IService2
{
#region DI
public Generic.HibernateTemplate HibernateTemplate { get; set; }
public HibernateTemplate HibernateTemplate { get; set; }
#endregion

4
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml
View File

@@ -26,11 +26,11 @@
</property>
</object>
<object id="IService1" type="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.Service1, Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests">
<object id="IService1" type="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.Service1, Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests">
<property name="HibernateTemplate" ref="Spring.Data.NHibernate.Generic.HibernateTemplate" />
</object>
<object id="IService2" type="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.Service2, Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests">
<object id="IService2" type="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.Service2, Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests">
<property name="HibernateTemplate" ref="Spring.Data.NHibernate.Generic.HibernateTemplate" />
</object>
</objects>

6
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.build → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<project name="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
<project name="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd">
<!--
Required properties:
* current.bin.dir - (path) root level to build to
@@ -11,7 +11,7 @@
<target name="build">
<!-- build Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests -->
<!-- build Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests -->
<csc target="library" define="${current.build.defines.csc}"
warnaserror="true"
optimize="${build.optimize}"
@@ -45,7 +45,7 @@
<exclude name="${current.bin.dir}/Spring.Data.NHibernate*Tests*.dll" />
<exclude name="${current.bin.dir}/CloverRuntime.dll" />
</references>
<resources prefix="Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests" dynamicprefix="true" failonempty="true">
<resources prefix="Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests" dynamicprefix="true" failonempty="true">
<include name="**/*.xml" />
</resources>
</csc>

4
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests.csproj → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj
View File

@@ -7,8 +7,8 @@
<ProjectGuid>{DE276F7C-4564-49EC-AABC-B964EC3D1626}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests</RootNamespace>
<AssemblyName>Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests</AssemblyName>
<RootNamespace>Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests</RootNamespace>
<AssemblyName>Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>

0
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml
View File

2
test/Spring/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml → test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml
View File

@@ -27,7 +27,7 @@
<property name="MappingResources">
<list>
<value>assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml</value>
<value>assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml</value>
</list>
</property>