From 5b00b18597aa6d3a132da53ada08ea8361c29ead Mon Sep 17 00:00:00 2001
From: eeichinger <eeichinger@gmail.com>
Date: Fri, 26 Sep 2008 13:53:32 +0000
Subject: [PATCH] switched to machine neutral connectionstrings

---
 .../TxQuickStart/AccountManagerTests.cs              |  5 ++++-
 .../TxQuickStart/system-test-dtc-config.xml          | 12 +++---------
 .../TxQuickStart/system-test-local-config.xml        | 11 +++++------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs
index 45d0b019..d9bfead1 100644
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/AccountManagerTests.cs
@@ -56,14 +56,17 @@ namespace Spring.TxQuickStart
             NamespaceParserRegistry.RegisterParser(typeof(AopNamespaceParser));
             IApplicationContext context = CreateContextFromXml();
             IDictionary dict = context.GetObjectsOfType(typeof (IAccountManager));
-            accountManager = context["accountManager"] as IAccountManager;
+            accountManager = context["accountManager"] as IAccountManager;  
             CleanDb(context);
         }
 
         private static IApplicationContext CreateContextFromXml()
         {
             return new XmlApplicationContext(
+            // use for demoing ado tx manager
                 "assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/system-test-local-config.xml" 
+            // use for demoing TransactionScope tx manager
+//                "assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/system-test-dtc-config.xml" 
                 );
         }
 
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml
index e42321fe..d022e34b 100644
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-dtc-config.xml
@@ -14,15 +14,14 @@
    
   <db:provider id="DebitDbProvider"
                  provider="System.Data.SqlClient"
-                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Debits;User ID=springqa; Password=springqa"/>
+                 connectionString="Data Source=(local)\SQLEXPRESS;Initial Catalog=Debits;User ID=springqa; Password=springqa"/>
 
 
   <db:provider id="CreditDbProvider"
                  provider="System.Data.SqlClient"
-                 connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=Credits;User ID=springqa; Password=springqa"/>
-                  
-  
+                 connectionString="Data Source=(local)\SQLEXPRESS;Initial Catalog=Credits;User ID=springqa; Password=springqa"/>
 
+    
  
   <!-- Transaction Manager if using two databases, one containing the credit table and the other a debit table -->
 
@@ -34,9 +33,4 @@
   <!-- Transaction aspect -->
   <tx:attribute-driven/>
 
-  
- 
- 
-  
-
 </objects>
\ No newline at end of file
diff --git a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml
index e87089ad..fd971776 100644
--- a/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml
+++ b/examples/Spring/Spring.TxQuickStart/test/Spring/Spring.TxQuickStart.Tests/TxQuickStart/system-test-local-config.xml
@@ -9,19 +9,18 @@
   <import resource="assembly://Spring.TxQuickStart/Spring.TxQuickStart/application-config.xml"/>
   
   <!-- Imports additional aspects -->
-  <!--
+<!--   
   <import resource="assembly://Spring.TxQuickStart.Tests/Spring.TxQuickStart/aspects-config.xml"/>
-  -->
-  
-  
+-->
+    
   <!-- Database Providers -->
   <db:provider id="DebitDbProvider"
                provider="System.Data.SqlClient"
-               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/>
+               connectionString="Data Source=(local)\SQLEXPRESS;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/>
 
   <db:provider id="CreditDbProvider"
                provider="System.Data.SqlClient"
-               connectionString="Data Source=MARKT60\SQL2005;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/>
+               connectionString="Data Source=(local)\SQLEXPRESS;Initial Catalog=CreditsAndDebits;User ID=springqa; Password=springqa"/>
   
   <!-- for .NET 1.1
   <db:provider id="DebitDbProvider"