Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Common.Logging to 3.0.0 and Spring to 2.0.1 #77

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Common.Logging to 3.0.0 and Spring to 2.0.1 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rhino.ServiceBus.Host/Actions/DebugAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Rhino.ServiceBus.Host.Actions
{
public class DebugAction : IAction
{
private static readonly ILog Log = LogManager.GetCurrentClassLogger();
private static readonly ILog Log = LogManager.GetLogger(typeof(DebugAction));

public void Execute(ExecutingOptions options)
{
Expand Down
3 changes: 3 additions & 0 deletions Rhino.ServiceBus.Host/Rhino.ServiceBus.Host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@
<Reference Include="Common.Logging">
<HintPath>..\SharedLibs\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Common.Logging.Core">
<HintPath>..\SharedLibs\3.5\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Core">
Expand Down
2 changes: 1 addition & 1 deletion Rhino.ServiceBus.Host/RhinoServiceBusHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace Rhino.ServiceBus.Host

internal partial class RhinoServiceBusHost : ServiceBase
{
private static readonly ILog Log = LogManager.GetCurrentClassLogger();
private static readonly ILog Log = LogManager.GetLogger(typeof(RhinoServiceBusHost));

private RemoteAppDomainHost host;
private string asm;
Expand Down
3 changes: 3 additions & 0 deletions Rhino.ServiceBus.RhinoQueues/Rhino.ServiceBus.RhinoQueues.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
<Reference Include="Common.Logging">
<HintPath>..\SharedLibs\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Common.Logging.Core">
<HintPath>..\SharedLibs\3.5\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="Esent.Interop">
<HintPath>..\SharedLibs\Esent.Interop.dll</HintPath>
</Reference>
Expand Down
6 changes: 3 additions & 3 deletions Rhino.ServiceBus.Spring/ApplicationContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ public static T Get<T>(this IConfigurableApplicationContext context)

public static IEnumerable<T> GetAll<T>(this IConfigurableApplicationContext context)
{
IDictionary objectsOfType = context.GetObjectsOfType(typeof(T));
IDictionary<string, object> objectsOfType = context.GetObjectsOfType(typeof(T));
return objectsOfType.Values.Cast<T>();
}

public static object Get(this IApplicationContext context, Type type)
{
string[] objectNamesForType = context.GetObjectNamesForType(type);
if ((objectNamesForType == null) || (objectNamesForType.Length == 0))
IList<string> objectNamesForType = context.GetObjectNamesForType(type);
if ((objectNamesForType == null) || (objectNamesForType.Count == 0))
{
throw new NoSuchObjectDefinitionException(type.FullName, "Requested Type not defined in the context.");
}
Expand Down
4 changes: 2 additions & 2 deletions Rhino.ServiceBus.Spring/SpringServiceLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public IEnumerable<T> ResolveAll<T>()

public IEnumerable<IHandler> GetAllHandlersFor(Type type)
{
IDictionary objectsOfType = applicationContext.GetObjectsOfType(type);
IDictionary<string, object> objectsOfType = applicationContext.GetObjectsOfType(type);
List<IHandler> handlers = new List<IHandler>();
foreach (DictionaryEntry dictionaryEntry in objectsOfType)
foreach (KeyValuePair<string, object> dictionaryEntry in objectsOfType)
{
string objectName = (string) dictionaryEntry.Key;
IObjectDefinition objectDefinition = applicationContext.ObjectFactory.GetObjectDefinition(objectName);
Expand Down
2 changes: 1 addition & 1 deletion Rhino.ServiceBus.Spring/app.config.transform
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
2 changes: 1 addition & 1 deletion Rhino.ServiceBus.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
3 changes: 3 additions & 0 deletions Rhino.ServiceBus.Tests/Rhino.ServiceBus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@
<Reference Include="Common.Logging">
<HintPath>..\SharedLibs\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Common.Logging.Core">
<HintPath>..\SharedLibs\3.5\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\SharedLibs\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
Expand Down
5 changes: 4 additions & 1 deletion Rhino.ServiceBus/Rhino.ServiceBus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@
<Reference Include="Common.Logging">
<HintPath>..\SharedLibs\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Common.Logging.Core">
<HintPath>..\SharedLibs\3.5\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core">
Expand Down Expand Up @@ -317,4 +320,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Binary file added SharedLibs/3.5/Common.Logging.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharedLibs/3.5/Common.Logging.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharedLibs/3.5/Rhino.Queues.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharedLibs/3.5/Rhino.Queues.pdb
View file
Open in desktop
Binary file not shown.
Binary file modified SharedLibs/3.5/Spring.Aop.dll
View file
Open in desktop
Binary file not shown.
Binary file modified SharedLibs/3.5/Spring.Aop.pdb
View file
Open in desktop
Binary file not shown.
Loading