Several fixes

csteeg · Feb 5, 2016 · b78361f · b78361f
1 parent bd2559a
commit b78361f
Show file tree

Hide file tree

Showing 17 changed files with 238 additions and 239 deletions.
diff --git a/Src/Commons.Logging.Log4Net/Log4netLogger.cs b/Src/Commons.Logging.Log4Net/Log4netLogger.cs
@@ -22,12 +22,7 @@ namespace BoC.Logging
     [Serializable]
     public class Log4netLogger : ILogger
     {
-        private Type ownerType = typeof(Log4netLogger);
-        public Type OwnerType
-        {
-            get { return ownerType; }
-            set { ownerType = value; }
-        }
+        private static Type ownerType = typeof(ILogger);
 
         public IDisposable Stack(string name)
         {

diff --git a/Src/Commons.Logging.Sitecore/DefaultSetupTasks/InitDefaultLoggerTask.cs b/Src/Commons.Logging.Sitecore/DefaultSetupTasks/InitDefaultLoggerTask.cs
@@ -16,7 +16,7 @@ public void Execute()
             if (!dependencyResolver.IsRegistered<ILogger>())
             {
                 log4net.Config.XmlConfigurator.Configure();
-                dependencyResolver.RegisterType<ILogger, SitecoreLogger>();
+                dependencyResolver.RegisterSingleton<ILogger, SitecoreLogger>();
             }
         }
     }

diff --git a/Src/Commons.Logging.Sitecore/SitecoreLogger.cs b/Src/Commons.Logging.Sitecore/SitecoreLogger.cs
@@ -1,24 +1,64 @@
 using System;
+using log4net;
 using Sitecore.Diagnostics;
 
 namespace BoC.Logging.Sitecore
 {
     [Serializable]
     public class SitecoreLogger : ILogger
     {
-        private Type ownerType = typeof(SitecoreLogger);
-        public Type OwnerType
-        {
-            get { return ownerType; }
-            set { ownerType = value; }
+        public bool IsDebugEnabled { get { return Log.IsDebugEnabled; } }
+
+        public bool IsInfoEnabled
+        {
+            get
+            {
+                if (!Log.Enabled)
+                    return false;
+                ILog logger = LoggerFactory.GetLogger(typeof(Log));
+                if (logger != null)
+                    return logger.IsInfoEnabled;
+                return false;
+            }
+        }
+
+        public bool IsWarnEnabled
+        {
+            get
+            {
+                if (!Log.Enabled)
+                    return false;
+                ILog logger = LoggerFactory.GetLogger(typeof(Log));
+                if (logger != null)
+                    return logger.IsWarnEnabled;
+                return false;
+            }
+        }
+        public bool IsErrorEnabled
+        {
+            get
+            {
+                if (!Log.Enabled)
+                    return false;
+                ILog logger = LoggerFactory.GetLogger(typeof(Log));
+                if (logger != null)
+                    return logger.IsErrorEnabled;
+                return false;
+            }
+        }
+        public bool IsFatalEnabled
+        {
+            get
+            {
+                if (!Log.Enabled)
+                    return false;
+                ILog logger = LoggerFactory.GetLogger(typeof(Log));
+                if (logger != null)
+                    return logger.IsErrorEnabled;
+                return false;
+            }
         }
 
-        public bool IsDebugEnabled { get { return true; } }
-        public bool IsInfoEnabled { get { return true; } }
-        public bool IsWarnEnabled { get { return true; } }
-        public bool IsErrorEnabled { get { return true; } }
-        public bool IsFatalEnabled { get { return true; } }
-
         public IDisposable Stack(string name)
         {
             return log4net.NDC.Push(name);

diff --git a/Src/Commons.Persistence.Sitecore/App_Config/Include/Glass.Mapper.Sc.CodeFirst.config.exclude b/Src/Commons.Persistence.Sitecore/App_Config/Include/Glass.Mapper.Sc.CodeFirst.config.exclude
diff --git a/Src/Commons.Persistence.Sitecore/App_Config/Include/Glass.Mapper.Sc.Start.config b/Src/Commons.Persistence.Sitecore/App_Config/Include/Glass.Mapper.Sc.Start.config
diff --git a/Src/Commons.Persistence.Sitecore/App_Config/Include/Glass.Mapper.Sc.config b/Src/Commons.Persistence.Sitecore/App_Config/Include/Glass.Mapper.Sc.config
diff --git a/Src/Commons.Persistence.Sitecore/App_Start/GlassMapperSc.cs b/Src/Commons.Persistence.Sitecore/App_Start/GlassMapperSc.cs
diff --git a/Src/Commons.Persistence.Sitecore/App_Start/GlassMapperScCustom.cs b/Src/Commons.Persistence.Sitecore/App_Start/GlassMapperScCustom.cs
diff --git a/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.csproj b/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.csproj
@@ -39,25 +39,25 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.4.0.3\lib\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=4.1.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.4.1.1\lib\Glass.Mapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc, Version=4.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.4.0.3\lib\80\Glass.Mapper.Sc.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.4.1.1\lib\80\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.ContentSearch, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc.ContentSearch, Version=4.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider.4.0.0\lib\80\Glass.Mapper.Sc.ContentSearch.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider.4.1.1\lib\80\Glass.Mapper.Sc.ContentSearch.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.ContentSearch.LuceneProvider, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc.ContentSearch.LuceneProvider, Version=4.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider.4.0.0\lib\80\Glass.Mapper.Sc.ContentSearch.LuceneProvider.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider.4.1.1\lib\80\Glass.Mapper.Sc.ContentSearch.LuceneProvider.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.Mvc, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Glass.Mapper.Sc.Mvc, Version=4.1.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.4.0.3\lib\Mvc5\Glass.Mapper.Sc.Mvc.dll</HintPath>
+      <HintPath>..\..\packages\BoC.Glass.Mapper.Sc.4.1.1\lib\Mvc5\Glass.Mapper.Sc.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -134,8 +134,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App_Start\GlassMapperSc.cs" />
-    <Compile Include="App_Start\GlassMapperScCustom.cs" />
     <Compile Include="DataContext\SitecoreDataContextDatabaseProvider.cs" />
     <Compile Include="ContextDatabaseProvider.cs" />
     <Compile Include="DefaultSetupTasks\EnableProfiling.cs" />
@@ -177,9 +175,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="App_Config\Include\Glass.Mapper.Sc.CodeFirst.config.exclude" />
-    <None Include="App_Config\Include\Glass.Mapper.Sc.config" />
-    <None Include="App_Config\Include\Glass.Mapper.Sc.Start.config" />
     <None Include="App_Start\GlassMapperScCustom.BoC.cs.pp" />
     <None Include="BoC.Persistence.SitecoreGlass.nuspec" />
     <None Include="packages.config" />

diff --git a/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.nuspec b/Src/Commons.Persistence.Sitecore/BoC.Persistence.SitecoreGlass.nuspec
@@ -15,9 +15,9 @@
     <dependencies>
       <dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
       <dependency id="BoC" version="4.0.1" />
-      <dependency id="BoC.Glass.Mapper.Sc" version="4.0.3" />
-      <dependency id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="4.0.0" />
-      <dependency id="Castle.Core" version="3.3.3" />
+      <dependency id="BoC.Glass.Mapper.Sc" version="4.1.2" />
+      <dependency id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="4.1.2" />
+      <dependency id="Castle.Core" />
       <dependency id="Lucene.Net" version="3.0.3" />
       <dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
       <dependency id="SharpZipLib" version="0.86.0" />

diff --git a/Src/Commons.Persistence.Sitecore/Properties/AssemblyInfo.cs b/Src/Commons.Persistence.Sitecore/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.10.0")]
-[assembly: AssemblyFileVersion("4.0.10.0")]
+[assembly: AssemblyVersion("4.0.15.0")]
+[assembly: AssemblyFileVersion("4.0.15.0")]
diff --git a/Src/Commons.Persistence.Sitecore/packages.config b/Src/Commons.Persistence.Sitecore/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BoC.Glass.Mapper.Sc" version="4.0.3" targetFramework="net45" />
-  <package id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="4.0.0" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper.Sc" version="4.1.1" targetFramework="net45" />
+  <package id="BoC.Glass.Mapper.Sc.ContentSearch.LuceneProvider" version="4.1.1" targetFramework="net45" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net45" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />

diff --git a/Src/Commons.Sitecore.Mvc/BoC.Sitecore.Mvc.nuspec b/Src/Commons.Sitecore.Mvc/BoC.Sitecore.Mvc.nuspec
@@ -15,7 +15,7 @@
     <tags>BoC,Persistence,Glass,Mapper,ORM,Repository,Sitecore</tags>
     <dependencies>
       <dependency id="BoC" version="4.0.1" />
-      <dependency id="BoC.Web.Mvc" version="4.0.0" />
+      <dependency id="BoC.Web.Mvc" version="4.0.1" />
       <dependency id="Microsoft.AspNet.Mvc" version="5.2.3" />
       <dependency id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" />
     </dependencies>