diff --git a/App_Config/Include/Cognifide.PowerShell.config b/App_Config/Include/Cognifide.PowerShell.config index 0a8deb0ae..688ca1129 100644 --- a/App_Config/Include/Cognifide.PowerShell.config +++ b/App_Config/Include/Cognifide.PowerShell.config @@ -38,6 +38,7 @@ + diff --git a/Cognifide.PowerShell.csproj b/Cognifide.PowerShell.csproj index 34b04194c..f6c88a002 100644 --- a/Cognifide.PowerShell.csproj +++ b/Cognifide.PowerShell.csproj @@ -113,9 +113,6 @@ - - RemoteScriptCall.ashx - @@ -129,6 +126,15 @@ + + PowerShellWebService.asmx + + + RemoteAutomation.asmx + + + RemoteScriptCall.ashx + @@ -293,14 +299,6 @@ - - PowerShellWebService.asmx - Component - - - RemoteAutomation.asmx - Component - @@ -336,10 +334,6 @@ - - - - False @@ -358,74 +352,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer @@ -460,15 +473,12 @@ Designer - - Designer - - - Designer - - + + + + diff --git a/Console/Services/web.config b/Console/Services/web.config deleted file mode 100644 index 6625eafa1..000000000 --- a/Console/Services/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Data/serialization/master/sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor.item b/Data/serialization/master/sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor.item deleted file mode 100644 index b50122688..000000000 --- a/Data/serialization/master/sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor.item +++ /dev/null @@ -1,44 +0,0 @@ -----item---- -version: 1 -id: {F38BE702-CE0D-4FDB-9BEC-A873657F140C} -database: master -path: /sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor -parent: {70A7FDA1-EE6A-4DC7-BB42-940FF0003A6A} -name: Content Editor -master: {00000000-0000-0000-0000-000000000000} -template: {AB154D3D-1126-4AB4-AC21-8B86E6BD70EA} -templatekey: PowerShell Script Library - -----version---- -language: en -version: 1 -revision: 3703c852-7800-4d11-90af-bc9d28d3999e - -----field---- -field: {25BED78C-4957-4165-998A-CA1B52F67497} -name: __Created -key: __created -content-length: 16 - -20141225T033442Z -----field---- -field: {8CDC337E-A112-42FB-BBB4-4143751E123F} -name: __Revision -key: __revision -content-length: 36 - -3703c852-7800-4d11-90af-bc9d28d3999e -----field---- -field: {D9CF14B1-FA16-4BA6-9288-E8A174D4D522} -name: __Updated -key: __updated -content-length: 35 - -20141225T033442:635550752826517734Z -----field---- -field: {BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A} -name: __Updated by -key: __updated by -content-length: 14 - -sitecore\admin diff --git a/Data/serialization/master/sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor/Context Menu.item b/Data/serialization/master/sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor/Context Menu.item deleted file mode 100644 index 5166a19a8..000000000 --- a/Data/serialization/master/sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor/Context Menu.item +++ /dev/null @@ -1,44 +0,0 @@ -----item---- -version: 1 -id: {97BCC0B3-A2BD-4302-B11B-658D11F59A08} -database: master -path: /sitecore/system/Modules/PowerShell/Script Library/Test/Content Editor/Context Menu -parent: {F38BE702-CE0D-4FDB-9BEC-A873657F140C} -name: Context Menu -master: {00000000-0000-0000-0000-000000000000} -template: {AB154D3D-1126-4AB4-AC21-8B86E6BD70EA} -templatekey: PowerShell Script Library - -----version---- -language: en -version: 1 -revision: e39ae7cd-25f0-4685-be86-f6f08ca87bd5 - -----field---- -field: {25BED78C-4957-4165-998A-CA1B52F67497} -name: __Created -key: __created -content-length: 16 - -20141225T033442Z -----field---- -field: {8CDC337E-A112-42FB-BBB4-4143751E123F} -name: __Revision -key: __revision -content-length: 36 - -e39ae7cd-25f0-4685-be86-f6f08ca87bd5 -----field---- -field: {D9CF14B1-FA16-4BA6-9288-E8A174D4D522} -name: __Updated -key: __updated -content-length: 35 - -20141225T033442:635550752829349765Z -----field---- -field: {BADD9CF9-53E0-4D0C-BCC0-2D784C282F6A} -name: __Updated by -key: __updated by -content-length: 14 - -sitecore\admin diff --git a/SitecoreIntegrations/Applications/PowerShellIse.cs b/SitecoreIntegrations/Applications/PowerShellIse.cs index e9e7cfe16..c97253f30 100644 --- a/SitecoreIntegrations/Applications/PowerShellIse.cs +++ b/SitecoreIntegrations/Applications/PowerShellIse.cs @@ -451,7 +451,7 @@ protected virtual void JobExecute(ClientPipelineArgs args) string.Format( "
x
" + "
Please wait, {0}
" + - "Working
", + "Working", ExecutionMessages.PleaseWaitMessages[ rnd.Next(ExecutionMessages.PleaseWaitMessages.Length - 1)])); Monitor.Start("ScriptExecution", "UI", progressBoxRunner.Run); diff --git a/SitecoreIntegrations/Processors/RewriteUrl.cs b/SitecoreIntegrations/Processors/RewriteUrl.cs index 9ca611bbc..3cccece2b 100644 --- a/SitecoreIntegrations/Processors/RewriteUrl.cs +++ b/SitecoreIntegrations/Processors/RewriteUrl.cs @@ -40,7 +40,7 @@ public override void Process(PreprocessRequestArgs arguments) string query = url.Query.TrimStart('?'); query += string.Format("{0}script={1}", string.IsNullOrEmpty(query) ? "?" : "&", scriptPath); WebUtil.RewriteUrl( - new UrlString {Path = "/Console/Services/RemoteScriptCall.ashx", Query = query}.ToString()); + new UrlString { Path = "/sitecore modules/PowerShell/Services/RemoteScriptCall.ashx", Query = query }.ToString()); } if (localPath.StartsWith("/-/script/v2")) { @@ -58,7 +58,7 @@ public override void Process(PreprocessRequestArgs arguments) string query = url.Query.TrimStart('?'); query += string.Format("{0}script={1}&sc_database={2}", string.IsNullOrEmpty(query) ? "?" : "&", scriptPath, sourceArray[3]); WebUtil.RewriteUrl( - new UrlString { Path = "/Console/Services/RemoteScriptCall.ashx", Query = query }.ToString()); + new UrlString { Path = "/sitecore modules/PowerShell/Services/RemoteScriptCall.ashx", Query = query }.ToString()); } } catch (Exception exception) diff --git a/Console/Assets/Cognifide.PowerShell.dll-Help.xml b/sitecore modules/PowerShell/Assets/Cognifide.PowerShell.dll-Help.xml similarity index 100% rename from Console/Assets/Cognifide.PowerShell.dll-Help.xml rename to sitecore modules/PowerShell/Assets/Cognifide.PowerShell.dll-Help.xml diff --git a/Console/Assets/Download.png b/sitecore modules/PowerShell/Assets/Download.png similarity index 100% rename from Console/Assets/Download.png rename to sitecore modules/PowerShell/Assets/Download.png diff --git a/Console/Assets/Sitecore.Types.ps1xml b/sitecore modules/PowerShell/Assets/Sitecore.Types.ps1xml similarity index 100% rename from Console/Assets/Sitecore.Types.ps1xml rename to sitecore modules/PowerShell/Assets/Sitecore.Types.ps1xml diff --git a/Console/Assets/Sitecore.Views.ps1xml b/sitecore modules/PowerShell/Assets/Sitecore.Views.ps1xml similarity index 100% rename from Console/Assets/Sitecore.Views.ps1xml rename to sitecore modules/PowerShell/Assets/Sitecore.Views.ps1xml diff --git a/Console/Assets/Splitter.png b/sitecore modules/PowerShell/Assets/Splitter.png similarity index 100% rename from Console/Assets/Splitter.png rename to sitecore modules/PowerShell/Assets/Splitter.png diff --git a/Console/Assets/bg_left.gif b/sitecore modules/PowerShell/Assets/bg_left.gif similarity index 100% rename from Console/Assets/bg_left.gif rename to sitecore modules/PowerShell/Assets/bg_left.gif diff --git a/Console/Assets/bg_middle.gif b/sitecore modules/PowerShell/Assets/bg_middle.gif similarity index 100% rename from Console/Assets/bg_middle.gif rename to sitecore modules/PowerShell/Assets/bg_middle.gif diff --git a/Console/Assets/bg_right.gif b/sitecore modules/PowerShell/Assets/bg_right.gif similarity index 100% rename from Console/Assets/bg_right.gif rename to sitecore modules/PowerShell/Assets/bg_right.gif diff --git a/Console/Assets/checked.png b/sitecore modules/PowerShell/Assets/checked.png similarity index 100% rename from Console/Assets/checked.png rename to sitecore modules/PowerShell/Assets/checked.png diff --git a/Console/Assets/coglogo.png b/sitecore modules/PowerShell/Assets/coglogo.png similarity index 100% rename from Console/Assets/coglogo.png rename to sitecore modules/PowerShell/Assets/coglogo.png diff --git a/Console/Assets/fg_left.gif b/sitecore modules/PowerShell/Assets/fg_left.gif similarity index 100% rename from Console/Assets/fg_left.gif rename to sitecore modules/PowerShell/Assets/fg_left.gif diff --git a/Console/Assets/fg_middle.gif b/sitecore modules/PowerShell/Assets/fg_middle.gif similarity index 100% rename from Console/Assets/fg_middle.gif rename to sitecore modules/PowerShell/Assets/fg_middle.gif diff --git a/Console/Assets/fg_right.gif b/sitecore modules/PowerShell/Assets/fg_right.gif similarity index 100% rename from Console/Assets/fg_right.gif rename to sitecore modules/PowerShell/Assets/fg_right.gif diff --git a/Console/Assets/highlight.png b/sitecore modules/PowerShell/Assets/highlight.png similarity index 100% rename from Console/Assets/highlight.png rename to sitecore modules/PowerShell/Assets/highlight.png diff --git a/Console/Assets/ind-highlight.png b/sitecore modules/PowerShell/Assets/ind-highlight.png similarity index 100% rename from Console/Assets/ind-highlight.png rename to sitecore modules/PowerShell/Assets/ind-highlight.png diff --git a/Console/Assets/info.png b/sitecore modules/PowerShell/Assets/info.png similarity index 100% rename from Console/Assets/info.png rename to sitecore modules/PowerShell/Assets/info.png diff --git a/Console/Assets/question.png b/sitecore modules/PowerShell/Assets/question.png similarity index 100% rename from Console/Assets/question.png rename to sitecore modules/PowerShell/Assets/question.png diff --git a/Console/Assets/refresh.png b/sitecore modules/PowerShell/Assets/refresh.png similarity index 100% rename from Console/Assets/refresh.png rename to sitecore modules/PowerShell/Assets/refresh.png diff --git a/Console/Assets/stewie.png b/sitecore modules/PowerShell/Assets/stewie.png similarity index 100% rename from Console/Assets/stewie.png rename to sitecore modules/PowerShell/Assets/stewie.png diff --git a/Console/Assets/unchecked.png b/sitecore modules/PowerShell/Assets/unchecked.png similarity index 100% rename from Console/Assets/unchecked.png rename to sitecore modules/PowerShell/Assets/unchecked.png diff --git a/Console/Assets/working.gif b/sitecore modules/PowerShell/Assets/working.gif similarity index 100% rename from Console/Assets/working.gif rename to sitecore modules/PowerShell/Assets/working.gif diff --git a/sitecore/shell/Applications/PowerShell/ConfirmChoice.xml b/sitecore modules/PowerShell/Controls/ConfirmChoice.xml similarity index 100% rename from sitecore/shell/Applications/PowerShell/ConfirmChoice.xml rename to sitecore modules/PowerShell/Controls/ConfirmChoice.xml diff --git a/sitecore/shell/Applications/PowerShell/DownloadFile.xml b/sitecore modules/PowerShell/Controls/DownloadFile.xml similarity index 90% rename from sitecore/shell/Applications/PowerShell/DownloadFile.xml rename to sitecore modules/PowerShell/Controls/DownloadFile.xml index 8789b0e05..000dc843b 100644 --- a/sitecore/shell/Applications/PowerShell/DownloadFile.xml +++ b/sitecore modules/PowerShell/Controls/DownloadFile.xml @@ -15,10 +15,10 @@ padding-left: 15px; } - + - + diff --git a/sitecore/shell/Applications/PowerShell/GetStringResponse.xml b/sitecore modules/PowerShell/Controls/GetStringResponse.xml similarity index 100% rename from sitecore/shell/Applications/PowerShell/GetStringResponse.xml rename to sitecore modules/PowerShell/Controls/GetStringResponse.xml diff --git a/sitecore modules/PowerShell/Controls/PowerShellConsole.xml b/sitecore modules/PowerShell/Controls/PowerShellConsole.xml new file mode 100644 index 000000000..d72b71fe3 --- /dev/null +++ b/sitecore modules/PowerShell/Controls/PowerShellConsole.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + No hints found +
+
+ Working +
+ + + \ No newline at end of file diff --git a/sitecore/shell/Applications/PowerShell/PowerShellIse.xml b/sitecore modules/PowerShell/Controls/PowerShellIse.xml similarity index 83% rename from sitecore/shell/Applications/PowerShell/PowerShellIse.xml rename to sitecore modules/PowerShell/Controls/PowerShellIse.xml index 1603e46ce..8743f6779 100644 --- a/sitecore/shell/Applications/PowerShell/PowerShellIse.xml +++ b/sitecore modules/PowerShell/Controls/PowerShellIse.xml @@ -6,11 +6,11 @@ - - - - - + + + + + @@ -24,10 +24,10 @@ - - - - + + + + @@ -80,7 +80,7 @@ Unsaved script. - Show next usability hint... + Show next usability hint... diff --git a/sitecore/shell/Applications/PowerShell/PowerShellMultiValuePrompt.xml b/sitecore modules/PowerShell/Controls/PowerShellMultiValuePrompt.xml similarity index 76% rename from sitecore/shell/Applications/PowerShell/PowerShellMultiValuePrompt.xml rename to sitecore modules/PowerShell/Controls/PowerShellMultiValuePrompt.xml index dd68ee628..799babd59 100644 --- a/sitecore/shell/Applications/PowerShell/PowerShellMultiValuePrompt.xml +++ b/sitecore modules/PowerShell/Controls/PowerShellMultiValuePrompt.xml @@ -3,15 +3,15 @@ - + - - - - + + + + - - + + - + + - - - + + + - + @@ -55,7 +55,7 @@ - Show next usability hint... + Show next usability hint... diff --git a/sitecore/shell/Applications/PowerShell/PowerShellResultViewerText.xml b/sitecore modules/PowerShell/Controls/PowerShellResultViewerText.xml similarity index 89% rename from sitecore/shell/Applications/PowerShell/PowerShellResultViewerText.xml rename to sitecore modules/PowerShell/Controls/PowerShellResultViewerText.xml index b2f255c69..18ba4eb37 100644 --- a/sitecore/shell/Applications/PowerShell/PowerShellResultViewerText.xml +++ b/sitecore modules/PowerShell/Controls/PowerShellResultViewerText.xml @@ -5,8 +5,8 @@ - - + + diff --git a/sitecore/shell/Applications/PowerShell/PowerShellRunner.xml b/sitecore modules/PowerShell/Controls/PowerShellRunner.xml similarity index 79% rename from sitecore/shell/Applications/PowerShell/PowerShellRunner.xml rename to sitecore modules/PowerShell/Controls/PowerShellRunner.xml index 328e5415e..c0f8243c2 100644 --- a/sitecore/shell/Applications/PowerShell/PowerShellRunner.xml +++ b/sitecore modules/PowerShell/Controls/PowerShellRunner.xml @@ -3,16 +3,16 @@ - + - - - - - + + + + + - - + + @@ -50,7 +50,7 @@
- Show copyright... + Show copyright... View Script Results View Script Results (there were errors) diff --git a/sitecore/shell/Applications/PowerShell/PowerShellScriptBrowser.xml b/sitecore modules/PowerShell/Controls/PowerShellScriptBrowser.xml similarity index 100% rename from sitecore/shell/Applications/PowerShell/PowerShellScriptBrowser.xml rename to sitecore modules/PowerShell/Controls/PowerShellScriptBrowser.xml diff --git a/sitecore/shell/Override/Controls/Splitters/HSplitter.xml b/sitecore modules/PowerShell/Controls/PsHSplitter.xml similarity index 60% rename from sitecore/shell/Override/Controls/Splitters/HSplitter.xml rename to sitecore modules/PowerShell/Controls/PsHSplitter.xml index 7a47858f4..f1043f800 100644 --- a/sitecore/shell/Override/Controls/Splitters/HSplitter.xml +++ b/sitecore modules/PowerShell/Controls/PsHSplitter.xml @@ -1,9 +1,9 @@ - + - - - - - - - - - No hints found -
-
- Working -
- - - \ No newline at end of file