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

Mongo driver 1.10 and other package updates #29

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Mongo driver 1.10 and other package updates #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32a3aac
Add CalendarExists to JobStore
flying19880517 Jan 6, 2015
4383382
fix JobStore Paused result throw NullReferenceException
flying19880517 Jan 7, 2015
0176f24
updated to driver version 1.10
Mar 6, 2015
16978ff
Merge pull request #1 from flying19880517/master
jpasichnyk Mar 6, 2015
fed39f0
Upgrades
Mar 6, 2015
bd39f41
updated dependencies
Mar 6, 2015
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
7 changes: 4 additions & 3 deletions pkg/nuget/nuspec/Quartz.Impl.MongoDB.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>quartz.impl.mongodb</id>
<version>1.3</version>
<version>1.4</version>
<title>Quartz.NET on MongoDB</title>
<authors>Renaud Calmont</authors>
<owners>Renaud Calmont</owners>
Expand All @@ -14,8 +14,9 @@
<language>en-US</language>
<tags>nosql mongodb quartz scheduler</tags>
<dependencies>
<dependency id="quartz" version="2.1.2" />
<dependency id="mongocsharpdriver" version="1.7" />
<dependency id="quartz" version="2.3.1" />
<dependency id="mongocsharpdriver" version="1.10.0" />
<dependency id="Common.Logging" version="3.0.0" />
</dependencies>
</metadata>
</package>
15 changes: 12 additions & 3 deletions src/Quartz.Impl.MongoDB.Tests/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<connectionStrings>
<add name="quartznet-mongodb" connectionString="server=localhost;database=quartznet_tests"/>
<add name="quartznet-mongodb" connectionString="server=localhost;database=quartznet_tests" />
</connectionStrings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
20 changes: 12 additions & 8 deletions src/Quartz.Impl.MongoDB.Tests/Quartz.Impl.MongoDB.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,23 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
<Reference Include="Common.Logging">
<HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="Common.Logging.Core">
<HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="Machine.Specifications">
<HintPath>..\packages\Machine.Specifications.0.5.10\lib\net40\Machine.Specifications.dll</HintPath>
<HintPath>..\packages\Machine.Specifications.0.9.1\lib\net40\Machine.Specifications.dll</HintPath>
</Reference>
<Reference Include="Machine.Specifications.Clr4">
<HintPath>..\packages\Machine.Specifications.0.5.10\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
<HintPath>..\packages\Machine.Specifications.0.9.1\lib\net40\Machine.Specifications.Clr4.dll</HintPath>
</Reference>
<Reference Include="Machine.Specifications.Should">
<HintPath>..\packages\Machine.Specifications.Should.0.7.2\lib\net40\Machine.Specifications.Should.dll</HintPath>
</Reference>
<Reference Include="Quartz, Version=2.1.2.400, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Quartz.2.1.2\lib\net40\Quartz.dll</HintPath>
<Reference Include="Quartz">
<HintPath>..\packages\Quartz.2.3.1\lib\net40\Quartz.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
361 changes: 361 additions & 0 deletions src/Quartz.Impl.MongoDB.Tests/job_scheduling_data_2_0.xsd
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions src/Quartz.Impl.MongoDB.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Common.Logging" version="2.1.2" targetFramework="net45" />
<package id="Machine.Specifications" version="0.5.10" targetFramework="net45" />
<package id="Quartz" version="2.1.2" />
<package id="Common.Logging" version="3.0.0" targetFramework="net40" />
<package id="Common.Logging.Core" version="3.0.0" targetFramework="net40" />
<package id="Machine.Specifications" version="0.9.1" targetFramework="net40" />
<package id="Machine.Specifications.Should" version="0.7.2" targetFramework="net40" />
<package id="Quartz" version="2.3.1" targetFramework="net40" />
</packages>
18 changes: 16 additions & 2 deletions src/Quartz.Impl.MongoDB/JobStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public virtual void StoreJobAndTrigger(IJobDetail newJob, IOperableTrigger newTr
public virtual bool IsJobGroupPaused(string groupName)
{
var result = this.PausedJobGroups.FindOneByIdAs<BsonDocument>(groupName);
return !result.IsBsonNull;
return result != null && !result.IsBsonNull;
}

/// <summary>
Expand All @@ -373,7 +373,7 @@ public virtual bool IsJobGroupPaused(string groupName)
public virtual bool IsTriggerGroupPaused(string groupName)
{
var result = this.PausedTriggerGroups.FindOneByIdAs<BsonDocument>(groupName);
return !result.IsBsonNull;
return result != null && !result.IsBsonNull;
}

/// <summary>
Expand Down Expand Up @@ -829,6 +829,20 @@ public virtual void StoreCalendar(string name, ICalendar calendar, bool replaceE
}
}

/// <summary>
/// Determine whether a <see cref="ICalendar" /> with the given identifier already
/// exists within the scheduler.
/// </summary>
/// <param name="calName">calName the identifier to check for</param>
/// <returns>true if a Calendar exists with the given identifier</returns>
public bool CalendarExists(string calName)
{
lock (lockObject)
{
return this.Calendars.FindOneByIdAs<BsonDocument>(calName) != null;
}
}

/// <summary>
/// Remove (delete) the <see cref="ICalendar" /> with the
/// given name.
Expand Down
4 changes: 2 additions & 2 deletions src/Quartz.Impl.MongoDB/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]
22 changes: 12 additions & 10 deletions src/Quartz.Impl.MongoDB/Quartz.Impl.MongoDB.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,23 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<Reference Include="Common.Logging, Version=3.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
<HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=1.8.1.20, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\mongocsharpdriver.1.8.1\lib\net35\MongoDB.Bson.dll</HintPath>
<Reference Include="Common.Logging.Core">
<HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=1.8.1.20, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\mongocsharpdriver.1.8.1\lib\net35\MongoDB.Driver.dll</HintPath>
<Reference Include="MongoDB.Bson">
<HintPath>..\packages\mongocsharpdriver.1.10.0\lib\net35\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver">
<HintPath>..\packages\mongocsharpdriver.1.10.0\lib\net35\MongoDB.Driver.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Quartz, Version=2.1.2.400, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<Reference Include="Quartz, Version=2.3.1.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Quartz.2.1.2\lib\net40\Quartz.dll</HintPath>
<HintPath>..\packages\Quartz.2.3.1\lib\net40\Quartz.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
11 changes: 11 additions & 0 deletions src/Quartz.Impl.MongoDB/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading