renaming project to identify specifically as NHibernate4
This commit is contained in:
@@ -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"/>
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
|
||||
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
|
||||
{
|
||||
public class Container : IContainer
|
||||
{
|
||||
@@ -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"
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
|
||||
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
|
||||
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
|
||||
{
|
||||
public interface IContainer
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
|
||||
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
|
||||
{
|
||||
public interface IService1
|
||||
{
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
|
||||
namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
|
||||
{
|
||||
public interface IService2
|
||||
{
|
||||
@@ -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">
|
||||
@@ -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")]
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user