mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Step 2 in renaming Orchard.Scripting to Orchard.Scripting.Dlr
--HG-- branch : dev rename : src/Orchard.Tests.Modules/Scripting/ScriptingTests.cs => src/Orchard.Tests.Modules/Scripting.Dlr/ScriptingTests.cs rename : src/Orchard.Tests.Modules/SimpleScripting/EvaluatorTests.cs => src/Orchard.Tests.Modules/Scripting/EvaluatorTests.cs rename : src/Orchard.Tests.Modules/SimpleScripting/ParserTests.cs => src/Orchard.Tests.Modules/Scripting/ParserTests.cs rename : src/Orchard.Tests.Modules/SimpleScripting/SimpleScriptingTests.cs => src/Orchard.Tests.Modules/Scripting/SimpleScriptingTests.cs rename : src/Orchard.Tests.Modules/SimpleScripting/TokenizerTests.cs => src/Orchard.Tests.Modules/Scripting/TokenizerTests.cs rename : src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.csproj => src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj
This commit is contained in:
@@ -135,10 +135,10 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="CodeGeneration\Commands\CodeGenerationCommandsTests.cs" />
|
||||
<Compile Include="SimpleScripting\EvaluatorTests.cs" />
|
||||
<Compile Include="SimpleScripting\ParserTests.cs" />
|
||||
<Compile Include="SimpleScripting\TokenizerTests.cs" />
|
||||
<Compile Include="SimpleScripting\SimpleScriptingTests.cs" />
|
||||
<Compile Include="Scripting\EvaluatorTests.cs" />
|
||||
<Compile Include="Scripting\ParserTests.cs" />
|
||||
<Compile Include="Scripting\TokenizerTests.cs" />
|
||||
<Compile Include="Scripting\SimpleScriptingTests.cs" />
|
||||
<Compile Include="DatabaseEnabledTestsBase.cs" />
|
||||
<Compile Include="Media\Extensions\LongExtensionsTests.cs" />
|
||||
<EmbeddedResource Include="Packaging\HelloDriver.cs.txt" />
|
||||
@@ -148,7 +148,7 @@
|
||||
<Compile Include="Roles\Controllers\AdminControllerTests.cs" />
|
||||
<Compile Include="Roles\Services\RoleServiceTests.cs" />
|
||||
<Compile Include="Migrations\SchemaCommandGeneratorTests.cs" />
|
||||
<Compile Include="Scripting\ScriptingTests.cs" />
|
||||
<Compile Include="Scripting.Dlr\ScriptingTests.cs" />
|
||||
<Compile Include="Settings\Blueprint\ShellDescriptorManagerTests.cs" />
|
||||
<Compile Include="Tags\Services\TagsServiceTests.cs" />
|
||||
<Compile Include="Themes\Services\ThemeServiceTests.cs" />
|
||||
@@ -196,9 +196,9 @@
|
||||
<Project>{D10AD48F-407D-4DB5-A328-173EC7CB010F}</Project>
|
||||
<Name>Orchard.Roles</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Orchard.Web\Modules\Orchard.Scripting\Orchard.Scripting.csproj">
|
||||
<ProjectReference Include="..\Orchard.Web\Modules\Orchard.Scripting.Dlr\Orchard.Scripting.Dlr.csproj">
|
||||
<Project>{2AD6973D-C7BB-416E-89FE-EEE34664E05F}</Project>
|
||||
<Name>Orchard.Scripting</Name>
|
||||
<Name>Orchard.Scripting.Dlr</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Orchard.Web\Modules\Orchard.Setup\Orchard.Setup.csproj">
|
||||
<Project>{8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4}</Project>
|
||||
|
@@ -5,10 +5,10 @@ using System.IO;
|
||||
using Autofac;
|
||||
using ClaySharp;
|
||||
using NUnit.Framework;
|
||||
using Orchard.Scripting.Services;
|
||||
using Orchard.Scripting.Dlr.Services;
|
||||
using Path = Bleroy.FluentPath.Path;
|
||||
|
||||
namespace Orchard.Tests.Modules.Scripting {
|
||||
namespace Orchard.Tests.Modules.Scripting.Dlr {
|
||||
[TestFixture]
|
||||
public class ScriptingTests {
|
||||
private IContainer _container;
|
@@ -5,7 +5,7 @@ using System.Linq;
|
||||
using NUnit.Framework;
|
||||
using Orchard.Widgets.SimpleScripting.Compiler;
|
||||
|
||||
namespace Orchard.Tests.Modules.SimpleScripting {
|
||||
namespace Orchard.Tests.Modules.Scripting {
|
||||
[TestFixture]
|
||||
public class EvaluatorTests {
|
||||
[Test]
|
@@ -4,7 +4,7 @@ using NUnit.Framework;
|
||||
using Orchard.Widgets.SimpleScripting.Ast;
|
||||
using Orchard.Widgets.SimpleScripting.Compiler;
|
||||
|
||||
namespace Orchard.Tests.Modules.SimpleScripting {
|
||||
namespace Orchard.Tests.Modules.Scripting {
|
||||
[TestFixture]
|
||||
public class ParserTests {
|
||||
[Test]
|
@@ -4,7 +4,7 @@ using Orchard.Tests.Stubs;
|
||||
using Orchard.Widgets.Services;
|
||||
using Orchard.Widgets.SimpleScripting;
|
||||
|
||||
namespace Orchard.Tests.Modules.SimpleScripting {
|
||||
namespace Orchard.Tests.Modules.Scripting {
|
||||
[TestFixture]
|
||||
public class SimpleScriptingTests {
|
||||
[Test]
|
@@ -1,7 +1,7 @@
|
||||
using NUnit.Framework;
|
||||
using Orchard.Widgets.SimpleScripting.Compiler;
|
||||
|
||||
namespace Orchard.Tests.Modules.SimpleScripting {
|
||||
namespace Orchard.Tests.Modules.Scripting {
|
||||
[TestFixture]
|
||||
public class TokenizerTests {
|
||||
|
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using Autofac;
|
||||
using NUnit.Framework;
|
||||
using Orchard.Scripting.Services;
|
||||
using Orchard.Scripting.Dlr.Services;
|
||||
using Orchard.Caching;
|
||||
using Orchard.Tests.Stubs;
|
||||
using Orchard.Widgets.RuleEngine;
|
||||
|
@@ -1,11 +1,11 @@
|
||||
Name: Scripting
|
||||
Name: DLR Scripting
|
||||
AntiForgery: enabled
|
||||
Author: The Orchard Team
|
||||
Website: http://orchardproject.net
|
||||
Version: 0.8.0
|
||||
OrchardVersion: 0.8.0
|
||||
Description: The scripting module enables the possibility to execute scripts.
|
||||
Description: The DLR scripting module enables the possibility to execute scripts using the DLR.
|
||||
Features:
|
||||
Orchard.Scripting:
|
||||
Description: Scripting support.
|
||||
Orchard.Scripting.Dlr:
|
||||
Description: DLR Scripting support.
|
||||
Category: Scripting
|
@@ -10,8 +10,8 @@
|
||||
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Orchard.Scripting</RootNamespace>
|
||||
<AssemblyName>Orchard.Scripting</AssemblyName>
|
||||
<RootNamespace>Orchard.Scripting.Dlr</RootNamespace>
|
||||
<AssemblyName>Orchard.Scripting.Dlr</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<MvcBuildViews>false</MvcBuildViews>
|
||||
</PropertyGroup>
|
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using Microsoft.Scripting.Hosting;
|
||||
|
||||
namespace Orchard.Scripting.Services {
|
||||
namespace Orchard.Scripting.Dlr.Services {
|
||||
public interface IScriptingManager : IDependency {
|
||||
dynamic GetVariable(string name);
|
||||
void SetVariable(string name, object value);
|
||||
|
@@ -1,6 +1,6 @@
|
||||
using Microsoft.Scripting.Hosting;
|
||||
|
||||
namespace Orchard.Scripting.Services {
|
||||
namespace Orchard.Scripting.Dlr.Services {
|
||||
public interface IScriptingRuntime : ISingletonDependency {
|
||||
ScriptScope CreateScope();
|
||||
dynamic ExecuteExpression(string expression, ScriptScope scope);
|
||||
|
@@ -1,7 +1,7 @@
|
||||
using IronRuby;
|
||||
using Microsoft.Scripting.Hosting;
|
||||
|
||||
namespace Orchard.Scripting.Services {
|
||||
namespace Orchard.Scripting.Dlr.Services {
|
||||
public class RubyScriptingRuntime : IScriptingRuntime {
|
||||
private readonly LanguageSetup _defaultLanguageSetup;
|
||||
private readonly ScriptRuntime _scriptingRuntime;
|
||||
|
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using Microsoft.Scripting.Hosting;
|
||||
|
||||
namespace Orchard.Scripting.Services {
|
||||
namespace Orchard.Scripting.Dlr.Services {
|
||||
public class ScriptingManager : IScriptingManager {
|
||||
private readonly IScriptingRuntime _scriptingRuntime;
|
||||
private readonly Lazy<ScriptScope> _scope;
|
||||
|
@@ -117,9 +117,9 @@
|
||||
<Name>Orchard.Framework</Name>
|
||||
<Private>True</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Orchard.Scripting\Orchard.Scripting.csproj">
|
||||
<ProjectReference Include="..\Orchard.Scripting.Dlr\Orchard.Scripting.Dlr.csproj">
|
||||
<Project>{2AD6973D-C7BB-416E-89FE-EEE34664E05F}</Project>
|
||||
<Name>Orchard.Scripting</Name>
|
||||
<Name>Orchard.Scripting.Dlr</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@@ -1,6 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Orchard.Scripting.Services;
|
||||
using Orchard.Scripting.Dlr.Services;
|
||||
using Orchard.Widgets.Services;
|
||||
using Microsoft.Scripting.Hosting;
|
||||
using Orchard.Caching;
|
||||
|
@@ -98,7 +98,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Messaging", "Orchar
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Localization", "Orchard.Web\Modules\Orchard.Localization\Orchard.Localization.csproj", "{FBC8B571-ED50-49D8-8D9D-64AB7454A0D6}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Scripting", "Orchard.Web\Modules\Orchard.Scripting\Orchard.Scripting.csproj", "{2AD6973D-C7BB-416E-89FE-EEE34664E05F}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Scripting.Dlr", "Orchard.Web\Modules\Orchard.Scripting.Dlr\Orchard.Scripting.Dlr.csproj", "{2AD6973D-C7BB-416E-89FE-EEE34664E05F}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
Reference in New Issue
Block a user