Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPRNET-1539 Quartz.NET 2.1 support

Browse Source
This commit is contained in:
Marko Lahma
2013-01-12 10:54:10 +02:00
parent e4a59c6dd4
commit ebfe101ad0
93 changed files with 1217 additions and 53683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.dll.config
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.1.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

2
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.cs
View File

@@ -37,7 +37,7 @@ namespace Spring.Scheduling.Quartz.Integration.Tests
[SetUp]
public void SetUp()
{
ctx = new XmlApplicationContext("assembly://Spring.Scheduling.Quartz20.Integration.Tests/Spring.Scheduling.Quartz/LocalDataSourceJobStoreTest.xml");
ctx = new XmlApplicationContext("assembly://Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz/LocalDataSourceJobStoreTest.xml");
}
[Test]

8
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.xml → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Scheduling/Quartz/LocalDataSourceJobStoreTest.xml
View File

@@ -21,7 +21,7 @@
<!-- And actual Quartz -->
<object id="quartzSchedulerFactory" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz20">
<object id="quartzSchedulerFactory" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz21">
<property name="AutoStartup" value="true" />
<property name="StartupDelay" value="5s" />
<property name="QuartzProperties">
@@ -46,11 +46,11 @@
<property name="TransactionManager" ref="transactionManager" />
</object>
<object id="testJob" type="Spring.Scheduling.Quartz.JobDetailObject, Spring.Scheduling.Quartz20">
<property name="JobType" value="Spring.Scheduling.Quartz.Integration.Tests.TestJob, Spring.Scheduling.Quartz20.Integration.Tests" />
<object id="testJob" type="Spring.Scheduling.Quartz.JobDetailObject, Spring.Scheduling.Quartz21">
<property name="JobType" value="Spring.Scheduling.Quartz.Integration.Tests.TestJob, Spring.Scheduling.Quartz21.Integration.Tests" />
</object>
<object id="simpleTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="simpleTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<!-- see the example of method invoking job above -->
<property name="jobDetail" ref="testJob" />
<!-- 2 seconds -->

0
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Scheduling/Quartz/TestJob.cs → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Scheduling/Quartz/TestJob.cs
View File

16
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Spring.Scheduling.Quartz20.Integration.Tests.2008.csproj → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.2008.csproj
View File

@@ -8,14 +8,14 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Scheduling.Quartz20.Integration.Tests</AssemblyName>
<AssemblyName>Spring.Scheduling.Quartz21.Integration.Tests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz20.Integration.Tests\Debug\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Integration.Tests\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz20.Integration.Tests\Release\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Integration.Tests\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -31,7 +31,7 @@
<ItemGroup>
<Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\C5.dll</HintPath>
<HintPath>..\..\..\lib\Quartz21\net\3.5\C5.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -39,7 +39,7 @@
</Reference>
<Reference Include="Quartz, Version=2.0.0.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\Quartz.dll</HintPath>
<HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -53,7 +53,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<None Include="Spring.Scheduling.Quartz20.Integration.Tests.dll.config">
<None Include="Spring.Scheduling.Quartz21.Integration.Tests.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
@@ -73,9 +73,9 @@
<Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
<Name>Spring.Data.2008</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz20\Spring.Scheduling.Quartz20.2008.csproj">
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2008.csproj">
<Project>{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}</Project>
<Name>Spring.Scheduling.Quartz20.2008</Name>
<Name>Spring.Scheduling.Quartz21.2008</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

18
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Spring.Scheduling.Quartz20.Integration.Tests.2010.csproj → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.2010.csproj
View File

@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Scheduling.Quartz20.Integration.Tests</AssemblyName>
<AssemblyName>Spring.Scheduling.Quartz21.Integration.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -36,7 +36,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz20.Integration.Tests\Debug\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21.Integration.Tests\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET_4_0;NET_3_5,QUARTZ_2_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -44,15 +44,15 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz20.Integration.Tests\Release\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21.Integration.Tests\Release\</OutputPath>
<DefineConstants>TRACE;NET_4_0;NET_3_5</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\C5.dll</HintPath>
<HintPath>..\..\..\lib\Net\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -60,7 +60,7 @@
</Reference>
<Reference Include="Quartz, Version=2.0.0.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\Quartz.dll</HintPath>
<HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -74,7 +74,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<None Include="Spring.Scheduling.Quartz20.Integration.Tests.dll.config">
<None Include="Spring.Scheduling.Quartz21.Integration.Tests.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
@@ -111,9 +111,9 @@
<Project>{AE00E5AB-C39A-436F-86D2-33BFE33E2E40}</Project>
<Name>Spring.Data.2010</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz20\Spring.Scheduling.Quartz20.2010.csproj">
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2010.csproj">
<Project>{E823D54C-CE82-4868-929F-5F95A999F123}</Project>
<Name>Spring.Scheduling.Quartz20.2010</Name>
<Name>Spring.Scheduling.Quartz21.2010</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

2
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Spring.Scheduling.Quartz20.Integration.Tests.build → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.build
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<project name="Spring.Scheduling.Quartz20.Integration.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
<project name="Spring.Scheduling.Quartz21.Integration.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
<include buildfile="${spring.basedir}/common-project.include" />

0
test/Spring/Spring.Scheduling.Quartz20.Integration.Tests/Spring.Scheduling.Quartz20.Integration.Tests.dll.config → test/Spring/Spring.Scheduling.Quartz21.Integration.Tests/Spring.Scheduling.Quartz21.Integration.Tests.dll.config
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/QuartzCompilerOptionsTests.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/QuartzCompilerOptionsTests.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/AdaptableJobFactoryTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/AdaptableJobFactoryTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/CronTriggerObjectTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/JobDetailObjectTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/JobDetailObjectTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/MethodInvokingJobDetailFactoryObjectTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/MethodInvokingJobDetailFactoryObjectTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/MethodInvokingJobTest.cs
View File

5
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/QuartzSupportTests.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/QuartzSupportTests.cs
View File

@@ -985,6 +985,11 @@ namespace Spring.Scheduling.Quartz
{
}
public void SchedulerStarting()
{
}
public void SchedulerShutdown()
{
}

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/QuartzTestObject.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/QuartzTestObject.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/SchedulerFactoryObjectTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/SimpleTriggerObjectTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/SpringObjectJobFactoryTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/SpringObjectJobFactoryTest.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/TestMethodInvokingTask.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/TestMethodInvokingTask.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/TestUtil.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/TestUtil.cs
View File

0
test/Spring/Spring.Scheduling.Quartz20.Tests/Scheduling/Quartz/TriggerObjectTest.cs → test/Spring/Spring.Scheduling.Quartz21.Tests/Scheduling/Quartz/TriggerObjectTest.cs
View File

18
test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2008.csproj → test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.2008.csproj
View File

@@ -8,14 +8,14 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Scheduling.Quartz20.Tests</AssemblyName>
<AssemblyName>Spring.Scheduling.Quartz21.Tests</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz20.Tests\Debug\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Tests\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz20.Tests\Release\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2008\Spring.Scheduling.Quartz21.Tests\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -34,7 +34,7 @@
<ItemGroup>
<Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\C5.dll</HintPath>
<HintPath>..\..\..\lib\Quartz21\net\3.5\C5.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -42,7 +42,7 @@
</Reference>
<Reference Include="Quartz, Version=2.0.0.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\Quartz.dll</HintPath>
<HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -93,9 +93,9 @@
<Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
<Name>Spring.Core.2008</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz20\Spring.Scheduling.Quartz20.2008.csproj">
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2008.csproj">
<Project>{764C3A6A-8690-49DD-B9AF-99E7C09AE4F0}</Project>
<Name>Spring.Scheduling.Quartz20.2008</Name>
<Name>Spring.Scheduling.Quartz21.2008</Name>
</ProjectReference>
<ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2008.csproj">
<Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
@@ -103,8 +103,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Spring.Scheduling.Quartz20.Tests.build" />
<None Include="Spring.Scheduling.Quartz20.Tests.dll.config" />
<None Include="Spring.Scheduling.Quartz21.Tests.build" />
<None Include="Spring.Scheduling.Quartz21.Tests.dll.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

18
test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.2010.csproj → test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.2010.csproj
View File

@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Spring</RootNamespace>
<AssemblyName>Spring.Scheduling.Quartz20.Tests</AssemblyName>
<AssemblyName>Spring.Scheduling.Quartz21.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -21,7 +21,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz20.Tests\Debug\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21.Tests\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -32,22 +32,22 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz20.Tests\Release\</OutputPath>
<OutputPath>..\..\..\build\VS.NET.2010\Spring.Scheduling.Quartz21.Tests\Release\</OutputPath>
<DefineConstants>TRACE;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="C5, Version=1.1.0.0, Culture=neutral, PublicKeyToken=06a1b38866503b69, processorArchitecture=MSIL">
<Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Quartz20\net\3.5\C5.dll</HintPath>
<HintPath>..\..\..\lib\Net\3.5\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.2.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\net\2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Quartz">
<HintPath>..\..\..\lib\Quartz20\net\3.5\Quartz.dll</HintPath>
<HintPath>..\..\..\lib\Quartz21\net\3.5\Quartz.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks, Version=2.9.6.40380, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -62,9 +62,9 @@
<Project>{710961A3-0DF4-49E4-A26E-F5B9C044AC84}</Project>
<Name>Spring.Core.2010</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz20\Spring.Scheduling.Quartz20.2010.csproj">
<ProjectReference Include="..\..\..\src\Spring\Spring.Scheduling.Quartz21\Spring.Scheduling.Quartz21.2010.csproj">
<Project>{E823D54C-CE82-4868-929F-5F95A999F123}</Project>
<Name>Spring.Scheduling.Quartz20.2010</Name>
<Name>Spring.Scheduling.Quartz21.2010</Name>
</ProjectReference>
<ProjectReference Include="..\Spring.Core.Tests\Spring.Core.Tests.2010.csproj">
<Project>{44B16BAA-6DF8-447C-9D7F-3AD3D854D904}</Project>
@@ -89,7 +89,7 @@
</Content>
</ItemGroup>
<ItemGroup>
<None Include="Spring.Scheduling.Quartz20.Tests.dll.config">
<None Include="Spring.Scheduling.Quartz21.Tests.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>

6
test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.Tests.build → test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.build
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<project name="Spring.Scheduling.Quartz20.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
<project name="Spring.Scheduling.Quartz21.Tests" default="build" xmlns="http://nant.sf.net/schemas/nant.xsd">
<include buildfile="${spring.basedir}/common-project.include" />
@@ -11,9 +11,9 @@
-->
<target name="build">
<echo message="${quartz20.lib.dir}" />
<echo message="${quartz21.lib.dir}" />
<copy todir="${current.bin.dir}" overwrite="true">
<fileset basedir="${quartz20.lib.dir}">
<fileset basedir="${quartz21.lib.dir}">
<include name="**/*.dll" />
</fileset>
</copy>

7
test/Spring/Spring.Scheduling.Quartz21.Tests/Spring.Scheduling.Quartz21.Tests.dll.config Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</assemblyBinding>
</runtime>
</configuration>

2
test/Spring/Spring.Scheduling.Quartz20.Tests/job-scheduling-data.xml → test/Spring/Spring.Scheduling.Quartz21.Tests/job-scheduling-data.xml
View File

@@ -13,7 +13,7 @@
<job>
<name>myJob</name>
<group>myGroup</group>
<job-type>Spring.Scheduling.Quartz.DummyJob, Spring.Scheduling.Quartz20.Tests</job-type>
<job-type>Spring.Scheduling.Quartz.DummyJob, Spring.Scheduling.Quartz21.Tests</job-type>
<durable>true</durable>
<recover>false</recover>
<job-data-map>

14
test/Spring/Spring.Scheduling.Quartz20.Tests/multipleAnonymousMethodInvokingJobDetailFB.xml → test/Spring/Spring.Scheduling.Quartz21.Tests/multipleAnonymousMethodInvokingJobDetailFB.xml
View File

@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
<object id="scheduler" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz20">
<object id="scheduler" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz21">
<property name="Triggers">
<list>
<ref local="exportTrigger"/>
@@ -14,9 +14,9 @@
</property>
</object>
<object id="exportTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="exportTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<property name="JobDetail">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz21">
<property name="TargetObject" ref="exportService"/>
<property name="TargetMethod" value="DoExport"/>
</object>
@@ -26,9 +26,9 @@
<property name="RepeatCount" value="1"/>
</object>
<object id="importTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="importTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<property name="JobDetail">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz21">
<property name="TargetObject" ref="importService"/>
<property name="TargetMethod" value="DoImport"/>
@@ -38,8 +38,8 @@
<property name="RepeatCount" value="1"/>
</object>
<object id="exportService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz20.Tests"/>
<object id="exportService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz21.Tests"/>
<object id="importService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz20.Tests"/>
<object id="importService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz21.Tests"/>
</objects>

4
test/Spring/Spring.Scheduling.Quartz20.Tests/multipleSchedulers.xml → test/Spring/Spring.Scheduling.Quartz21.Tests/multipleSchedulers.xml
View File

@@ -5,11 +5,11 @@
xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
<object id="scheduler1" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz20">
<object id="scheduler1" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz21">
<property name="SchedulerName" value="quartz1"/>
</object>
<object id="scheduler2" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz20">
<object id="scheduler2" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz21">
<property name="SchedulerName" value="quartz2"/>
</object>

16
test/Spring/Spring.Scheduling.Quartz20.Tests/schedulerAccessorObject.xml → test/Spring/Spring.Scheduling.Quartz21.Tests/schedulerAccessorObject.xml
View File

@@ -5,9 +5,9 @@
xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
<object id="scheduler" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz20"/>
<object id="scheduler" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz21"/>
<object type="Spring.Scheduling.Quartz.SchedulerAccessorObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.SchedulerAccessorObject, Spring.Scheduling.Quartz21">
<property name="Scheduler" ref="scheduler"/>
<property name="Triggers">
<list>
@@ -18,9 +18,9 @@
</property>
</object>
<object id="exportTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="exportTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<property name="JobDetail">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz21">
<property name="TargetObject" ref="exportService"/>
<property name="TargetMethod" value="DoExport"/>
</object>
@@ -29,10 +29,10 @@
<property name="RepeatCount" value="1"/>
</object>
<object id="importTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="importTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<property name="jobDetail">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz21">
<property name="TargetObject" ref="importService"/>
<property name="TargetMethod" value="DoImport"/>
</object>
@@ -41,8 +41,8 @@
<property name="RepeatCount" value="1"/>
</object>
<object id="exportService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz20.Tests"/>
<object id="exportService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz21.Tests"/>
<object id="importService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz20.Tests"/>
<object id="importService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz21.Tests"/>
</objects>

16
test/Spring/Spring.Scheduling.Quartz20.Tests/schedulerRepositoryExposure.xml → test/Spring/Spring.Scheduling.Quartz21.Tests/schedulerRepositoryExposure.xml
View File

@@ -5,12 +5,12 @@
xsi:schemaLocation="http://www.springframework.net http://www.springframework.net/xsd/spring-objects.xsd">
<object id="scheduler" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz20">
<object id="scheduler" type="Spring.Scheduling.Quartz.SchedulerFactoryObject, Spring.Scheduling.Quartz21">
<property name="schedulerName" value="myScheduler"/>
<property name="exposeSchedulerInRepository" value="true"/>
</object>
<object type="Spring.Scheduling.Quartz.SchedulerAccessorObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.SchedulerAccessorObject, Spring.Scheduling.Quartz21">
<property name="schedulerName" value="myScheduler"/>
<property name="triggers">
@@ -21,10 +21,10 @@
</property>
</object>
<object id="exportTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="exportTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<property name="JobDetail">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz21">
<property name="TargetObject" ref="exportService"/>
<property name="TargetMethod" value="DoExport"/>
</object>
@@ -33,9 +33,9 @@
<property name="RepeatCount" value="1"/>
</object>
<object id="importTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz20">
<object id="importTrigger" type="Spring.Scheduling.Quartz.SimpleTriggerObject, Spring.Scheduling.Quartz21">
<property name="jobDetail">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz20">
<object type="Spring.Scheduling.Quartz.MethodInvokingJobDetailFactoryObject, Spring.Scheduling.Quartz21">
<property name="TargetObject" ref="importService"/>
<property name="TargetMethod" value="DoImport"/>
</object>
@@ -45,8 +45,8 @@
<property name="RepeatCount" value="1"/>
</object>
<object id="exportService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz20.Tests"/>
<object id="exportService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz21.Tests"/>
<object id="importService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz20.Tests"/>
<object id="importService" type="Spring.Scheduling.Quartz.QuartzTestObject, Spring.Scheduling.Quartz21.Tests"/>
</objects>