renaming project to identify specifically as NHibernate4

sbohlen · sbohlen · commit 45e67d88dd2b · 2015-03-27T17:45:36.000-04:00
diff --git a/Spring.Net.2010.sln b/Spring.Net.2010.sln
@@ -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
diff --git a/Spring.build b/Spring.build
@@ -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/**"/>
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/App.config b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/App.config
@@ -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"/>
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Container.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Container.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
+namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
 {
     public class Container : IContainer
     {
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests.cs
@@ -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 @@ protected override string[] ConfigLocations
                 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"                         
                 };
             }
         }
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IContainer.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IContainer.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
+namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
 {
     public interface IContainer
     {
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IService1.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IService1.cs
@@ -1,4 +1,4 @@
-﻿namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
+﻿namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
 {
     public interface IService1
     {
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IService2.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/IService2.cs
@@ -1,4 +1,4 @@
-﻿namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests
+﻿namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests
 {
     public interface IService2
     {
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Mappings.hbm.xml
@@ -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">
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Properties/AssemblyInfo.cs
@@ -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")]
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Service1.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Service1.cs
@@ -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
 
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Service2.cs b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Service2.cs
@@ -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
 
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml
@@ -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>
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.build
@@ -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>
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests.csproj
@@ -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>
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml
diff --git a/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml b/test/Spring/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml
@@ -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>
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests`
	`3`	`+namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests`
`4`	`4`	`{`
`5`	`5`	`public class Container : IContainer`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`using Spring.Testing.NUnit;`
`4`	`4`
`5`		`-namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests`
	`5`	`+namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests`
`6`	`6`	`{`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class HibernateTxScopeTransactionManagerNestedTransactionSuspensionTests : AbstractTransactionalSpringContextTests`
`@@ -21,9 +21,9 @@ protected override string[] ConfigLocations`
`21`	`21`	`return new[]`
`22`	`22`	`{`
`23`	`23`	`"config://spring/objects",`
`24`		`- "assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml",`
`25`		`- "assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml",`
`26`		`- "assembly://Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml"`
	`24`	`+ "assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Configuration.xml",`
	`25`	`+ "assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.NHibernate.xml",`
	`26`	`+ "assembly://Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests/Spring.HibernateTxScopeTransactionManager.xml"`
`27`	`27`	`};`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Spring.Data.NHibernate.NestedTxSuspension.Integration.Tests`
	`1`	`+namespace Spring.Data.NHibernate4.NestedTxSuspension.Integration.Tests`
`2`	`2`	`{`
`3`	`3`	`public interface IService1`
`4`	`4`	`{`