diff --git a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs index 02f2bc30..2598c056 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs +++ b/examples/Spring/Spring.Calculator/src/Spring.Aspects/Logging/CommonLoggingAroundAdvice.cs @@ -33,7 +33,6 @@ namespace Spring.Aspects.Logging /// Basic implementation of a logging aspect using Common.Logging library. /// /// Bruno Baia - /// $Id: CommonLoggingAroundAdvice.cs,v 1.2 2007/06/27 16:00:42 bbaia Exp $ public class CommonLoggingAroundAdvice : IMethodInterceptor { #region Logging diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config index fe1598fd..6cd6d449 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/App.config @@ -34,7 +34,7 @@ - + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj index 96700c02..1f67f755 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.ClientApp/Spring.Calculator.ClientApp.2005.csproj @@ -49,6 +49,7 @@ 4 full prompt + false bin\Release\ diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config index 6f9879ea..74bf8177 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/App.config @@ -1,15 +1,15 @@ - +
-
-
- - +
+
+ + @@ -20,12 +20,89 @@ - - - - - - - - + + + + + + + + Contains definitions how to export objects defined in ~/Config/services.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + \ No newline at end of file diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/enterpriseServices.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/enterpriseServices.xml deleted file mode 100644 index 648c6568..00000000 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/enterpriseServices.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - enterpriseService - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - \ No newline at end of file diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml index 6e325dd6..cff4a19b 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Config/services.xml @@ -2,7 +2,27 @@ Definitions of objects to be registered. - + + + + + + + + + + + + + + + CommonLoggingAroundAdvice + + + + + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.EnterpriseServices.dll.spring-context.xml b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.EnterpriseServices.dll.spring-context.xml index 565b4226..3c1351c8 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.EnterpriseServices.dll.spring-context.xml +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.EnterpriseServices.dll.spring-context.xml @@ -1,4 +1,6 @@ - - - + + + + + \ No newline at end of file diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj index 7903a35f..cd7f756a 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.RegisterComponentServices/Spring.Calculator.RegisterComponentServices.2003.csproj @@ -84,6 +84,11 @@ AssemblyName = "Spring.Core" HintPath = "..\..\..\..\..\bin\net\1.1\debug\Spring.Core.dll" /> + @@ -106,10 +111,6 @@ RelPath = "Spring.Calculator.EnterpriseServices.dll.spring-context.xml" BuildAction = "Content" /> - 4 full prompt + false bin\Release\ @@ -81,9 +82,12 @@ Code - + + {6B34626E-8D2A-4387-BBB6-CB352D4DBDEC} + Spring.Aspects.2005 + {284C0873-BBB4-4399-B6F7-CB7EDBD001C7} Spring.Calculator.Contract.2005 @@ -103,6 +107,14 @@ ..\..\..\..\..\bin\net\2.0\debug\Spring.Services.dll + + + Always + + + Always + + diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs index 4dc0c6f7..addb2ac0 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/AdvancedCalculator.cs @@ -20,9 +20,6 @@ #region Imports -using System; -using System.Reflection; -using Common.Logging; using Spring.Calculator.Interfaces; #endregion @@ -58,25 +55,22 @@ namespace Spring.Calculator.Services public int GetMemory() { - Log.Debug(string.Format("GetMemory: IsInTransaction={0}, at {1}", System.EnterpriseServices.ContextUtil.IsInTransaction, new System.Diagnostics.StackTrace())); +// Log.Debug(string.Format("GetMemory: IsInTransaction={0}, at {1}", System.EnterpriseServices.ContextUtil.IsInTransaction, new System.Diagnostics.StackTrace())); return memoryStore; } public void SetMemory(int memoryValue) { - Log.Debug("SetMemory"); memoryStore = memoryValue; } public void MemoryClear() { - Log.Debug("MemoryClear"); memoryStore = 0; } public void MemoryAdd(int num) { - Log.Debug("MemoryAdd"); memoryStore += num; } diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs index ffa5f112..8481e95b 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Services/Calculator.cs @@ -20,10 +20,6 @@ #region Imports -using System; -using System.Diagnostics; -using System.Reflection; -using Common.Logging; using Spring.Calculator.Domain; using Spring.Calculator.Interfaces; @@ -43,25 +39,25 @@ namespace Spring.Calculator.Services static Calculator() { instanceCount = 0; - ILog log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType); - log.Debug( - string.Format("Initialized Type in AppDomain {0}, ConfigFile={1}, BaseDirectory={2}, CurrentDirectory={3}, ExecutingAssembly={4}, EntryAssembly={5}" - , AppDomain.CurrentDomain.GetHashCode() - , AppDomain.CurrentDomain.SetupInformation.ConfigurationFile - , AppDomain.CurrentDomain.BaseDirectory - , Environment.CurrentDirectory - , Assembly.GetExecutingAssembly().Location - , Assembly.GetEntryAssembly().Location - )); +// Common.Logging.ILog log = Common.Logging.LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType); +// log.Debug( +// string.Format("Initialized Type in AppDomain {0}, ConfigFile={1}, BaseDirectory={2}, CurrentDirectory={3}, ExecutingAssembly={4}, EntryAssembly={5}" +// , AppDomain.CurrentDomain.GetHashCode() +// , AppDomain.CurrentDomain.SetupInformation.ConfigurationFile +// , AppDomain.CurrentDomain.BaseDirectory +// , Environment.CurrentDirectory +// , Assembly.GetExecutingAssembly().Location +// , Assembly.GetEntryAssembly().Location +// )); } #region ICalculator Members - protected readonly ILog Log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType); +// protected readonly Common.Logging.ILog Log = Common.Logging.LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType); public Calculator() { - Log.Debug(string.Format("Initialized Instance in AppDomain {0}, #{0} at {1}", AppDomain.CurrentDomain.GetHashCode(), instanceCount, new System.Diagnostics.StackTrace())); +// Common.Logging.Log.Debug(string.Format("Initialized Instance in AppDomain {0}, #{0} at {1}", AppDomain.CurrentDomain.GetHashCode(), instanceCount, new System.Diagnostics.StackTrace())); instanceCount++; } diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj index 587b01b5..770667cf 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2003.csproj @@ -69,16 +69,6 @@ Project = "{284C0873-BBB4-4399-B6F7-CB7EDBD001C7}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> - - diff --git a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj index 383959b6..1fa714a6 100644 --- a/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj +++ b/examples/Spring/Spring.Calculator/src/Spring.Calculator.Services/Spring.Calculator.Services.2005.csproj @@ -25,7 +25,7 @@ - true + false bin\Debug\