wip

danielgerlag · Jul 14, 2019 · 7cbf3bc · 7cbf3bc
1 parent b0ffdc1
commit 7cbf3bc
Show file tree

Hide file tree

Showing 62 changed files with 13 additions and 13 deletions.
diff --git a/Conductor.sln b/Conductor.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28922.388
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor", "Conductor\Conductor.csproj", "{BC743A97-4ACF-4189-96B7-02FD9B140841}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor", "src\Conductor\Conductor.csproj", "{BC743A97-4ACF-4189-96B7-02FD9B140841}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Domain", "Conductor.Domain\Conductor.Domain.csproj", "{17322103-FD01-472B-A33E-4A955460351B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Domain", "src\Conductor.Domain\Conductor.Domain.csproj", "{17322103-FD01-472B-A33E-4A955460351B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Storage", "Conductor.Storage\Conductor.Storage.csproj", "{1010AB76-79FD-42FE-9F59-166323E9BDBD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Storage", "src\Conductor.Storage\Conductor.Storage.csproj", "{1010AB76-79FD-42FE-9F59-166323E9BDBD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Steps", "Conductor.Steps\Conductor.Steps.csproj", "{C9DA979C-9D97-4D8B-B297-C0DEC68C9490}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Steps", "src\Conductor.Steps\Conductor.Steps.csproj", "{C9DA979C-9D97-4D8B-B297-C0DEC68C9490}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3E1C72D-C63A-4A85-AAC1-AF7C1F072907}"
 	ProjectSection(SolutionItems) = preProject
@@ -24,7 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.IntegrationTests"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScratchPad", "tests\ScratchPad\ScratchPad.csproj", "{45D807EA-1D48-4356-9BA2-E93C6A791F3C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Domain.Scripting", "Conductor.Domain.Scripting\Conductor.Domain.Scripting.csproj", "{8DD6BFDB-3050-4E99-953F-B4B6B4667199}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conductor.Domain.Scripting", "src\Conductor.Domain.Scripting\Conductor.Domain.Scripting.csproj", "{8DD6BFDB-3050-4E99-953F-B4B6B4667199}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Dockerfile b/Dockerfile
@@ -6,11 +6,11 @@ EXPOSE 443
 
 FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /src
-COPY ["Conductor/Conductor.csproj", "Conductor/"]
-COPY ["Conductor.Steps/Conductor.Steps.csproj", "Conductor.Steps/"]
-COPY ["Conductor.Domain/Conductor.Domain.csproj", "Conductor.Domain/"]
-COPY ["Conductor.Domain.Scripting/Conductor.Domain.Scripting.csproj", "Conductor.Domain.Scripting/"]
-COPY ["Conductor.Storage/Conductor.Storage.csproj", "Conductor.Storage/"]
+COPY ["src/Conductor/Conductor.csproj", "Conductor/"]
+COPY ["src/Conductor.Steps/Conductor.Steps.csproj", "Conductor.Steps/"]
+COPY ["src/Conductor.Domain/Conductor.Domain.csproj", "Conductor.Domain/"]
+COPY ["src/Conductor.Domain.Scripting/Conductor.Domain.Scripting.csproj", "Conductor.Domain.Scripting/"]
+COPY ["src/Conductor.Storage/Conductor.Storage.csproj", "Conductor.Storage/"]
 RUN dotnet restore "Conductor/Conductor.csproj"
 COPY . .
 WORKDIR "/src/Conductor"

diff --git a/Conductor.Domain.Scripting/.gitignore → src/Conductor.Domain.Scripting/.gitignore b/Conductor.Domain.Scripting/.gitignore → src/Conductor.Domain.Scripting/.gitignore
diff --git a/...ripting/Conductor.Domain.Scripting.csproj → ...ripting/Conductor.Domain.Scripting.csproj b/...ripting/Conductor.Domain.Scripting.csproj → ...ripting/Conductor.Domain.Scripting.csproj
diff --git a/....Domain.Scripting/IScriptEngineFactory.cs → ....Domain.Scripting/IScriptEngineFactory.cs b/....Domain.Scripting/IScriptEngineFactory.cs → ....Domain.Scripting/IScriptEngineFactory.cs
diff --git a/...r.Domain.Scripting/ScriptEngineFactory.cs → ...r.Domain.Scripting/ScriptEngineFactory.cs b/...r.Domain.Scripting/ScriptEngineFactory.cs → ...r.Domain.Scripting/ScriptEngineFactory.cs
diff --git a/...ctor.Domain.Scripting/ScriptEngineHost.cs → ...ctor.Domain.Scripting/ScriptEngineHost.cs b/...ctor.Domain.Scripting/ScriptEngineHost.cs → ...ctor.Domain.Scripting/ScriptEngineHost.cs
diff --git a/....Scripting/ServiceCollectionExtensions.cs → ....Scripting/ServiceCollectionExtensions.cs b/....Scripting/ServiceCollectionExtensions.cs → ....Scripting/ServiceCollectionExtensions.cs
diff --git a/Conductor.Domain/.gitignore → src/Conductor.Domain/.gitignore b/Conductor.Domain/.gitignore → src/Conductor.Domain/.gitignore
diff --git a/Conductor.Domain/Conductor.Domain.csproj → src/Conductor.Domain/Conductor.Domain.csproj b/Conductor.Domain/Conductor.Domain.csproj → src/Conductor.Domain/Conductor.Domain.csproj
diff --git a/...or.Domain/Interfaces/IClusterBackplane.cs → ...or.Domain/Interfaces/IClusterBackplane.cs b/...or.Domain/Interfaces/IClusterBackplane.cs → ...or.Domain/Interfaces/IClusterBackplane.cs
diff --git a/...omain/Interfaces/IDefinitionRepository.cs → ...omain/Interfaces/IDefinitionRepository.cs b/...omain/Interfaces/IDefinitionRepository.cs → ...omain/Interfaces/IDefinitionRepository.cs
diff --git a/...r.Domain/Interfaces/IDefinitionService.cs → ...r.Domain/Interfaces/IDefinitionService.cs b/...r.Domain/Interfaces/IDefinitionService.cs → ...r.Domain/Interfaces/IDefinitionService.cs
diff --git a/...uctor.Domain/Interfaces/ILambdaService.cs → ...uctor.Domain/Interfaces/ILambdaService.cs b/...uctor.Domain/Interfaces/ILambdaService.cs → ...uctor.Domain/Interfaces/ILambdaService.cs
diff --git a/....Domain/Interfaces/IResourceRepository.cs → ....Domain/Interfaces/IResourceRepository.cs b/....Domain/Interfaces/IResourceRepository.cs → ....Domain/Interfaces/IResourceRepository.cs
diff --git a/...or.Domain/Interfaces/IScriptEngineHost.cs → ...or.Domain/Interfaces/IScriptEngineHost.cs b/...or.Domain/Interfaces/IScriptEngineHost.cs → ...or.Domain/Interfaces/IScriptEngineHost.cs
diff --git a/...ctor.Domain/Interfaces/IWorkflowLoader.cs → ...ctor.Domain/Interfaces/IWorkflowLoader.cs b/...ctor.Domain/Interfaces/IWorkflowLoader.cs → ...ctor.Domain/Interfaces/IWorkflowLoader.cs
diff --git a/Conductor.Domain/Models/Definition.cs → src/Conductor.Domain/Models/Definition.cs b/Conductor.Domain/Models/Definition.cs → src/Conductor.Domain/Models/Definition.cs
diff --git a/Conductor.Domain/Models/Resource.cs → src/Conductor.Domain/Models/Resource.cs b/Conductor.Domain/Models/Resource.cs → src/Conductor.Domain/Models/Resource.cs
diff --git a/Conductor.Domain/Models/Step.cs → src/Conductor.Domain/Models/Step.cs b/Conductor.Domain/Models/Step.cs → src/Conductor.Domain/Models/Step.cs
diff --git a/...tor.Domain/ServiceCollectionExtensions.cs → ...tor.Domain/ServiceCollectionExtensions.cs b/...tor.Domain/ServiceCollectionExtensions.cs → ...tor.Domain/ServiceCollectionExtensions.cs
diff --git a/...ctor.Domain/Services/ConductorRegistry.cs → ...ctor.Domain/Services/ConductorRegistry.cs b/...ctor.Domain/Services/ConductorRegistry.cs → ...ctor.Domain/Services/ConductorRegistry.cs
diff --git a/...ctor.Domain/Services/DefinitionService.cs → ...ctor.Domain/Services/DefinitionService.cs b/...ctor.Domain/Services/DefinitionService.cs → ...ctor.Domain/Services/DefinitionService.cs
diff --git a/Conductor.Domain/Services/LambdaService.cs → ...onductor.Domain/Services/LambdaService.cs b/Conductor.Domain/Services/LambdaService.cs → ...onductor.Domain/Services/LambdaService.cs
diff --git a/Conductor.Domain/Services/LocalBackplane.cs → ...nductor.Domain/Services/LocalBackplane.cs b/Conductor.Domain/Services/LocalBackplane.cs → ...nductor.Domain/Services/LocalBackplane.cs
diff --git a/Conductor.Domain/Services/RedisBackplane.cs → ...nductor.Domain/Services/RedisBackplane.cs b/Conductor.Domain/Services/RedisBackplane.cs → ...nductor.Domain/Services/RedisBackplane.cs
diff --git a/Conductor.Domain/Services/WorkflowLoader.cs → ...nductor.Domain/Services/WorkflowLoader.cs b/Conductor.Domain/Services/WorkflowLoader.cs → ...nductor.Domain/Services/WorkflowLoader.cs
diff --git a/Conductor.Steps/.gitignore → src/Conductor.Steps/.gitignore b/Conductor.Steps/.gitignore → src/Conductor.Steps/.gitignore
diff --git a/Conductor.Steps/Add.cs → src/Conductor.Steps/Add.cs b/Conductor.Steps/Add.cs → src/Conductor.Steps/Add.cs
diff --git a/Conductor.Steps/Conductor.Steps.csproj → src/Conductor.Steps/Conductor.Steps.csproj b/Conductor.Steps/Conductor.Steps.csproj → src/Conductor.Steps/Conductor.Steps.csproj
diff --git a/Conductor.Steps/EmitLog.cs → src/Conductor.Steps/EmitLog.cs b/Conductor.Steps/EmitLog.cs → src/Conductor.Steps/EmitLog.cs
diff --git a/Conductor.Steps/HttpRequest.cs → src/Conductor.Steps/HttpRequest.cs b/Conductor.Steps/HttpRequest.cs → src/Conductor.Steps/HttpRequest.cs
diff --git a/Conductor.Steps/Lambda.cs → src/Conductor.Steps/Lambda.cs b/Conductor.Steps/Lambda.cs → src/Conductor.Steps/Lambda.cs
diff --git a/...ctor.Steps/ServiceCollectionExtensions.cs → ...ctor.Steps/ServiceCollectionExtensions.cs b/...ctor.Steps/ServiceCollectionExtensions.cs → ...ctor.Steps/ServiceCollectionExtensions.cs
diff --git a/Conductor.Storage/.gitignore → src/Conductor.Storage/.gitignore b/Conductor.Storage/.gitignore → src/Conductor.Storage/.gitignore
diff --git a/Conductor.Storage/Conductor.Storage.csproj → ...onductor.Storage/Conductor.Storage.csproj b/Conductor.Storage/Conductor.Storage.csproj → ...onductor.Storage/Conductor.Storage.csproj
diff --git a/Conductor.Storage/Models/StoredDefinition.cs → ...ductor.Storage/Models/StoredDefinition.cs b/Conductor.Storage/Models/StoredDefinition.cs → ...ductor.Storage/Models/StoredDefinition.cs
diff --git a/Conductor.Storage/Models/StoredResource.cs → ...onductor.Storage/Models/StoredResource.cs b/Conductor.Storage/Models/StoredResource.cs → ...onductor.Storage/Models/StoredResource.cs
diff --git a/...or.Storage/ServiceCollectionExtensions.cs → ...or.Storage/ServiceCollectionExtensions.cs b/...or.Storage/ServiceCollectionExtensions.cs → ...or.Storage/ServiceCollectionExtensions.cs
diff --git a/....Storage/Services/DataObjectSerializer.cs → ....Storage/Services/DataObjectSerializer.cs b/....Storage/Services/DataObjectSerializer.cs → ....Storage/Services/DataObjectSerializer.cs
diff --git a/....Storage/Services/DefinitionRepository.cs → ....Storage/Services/DefinitionRepository.cs b/....Storage/Services/DefinitionRepository.cs → ....Storage/Services/DefinitionRepository.cs
diff --git a/...or.Storage/Services/ResourceRepository.cs → ...or.Storage/Services/ResourceRepository.cs b/...or.Storage/Services/ResourceRepository.cs → ...or.Storage/Services/ResourceRepository.cs
diff --git a/...e/Services/WorkflowPersistenceProvider.cs → ...e/Services/WorkflowPersistenceProvider.cs b/...e/Services/WorkflowPersistenceProvider.cs → ...e/Services/WorkflowPersistenceProvider.cs
diff --git a/Conductor/.gitignore → src/Conductor/.gitignore b/Conductor/.gitignore → src/Conductor/.gitignore
diff --git a/Conductor/Conductor.csproj → src/Conductor/Conductor.csproj b/Conductor/Conductor.csproj → src/Conductor/Conductor.csproj
diff --git a/Conductor/Conductor.csproj.user → src/Conductor/Conductor.csproj.user b/Conductor/Conductor.csproj.user → src/Conductor/Conductor.csproj.user
diff --git a/...uctor/Controllers/DefinitionController.cs → ...uctor/Controllers/DefinitionController.cs b/...uctor/Controllers/DefinitionController.cs → ...uctor/Controllers/DefinitionController.cs
diff --git a/Conductor/Controllers/EventController.cs → src/Conductor/Controllers/EventController.cs b/Conductor/Controllers/EventController.cs → src/Conductor/Controllers/EventController.cs
diff --git a/Conductor/Controllers/InfoController.cs → src/Conductor/Controllers/InfoController.cs b/Conductor/Controllers/InfoController.cs → src/Conductor/Controllers/InfoController.cs
diff --git a/Conductor/Controllers/LambdaController.cs → ...Conductor/Controllers/LambdaController.cs b/Conductor/Controllers/LambdaController.cs → ...Conductor/Controllers/LambdaController.cs
diff --git a/Conductor/Controllers/WorkflowController.cs → ...nductor/Controllers/WorkflowController.cs b/Conductor/Controllers/WorkflowController.cs → ...nductor/Controllers/WorkflowController.cs
diff --git a/...rmatters/YamlRequestBodyInputFormatter.cs → ...rmatters/YamlRequestBodyInputFormatter.cs b/...rmatters/YamlRequestBodyInputFormatter.cs → ...rmatters/YamlRequestBodyInputFormatter.cs
diff --git a/...matters/YamlRequestBodyOutputFormatter.cs → ...matters/YamlRequestBodyOutputFormatter.cs b/...matters/YamlRequestBodyOutputFormatter.cs → ...matters/YamlRequestBodyOutputFormatter.cs
diff --git a/Conductor/Mappings/APIProfile.cs → src/Conductor/Mappings/APIProfile.cs b/Conductor/Mappings/APIProfile.cs → src/Conductor/Mappings/APIProfile.cs
diff --git a/Conductor/Models/DiagnosticInfo.cs → src/Conductor/Models/DiagnosticInfo.cs b/Conductor/Models/DiagnosticInfo.cs → src/Conductor/Models/DiagnosticInfo.cs
diff --git a/Conductor/Models/WorkflowInstance.cs → src/Conductor/Models/WorkflowInstance.cs b/Conductor/Models/WorkflowInstance.cs → src/Conductor/Models/WorkflowInstance.cs
diff --git a/Conductor/Program.cs → src/Conductor/Program.cs b/Conductor/Program.cs → src/Conductor/Program.cs
diff --git a/Conductor/Properties/launchSettings.json → src/Conductor/Properties/launchSettings.json b/Conductor/Properties/launchSettings.json → src/Conductor/Properties/launchSettings.json
diff --git a/Conductor/Startup.cs → src/Conductor/Startup.cs b/Conductor/Startup.cs → src/Conductor/Startup.cs
diff --git a/Conductor/appsettings.Development.json → src/Conductor/appsettings.Development.json b/Conductor/appsettings.Development.json → src/Conductor/appsettings.Development.json
diff --git a/Conductor/appsettings.json → src/Conductor/appsettings.json b/Conductor/appsettings.json → src/Conductor/appsettings.json
diff --git a/tests/Conductor.IntegrationTests/Conductor.IntegrationTests.csproj b/tests/Conductor.IntegrationTests/Conductor.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -16,8 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Conductor.Domain\Conductor.Domain.csproj" />
-    <ProjectReference Include="..\..\Conductor\Conductor.csproj" />
+    <ProjectReference Include="..\..\src\Conductor.Domain\Conductor.Domain.csproj" />
+    <ProjectReference Include="..\..\src\Conductor\Conductor.csproj" />
   </ItemGroup>
 
   <ItemGroup>