You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/13 06:59:00 UTC
[groovy] branch master updated (5871a71 -> 647f07d)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 5871a71 GROOVY-8647: Split package renaming (groovy-nio)
new 496030a Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - rename source-file to temp
new 150cd9e Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - rename file to target-name
new 8fd5e92 Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - resolve conflict and keep both files
new 4b288ca Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - restore name of source-file
new bb75980 Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - rename source-file to temp
new d5b8318 Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - rename file to target-name
new 5d38041 Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - resolve conflict and keep both files
new 4293481 Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - restore name of source-file
new 647f07d GROOVY-8647: Split package renaming (groovy-groovysh)
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/bin/groovysh | 2 +-
src/bin/groovysh.bat | 2 +-
.../groovy/groovysh}/AnsiDetector.groovy | 2 +-
.../groovy/groovysh}/BufferManager.groovy | 2 +-
.../groovy/groovysh}/Command.groovy | 2 +-
.../groovy/groovysh}/CommandAlias.groovy | 3 +-
.../groovy/groovysh}/CommandException.groovy | 2 +-
.../groovy/groovysh}/CommandRegistry.groovy | 2 +-
.../groovy/groovysh}/CommandSupport.groovy | 5 +-
.../groovy/groovysh}/ComplexCommandSupport.groovy | 6 +-
.../groovy/groovysh}/ExitNotification.groovy | 2 +-
.../groovy/groovysh}/Groovysh.groovy | 19 +--
.../groovy/groovysh}/InteractiveShellRunner.groovy | 44 +++---
.../groovy/groovysh}/Interpreter.groovy | 2 +-
.../shell => apache/groovy/groovysh}/Main.groovy | 5 +-
.../shell => apache/groovy/groovysh}/Parser.groovy | 2 +-
.../shell => apache/groovy/groovysh}/Shell.groovy | 5 +-
.../groovy/groovysh}/ShellRunner.groovy | 2 +-
.../groovy/groovysh}/commands/AliasCommand.groovy | 12 +-
.../groovy/groovysh}/commands/ClearCommand.groovy | 10 +-
.../groovysh}/commands/DisplayCommand.groovy | 13 +-
.../groovy/groovysh}/commands/DocCommand.groovy | 18 +--
.../groovy/groovysh}/commands/EditCommand.groovy | 6 +-
.../groovy/groovysh}/commands/ExitCommand.groovy | 12 +-
.../groovy/groovysh}/commands/GrabCommand.groovy | 8 +-
.../groovy/groovysh}/commands/HelpCommand.groovy | 14 +-
.../groovysh}/commands/HistoryCommand.groovy | 18 +--
.../groovy/groovysh}/commands/ImportCommand.groovy | 44 +++---
.../groovysh}/commands/InspectCommand.groovy | 24 ++-
.../groovy/groovysh}/commands/LoadCommand.groovy | 8 +-
.../groovy/groovysh}/commands/PurgeCommand.groovy | 10 +-
.../groovy/groovysh}/commands/RecordCommand.groovy | 10 +-
.../groovysh}/commands/RegisterCommand.groovy | 16 +-
.../groovy/groovysh}/commands/SaveCommand.groovy | 10 +-
.../groovy/groovysh}/commands/SetCommand.groovy | 21 ++-
.../groovy/groovysh}/commands/ShadowCommand.groovy | 10 +-
.../groovy/groovysh}/commands/ShowCommand.groovy | 24 ++-
.../completion/BackslashEscapeCompleter.groovy | 2 +-
.../completion/CommandNameCompleter.groovy | 12 +-
.../completion/CustomClassSyntaxCompleter.groovy} | 10 +-
.../groovysh}/completion/FileNameCompleter.groovy | 2 +-
.../completion/GroovySyntaxCompleter.groovy} | 72 ++++-----
.../completion/IdentifierCompleter.groovy} | 6 +-
.../completion/ImportsSyntaxCompleter.groovy} | 20 +--
.../completion/InfixKeywordSyntaxCompleter.groovy} | 6 +-
.../completion/KeywordSyntaxCompleter.groovy} | 6 +-
.../completion/NavigablePropertiesCompleter.groovy | 2 +-
.../completion/ReflectionCompleter.groovy} | 163 +++++++--------------
.../ReflectionCompletionCandidate.groovy | 2 +-
.../completion/StricterArgumentCompleter.groovy | 2 +-
.../completion/VariableSyntaxCompleter.groovy} | 12 +-
.../shell => apache/groovy/groovysh}/package.html | 0
.../groovysh}/util/CommandArgumentParser.groovy | 2 +-
.../groovysh}/util/CurlyCountingGroovyLexer.groovy | 2 +-
.../groovysh}/util/DefaultCommandsRegistrar.groovy | 47 +++---
.../groovysh}/util/NoExitSecurityManager.groovy | 14 +-
.../groovy/groovysh}/util/PackageHelper.groovy | 2 +-
.../groovy/groovysh}/util/PackageHelperImpl.groovy | 4 +-
.../groovysh}/util/ScriptVariableAnalyzer.groovy | 2 +-
.../groovy/groovysh/util/SimpleCompleter.groovy} | 12 +-
.../groovysh}/util/WrappedInputStream.groovy | 2 +-
.../groovysh}/util/XmlCommandRegistrar.groovy | 16 +-
.../groovy/groovysh}/util/package.html | 0
.../groovy/tools/shell/AnsiDetector.groovy | 1 +
.../groovy/tools/shell/BufferManager.groovy | 1 +
.../org/codehaus/groovy/tools/shell/Command.groovy | 1 +
.../groovy/tools/shell/CommandAlias.groovy | 1 +
.../groovy/tools/shell/CommandException.groovy | 1 +
.../groovy/tools/shell/CommandRegistry.groovy | 1 +
.../groovy/tools/shell/CommandSupport.groovy | 1 +
.../tools/shell/ComplexCommandSupport.groovy | 1 +
.../groovy/tools/shell/ExitNotification.groovy | 1 +
.../codehaus/groovy/tools/shell/Groovysh.groovy | 1 +
.../tools/shell/InteractiveShellRunner.groovy | 2 +
.../codehaus/groovy/tools/shell/Interpreter.groovy | 2 +
.../org/codehaus/groovy/tools/shell/Main.groovy | 1 +
.../org/codehaus/groovy/tools/shell/Parser.groovy | 2 +
.../org/codehaus/groovy/tools/shell/Shell.groovy | 1 +
.../codehaus/groovy/tools/shell/ShellRunner.groovy | 1 +
.../tools/shell/commands/AliasCommand.groovy | 1 +
.../tools/shell/commands/ClearCommand.groovy | 1 +
.../tools/shell/commands/DisplayCommand.groovy | 1 +
.../groovy/tools/shell/commands/DocCommand.groovy | 1 +
.../groovy/tools/shell/commands/EditCommand.groovy | 1 +
.../groovy/tools/shell/commands/ExitCommand.groovy | 1 +
.../groovy/tools/shell/commands/GrabCommand.groovy | 1 +
.../groovy/tools/shell/commands/HelpCommand.groovy | 1 +
.../tools/shell/commands/HistoryCommand.groovy | 1 +
.../tools/shell/commands/ImportCommand.groovy | 1 +
.../tools/shell/commands/InspectCommand.groovy | 1 +
.../groovy/tools/shell/commands/LoadCommand.groovy | 1 +
.../tools/shell/commands/PurgeCommand.groovy | 1 +
.../tools/shell/commands/RecordCommand.groovy | 1 +
.../tools/shell/commands/RegisterCommand.groovy | 1 +
.../groovy/tools/shell/commands/SaveCommand.groovy | 1 +
.../groovy/tools/shell/commands/SetCommand.groovy | 1 +
.../tools/shell/commands/ShadowCommand.groovy | 1 +
.../groovy/tools/shell/commands/ShowCommand.groovy | 1 +
.../completion/BackslashEscapeCompleter.groovy | 1 +
.../shell/completion/CommandNameCompleter.groovy | 1 +
.../completion/CustomClassSyntaxCompletor.groovy | 1 +
.../shell/completion/FileNameCompleter.groovy | 1 +
.../shell/completion/GroovySyntaxCompletor.groovy | 1 +
.../shell/completion/IdentifierCompletor.groovy | 1 +
.../shell/completion/ImportsSyntaxCompletor.groovy | 1 +
.../completion/InfixKeywordSyntaxCompletor.groovy | 1 +
.../shell/completion/KeywordSyntaxCompletor.groovy | 1 +
.../completion/NavigablePropertiesCompleter.groovy | 1 +
.../ReflectionCompletionCandidate.groovy | 1 +
.../shell/completion/ReflectionCompletor.groovy | 1 +
.../completion/StricterArgumentCompleter.groovy | 1 +
.../completion/VariableSyntaxCompletor.groovy | 1 +
.../tools/shell/util/CommandArgumentParser.groovy | 1 +
.../shell/util/CurlyCountingGroovyLexer.groovy | 1 +
.../shell/util/DefaultCommandsRegistrar.groovy | 1 +
.../tools/shell/util/NoExitSecurityManager.groovy | 1 +
.../groovy/tools/shell/util/PackageHelper.groovy | 1 +
.../tools/shell/util/PackageHelperImpl.groovy | 1 +
.../tools/shell/util/ScriptVariableAnalyzer.groovy | 1 +
.../groovy/tools/shell/util/SimpleCompletor.groovy | 1 +
.../tools/shell/util/WrappedInputStream.groovy | 1 +
.../tools/shell/util/XmlCommandRegistrar.groovy | 1 +
.../groovy/groovysh}/CommandAlias.properties | 0
.../groovy/groovysh}/CommandSupport.properties | 0
.../groovy/groovysh}/Groovysh.properties | 0
.../groovy/groovysh}/Main.properties | 0
.../groovysh}/commands/AliasCommand.properties | 0
.../groovysh}/commands/ClearCommand.properties | 0
.../groovysh}/commands/DisplayCommand.properties | 0
.../groovysh}/commands/DocCommand.properties | 0
.../groovysh}/commands/EditCommand.properties | 0
.../groovysh}/commands/ExitCommand.properties | 0
.../groovysh}/commands/GrabCommand.properties | 0
.../groovysh}/commands/HelpCommand.properties | 0
.../groovysh}/commands/HistoryCommand.properties | 0
.../groovysh}/commands/ImportCommand.properties | 0
.../groovysh}/commands/InspectCommand.properties | 0
.../groovysh}/commands/LoadCommand.properties | 0
.../groovysh}/commands/PurgeCommand.properties | 0
.../groovysh}/commands/RecordCommand.properties | 0
.../groovysh}/commands/RegisterCommand.properties | 0
.../groovysh}/commands/SaveCommand.properties | 0
.../groovysh}/commands/SetCommand.properties | 0
.../groovysh}/commands/ShadowCommand.properties | 0
.../groovysh}/commands/ShowCommand.properties | 0
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 6 +-
.../groovy/groovysh}/AllCompletorsTest.groovy | 0
.../groovy/groovysh}/AnsiDetectorTest.groovy | 0
.../groovy/groovysh}/CommandCompletorTest.groovy | 0
.../groovy/groovysh}/CompletorTestSupport.groovy | 0
.../groovy/groovysh}/ErrorDisplayTest.groovy | 0
.../groovy/groovysh}/GroovyshParsersTest.groovy | 0
.../groovy/groovysh}/GroovyshTest.groovy | 0
.../groovy/groovysh}/ImportCompletorTest.groovy | 0
.../groovy/groovysh}/ShellRunnerTest.groovy | 0
.../groovy/groovysh}/ShellRunnerTestSupport.groovy | 0
.../groovy/groovysh}/ShellTest.groovy | 0
.../groovysh}/commands/AliasCommandTest.groovy | 0
.../groovysh}/commands/ClearCommandTest.groovy | 0
.../groovysh}/commands/CommandTestSupport.groovy | 0
.../commands/ComplexCommandSupportTest.groovy | 0
.../groovysh}/commands/DisplayCommandTest.groovy | 0
.../groovysh}/commands/DocCommandTest.groovy | 0
.../groovysh}/commands/EchoCommand.properties | 0
.../groovysh}/commands/EditCommandTest.groovy | 0
.../groovysh}/commands/ExitCommandTest.groovy | 0
.../groovysh}/commands/GrabCommandTest.groovy | 0
.../groovysh}/commands/HelpCommandTest.groovy | 0
.../groovysh}/commands/HistoryCommandTest.groovy | 0
.../groovysh}/commands/ImportCommandTest.groovy | 0
.../groovysh}/commands/InspectCommandTest.groovy | 0
.../groovysh}/commands/LoadCommandTest.groovy | 0
.../groovysh}/commands/PurgeCommandTest.groovy | 0
.../groovysh}/commands/RecordCommandTest.groovy | 0
.../groovysh}/commands/RegisterCommandTest.groovy | 0
.../groovysh}/commands/SaveCommandTest.groovy | 0
.../groovysh}/commands/SetCommandTest.groovy | 0
.../groovysh}/commands/ShowCommandTest.groovy | 0
.../completion/CustomClassCompletorTest.groovy | 0
.../completion/FileNameCompleterTest.groovy | 0
.../completion/GroovySyntaxCompletorTest.groovy | 4 +-
.../completion/ImportsSyntaxCompletorTest.groovy | 0
.../completion/KeywordCompletorTest.groovy | 0
.../NavigablePropertiesCompleterTest.groovy | 0
.../completion/ReflectionCompletorTest.groovy | 0
.../groovysh}/completion/TokenUtilTest.groovy | 0
.../completion/VariableCompletorTest.groovy | 0
.../expr/ClassWithPrivateConstructor.groovy | 0
.../groovy/groovysh}/expr/ExprTestSupport.groovy | 0
.../groovy/groovysh}/expr/TimeItTest.groovy | 0
.../util/CommandArgumentParserTest.groovy | 0
.../util/CurlyCountingGroovyLexerTest.groovy | 0
.../groovy/groovysh}/util/MessageSourceTest.groovy | 0
.../groovysh}/util/PackageHelperImplTest.groovy | 0
.../util/ScriptVariableAnalyzerTest.groovy | 0
.../groovysh}/util/WrappedInputStreamTest.groovy | 0
196 files changed, 430 insertions(+), 459 deletions(-)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/AnsiDetector.groovy (96%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/BufferManager.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Command.groovy (96%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandAlias.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandException.groovy (97%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandRegistry.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandSupport.groovy (97%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ComplexCommandSupport.groovy (95%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ExitNotification.groovy (96%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Groovysh.groovy (97%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/InteractiveShellRunner.groovy (82%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Interpreter.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Main.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Parser.groovy (99%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Shell.groovy (96%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ShellRunner.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/AliasCommand.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ClearCommand.groovy (85%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/DisplayCommand.groovy (85%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/DocCommand.groovy (90%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/EditCommand.groovy (95%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ExitCommand.groovy (84%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/GrabCommand.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/HelpCommand.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/HistoryCommand.groovy (90%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ImportCommand.groovy (89%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/InspectCommand.groovy (86%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/LoadCommand.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/PurgeCommand.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/RecordCommand.groovy (93%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/RegisterCommand.groovy (89%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/SaveCommand.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/SetCommand.groovy (87%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ShadowCommand.groovy (87%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ShowCommand.groovy (86%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/BackslashEscapeCompleter.groovy (97%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/CommandNameCompleter.groovy (82%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy => apache/groovy/groovysh/completion/CustomClassSyntaxCompleter.groovy} (85%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/FileNameCompleter.groovy (99%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy => apache/groovy/groovysh/completion/GroovySyntaxCompleter.groovy} (87%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy => apache/groovy/groovysh/completion/IdentifierCompleter.groovy} (88%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy => apache/groovy/groovysh/completion/ImportsSyntaxCompleter.groovy} (90%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy => apache/groovy/groovysh/completion/InfixKeywordSyntaxCompleter.groovy} (89%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy => apache/groovy/groovysh/completion/KeywordSyntaxCompleter.groovy} (95%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/NavigablePropertiesCompleter.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy => apache/groovy/groovysh/completion/ReflectionCompleter.groovy} (78%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/ReflectionCompletionCandidate.groovy (97%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/StricterArgumentCompleter.groovy (99%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy => apache/groovy/groovysh/completion/VariableSyntaxCompleter.groovy} (84%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/package.html (100%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/CommandArgumentParser.groovy (99%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/CurlyCountingGroovyLexer.groovy (97%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/DefaultCommandsRegistrar.groovy (60%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/NoExitSecurityManager.groovy (83%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/PackageHelper.groovy (95%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/PackageHelperImpl.groovy (99%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/ScriptVariableAnalyzer.groovy (99%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell/util/SimpleCompletor.groovy => apache/groovy/groovysh/util/SimpleCompleter.groovy} (93%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/WrappedInputStream.groovy (98%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/XmlCommandRegistrar.groovy (91%)
copy subprojects/groovy-groovysh/src/main/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/package.html (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandAlias.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandSupport.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Groovysh.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Main.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/AliasCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ClearCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/DisplayCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/DocCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/EditCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ExitCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/GrabCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/HelpCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/HistoryCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ImportCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/InspectCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/LoadCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/PurgeCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/RecordCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/RegisterCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/SaveCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/SetCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ShadowCommand.properties (100%)
copy subprojects/groovy-groovysh/src/main/resources/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ShowCommand.properties (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/AllCompletorsTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/AnsiDetectorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CommandCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/CompletorTestSupport.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ErrorDisplayTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/GroovyshParsersTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/GroovyshTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ImportCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ShellRunnerTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ShellRunnerTestSupport.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/ShellTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/AliasCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ClearCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/CommandTestSupport.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ComplexCommandSupportTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/DisplayCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/DocCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/EchoCommand.properties (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/EditCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ExitCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/GrabCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/HelpCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/HistoryCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ImportCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/InspectCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/LoadCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/PurgeCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/RecordCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/RegisterCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/SaveCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/SetCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/commands/ShowCommandTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/CustomClassCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/FileNameCompleterTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/GroovySyntaxCompletorTest.groovy (99%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/ImportsSyntaxCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/KeywordCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/NavigablePropertiesCompleterTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/ReflectionCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/TokenUtilTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/completion/VariableCompletorTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/expr/ClassWithPrivateConstructor.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/expr/ExprTestSupport.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/expr/TimeItTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/CommandArgumentParserTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/CurlyCountingGroovyLexerTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/MessageSourceTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/PackageHelperImplTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/ScriptVariableAnalyzerTest.groovy (100%)
rename subprojects/groovy-groovysh/src/test/groovy/org/{codehaus/groovy/tools/shell => apache/groovy/groovysh}/util/WrappedInputStreamTest.groovy (100%)
[groovy] 02/09: Split history
main/groovy/org/codehaus/groovy/tools/shell to
main/groovy/org/apache/groovy/groovysh - rename source-file to temp
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 496030afc9af0e858c4f7f19e9f023d89d51c678
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:04:33 2019 +1000
Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - rename source-file to temp
---
.../groovy/org/codehaus/groovy/tools/shell => temp}/AnsiDetector.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell => temp}/BufferManager.groovy | 0
.../{main/groovy/org/codehaus/groovy/tools/shell => temp}/Command.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell => temp}/CommandAlias.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/CommandException.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/CommandRegistry.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell => temp}/CommandSupport.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/ComplexCommandSupport.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/ExitNotification.groovy | 0
.../{main/groovy/org/codehaus/groovy/tools/shell => temp}/Groovysh.groovy | 0
.../codehaus/groovy/tools/shell => temp}/InteractiveShellRunner.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell => temp}/Interpreter.groovy | 0
.../src/{main/groovy/org/codehaus/groovy/tools/shell => temp}/Main.groovy | 0
.../{main/groovy/org/codehaus/groovy/tools/shell => temp}/Parser.groovy | 0
.../{main/groovy/org/codehaus/groovy/tools/shell => temp}/Shell.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell => temp}/ShellRunner.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/AliasCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/ClearCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/DisplayCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/DocCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/EditCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/ExitCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/GrabCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/HelpCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/HistoryCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/ImportCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/InspectCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/LoadCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/PurgeCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/RecordCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/RegisterCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/SaveCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/SetCommand.groovy | 0
.../codehaus/groovy/tools/shell => temp}/commands/ShadowCommand.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/commands/ShowCommand.groovy | 0
.../tools/shell => temp}/completion/BackslashEscapeCompleter.groovy | 0
.../groovy/tools/shell => temp}/completion/CommandNameCompleter.groovy | 0
.../tools/shell => temp}/completion/CustomClassSyntaxCompletor.groovy | 0
.../groovy/tools/shell => temp}/completion/FileNameCompleter.groovy | 0
.../groovy/tools/shell => temp}/completion/GroovySyntaxCompletor.groovy | 0
.../groovy/tools/shell => temp}/completion/IdentifierCompletor.groovy | 0
.../groovy/tools/shell => temp}/completion/ImportsSyntaxCompletor.groovy | 0
.../tools/shell => temp}/completion/InfixKeywordSyntaxCompletor.groovy | 0
.../groovy/tools/shell => temp}/completion/KeywordSyntaxCompletor.groovy | 0
.../tools/shell => temp}/completion/NavigablePropertiesCompleter.groovy | 0
.../tools/shell => temp}/completion/ReflectionCompletionCandidate.groovy | 0
.../groovy/tools/shell => temp}/completion/ReflectionCompletor.groovy | 0
.../tools/shell => temp}/completion/StricterArgumentCompleter.groovy | 0
.../groovy/tools/shell => temp}/completion/VariableSyntaxCompletor.groovy | 0
.../{main/groovy/org/codehaus/groovy/tools/shell => temp}/package.html | 0
.../groovy/tools/shell => temp}/util/CommandArgumentParser.groovy | 0
.../groovy/tools/shell => temp}/util/CurlyCountingGroovyLexer.groovy | 0
.../groovy/tools/shell => temp}/util/DefaultCommandsRegistrar.groovy | 0
.../groovy/tools/shell => temp}/util/NoExitSecurityManager.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/util/PackageHelper.groovy | 0
.../codehaus/groovy/tools/shell => temp}/util/PackageHelperImpl.groovy | 0
.../groovy/tools/shell => temp}/util/ScriptVariableAnalyzer.groovy | 0
.../org/codehaus/groovy/tools/shell => temp}/util/SimpleCompletor.groovy | 0
.../codehaus/groovy/tools/shell => temp}/util/WrappedInputStream.groovy | 0
.../codehaus/groovy/tools/shell => temp}/util/XmlCommandRegistrar.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell => temp}/util/package.html | 0
61 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy b/subprojects/groovy-groovysh/src/temp/AnsiDetector.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
rename to subprojects/groovy-groovysh/src/temp/AnsiDetector.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy b/subprojects/groovy-groovysh/src/temp/BufferManager.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
rename to subprojects/groovy-groovysh/src/temp/BufferManager.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy b/subprojects/groovy-groovysh/src/temp/Command.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
rename to subprojects/groovy-groovysh/src/temp/Command.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy b/subprojects/groovy-groovysh/src/temp/CommandAlias.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
rename to subprojects/groovy-groovysh/src/temp/CommandAlias.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy b/subprojects/groovy-groovysh/src/temp/CommandException.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
rename to subprojects/groovy-groovysh/src/temp/CommandException.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/temp/CommandRegistry.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
rename to subprojects/groovy-groovysh/src/temp/CommandRegistry.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy b/subprojects/groovy-groovysh/src/temp/CommandSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
rename to subprojects/groovy-groovysh/src/temp/CommandSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy b/subprojects/groovy-groovysh/src/temp/ComplexCommandSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
rename to subprojects/groovy-groovysh/src/temp/ComplexCommandSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy b/subprojects/groovy-groovysh/src/temp/ExitNotification.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
rename to subprojects/groovy-groovysh/src/temp/ExitNotification.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy b/subprojects/groovy-groovysh/src/temp/Groovysh.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
rename to subprojects/groovy-groovysh/src/temp/Groovysh.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/temp/InteractiveShellRunner.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
rename to subprojects/groovy-groovysh/src/temp/InteractiveShellRunner.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/temp/Interpreter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
rename to subprojects/groovy-groovysh/src/temp/Interpreter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy b/subprojects/groovy-groovysh/src/temp/Main.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
rename to subprojects/groovy-groovysh/src/temp/Main.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy b/subprojects/groovy-groovysh/src/temp/Parser.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
rename to subprojects/groovy-groovysh/src/temp/Parser.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy b/subprojects/groovy-groovysh/src/temp/Shell.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
rename to subprojects/groovy-groovysh/src/temp/Shell.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy b/subprojects/groovy-groovysh/src/temp/ShellRunner.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
rename to subprojects/groovy-groovysh/src/temp/ShellRunner.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/AliasCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/AliasCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/ClearCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/ClearCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/DocCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/DocCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/EditCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/EditCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/ExitCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/ExitCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/GrabCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/GrabCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/HelpCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/HelpCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/ImportCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/ImportCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/InspectCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/InspectCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/LoadCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/LoadCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/RecordCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/RecordCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/SaveCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/SaveCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/SetCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/SetCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/temp/commands/ShowCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
rename to subprojects/groovy-groovysh/src/temp/commands/ShowCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy b/subprojects/groovy-groovysh/src/temp/completion/BackslashEscapeCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/BackslashEscapeCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/temp/completion/CommandNameCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/CommandNameCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/CustomClassSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/CustomClassSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/temp/completion/FileNameCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/FileNameCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/GroovySyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/GroovySyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/IdentifierCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/IdentifierCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/ImportsSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/ImportsSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/InfixKeywordSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/InfixKeywordSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/KeywordSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/KeywordSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy b/subprojects/groovy-groovysh/src/temp/completion/NavigablePropertiesCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/NavigablePropertiesCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy b/subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletionCandidate.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletionCandidate.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/temp/completion/StricterArgumentCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/StricterArgumentCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/temp/completion/VariableSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/completion/VariableSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html b/subprojects/groovy-groovysh/src/temp/package.html
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
rename to subprojects/groovy-groovysh/src/temp/package.html
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy b/subprojects/groovy-groovysh/src/temp/util/CommandArgumentParser.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
rename to subprojects/groovy-groovysh/src/temp/util/CommandArgumentParser.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy b/subprojects/groovy-groovysh/src/temp/util/CurlyCountingGroovyLexer.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
rename to subprojects/groovy-groovysh/src/temp/util/CurlyCountingGroovyLexer.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/temp/util/DefaultCommandsRegistrar.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
rename to subprojects/groovy-groovysh/src/temp/util/DefaultCommandsRegistrar.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy b/subprojects/groovy-groovysh/src/temp/util/NoExitSecurityManager.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
rename to subprojects/groovy-groovysh/src/temp/util/NoExitSecurityManager.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy b/subprojects/groovy-groovysh/src/temp/util/PackageHelper.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
rename to subprojects/groovy-groovysh/src/temp/util/PackageHelper.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/temp/util/PackageHelperImpl.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
rename to subprojects/groovy-groovysh/src/temp/util/PackageHelperImpl.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/temp/util/ScriptVariableAnalyzer.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
rename to subprojects/groovy-groovysh/src/temp/util/ScriptVariableAnalyzer.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/temp/util/SimpleCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
rename to subprojects/groovy-groovysh/src/temp/util/SimpleCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy b/subprojects/groovy-groovysh/src/temp/util/WrappedInputStream.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
rename to subprojects/groovy-groovysh/src/temp/util/WrappedInputStream.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/temp/util/XmlCommandRegistrar.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
rename to subprojects/groovy-groovysh/src/temp/util/XmlCommandRegistrar.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html b/subprojects/groovy-groovysh/src/temp/util/package.html
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
rename to subprojects/groovy-groovysh/src/temp/util/package.html
[groovy] 04/09: Split history
main/groovy/org/codehaus/groovy/tools/shell to
main/groovy/org/apache/groovy/groovysh - restore name of source-file
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4b288cae41d35b940f1e41801446649b67aadc5e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:04:34 2019 +1000
Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - restore name of source-file
---
.../groovy/org/codehaus/groovy/tools/shell}/AnsiDetector.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/BufferManager.groovy | 0
.../{temp => main/groovy/org/codehaus/groovy/tools/shell}/Command.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/CommandAlias.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/CommandException.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/CommandRegistry.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/CommandSupport.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/ComplexCommandSupport.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/ExitNotification.groovy | 0
.../{temp => main/groovy/org/codehaus/groovy/tools/shell}/Groovysh.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/InteractiveShellRunner.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/Interpreter.groovy | 0
.../src/{temp => main/groovy/org/codehaus/groovy/tools/shell}/Main.groovy | 0
.../{temp => main/groovy/org/codehaus/groovy/tools/shell}/Parser.groovy | 0
.../{temp => main/groovy/org/codehaus/groovy/tools/shell}/Shell.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/ShellRunner.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/AliasCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/ClearCommand.groovy | 0
.../org/codehaus/groovy/tools/shell}/commands/DisplayCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/DocCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/EditCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/ExitCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/GrabCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/HelpCommand.groovy | 0
.../org/codehaus/groovy/tools/shell}/commands/HistoryCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/ImportCommand.groovy | 0
.../org/codehaus/groovy/tools/shell}/commands/InspectCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/LoadCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/PurgeCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/RecordCommand.groovy | 0
.../org/codehaus/groovy/tools/shell}/commands/RegisterCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/SaveCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/SetCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/ShadowCommand.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/commands/ShowCommand.groovy | 0
.../groovy/tools/shell}/completion/BackslashEscapeCompleter.groovy | 0
.../codehaus/groovy/tools/shell}/completion/CommandNameCompleter.groovy | 0
.../groovy/tools/shell}/completion/CustomClassSyntaxCompletor.groovy | 0
.../org/codehaus/groovy/tools/shell}/completion/FileNameCompleter.groovy | 0
.../codehaus/groovy/tools/shell}/completion/GroovySyntaxCompletor.groovy | 0
.../codehaus/groovy/tools/shell}/completion/IdentifierCompletor.groovy | 0
.../codehaus/groovy/tools/shell}/completion/ImportsSyntaxCompletor.groovy | 0
.../groovy/tools/shell}/completion/InfixKeywordSyntaxCompletor.groovy | 0
.../codehaus/groovy/tools/shell}/completion/KeywordSyntaxCompletor.groovy | 0
.../groovy/tools/shell}/completion/NavigablePropertiesCompleter.groovy | 0
.../groovy/tools/shell}/completion/ReflectionCompletionCandidate.groovy | 0
.../codehaus/groovy/tools/shell}/completion/ReflectionCompletor.groovy | 0
.../groovy/tools/shell}/completion/StricterArgumentCompleter.groovy | 0
.../groovy/tools/shell}/completion/VariableSyntaxCompletor.groovy | 0
.../{temp => main/groovy/org/codehaus/groovy/tools/shell}/package.html | 0
.../org/codehaus/groovy/tools/shell}/util/CommandArgumentParser.groovy | 0
.../org/codehaus/groovy/tools/shell}/util/CurlyCountingGroovyLexer.groovy | 0
.../org/codehaus/groovy/tools/shell}/util/DefaultCommandsRegistrar.groovy | 0
.../org/codehaus/groovy/tools/shell}/util/NoExitSecurityManager.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/util/PackageHelper.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/util/PackageHelperImpl.groovy | 0
.../org/codehaus/groovy/tools/shell}/util/ScriptVariableAnalyzer.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/util/SimpleCompletor.groovy | 0
.../org/codehaus/groovy/tools/shell}/util/WrappedInputStream.groovy | 0
.../org/codehaus/groovy/tools/shell}/util/XmlCommandRegistrar.groovy | 0
.../groovy/org/codehaus/groovy/tools/shell}/util/package.html | 0
61 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-groovysh/src/temp/AnsiDetector.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/AnsiDetector.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/BufferManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/BufferManager.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/Command.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Command.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/CommandAlias.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/CommandAlias.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/CommandException.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/CommandException.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/CommandRegistry.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/CommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/CommandSupport.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/ComplexCommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/ComplexCommandSupport.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/ExitNotification.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/ExitNotification.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Groovysh.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/InteractiveShellRunner.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Interpreter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Main.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/Parser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Parser.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/Shell.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Shell.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/ShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/ShellRunner.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/AliasCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ClearCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/DocCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/EditCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ExitCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/GrabCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/GrabCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/HelpCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ImportCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ImportCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/InspectCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/LoadCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/RecordCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/SaveCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/SetCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ShowCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/BackslashEscapeCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/BackslashEscapeCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/CommandNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/CustomClassSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/CustomClassSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/FileNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/GroovySyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/IdentifierCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/IdentifierCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/ImportsSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/ImportsSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/InfixKeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/InfixKeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/KeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/KeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/NavigablePropertiesCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/NavigablePropertiesCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletionCandidate.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletionCandidate.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/ReflectionCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/StricterArgumentCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/completion/VariableSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/completion/VariableSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/package.html
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
diff --git a/subprojects/groovy-groovysh/src/temp/util/CommandArgumentParser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/CommandArgumentParser.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/CurlyCountingGroovyLexer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/CurlyCountingGroovyLexer.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/DefaultCommandsRegistrar.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/NoExitSecurityManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/NoExitSecurityManager.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/PackageHelper.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/PackageHelper.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/PackageHelperImpl.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/ScriptVariableAnalyzer.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/SimpleCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/WrappedInputStream.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/WrappedInputStream.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/XmlCommandRegistrar.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
diff --git a/subprojects/groovy-groovysh/src/temp/util/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/util/package.html
rename to subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
[groovy] 01/09: Split history
main/groovy/org/codehaus/groovy/tools/shell to
main/groovy/org/apache/groovy/groovysh - rename file to target-name
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 150cd9e63f9bf39c8131afbf230880d2acdf2281
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:04:33 2019 +1000
Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - rename file to target-name
---
.../groovy/tools/shell => apache/groovy/groovysh}/AnsiDetector.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/BufferManager.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/Command.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/CommandAlias.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/CommandException.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/CommandRegistry.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/CommandSupport.groovy | 0
.../tools/shell => apache/groovy/groovysh}/ComplexCommandSupport.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/ExitNotification.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/Groovysh.groovy | 0
.../tools/shell => apache/groovy/groovysh}/InteractiveShellRunner.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/Interpreter.groovy | 0
.../{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Main.groovy | 0
.../{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Parser.groovy | 0
.../{codehaus/groovy/tools/shell => apache/groovy/groovysh}/Shell.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/ShellRunner.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/AliasCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/ClearCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/DisplayCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/DocCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/EditCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/ExitCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/GrabCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/HelpCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/HistoryCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/ImportCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/InspectCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/LoadCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/PurgeCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/RecordCommand.groovy | 0
.../shell => apache/groovy/groovysh}/commands/RegisterCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/SaveCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/SetCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/ShadowCommand.groovy | 0
.../tools/shell => apache/groovy/groovysh}/commands/ShowCommand.groovy | 0
.../groovy/groovysh}/completion/BackslashEscapeCompleter.groovy | 0
.../groovy/groovysh}/completion/CommandNameCompleter.groovy | 0
.../groovy/groovysh}/completion/CustomClassSyntaxCompletor.groovy | 0
.../shell => apache/groovy/groovysh}/completion/FileNameCompleter.groovy | 0
.../groovy/groovysh}/completion/GroovySyntaxCompletor.groovy | 0
.../groovy/groovysh}/completion/IdentifierCompletor.groovy | 0
.../groovy/groovysh}/completion/ImportsSyntaxCompletor.groovy | 0
.../groovy/groovysh}/completion/InfixKeywordSyntaxCompletor.groovy | 0
.../groovy/groovysh}/completion/KeywordSyntaxCompletor.groovy | 0
.../groovy/groovysh}/completion/NavigablePropertiesCompleter.groovy | 0
.../groovy/groovysh}/completion/ReflectionCompletionCandidate.groovy | 0
.../groovy/groovysh}/completion/ReflectionCompletor.groovy | 0
.../groovy/groovysh}/completion/StricterArgumentCompleter.groovy | 0
.../groovy/groovysh}/completion/VariableSyntaxCompletor.groovy | 0
.../{codehaus/groovy/tools/shell => apache/groovy/groovysh}/package.html | 0
.../shell => apache/groovy/groovysh}/util/CommandArgumentParser.groovy | 0
.../shell => apache/groovy/groovysh}/util/CurlyCountingGroovyLexer.groovy | 0
.../shell => apache/groovy/groovysh}/util/DefaultCommandsRegistrar.groovy | 0
.../shell => apache/groovy/groovysh}/util/NoExitSecurityManager.groovy | 0
.../tools/shell => apache/groovy/groovysh}/util/PackageHelper.groovy | 0
.../tools/shell => apache/groovy/groovysh}/util/PackageHelperImpl.groovy | 0
.../shell => apache/groovy/groovysh}/util/ScriptVariableAnalyzer.groovy | 0
.../tools/shell => apache/groovy/groovysh}/util/SimpleCompletor.groovy | 0
.../tools/shell => apache/groovy/groovysh}/util/WrappedInputStream.groovy | 0
.../shell => apache/groovy/groovysh}/util/XmlCommandRegistrar.groovy | 0
.../groovy/tools/shell => apache/groovy/groovysh}/util/package.html | 0
61 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/AnsiDetector.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/AnsiDetector.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/BufferManager.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/BufferManager.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Command.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Command.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandAlias.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandAlias.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandException.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandException.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandRegistry.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandRegistry.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ComplexCommandSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ComplexCommandSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ExitNotification.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ExitNotification.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Groovysh.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Groovysh.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/InteractiveShellRunner.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/InteractiveShellRunner.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Interpreter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Interpreter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Parser.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Parser.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Shell.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Shell.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ShellRunner.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ShellRunner.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/AliasCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/AliasCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ClearCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ClearCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DisplayCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DisplayCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DocCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DocCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/EditCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/EditCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ExitCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ExitCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/GrabCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/GrabCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HelpCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HelpCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HistoryCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HistoryCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ImportCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ImportCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/LoadCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/LoadCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/PurgeCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/PurgeCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RecordCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RecordCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RegisterCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RegisterCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SaveCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SaveCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SetCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SetCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShadowCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShadowCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShowCommand.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShowCommand.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/BackslashEscapeCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/BackslashEscapeCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CommandNameCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CommandNameCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/FileNameCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/FileNameCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletionCandidate.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletionCandidate.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/StricterArgumentCompleter.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/StricterArgumentCompleter.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/package.html
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/package.html
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/package.html
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CommandArgumentParser.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CommandArgumentParser.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexer.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexer.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/DefaultCommandsRegistrar.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/DefaultCommandsRegistrar.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/NoExitSecurityManager.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/NoExitSecurityManager.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelper.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelper.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzer.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzer.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompletor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompletor.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/WrappedInputStream.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/WrappedInputStream.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/XmlCommandRegistrar.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/XmlCommandRegistrar.groovy
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/package.html
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/package.html
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/package.html
[groovy] 07/09: Split history
main/resources/org/codehaus/groovy/tools/shell to
main/resources/org/apache/groovy/groovysh - resolve conflict and keep both
files
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5d38041858da75dee3fe30107480f9e634af6baa
Merge: bb75980 d5b8318
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:15:06 2019 +1000
Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - resolve conflict and keep both files
.../apache/groovy/groovysh/CommandAlias.properties | 21 ++++++++++
.../groovy/groovysh/CommandSupport.properties | 21 ++++++++++
.../org/apache/groovy/groovysh/Groovysh.properties | 34 +++++++++++++++
.../org/apache/groovy/groovysh/Main.properties | 49 ++++++++++++++++++++++
.../groovysh/commands/AliasCommand.properties | 22 ++++++++++
.../groovysh/commands/ClearCommand.properties | 22 ++++++++++
.../groovysh/commands/DisplayCommand.properties | 22 ++++++++++
.../groovy/groovysh/commands/DocCommand.properties | 21 ++++++++++
.../groovysh/commands/EditCommand.properties | 21 ++++++++++
.../groovysh/commands/ExitCommand.properties | 24 +++++++++++
.../groovysh/commands/GrabCommand.properties | 21 ++++++++++
.../groovysh/commands/HelpCommand.properties | 21 ++++++++++
.../groovysh/commands/HistoryCommand.properties | 21 ++++++++++
.../groovysh/commands/ImportCommand.properties | 22 ++++++++++
.../groovysh/commands/InspectCommand.properties | 22 ++++++++++
.../groovysh/commands/LoadCommand.properties | 22 ++++++++++
.../groovysh/commands/PurgeCommand.properties | 22 ++++++++++
.../groovysh/commands/RecordCommand.properties | 22 ++++++++++
.../groovysh/commands/RegisterCommand.properties | 21 ++++++++++
.../groovysh/commands/SaveCommand.properties | 22 ++++++++++
.../groovy/groovysh/commands/SetCommand.properties | 22 ++++++++++
.../groovysh/commands/ShadowCommand.properties | 22 ++++++++++
.../groovysh/commands/ShowCommand.properties | 22 ++++++++++
23 files changed, 539 insertions(+)
[groovy] 03/09: Split history
main/groovy/org/codehaus/groovy/tools/shell to
main/groovy/org/apache/groovy/groovysh - resolve conflict and keep both
files
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8fd5e92f3c7209e33faddfd01d0323de131a765c
Merge: 496030a 150cd9e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:04:34 2019 +1000
Split history main/groovy/org/codehaus/groovy/tools/shell to main/groovy/org/apache/groovy/groovysh - resolve conflict and keep both files
.../org/apache/groovy/groovysh/AnsiDetector.groovy | 33 +
.../apache/groovy/groovysh/BufferManager.groovy | 114 ++++
.../org/apache/groovy/groovysh/Command.groovy | 47 ++
.../org/apache/groovy/groovysh/CommandAlias.groovy | 86 +++
.../apache/groovy/groovysh/CommandException.groovy | 46 ++
.../apache/groovy/groovysh/CommandRegistry.groovy | 108 ++++
.../apache/groovy/groovysh/CommandSupport.groovy | 226 +++++++
.../groovy/groovysh/ComplexCommandSupport.groovy | 100 +++
.../apache/groovy/groovysh/ExitNotification.groovy | 33 +
.../org/apache/groovy/groovysh/Groovysh.groovy | 671 +++++++++++++++++++
.../groovy/groovysh/InteractiveShellRunner.groovy | 214 ++++++
.../org/apache/groovy/groovysh/Interpreter.groovy | 110 ++++
.../groovy/org/apache/groovy/groovysh/Main.groovy | 263 ++++++++
.../org/apache/groovy/groovysh/Parser.groovy | 283 ++++++++
.../groovy/org/apache/groovy/groovysh/Shell.groovy | 127 ++++
.../org/apache/groovy/groovysh/ShellRunner.groovy | 101 +++
.../groovy/groovysh/commands/AliasCommand.groovy | 132 ++++
.../groovy/groovysh/commands/ClearCommand.groovy | 46 ++
.../groovy/groovysh/commands/DisplayCommand.groovy | 47 ++
.../groovy/groovysh/commands/DocCommand.groovy | 190 ++++++
.../groovy/groovysh/commands/EditCommand.groovy | 103 +++
.../groovy/groovysh/commands/ExitCommand.groovy | 53 ++
.../groovy/groovysh/commands/GrabCommand.groovy | 68 ++
.../groovy/groovysh/commands/HelpCommand.groovy | 130 ++++
.../groovy/groovysh/commands/HistoryCommand.groovy | 153 +++++
.../groovy/groovysh/commands/ImportCommand.groovy | 263 ++++++++
.../groovy/groovysh/commands/InspectCommand.groovy | 129 ++++
.../groovy/groovysh/commands/LoadCommand.groovy | 87 +++
.../groovy/groovysh/commands/PurgeCommand.groovy | 84 +++
.../groovy/groovysh/commands/RecordCommand.groovy | 138 ++++
.../groovysh/commands/RegisterCommand.groovy | 79 +++
.../groovy/groovysh/commands/SaveCommand.groovy | 78 +++
.../groovy/groovysh/commands/SetCommand.groovy | 107 +++
.../groovy/groovysh/commands/ShadowCommand.groovy | 56 ++
.../groovy/groovysh/commands/ShowCommand.groovy | 104 +++
.../completion/BackslashEscapeCompleter.groovy | 43 ++
.../completion/CommandNameCompleter.groovy | 52 ++
.../completion/CustomClassSyntaxCompletor.groovy | 51 ++
.../groovysh/completion/FileNameCompleter.groovy | 171 +++++
.../completion/GroovySyntaxCompletor.groovy | 374 +++++++++++
.../groovysh/completion/IdentifierCompletor.groovy | 38 ++
.../completion/ImportsSyntaxCompletor.groovy | 126 ++++
.../completion/InfixKeywordSyntaxCompletor.groovy | 48 ++
.../completion/KeywordSyntaxCompletor.groovy | 126 ++++
.../completion/NavigablePropertiesCompleter.groovy | 96 +++
.../ReflectionCompletionCandidate.groovy | 78 +++
.../groovysh/completion/ReflectionCompletor.groovy | 720 +++++++++++++++++++++
.../completion/StricterArgumentCompleter.groovy | 132 ++++
.../completion/VariableSyntaxCompletor.groovy | 62 ++
.../groovy/org/apache/groovy/groovysh/package.html | 28 +
.../groovysh/util/CommandArgumentParser.groovy | 122 ++++
.../groovysh/util/CurlyCountingGroovyLexer.groovy | 68 ++
.../groovysh/util/DefaultCommandsRegistrar.groovy | 88 +++
.../groovysh/util/NoExitSecurityManager.groovy | 63 ++
.../groovy/groovysh/util/PackageHelper.groovy | 29 +
.../groovy/groovysh/util/PackageHelperImpl.groovy | 485 ++++++++++++++
.../groovysh/util/ScriptVariableAnalyzer.groovy | 119 ++++
.../groovy/groovysh/util/SimpleCompletor.groovy | 140 ++++
.../groovy/groovysh/util/WrappedInputStream.groovy | 109 ++++
.../groovysh/util/XmlCommandRegistrar.groovy | 94 +++
.../org/apache/groovy/groovysh/util/package.html | 30 +
61 files changed, 8101 insertions(+)
[groovy] 05/09: Split history
main/resources/org/codehaus/groovy/tools/shell to
main/resources/org/apache/groovy/groovysh - rename file to target-name
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit d5b831827bd9b8d06cef4044795c05ac83707fd9
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:15:05 2019 +1000
Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - rename file to target-name
---
.../groovy/tools/shell => apache/groovy/groovysh}/CommandAlias.properties | 0
.../tools/shell => apache/groovy/groovysh}/CommandSupport.properties | 0
.../groovy/tools/shell => apache/groovy/groovysh}/Groovysh.properties | 0
.../groovy/tools/shell => apache/groovy/groovysh}/Main.properties | 0
.../shell => apache/groovy/groovysh}/commands/AliasCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/ClearCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/DisplayCommand.properties | 0
.../tools/shell => apache/groovy/groovysh}/commands/DocCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/EditCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/ExitCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/GrabCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/HelpCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/HistoryCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/ImportCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/InspectCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/LoadCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/PurgeCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/RecordCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/RegisterCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/SaveCommand.properties | 0
.../tools/shell => apache/groovy/groovysh}/commands/SetCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/ShadowCommand.properties | 0
.../shell => apache/groovy/groovysh}/commands/ShowCommand.properties | 0
23 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/CommandAlias.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/CommandAlias.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/CommandSupport.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/CommandSupport.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/Groovysh.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/Groovysh.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/Main.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/Main.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/AliasCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/AliasCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ClearCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ClearCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/DisplayCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/DisplayCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/DocCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/DocCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/EditCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/EditCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ExitCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ExitCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/GrabCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/GrabCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/GrabCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/GrabCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/HelpCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/HelpCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/HistoryCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/HistoryCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ImportCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ImportCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/InspectCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/InspectCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/LoadCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/LoadCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/PurgeCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/PurgeCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/RecordCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/RecordCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/RegisterCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/RegisterCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/SaveCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/SaveCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/SetCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/SetCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ShadowCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ShadowCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ShowCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/apache/groovy/groovysh/commands/ShowCommand.properties
[groovy] 09/09: GROOVY-8647: Split package renaming
(groovy-groovysh)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 647f07dac715baea27bcfa91c1046537efc795af
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 16:58:48 2019 +1000
GROOVY-8647: Split package renaming (groovy-groovysh)
---
src/bin/groovysh | 2 +-
src/bin/groovysh.bat | 2 +-
.../org/apache/groovy/groovysh/AnsiDetector.groovy | 2 +-
.../apache/groovy/groovysh/BufferManager.groovy | 2 +-
.../org/apache/groovy/groovysh/Command.groovy | 2 +-
.../org/apache/groovy/groovysh/CommandAlias.groovy | 3 +-
.../apache/groovy/groovysh/CommandException.groovy | 2 +-
.../apache/groovy/groovysh/CommandRegistry.groovy | 2 +-
.../apache/groovy/groovysh/CommandSupport.groovy | 5 +-
.../groovy/groovysh/ComplexCommandSupport.groovy | 6 +-
.../apache/groovy/groovysh/ExitNotification.groovy | 2 +-
.../org/apache/groovy/groovysh/Groovysh.groovy | 19 +--
.../groovy/groovysh/InteractiveShellRunner.groovy | 44 +++---
.../org/apache/groovy/groovysh/Interpreter.groovy | 2 +-
.../groovy/org/apache/groovy/groovysh/Main.groovy | 5 +-
.../org/apache/groovy/groovysh/Parser.groovy | 2 +-
.../groovy/org/apache/groovy/groovysh/Shell.groovy | 5 +-
.../org/apache/groovy/groovysh/ShellRunner.groovy | 2 +-
.../groovy/groovysh/commands/AliasCommand.groovy | 12 +-
.../groovy/groovysh/commands/ClearCommand.groovy | 10 +-
.../groovy/groovysh/commands/DisplayCommand.groovy | 13 +-
.../groovy/groovysh/commands/DocCommand.groovy | 18 +--
.../groovy/groovysh/commands/EditCommand.groovy | 6 +-
.../groovy/groovysh/commands/ExitCommand.groovy | 12 +-
.../groovy/groovysh/commands/GrabCommand.groovy | 8 +-
.../groovy/groovysh/commands/HelpCommand.groovy | 14 +-
.../groovy/groovysh/commands/HistoryCommand.groovy | 18 +--
.../groovy/groovysh/commands/ImportCommand.groovy | 44 +++---
.../groovy/groovysh/commands/InspectCommand.groovy | 24 ++-
.../groovy/groovysh/commands/LoadCommand.groovy | 8 +-
.../groovy/groovysh/commands/PurgeCommand.groovy | 10 +-
.../groovy/groovysh/commands/RecordCommand.groovy | 10 +-
.../groovysh/commands/RegisterCommand.groovy | 16 +-
.../groovy/groovysh/commands/SaveCommand.groovy | 10 +-
.../groovy/groovysh/commands/SetCommand.groovy | 21 ++-
.../groovy/groovysh/commands/ShadowCommand.groovy | 10 +-
.../groovy/groovysh/commands/ShowCommand.groovy | 24 ++-
.../completion/BackslashEscapeCompleter.groovy | 2 +-
.../completion/CommandNameCompleter.groovy | 12 +-
...or.groovy => CustomClassSyntaxCompleter.groovy} | 10 +-
.../groovysh/completion/FileNameCompleter.groovy | 2 +-
...mpletor.groovy => GroovySyntaxCompleter.groovy} | 72 ++++-----
...Completor.groovy => IdentifierCompleter.groovy} | 6 +-
...pletor.groovy => ImportsSyntaxCompleter.groovy} | 20 +--
...r.groovy => InfixKeywordSyntaxCompleter.groovy} | 6 +-
...pletor.groovy => KeywordSyntaxCompleter.groovy} | 6 +-
.../completion/NavigablePropertiesCompleter.groovy | 2 +-
...Completor.groovy => ReflectionCompleter.groovy} | 163 +++++++--------------
.../ReflectionCompletionCandidate.groovy | 2 +-
.../completion/StricterArgumentCompleter.groovy | 2 +-
...letor.groovy => VariableSyntaxCompleter.groovy} | 12 +-
.../groovysh/util/CommandArgumentParser.groovy | 2 +-
.../groovysh/util/CurlyCountingGroovyLexer.groovy | 2 +-
.../groovysh/util/DefaultCommandsRegistrar.groovy | 47 +++---
.../groovysh/util/NoExitSecurityManager.groovy | 14 +-
.../groovy/groovysh/util/PackageHelper.groovy | 2 +-
.../groovy/groovysh/util/PackageHelperImpl.groovy | 4 +-
.../groovysh/util/ScriptVariableAnalyzer.groovy | 2 +-
...mpleCompletor.groovy => SimpleCompleter.groovy} | 12 +-
.../groovy/groovysh/util/WrappedInputStream.groovy | 2 +-
.../groovysh/util/XmlCommandRegistrar.groovy | 16 +-
.../groovy/tools/shell/AnsiDetector.groovy | 1 +
.../groovy/tools/shell/BufferManager.groovy | 1 +
.../org/codehaus/groovy/tools/shell/Command.groovy | 1 +
.../groovy/tools/shell/CommandAlias.groovy | 1 +
.../groovy/tools/shell/CommandException.groovy | 1 +
.../groovy/tools/shell/CommandRegistry.groovy | 1 +
.../groovy/tools/shell/CommandSupport.groovy | 1 +
.../tools/shell/ComplexCommandSupport.groovy | 1 +
.../groovy/tools/shell/ExitNotification.groovy | 1 +
.../codehaus/groovy/tools/shell/Groovysh.groovy | 1 +
.../tools/shell/InteractiveShellRunner.groovy | 2 +
.../codehaus/groovy/tools/shell/Interpreter.groovy | 2 +
.../org/codehaus/groovy/tools/shell/Main.groovy | 1 +
.../org/codehaus/groovy/tools/shell/Parser.groovy | 2 +
.../org/codehaus/groovy/tools/shell/Shell.groovy | 1 +
.../codehaus/groovy/tools/shell/ShellRunner.groovy | 1 +
.../tools/shell/commands/AliasCommand.groovy | 1 +
.../tools/shell/commands/ClearCommand.groovy | 1 +
.../tools/shell/commands/DisplayCommand.groovy | 1 +
.../groovy/tools/shell/commands/DocCommand.groovy | 1 +
.../groovy/tools/shell/commands/EditCommand.groovy | 1 +
.../groovy/tools/shell/commands/ExitCommand.groovy | 1 +
.../groovy/tools/shell/commands/GrabCommand.groovy | 1 +
.../groovy/tools/shell/commands/HelpCommand.groovy | 1 +
.../tools/shell/commands/HistoryCommand.groovy | 1 +
.../tools/shell/commands/ImportCommand.groovy | 1 +
.../tools/shell/commands/InspectCommand.groovy | 1 +
.../groovy/tools/shell/commands/LoadCommand.groovy | 1 +
.../tools/shell/commands/PurgeCommand.groovy | 1 +
.../tools/shell/commands/RecordCommand.groovy | 1 +
.../tools/shell/commands/RegisterCommand.groovy | 1 +
.../groovy/tools/shell/commands/SaveCommand.groovy | 1 +
.../groovy/tools/shell/commands/SetCommand.groovy | 1 +
.../tools/shell/commands/ShadowCommand.groovy | 1 +
.../groovy/tools/shell/commands/ShowCommand.groovy | 1 +
.../completion/BackslashEscapeCompleter.groovy | 1 +
.../shell/completion/CommandNameCompleter.groovy | 1 +
.../completion/CustomClassSyntaxCompletor.groovy | 1 +
.../shell/completion/FileNameCompleter.groovy | 1 +
.../shell/completion/GroovySyntaxCompletor.groovy | 1 +
.../shell/completion/IdentifierCompletor.groovy | 1 +
.../shell/completion/ImportsSyntaxCompletor.groovy | 1 +
.../completion/InfixKeywordSyntaxCompletor.groovy | 1 +
.../shell/completion/KeywordSyntaxCompletor.groovy | 1 +
.../completion/NavigablePropertiesCompleter.groovy | 1 +
.../ReflectionCompletionCandidate.groovy | 1 +
.../shell/completion/ReflectionCompletor.groovy | 1 +
.../completion/StricterArgumentCompleter.groovy | 1 +
.../completion/VariableSyntaxCompletor.groovy | 1 +
.../tools/shell/util/CommandArgumentParser.groovy | 1 +
.../shell/util/CurlyCountingGroovyLexer.groovy | 1 +
.../shell/util/DefaultCommandsRegistrar.groovy | 1 +
.../tools/shell/util/NoExitSecurityManager.groovy | 1 +
.../groovy/tools/shell/util/PackageHelper.groovy | 1 +
.../tools/shell/util/PackageHelperImpl.groovy | 1 +
.../tools/shell/util/ScriptVariableAnalyzer.groovy | 1 +
.../groovy/tools/shell/util/SimpleCompletor.groovy | 1 +
.../tools/shell/util/WrappedInputStream.groovy | 1 +
.../tools/shell/util/XmlCommandRegistrar.groovy | 1 +
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 6 +-
.../groovy/groovysh}/AllCompletorsTest.groovy | 0
.../groovy/groovysh}/AnsiDetectorTest.groovy | 0
.../groovy/groovysh}/CommandCompletorTest.groovy | 0
.../groovy/groovysh}/CompletorTestSupport.groovy | 0
.../groovy/groovysh}/ErrorDisplayTest.groovy | 0
.../groovy/groovysh}/GroovyshParsersTest.groovy | 0
.../groovy/groovysh}/GroovyshTest.groovy | 0
.../groovy/groovysh}/ImportCompletorTest.groovy | 0
.../groovy/groovysh}/ShellRunnerTest.groovy | 0
.../groovy/groovysh}/ShellRunnerTestSupport.groovy | 0
.../groovy/groovysh}/ShellTest.groovy | 0
.../groovysh}/commands/AliasCommandTest.groovy | 0
.../groovysh}/commands/ClearCommandTest.groovy | 0
.../groovysh}/commands/CommandTestSupport.groovy | 0
.../commands/ComplexCommandSupportTest.groovy | 0
.../groovysh}/commands/DisplayCommandTest.groovy | 0
.../groovysh}/commands/DocCommandTest.groovy | 0
.../groovysh}/commands/EchoCommand.properties | 0
.../groovysh}/commands/EditCommandTest.groovy | 0
.../groovysh}/commands/ExitCommandTest.groovy | 0
.../groovysh}/commands/GrabCommandTest.groovy | 0
.../groovysh}/commands/HelpCommandTest.groovy | 0
.../groovysh}/commands/HistoryCommandTest.groovy | 0
.../groovysh}/commands/ImportCommandTest.groovy | 0
.../groovysh}/commands/InspectCommandTest.groovy | 0
.../groovysh}/commands/LoadCommandTest.groovy | 0
.../groovysh}/commands/PurgeCommandTest.groovy | 0
.../groovysh}/commands/RecordCommandTest.groovy | 0
.../groovysh}/commands/RegisterCommandTest.groovy | 0
.../groovysh}/commands/SaveCommandTest.groovy | 0
.../groovysh}/commands/SetCommandTest.groovy | 0
.../groovysh}/commands/ShowCommandTest.groovy | 0
.../completion/CustomClassCompletorTest.groovy | 0
.../completion/FileNameCompleterTest.groovy | 0
.../completion/GroovySyntaxCompletorTest.groovy | 4 +-
.../completion/ImportsSyntaxCompletorTest.groovy | 0
.../completion/KeywordCompletorTest.groovy | 0
.../NavigablePropertiesCompleterTest.groovy | 0
.../completion/ReflectionCompletorTest.groovy | 0
.../groovysh}/completion/TokenUtilTest.groovy | 0
.../completion/VariableCompletorTest.groovy | 0
.../expr/ClassWithPrivateConstructor.groovy | 0
.../groovy/groovysh}/expr/ExprTestSupport.groovy | 0
.../groovy/groovysh}/expr/TimeItTest.groovy | 0
.../util/CommandArgumentParserTest.groovy | 0
.../util/CurlyCountingGroovyLexerTest.groovy | 0
.../groovy/groovysh}/util/MessageSourceTest.groovy | 0
.../groovysh}/util/PackageHelperImplTest.groovy | 0
.../util/ScriptVariableAnalyzerTest.groovy | 0
.../groovysh}/util/WrappedInputStreamTest.groovy | 0
171 files changed, 430 insertions(+), 459 deletions(-)
diff --git a/src/bin/groovysh b/src/bin/groovysh
index cfd558d..d1d01ba 100644
--- a/src/bin/groovysh
+++ b/src/bin/groovysh
@@ -43,4 +43,4 @@ DIRNAME="$(dirname "$PRG")"
. "$DIRNAME/startGroovy"
-startGroovy org.codehaus.groovy.tools.shell.Main "$@"
+startGroovy org.apache.groovy.groovysh.Main "$@"
diff --git a/src/bin/groovysh.bat b/src/bin/groovysh.bat
index 6835633..e23e8a5 100644
--- a/src/bin/groovysh.bat
+++ b/src/bin/groovysh.bat
@@ -27,7 +27,7 @@ if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.\
-set CLASSNAME=org.codehaus.groovy.tools.shell.Main
+set CLASSNAME=org.apache.groovy.groovysh.Main
"%DIRNAME%\startGroovy.bat" "%DIRNAME%" %CLASSNAME% %*
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/AnsiDetector.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/AnsiDetector.groovy
index dc51966..5cddac9 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/AnsiDetector.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/AnsiDetector.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import groovy.transform.CompileStatic
import jline.TerminalFactory
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/BufferManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/BufferManager.groovy
index 79a0289..c4a890c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/BufferManager.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/BufferManager.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import org.codehaus.groovy.tools.shell.util.Logger
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Command.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Command.groovy
index 455351e..1f437ba 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Command.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Command.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import groovy.transform.CompileStatic
import jline.console.completer.Completer
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandAlias.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandAlias.groovy
index 8c7fdc3..a02b2d2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandAlias.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandAlias.groovy
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import jline.console.completer.Completer
-
/**
* Provides simple command aliasing.
*/
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandException.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandException.groovy
index f807677..d4f8e3e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandException.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandException.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import groovy.transform.CompileStatic
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandRegistry.groovy
index c4af3a8..e691864 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandRegistry.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandRegistry.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import org.codehaus.groovy.tools.shell.util.Logger
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandSupport.groovy
index acd2d3c..bdab2f1 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandSupport.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/CommandSupport.groovy
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import jline.console.completer.Completer
import jline.console.completer.NullCompleter
import jline.console.completer.StringsCompleter
import jline.console.history.FileHistory
-import org.codehaus.groovy.tools.shell.completion.StricterArgumentCompleter
+import org.apache.groovy.groovysh.completion.StricterArgumentCompleter
+import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.util.Logger
import org.codehaus.groovy.tools.shell.util.MessageSource
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ComplexCommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ComplexCommandSupport.groovy
index 98ddfb7..ad5fbe1 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ComplexCommandSupport.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ComplexCommandSupport.groovy
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import jline.console.completer.Completer
-import org.codehaus.groovy.tools.shell.util.SimpleCompletor
+import org.apache.groovy.groovysh.util.SimpleCompleter
/**
* Support for more complex commands.
@@ -46,7 +46,7 @@ abstract class ComplexCommandSupport
@Override
protected List<Completer> createCompleters() {
- def c = new SimpleCompletor()
+ def c = new SimpleCompleter()
c.setWithBlank(false)
functions.each { String it -> c.add(it) }
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ExitNotification.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ExitNotification.groovy
index 682ff02..847a348 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ExitNotification.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ExitNotification.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
/**
* Notification to signal the shell to exit.
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Groovysh.groovy
index db152a8..8eb85ba 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Groovysh.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Groovysh.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import antlr.TokenStreamException
import groovy.transform.CompileStatic
@@ -30,16 +30,17 @@ import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.control.messages.Message
import org.codehaus.groovy.runtime.InvokerHelper
import org.codehaus.groovy.runtime.StackTraceUtils
-import org.codehaus.groovy.tools.shell.commands.LoadCommand
-import org.codehaus.groovy.tools.shell.commands.RecordCommand
-import org.codehaus.groovy.tools.shell.util.CurlyCountingGroovyLexer
-import org.codehaus.groovy.tools.shell.util.DefaultCommandsRegistrar
+import org.apache.groovy.groovysh.commands.LoadCommand
+import org.apache.groovy.groovysh.commands.RecordCommand
+import org.apache.groovy.groovysh.util.CurlyCountingGroovyLexer
+import org.apache.groovy.groovysh.util.DefaultCommandsRegistrar
+import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.util.MessageSource
-import org.codehaus.groovy.tools.shell.util.PackageHelper
-import org.codehaus.groovy.tools.shell.util.PackageHelperImpl
+import org.apache.groovy.groovysh.util.PackageHelper
+import org.apache.groovy.groovysh.util.PackageHelperImpl
import org.codehaus.groovy.tools.shell.util.Preferences
-import org.codehaus.groovy.tools.shell.util.ScriptVariableAnalyzer
-import org.codehaus.groovy.tools.shell.util.XmlCommandRegistrar
+import org.apache.groovy.groovysh.util.ScriptVariableAnalyzer
+import org.apache.groovy.groovysh.util.XmlCommandRegistrar
import org.fusesource.jansi.AnsiRenderer
import java.util.regex.Pattern
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/InteractiveShellRunner.groovy
index 0733ec9..80e385c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/InteractiveShellRunner.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/InteractiveShellRunner.groovy
@@ -16,31 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import jline.console.ConsoleReader
import jline.console.completer.AggregateCompleter
import jline.console.completer.CandidateListCompletionHandler
import jline.console.completer.CompletionHandler
import jline.console.history.FileHistory
-import org.codehaus.groovy.tools.shell.completion.CustomClassSyntaxCompletor
-import org.codehaus.groovy.tools.shell.completion.FileNameCompleter
-import org.codehaus.groovy.tools.shell.completion.GroovySyntaxCompletor
-import org.codehaus.groovy.tools.shell.completion.ImportsSyntaxCompletor
-import org.codehaus.groovy.tools.shell.completion.KeywordSyntaxCompletor
-import org.codehaus.groovy.tools.shell.completion.ReflectionCompletor
-import org.codehaus.groovy.tools.shell.completion.VariableSyntaxCompletor
+import org.apache.groovy.groovysh.completion.CustomClassSyntaxCompleter
+import org.apache.groovy.groovysh.completion.FileNameCompleter
+import org.apache.groovy.groovysh.completion.GroovySyntaxCompleter
+import org.apache.groovy.groovysh.completion.ImportsSyntaxCompleter
+import org.apache.groovy.groovysh.completion.KeywordSyntaxCompleter
+import org.apache.groovy.groovysh.completion.ReflectionCompleter
+import org.apache.groovy.groovysh.completion.VariableSyntaxCompleter
+import org.apache.groovy.groovysh.util.WrappedInputStream
import org.codehaus.groovy.tools.shell.util.Logger
import org.codehaus.groovy.tools.shell.util.Preferences
-import org.codehaus.groovy.tools.shell.util.WrappedInputStream
/**
* Support for running a {@link Shell} interactively using the JLine library.
*/
-class InteractiveShellRunner
- extends ShellRunner
- implements Runnable
-{
+class InteractiveShellRunner extends ShellRunner implements Runnable {
ConsoleReader reader
final Closure prompt
@@ -71,15 +68,15 @@ class InteractiveShellRunner
this.completer = new CommandsMultiCompleter()
reader.addCompleter(this.completer)
- CustomClassSyntaxCompletor classnameCompletor = new CustomClassSyntaxCompletor(shell)
+ CustomClassSyntaxCompleter classnameCompleter = new CustomClassSyntaxCompleter(shell)
- reader.addCompleter(new GroovySyntaxCompletor(shell,
- new ReflectionCompletor(shell),
- classnameCompletor,
- [new KeywordSyntaxCompletor(),
- new VariableSyntaxCompletor(shell),
- classnameCompletor,
- new ImportsSyntaxCompletor(shell)],
+ reader.addCompleter(new GroovySyntaxCompleter(shell,
+ new ReflectionCompleter(shell),
+ classnameCompleter,
+ [new KeywordSyntaxCompleter(),
+ new VariableSyntaxCompleter(shell),
+ classnameCompleter,
+ new ImportsSyntaxCompleter(shell)],
new FileNameCompleter(false)))
}
@@ -135,7 +132,7 @@ class InteractiveShellRunner
@Override
protected boolean work() {
- boolean result= super.work()
+ boolean result = super.work()
adjustHistory()
result
@@ -161,8 +158,7 @@ class InteractiveShellRunner
* Completer for interactive shells.
*/
class CommandsMultiCompleter
- extends AggregateCompleter
-{
+ extends AggregateCompleter {
protected final Logger log = Logger.create(this.class)
List/*<Completer>*/ list = []
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Interpreter.groovy
index 31a01ca..1084bc5 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Interpreter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Interpreter.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import org.codehaus.groovy.control.CompilerConfiguration
import org.codehaus.groovy.runtime.InvokerHelper
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy
index 462dd35..a872eb2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Main.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import groovy.cli.picocli.CliBuilder
import groovy.cli.picocli.OptionAccessor
@@ -25,9 +25,10 @@ import jline.UnixTerminal
import jline.UnsupportedTerminal
import jline.WindowsTerminal
import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.util.Logger
import org.codehaus.groovy.tools.shell.util.MessageSource
-import org.codehaus.groovy.tools.shell.util.NoExitSecurityManager
+import org.apache.groovy.groovysh.util.NoExitSecurityManager
import org.fusesource.jansi.Ansi
import org.fusesource.jansi.AnsiConsole
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Parser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Parser.groovy
index d9f6b4e..f1980be 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Parser.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Parser.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import antlr.RecognitionException
import antlr.TokenStreamException
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Shell.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Shell.groovy
index ac06f8f..150d0bd 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Shell.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/Shell.groovy
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import org.codehaus.groovy.runtime.InvokerHelper
-import org.codehaus.groovy.tools.shell.util.CommandArgumentParser
+import org.apache.groovy.groovysh.util.CommandArgumentParser
+import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.util.Logger
import org.fusesource.jansi.Ansi
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ShellRunner.groovy
index 16f5165..f8da085 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ShellRunner.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/ShellRunner.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell
+package org.apache.groovy.groovysh
import org.codehaus.groovy.tools.shell.util.Logger
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/AliasCommand.groovy
index ffb32ae..21b44c2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/AliasCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/AliasCommand.groovy
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.completer.Completer
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.completion.CommandNameCompleter
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.completion.CommandNameCompleter
/**
* The 'alias' command.
@@ -80,7 +80,7 @@ class AliasCommand
// TODO: Should this be here... or should this be in the Shell's impl?
//
- // Try to install the completor
+ // Try to install the completer
if (shell.runner) {
shell.runner.completer.add(command)
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ClearCommand.groovy
index 5a1ba91..d30d50a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ClearCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ClearCommand.groovy
@@ -16,17 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'clear' command.
*/
-class ClearCommand
- extends CommandSupport
-{
+class ClearCommand extends CommandSupport {
public static final String COMMAND_NAME = ':clear'
ClearCommand(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DisplayCommand.groovy
index e4a828e..b7ea312 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DisplayCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DisplayCommand.groovy
@@ -16,17 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'display' command. Displays the current buffer (e.g. while method declaration was not finished).
*/
-class DisplayCommand
- extends CommandSupport
-{
+class DisplayCommand extends CommandSupport {
public static final String COMMAND_NAME = ':display'
DisplayCommand(final Groovysh shell) {
@@ -39,8 +37,7 @@ class DisplayCommand
if (buffer.isEmpty()) {
io.out.println('Buffer is empty') // TODO: i18n
- }
- else {
+ } else {
shell.displayBuffer(buffer)
}
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DocCommand.groovy
index 75a939a..6923aeb 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DocCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/DocCommand.groovy
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.completer.Completer
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'doc' command.
@@ -50,8 +50,8 @@ class DocCommand extends CommandSupport {
desktop = desktopClass.desktopSupported ? desktopClass.desktop : null
hasAWTDesktopPlatformSupport =
- desktop != null &&
- desktop.isSupported(desktopClass.declaredClasses.find { it.simpleName == 'Action' }.BROWSE)
+ desktop != null &&
+ desktop.isSupported(desktopClass.declaredClasses.find { it.simpleName == 'Action' }.BROWSE)
} catch (Exception e) {
hasAWTDesktopPlatformSupport = false
@@ -106,8 +106,8 @@ class DocCommand extends CommandSupport {
browseWithAWT(urls)
} else {
fail 'Browser could not be opened due to missing platform support for "java.awt.Desktop". Please set ' +
- "a $ENV_BROWSER_GROOVYSH or $ENV_BROWSER environment variable referring to the browser binary to " +
- 'solve this issue.'
+ "a $ENV_BROWSER_GROOVYSH or $ENV_BROWSER environment variable referring to the browser binary to " +
+ 'solve this issue.'
}
}
@@ -120,7 +120,7 @@ class DocCommand extends CommandSupport {
urls.each { url -> desktop.browse(url.toURI()) }
} catch (Exception e) {
fail "Browser could not be opened, an unexpected error occured (${e}). You can add a " +
- "$ENV_BROWSER_GROOVYSH or $ENV_BROWSER environment variable to explicitly specify a browser binary."
+ "$ENV_BROWSER_GROOVYSH or $ENV_BROWSER environment variable to explicitly specify a browser binary."
}
}
@@ -130,7 +130,7 @@ class DocCommand extends CommandSupport {
} catch (Exception e) {
// we could be here caused by a IOException, SecurityException or NP Exception
fail "Browser could not be opened (${e}). Please check the $ENV_BROWSER_GROOVYSH or $ENV_BROWSER " +
- "environment variable."
+ "environment variable."
}
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/EditCommand.groovy
index 8962009..1cce2dd 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/EditCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/EditCommand.groovy
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.tools.shell.util.Preferences
/**
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ExitCommand.groovy
index aa9f815..bdddc99 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ExitCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ExitCommand.groovy
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.ExitNotification
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.ExitNotification
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'exit' command.
*/
-class ExitCommand
- extends CommandSupport
-{
+class ExitCommand extends CommandSupport {
public static final String COMMAND_NAME = ':exit'
ExitCommand(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/GrabCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/GrabCommand.groovy
index 442a60f..9770c28 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/GrabCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/GrabCommand.groovy
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import groovy.grape.Grape
import jline.console.completer.Completer
import org.codehaus.groovy.tools.GrapeUtil
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'grab' command.
@@ -31,7 +31,7 @@ class GrabCommand extends CommandSupport {
public static final String COMMAND_NAME = ':grab'
- public GrabCommand(Groovysh shell) {
+ GrabCommand(Groovysh shell) {
super(shell, COMMAND_NAME, ':g')
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HelpCommand.groovy
index 1a27701..2112b97 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HelpCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HelpCommand.groovy
@@ -16,20 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.completer.Completer
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.completion.CommandNameCompleter
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.completion.CommandNameCompleter
/**
* The 'help' command.
*/
-class HelpCommand
- extends CommandSupport
-{
+class HelpCommand extends CommandSupport {
public static final String COMMAND_NAME = ':help'
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HistoryCommand.groovy
index 306c28e..056505b 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HistoryCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/HistoryCommand.groovy
@@ -16,19 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.history.History
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.util.SimpleCompletor
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.util.SimpleCompleter
/**
* The 'history' command.
*/
-class HistoryCommand
- extends ComplexCommandSupport
-{
+class HistoryCommand extends ComplexCommandSupport {
public static final String COMMAND_NAME = ':history'
@@ -45,10 +43,10 @@ class HistoryCommand
return list
}
- SimpleCompletor subCommandsCompletor = new SimpleCompletor(loader)
- subCommandsCompletor.setWithBlank(false)
+ SimpleCompleter subCommandsCompleter = new SimpleCompleter(loader)
+ subCommandsCompleter.setWithBlank(false)
return [
- subCommandsCompletor,
+ subCommandsCompleter,
null
]
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ImportCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ImportCommand.groovy
index 894d076..9f7b928 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ImportCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ImportCommand.groovy
@@ -16,33 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import groovy.transform.CompileStatic
import jline.console.completer.AggregateCompleter
import jline.console.completer.Completer
import jline.console.completer.NullCompleter
import jline.console.completer.StringsCompleter
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Evaluator
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.Interpreter
+import org.apache.groovy.groovysh.completion.ReflectionCompleter
+import org.apache.groovy.groovysh.completion.ReflectionCompletionCandidate
+import org.apache.groovy.groovysh.completion.StricterArgumentCompleter
+import org.apache.groovy.groovysh.util.PackageHelper
import org.codehaus.groovy.control.CompilationFailedException
import org.codehaus.groovy.control.ResolveVisitor
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Evaluator
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.Interpreter
-import org.codehaus.groovy.tools.shell.completion.ReflectionCompletionCandidate
-import org.codehaus.groovy.tools.shell.completion.ReflectionCompletor
-import org.codehaus.groovy.tools.shell.completion.StricterArgumentCompleter
import org.codehaus.groovy.tools.shell.util.Logger
-import org.codehaus.groovy.tools.shell.util.PackageHelper
import java.util.regex.Pattern
/**
* The 'import' command.
*/
-class ImportCommand
- extends CommandSupport
-{
+class ImportCommand extends CommandSupport {
/**
* pattern used to validate the arguments to the import command,
@@ -97,7 +95,7 @@ class ImportCommand
// "java.awt.TextField" so it is not implemented as such here. Perhaps this could be made to be more
// intelligent if someone could figure out why that is happening or could write a nicer batch of regex to
// solve the problem
- if (! (importSpec.matches(IMPORTED_ITEM_PATTERN))) {
+ if (!(importSpec.matches(IMPORTED_ITEM_PATTERN))) {
def msg = "Invalid import definition: '${importSpec}'" // TODO: i18n
log.debug(msg)
fail(msg)
@@ -105,7 +103,7 @@ class ImportCommand
// remove last semicolon
importSpec = importSpec.replaceAll(';', '')
- def buff = [ 'import ' + args.join(' ') ]
+ def buff = ['import ' + args.join(' ')]
buff << 'def dummp = false'
def type
@@ -174,11 +172,11 @@ class ImportCompleter implements Completer {
int complete(final String buffer, final int cursor, final List<CharSequence> result) {
String currentImportExpression = buffer ? buffer.substring(0, cursor) : ''
if (staticImport) {
- if (! (currentImportExpression.matches(PACK_OR_CLASS_OR_METHODNAME_PATTERN))) {
+ if (!(currentImportExpression.matches(PACK_OR_CLASS_OR_METHODNAME_PATTERN))) {
return -1
}
} else {
- if (! (currentImportExpression.matches(PACK_OR_SIMPLE_CLASSNAME_PATTERN))) {
+ if (!(currentImportExpression.matches(PACK_OR_SIMPLE_CLASSNAME_PATTERN))) {
return -1
}
}
@@ -192,19 +190,19 @@ class ImportCompleter implements Completer {
Set<String> classnames = packageHelper.getContents(currentImportExpression[0..-2])
if (classnames) {
if (staticImport) {
- result.addAll(classnames.collect({ String it -> it + '.'}))
+ result.addAll(classnames.collect({ String it -> it + '.' }))
} else {
result.addAll(classnames.collect({ String it -> addDotOrBlank(it) }))
}
}
- if (! staticImport) {
+ if (!staticImport) {
result.add('* ')
}
return currentImportExpression.length()
} else if (staticImport && currentImportExpression.matches(QUALIFIED_CLASS_DOT_PATTERN)) {
Class clazz = interpreter.evaluate([currentImportExpression[0..-2]]) as Class
if (clazz != null) {
- Collection<ReflectionCompletionCandidate> members = ReflectionCompletor.getPublicFieldsAndMethods(clazz, '')
+ Collection<ReflectionCompletionCandidate> members = ReflectionCompleter.getPublicFieldsAndMethods(clazz, '')
result.addAll(members.collect({ ReflectionCompletionCandidate it -> it.value.replace('(', '').replace(')', '') + ' ' }))
}
result.add('* ')
@@ -227,7 +225,7 @@ class ImportCompleter implements Completer {
Set<String> candidates = packageHelper.getContents(baseString)
if (candidates == null || candidates.size() == 0) {
// At least give standard package completion, else static keyword is highly annoying
- Collection<String> standards = ResolveVisitor.DEFAULT_IMPORTS.findAll({ String it -> it.startsWith(currentImportExpression)})
+ Collection<String> standards = ResolveVisitor.DEFAULT_IMPORTS.findAll({ String it -> it.startsWith(currentImportExpression) })
if (standards) {
result.addAll(standards)
return 0
@@ -244,7 +242,7 @@ class ImportCompleter implements Completer {
} else if (staticImport) {
Class clazz = interpreter.evaluate([baseString]) as Class
if (clazz != null) {
- Collection<ReflectionCompletionCandidate> members = ReflectionCompletor.getPublicFieldsAndMethods(clazz, prefix)
+ Collection<ReflectionCompletionCandidate> members = ReflectionCompleter.getPublicFieldsAndMethods(clazz, prefix)
if (members) {
result.addAll(members.collect({ ReflectionCompletionCandidate it -> it.value.replace('(', '').replace(')', '') + ' ' }))
return lastDot <= 0 ? 0 : lastDot + 1
@@ -255,8 +253,8 @@ class ImportCompleter implements Completer {
}
private static String addDotOrBlank(final String it) {
- if (it[0] in 'A' .. 'Z') {
- return it + ' '
+ if (it[0] in 'A'..'Z') {
+ return it + ' '
}
return it + '.'
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
index 7c56def..eee2a10 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/InspectCommand.groovy
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import groovy.inspect.swingui.ObjectBrowser
import jline.console.completer.Completer
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.util.SimpleCompletor
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.util.SimpleCompleter
import javax.swing.*
import java.awt.*
@@ -31,9 +31,7 @@ import java.util.List
/**
* The 'inspect' command.
*/
-class InspectCommand
- extends CommandSupport
-{
+class InspectCommand extends CommandSupport {
public static final String COMMAND_NAME = ':inspect'
InspectCommand(final Groovysh shell) {
@@ -46,8 +44,8 @@ class InspectCommand
@Override
protected List<Completer> createCompleters() {
return [
- new InspectCommandCompletor(binding),
- null
+ new InspectCommandCompleter(binding),
+ null
]
}
@@ -103,14 +101,12 @@ class InspectCommand
}
/**
- * Completor for the 'inspect' command.
+ * Completer for the 'inspect' command.
*/
-class InspectCommandCompletor
- extends SimpleCompletor
-{
+class InspectCommandCompleter extends SimpleCompleter {
private final Binding binding
- InspectCommandCompletor(final Binding binding) {
+ InspectCommandCompleter(final Binding binding) {
assert binding
this.setWithBlank(false)
this.binding = binding
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/LoadCommand.groovy
index f8fe884..bcbec3e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/LoadCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/LoadCommand.groovy
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.completer.Completer
import jline.internal.Configuration
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.completion.FileNameCompleter
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.completion.FileNameCompleter
/**
* The 'load' command.
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/PurgeCommand.groovy
index bbec262..54b9410 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/PurgeCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/PurgeCommand.groovy
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'purge' command.
*/
-class PurgeCommand
- extends ComplexCommandSupport
-{
+class PurgeCommand extends ComplexCommandSupport {
public static final String COMMAND_NAME = ':purge'
PurgeCommand(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RecordCommand.groovy
index d7e0711..aa68b65 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RecordCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RecordCommand.groovy
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import org.codehaus.groovy.runtime.InvokerHelper
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'record' command.
*/
-class RecordCommand
- extends ComplexCommandSupport
-{
+class RecordCommand extends ComplexCommandSupport {
public static final String COMMAND_NAME = ':record'
RecordCommand(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RegisterCommand.groovy
index 57055d9..53f5ac0 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RegisterCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/RegisterCommand.groovy
@@ -16,20 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'register' command.
* Registers a class as a new groovysh command.
* Requires the command to have matching constructors (shell) or (shell, name, alias).
*/
-class RegisterCommand
- extends CommandSupport
-{
+class RegisterCommand extends CommandSupport {
static final String COMMAND_NAME = ':register'
RegisterCommand(final Groovysh shell) {
@@ -53,10 +51,10 @@ class RegisterCommand
if (args.size() == 1) { // use default name
command = type.newInstance(shell) as Command
}
- else if (args.size() == 2) { // pass name to completor
+ else if (args.size() == 2) { // pass name to completer
command = type.newInstance(shell, args.get(1), null) as Command
}
- else if (args.size() == 3) { // pass name, alias to completor
+ else if (args.size() == 3) { // pass name, alias to completer
command = type.newInstance(shell, args.get(1), args.get(2)) as Command
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SaveCommand.groovy
index 3577bfc..3174cab 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SaveCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SaveCommand.groovy
@@ -16,19 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.completer.Completer
import jline.console.completer.FileNameCompleter
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
/**
* The 'save' command.
*/
-class SaveCommand
- extends CommandSupport
-{
+class SaveCommand extends CommandSupport {
public static final String COMMAND_NAME = ':save'
SaveCommand(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SetCommand.groovy
index 4c6ba52..bff65a6 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SetCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/SetCommand.groovy
@@ -16,21 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
import jline.console.completer.Completer
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
-import org.codehaus.groovy.tools.shell.util.PackageHelper
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
+import org.apache.groovy.groovysh.util.PackageHelper
+import org.apache.groovy.groovysh.util.SimpleCompleter
import org.codehaus.groovy.tools.shell.util.Preferences
-import org.codehaus.groovy.tools.shell.util.SimpleCompletor
/**
* The 'set' command, used to set preferences.
*/
-class SetCommand
- extends CommandSupport
-{
+class SetCommand extends CommandSupport {
public static final String COMMAND_NAME = ':set'
SetCommand(final Groovysh shell) {
@@ -61,8 +59,8 @@ class SetCommand
}
return [
- new SimpleCompletor(loader),
- null
+ new SimpleCompleter(loader),
+ null
]
}
@@ -95,8 +93,7 @@ class SetCommand
if (args.size() == 1) {
value = true
- }
- else {
+ } else {
value = args[1]
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShadowCommand.groovy
index 936864c..77c4fac 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShadowCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShadowCommand.groovy
@@ -16,19 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'shadow' command.
*/
-class ShadowCommand
- extends ComplexCommandSupport
-{
+class ShadowCommand extends ComplexCommandSupport {
public static final String COMMAND_NAME = ':shadow'
ShadowCommand(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShowCommand.groovy
index a824919..3336f7e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShowCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/commands/ShowCommand.groovy
@@ -16,31 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.commands
+package org.apache.groovy.groovysh.commands
+import org.apache.groovy.groovysh.ComplexCommandSupport
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.runtime.InvokerHelper
import org.codehaus.groovy.runtime.MethodClosure
-import org.codehaus.groovy.tools.shell.ComplexCommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'show' command.
*/
-class ShowCommand
- extends ComplexCommandSupport
-{
+class ShowCommand extends ComplexCommandSupport {
public static final String COMMAND_NAME = ':show'
ShowCommand(final Groovysh shell) {
- super(shell, COMMAND_NAME, ':S', [ 'variables', 'classes', 'imports', 'preferences', 'all' ])
+ super(shell, COMMAND_NAME, ':S', ['variables', 'classes', 'imports', 'preferences', 'all'])
}
def do_variables = {
if (variables.isEmpty()) {
io.out.println('No variables defined') // TODO: i18n
- }
- else {
+ } else {
io.out.println('Variables:') // TODO: i18n
variables.each { key, value ->
@@ -62,8 +59,7 @@ class ShowCommand
if (classes.size() == 0) {
io.out.println('No classes have been loaded') // TODO: i18n
- }
- else {
+ } else {
io.out.println('Classes:') // TODO: i18n
classes.each { Class classIt ->
@@ -75,11 +71,10 @@ class ShowCommand
def do_imports = {
if (imports.isEmpty()) {
io.out.println('No custom imports have been defined') // TODO: i18n
- }
- else {
+ } else {
io.out.println('Custom imports:') // TODO: i18n
- imports.each {String importIt ->
+ imports.each { String importIt ->
io.out.println(" $importIt")
}
}
@@ -101,4 +96,3 @@ class ShowCommand
return
}
}
-
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/BackslashEscapeCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/BackslashEscapeCompleter.groovy
index 7990891..e20ed16 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/BackslashEscapeCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/BackslashEscapeCompleter.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import jline.console.completer.Completer
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CommandNameCompleter.groovy
index e13657f..34212ea 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CommandNameCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CommandNameCompleter.groovy
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.CommandRegistry
-import org.codehaus.groovy.tools.shell.util.SimpleCompletor
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.CommandRegistry
+import org.apache.groovy.groovysh.util.SimpleCompleter
/**
- * Completor for the command.names
+ * Completer for the command.names
*/
-class CommandNameCompleter extends SimpleCompletor {
+class CommandNameCompleter extends SimpleCompleter {
private final CommandRegistry registry
CommandNameCompleter(final CommandRegistry registry, boolean withBlank) {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompleter.groovy
similarity index 85%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompleter.groovy
index ead2555..07efae7 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/CustomClassSyntaxCompleter.groovy
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.antlr.GroovySourceToken
-import org.codehaus.groovy.tools.shell.Groovysh
/**
- * Completor completingclasses defined in the shell
+ * Completer completing classes defined in the shell
*/
-class CustomClassSyntaxCompletor implements IdentifierCompletor {
+class CustomClassSyntaxCompleter implements IdentifierCompleter {
private final Groovysh shell
- CustomClassSyntaxCompletor(final Groovysh shell) {
+ CustomClassSyntaxCompleter(final Groovysh shell) {
this.shell = shell
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/FileNameCompleter.groovy
index afc8fb2..24c3520 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/FileNameCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/FileNameCompleter.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import groovy.transform.PackageScope
import jline.internal.Configuration
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompleter.groovy
similarity index 87%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompleter.groovy
index f31ff8a4..a8179aa 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompleter.groovy
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import antlr.TokenStreamException
import groovy.transform.TupleConstructor
import jline.console.completer.Completer
import jline.internal.Configuration
+import org.apache.groovy.groovysh.CommandRegistry
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.antlr.GroovySourceToken
import org.codehaus.groovy.antlr.SourceBuffer
import org.codehaus.groovy.antlr.UnicodeEscapingReader
import org.codehaus.groovy.antlr.parser.GroovyLexer
-import org.codehaus.groovy.tools.shell.CommandRegistry
-import org.codehaus.groovy.tools.shell.Groovysh
import org.codehaus.groovy.tools.shell.util.Logger
import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DOT
@@ -60,22 +60,22 @@ import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.OPTIONAL_DOT
import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SPREAD_DOT
/**
- * Implements the Completor interface to provide competions for
+ * Implements the Completer interface to provide completions for
* GroovyShell by tokenizing the buffer and invoking other classes depending on the tokens found.
*/
-class GroovySyntaxCompletor implements Completer {
+class GroovySyntaxCompleter implements Completer {
- protected final static Logger LOG = Logger.create(GroovySyntaxCompletor)
+ protected final static Logger LOG = Logger.create(GroovySyntaxCompleter)
private final Groovysh shell
- private final List<IdentifierCompletor> identifierCompletors
- private final IdentifierCompletor classnameCompletor
- private final ReflectionCompletor reflectionCompletor
- private final InfixKeywordSyntaxCompletor infixCompletor
- private final Completer defaultFilenameCompletor
- private final Completer windowsFilenameCompletor
- private final Completer instringFilenameCompletor
- private final Completer backslashCompletor
+ private final List<IdentifierCompleter> identifierCompleters
+ private final IdentifierCompleter classnameCompleter
+ private final ReflectionCompleter reflectionCompleter
+ private final InfixKeywordSyntaxCompleter infixCompleter
+ private final Completer defaultFilenameCompleter
+ private final Completer windowsFilenameCompleter
+ private final Completer instringFilenameCompleter
+ private final Completer backslashCompleter
private static final boolean isWin = Configuration.isWindows()
private final GroovyShell gs = new GroovyShell()
@@ -90,20 +90,20 @@ class GroovySyntaxCompletor implements Completer {
INSTANCEOF
}
- GroovySyntaxCompletor(final Groovysh shell,
- final ReflectionCompletor reflectionCompletor,
- IdentifierCompletor classnameCompletor,
- final List<IdentifierCompletor> identifierCompletors,
- final Completer filenameCompletor) {
+ GroovySyntaxCompleter(final Groovysh shell,
+ final ReflectionCompleter reflectionCompleter,
+ IdentifierCompleter classnameCompleter,
+ final List<IdentifierCompleter> identifierCompleters,
+ final Completer filenameCompleter) {
this.shell = shell
- this.classnameCompletor = classnameCompletor
- this.identifierCompletors = identifierCompletors
- infixCompletor = new InfixKeywordSyntaxCompletor()
- backslashCompletor = new BackslashEscapeCompleter()
- this.reflectionCompletor = reflectionCompletor
- defaultFilenameCompletor = filenameCompletor
- windowsFilenameCompletor = new FileNameCompleter(false, true, false)
- instringFilenameCompletor = new FileNameCompleter(false, false, false)
+ this.classnameCompleter = classnameCompleter
+ this.identifierCompleters = identifierCompleters
+ infixCompleter = new InfixKeywordSyntaxCompleter()
+ backslashCompleter = new BackslashEscapeCompleter()
+ this.reflectionCompleter = reflectionCompleter
+ defaultFilenameCompleter = filenameCompleter
+ windowsFilenameCompleter = new FileNameCompleter(false, true, false)
+ instringFilenameCompleter = new FileNameCompleter(false, false, false)
}
@Override
@@ -124,10 +124,10 @@ class GroovySyntaxCompletor implements Completer {
} catch (InStringException ise) {
int completionStart = ise.column + ise.openDelim.size()
def remainder = bufferLine.substring(completionStart)
- def completer = instringFilenameCompletor
+ def completer = instringFilenameCompleter
if (['"', "'", '"""', "'''"].contains(ise.openDelim)) {
if (isWin) {
- completer = windowsFilenameCompletor
+ completer = windowsFilenameCompleter
}
// perhaps a backslash
if (remainder.contains("\\")) {
@@ -138,7 +138,7 @@ class GroovySyntaxCompletor implements Completer {
gs.evaluate("'${remainder.substring(0, remainder.size() - 1)}'")
// only get here if there is an unescaped backslash at the end of the buffer
// ignore the result since it is only informational
- return backslashCompletor.complete(remainder, cursor, candidates)
+ return backslashCompleter.complete(remainder, cursor, candidates)
} catch (Exception ex2) {
}
}
@@ -156,13 +156,13 @@ class GroovySyntaxCompletor implements Completer {
return -1
}
if (completionCase == CompletionCase.SECOND_IDENT) {
- if (infixCompletor.complete(tokens, candidates)) {
+ if (infixCompleter.complete(tokens, candidates)) {
return tokens.last().column - 1
}
return -1
}
if (completionCase == CompletionCase.INSTANCEOF) {
- if (classnameCompletor.complete(tokens, candidates)) {
+ if (classnameCompleter.complete(tokens, candidates)) {
return tokens.last().column - 1
}
return -1
@@ -178,7 +178,7 @@ class GroovySyntaxCompletor implements Completer {
case CompletionCase.PREFIX_AFTER_DOT:
case CompletionCase.SPREAD_DOT_LAST:
case CompletionCase.PREFIX_AFTER_SPREAD_DOT:
- result = reflectionCompletor.complete(tokens, candidates)
+ result = reflectionCompleter.complete(tokens, candidates)
break
default:
// bug
@@ -214,7 +214,7 @@ class GroovySyntaxCompletor implements Completer {
} else {
// no dot, so we complete a varname, classname, or similar
switch (previousToken.type) {
- // if any of these is before, no useful completion possible in this completor
+ // if any of these is before, no useful completion possible in this completer
case LITERAL_import:
case LITERAL_class:
case LITERAL_interface:
@@ -269,8 +269,8 @@ class GroovySyntaxCompletor implements Completer {
int completeIdentifier(final List<GroovySourceToken> tokens, final List<CharSequence> candidates) {
boolean foundMatches = false
- for (IdentifierCompletor completor : identifierCompletors) {
- foundMatches |= completor.complete(tokens, candidates)
+ for (IdentifierCompleter completer : identifierCompleters) {
+ foundMatches |= completer.complete(tokens, candidates)
}
if (foundMatches) {
return tokens.last().column - 1
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompleter.groovy
similarity index 88%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompleter.groovy
index 4e3099a..c2d7042 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/IdentifierCompleter.groovy
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import org.codehaus.groovy.antlr.GroovySourceToken
/**
* Interface for classes that complete identifier tokens within a groovy Statement
* (Class, variable, keyword, method, ...)
- * Similar to JLine Completor, but adapted for usage in GroovySyntaxCompletor
+ * Similar to JLine Completer, but adapted for usage in GroovySyntaxCompleter
*/
-interface IdentifierCompletor {
+interface IdentifierCompleter {
/**
*
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompleter.groovy
similarity index 90%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompleter.groovy
index 19a55df..b4a77f7 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompleter.groovy
@@ -16,28 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.antlr.GroovySourceToken
import org.codehaus.groovy.control.ResolveVisitor
-import org.codehaus.groovy.tools.shell.Groovysh
/**
- * Completor completing imported classnames
+ * Completer completing imported classnames
*/
-class ImportsSyntaxCompletor implements IdentifierCompletor {
+class ImportsSyntaxCompleter implements IdentifierCompleter {
final Groovysh shell
// cache for all preimported classes
List<String> preimportedClassNames
// cache for all manually imported classes
- final Map<String, Collection<String>> cachedImports = new HashMap<String, Collection<String>>().withDefault {String key ->
+ final Map<String, Collection<String>> cachedImports = new HashMap<String, Collection<String>>().withDefault { String key ->
Collection<String> matchingImports = new TreeSet<String>()
collectImportedSymbols(key, matchingImports)
matchingImports
}
- ImportsSyntaxCompletor(final Groovysh shell) {
+ ImportsSyntaxCompleter(final Groovysh shell) {
this.shell = shell
}
@@ -53,8 +53,8 @@ class ImportsSyntaxCompletor implements IdentifierCompletor {
boolean findMatchingImportedClassesCached(final String prefix, final String importSpec, final List<String> candidates) {
candidates.addAll(cachedImports
- .get(importSpec)
- .findAll({String it -> it.startsWith(prefix)}))
+ .get(importSpec)
+ .findAll({ String it -> it.startsWith(prefix) }))
}
boolean findMatchingPreImportedClasses(final String prefix, final Collection<String> matches) {
@@ -64,7 +64,7 @@ class ImportsSyntaxCompletor implements IdentifierCompletor {
for (packname in ResolveVisitor.DEFAULT_IMPORTS) {
Set<String> packnames = shell.packageHelper.getContents(packname[0..-2])
if (packnames) {
- preimportedClassNames.addAll(packnames.findAll({String it -> it[0] in 'A'..'Z'}))
+ preimportedClassNames.addAll(packnames.findAll({ String it -> it[0] in 'A'..'Z' }))
}
}
preimportedClassNames.add('BigInteger')
@@ -104,7 +104,7 @@ class ImportsSyntaxCompletor implements IdentifierCompletor {
String className = importSpec.substring(staticPrefix.length(), lastDotIndex)
Class clazz = shell.interp.evaluate([className]) as Class
if (clazz != null) {
- Set<String> clazzSymbols = ReflectionCompletor.getPublicFieldsAndMethods(clazz, '')*.value
+ Set<String> clazzSymbols = ReflectionCompleter.getPublicFieldsAndMethods(clazz, '')*.value
Collection<String> importedSymbols
if (symbolName == '*') {
importedSymbols = clazzSymbols
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompleter.groovy
similarity index 89%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompleter.groovy
index dbf2e44..8780ca4 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/InfixKeywordSyntaxCompleter.groovy
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import org.codehaus.groovy.antlr.GroovySourceToken
/**
- * Completor completing groovy keywords that appear after identifiers
+ * Completer completing groovy keywords that appear after identifiers
*/
-class InfixKeywordSyntaxCompletor implements IdentifierCompletor {
+class InfixKeywordSyntaxCompleter implements IdentifierCompleter {
// INFIX keywords can only occur after identifiers
private static final String[] INFIX_KEYWORDS = [
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompleter.groovy
similarity index 95%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompleter.groovy
index 5c3eccf..bcfaa3c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/KeywordSyntaxCompleter.groovy
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import org.codehaus.groovy.antlr.GroovySourceToken
/**
- * Completor completing Groovy keywords and special functions
+ * Completer completing Groovy keywords and special functions
*/
-class KeywordSyntaxCompletor implements IdentifierCompletor {
+class KeywordSyntaxCompleter implements IdentifierCompleter {
private static final String[] KEYWORDS = [
'abstract',
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleter.groovy
index ce577de..390f7c2 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleter.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import java.util.regex.Pattern
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompleter.groovy
similarity index 78%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompleter.groovy
index ef013df..023309b 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompleter.groovy
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.antlr.GroovySourceToken
+import org.codehaus.groovy.antlr.parser.GroovyTokenTypes
import org.codehaus.groovy.control.MultipleCompilationErrorsException
import org.codehaus.groovy.runtime.InvokerHelper
-import org.codehaus.groovy.tools.shell.Groovysh
import org.codehaus.groovy.tools.shell.util.Preferences
import org.fusesource.jansi.Ansi
import org.fusesource.jansi.AnsiRenderer
@@ -31,66 +32,12 @@ import java.lang.reflect.Method
import java.lang.reflect.Modifier
import java.util.regex.Pattern
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BAND
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BAND_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BNOT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BOR
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BOR_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BXOR
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.BXOR_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.COLON
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.COMMA
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.COMPARE_TO
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DIV
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DIV_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.DOT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.EQUAL
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.GE
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.GT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.IDENT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LAND
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LBRACK
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LCURLY
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LE
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_false
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_in
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_instanceof
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LITERAL_true
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LNOT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LOR
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LPAREN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.LT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.MEMBER_POINTER
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.MINUS
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.MINUS_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NOT_EQUAL
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_BIG_DECIMAL
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_BIG_INT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_DOUBLE
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_FLOAT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_INT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.NUM_LONG
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.OPTIONAL_DOT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.PLUS
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.PLUS_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RANGE_EXCLUSIVE
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RANGE_INCLUSIVE
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RBRACK
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.RPAREN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SEMI
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SPREAD_DOT
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STAR
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STAR_ASSIGN
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STRING_CTOR_START
-import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STRING_LITERAL
-
/**
* Completes fields and methods of Classes or instances.
- * Does not quite respect the contract of IdentifierCompletor, as last Token may be a dot or not,
+ * Does not quite respect the contract of IdentifierCompleter, as last Token may be a dot or not,
* thus also returns as int the cursor position.
*/
-class ReflectionCompletor {
+class ReflectionCompleter implements GroovyTokenTypes {
private static final NavigablePropertiesCompleter PROPERTIES_COMPLETER = new NavigablePropertiesCompleter()
private static final Pattern BEAN_ACCESSOR_PATTERN = ~'^(get|set|is)[A-Z].*'
@@ -102,7 +49,7 @@ class ReflectionCompletor {
* @param shell
* @param metaclass_completion_prefix_length how long the prefix must be to display candidates from metaclass
*/
- ReflectionCompletor(final Groovysh shell) {
+ ReflectionCompleter(final Groovysh shell) {
this.shell = shell
}
@@ -154,10 +101,10 @@ class ReflectionCompletor {
}
private int completeInstanceMembers(final Object instanceOrClass,
- final String identifierPrefix,
- final List<CharSequence> candidates,
- final GroovySourceToken currentElementToken,
- final GroovySourceToken dotToken) {
+ final String identifierPrefix,
+ final List<CharSequence> candidates,
+ final GroovySourceToken currentElementToken,
+ final GroovySourceToken dotToken) {
// look for public methods/fields that match the prefix
Collection<ReflectionCompletionCandidate> myCandidates = getPublicFieldsAndMethods(instanceOrClass, identifierPrefix)
@@ -196,7 +143,7 @@ class ReflectionCompletor {
lastDot = currentElementToken.column - 1
} else {
// Spread-dot has length 2!
- lastDot = dotToken.column +(dotToken.getText().length() - 1)
+ lastDot = dotToken.column + (dotToken.getText().length() - 1)
}
return lastDot
}
@@ -226,9 +173,9 @@ class ReflectionCompletor {
Object instance = shell.interp.evaluate([shell.getImportStatements()] + ['true'] + [instanceRefExpression])
return instance
} catch (MissingPropertyException |
- MissingMethodException |
- MissingFieldException |
- MultipleCompilationErrorsException e) {
+ MissingMethodException |
+ MissingFieldException |
+ MultipleCompilationErrorsException e) {
}
}
@@ -285,8 +232,8 @@ class ReflectionCompletor {
case RPAREN:
expectedOpeners.push(LPAREN)
break
- // tokens which indicate we have reached the beginning of a statement
- // operator tokens (must not be evaluated, as they can have side effects via evil overriding
+ // tokens which indicate we have reached the beginning of a statement
+ // operator tokens (must not be evaluated, as they can have side effects via evil overriding
case COMPARE_TO:
case EQUAL:
case NOT_EQUAL:
@@ -319,25 +266,25 @@ class ReflectionCompletor {
break outerloop
}
break
- // tokens which indicate we have reached the beginning of a statement
+ // tokens which indicate we have reached the beginning of a statement
case LCURLY:
case SEMI:
case STRING_CTOR_START:
break outerloop
- // tokens we accept
+ // tokens we accept
case IDENT:
- if (lastToken) {
- if (lastToken.type == LPAREN) {
- //Method invocation,must be avoided
- return []
- }
- if (lastToken.type == IDENT) {
- // could be attempt to invoke closure like 'foo.each bar.baz'
- return []
- }
- }
+ if (lastToken) {
+ if (lastToken.type == LPAREN) {
+ //Method invocation,must be avoided
+ return []
+ }
+ if (lastToken.type == IDENT) {
+ // could be attempt to invoke closure like 'foo.each bar.baz'
+ return []
+ }
+ }
break
- // may begin expression when outside brackets (from back)
+ // may begin expression when outside brackets (from back)
case RANGE_INCLUSIVE:
case RANGE_EXCLUSIVE:
case COLON:
@@ -345,7 +292,7 @@ class ReflectionCompletor {
if (expectedOpeners.empty()) {
break outerloop
}
- // harmless literals
+ // harmless literals
case LITERAL_true:
case LITERAL_false:
case NUM_INT:
@@ -361,7 +308,7 @@ class ReflectionCompletor {
default:
return null
} // end switch
- validIndex --
+ validIndex--
lastToken = loopToken
} // end for
return groovySourceTokens[(validIndex)..-1]
@@ -369,7 +316,7 @@ class ReflectionCompletor {
static String tokenListToEvalString(final List<GroovySourceToken> groovySourceTokens) {
StringBuilder builder = new StringBuilder()
- for (GroovySourceToken token: groovySourceTokens) {
+ for (GroovySourceToken token : groovySourceTokens) {
if (token.type == STRING_LITERAL) {
builder.append('\'').append(token.text).append('\'')
} else {
@@ -418,7 +365,7 @@ class ReflectionCompletor {
Class loopclazz = clazz
// render immediate class members bold when completing an instance
- boolean renderBold = ! isClass
+ boolean renderBold = !isClass
// hide static members for instances unless user typed a prefix
boolean showStatic = isClass || (prefix.length() >= Integer.valueOf(Preferences.get(Groovysh.METACLASS_COMPLETION_PREFIX_LENGTH_PREFERENCE_KEY, '3')))
while (loopclazz != null && loopclazz != Object && loopclazz != GroovyObject) {
@@ -439,7 +386,7 @@ class ReflectionCompletor {
if (!isClass) {
Set<String> candidates = new HashSet<String>()
PROPERTIES_COMPLETER.addCompletions(instance, prefix, candidates)
- rv.addAll(candidates.collect({String it -> new ReflectionCompletionCandidate(it, AnsiRenderer.Code.MAGENTA.name())}))
+ rv.addAll(candidates.collect({ String it -> new ReflectionCompletionCandidate(it, AnsiRenderer.Code.MAGENTA.name()) }))
}
return rv.sort()
@@ -452,7 +399,7 @@ class ReflectionCompletor {
static removeStandardMethods(final Collection<ReflectionCompletionCandidate> candidates) {
for (String defaultMethod : [
'clone()', 'finalize()', 'getClass()',
- 'getMetaClass()', 'getProperty(', 'invokeMethod(', 'setMetaClass(', 'setProperty(',
+ 'getMetaClass()', 'getProperty(', 'invokeMethod(', 'setMetaClass(', 'setProperty(',
'equals(', 'hashCode()', 'toString()',
'notify()', 'notifyAll()', 'wait(', 'wait()']) {
for (ReflectionCompletionCandidate candidate : candidates) {
@@ -498,7 +445,7 @@ class ReflectionCompletor {
'toSet()',
'retainAll(', 'removeAll(',
'unique()', 'unique('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
if (instance instanceof Collection) {
[
'grep('
@@ -510,7 +457,7 @@ class ReflectionCompletor {
'execute()', 'execute(',
'pop()',
'transpose()'
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
}
if (instance instanceof Map) {
@@ -531,7 +478,7 @@ class ReflectionCompletor {
'spread()',
'subMap(',
'take(', 'takeWhile('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
if (instance instanceof File) {
[
@@ -546,7 +493,7 @@ class ReflectionCompletor {
'setBytes(', 'setText(', 'size()', 'splitEachLine(',
'traverse(',
'withInputStream(', 'withOutputStream(', 'withPrintWriter(', 'withReader(', 'withWriter(', 'withWriterAppend(', 'write('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
if (instance instanceof String) {
[
@@ -555,14 +502,14 @@ class ReflectionCompletor {
'eachLine(', 'eachMatch(', 'execute()', 'execute(',
'find(', 'findAll(',
'isAllWhitespace()', 'isBigDecimal()', 'isBigInteger()', 'isDouble()', 'isFloat()', 'isInteger()', 'isLong()', 'isNumber()',
- 'normalize()',
+ 'normalize()',
'padLeft(', 'padRight(',
- 'readLines()', 'reverse()',
+ 'readLines()', 'reverse()',
'size()', 'splitEachLine(', 'stripIndent(', 'stripMargin(',
'toBigDecimal()', 'toBigInteger()', 'toBoolean()', 'toCharacter()', 'toDouble()', 'toFloat()', 'toInteger()',
'toList()', 'toLong()', 'toSet()', 'toShort()', 'toURI()', 'toURL()',
'tokenize(', 'tr('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
if (instance instanceof URL) {
[
@@ -573,7 +520,7 @@ class ReflectionCompletor {
'readLines()', 'readLines(',
'splitEachLine(',
'withInputStream(', 'withReader('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
if (instance instanceof InputStream) {
[
@@ -584,14 +531,14 @@ class ReflectionCompletor {
'readLines()', 'readLines(',
'splitEachLine(',
'withReader(', 'withStream('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
if (instance instanceof OutputStream) {
[
'newPrintWriter()', 'newWriter()', 'newWriter(',
'setBytes(',
'withPrintWriter(', 'withStream(', 'withWriter('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
if (instance instanceof Number) {
[
@@ -600,7 +547,7 @@ class ReflectionCompletor {
'times(',
'power(',
'upto('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
Class clazz = instance.getClass()
if (clazz != null && clazz != Class && clazz.isArray()) {
@@ -623,19 +570,19 @@ class ReflectionCompletor {
'sort()',
'split(',
'take(', 'takeRight(', 'takeWhile('
- ].findAll({it.startsWith(prefix)}).each({candidates.add(it)})
+ ].findAll({ it.startsWith(prefix) }).each({ candidates.add(it) })
}
return candidates
}
private static Collection<ReflectionCompletionCandidate> addClassFieldsAndMethods(final Class clazz,
- final boolean includeStatic,
- final boolean includeNonStatic,
- final String prefix,
- final Collection<ReflectionCompletionCandidate> rv,
- final boolean renderBold) {
+ final boolean includeStatic,
+ final boolean includeNonStatic,
+ final String prefix,
+ final Collection<ReflectionCompletionCandidate> rv,
+ final boolean renderBold) {
- Field[] fields = (includeStatic && ! includeNonStatic) ? clazz.fields : clazz.getDeclaredFields()
+ Field[] fields = (includeStatic && !includeNonStatic) ? clazz.fields : clazz.getDeclaredFields()
fields.each { Field fit ->
if (acceptName(fit.name, prefix)) {
int modifiers = fit.getModifiers()
@@ -653,7 +600,7 @@ class ReflectionCompletor {
}
}
}
- Method[] methods = (includeStatic && ! includeNonStatic) ? clazz.methods : clazz.getDeclaredMethods()
+ Method[] methods = (includeStatic && !includeNonStatic) ? clazz.methods : clazz.getDeclaredMethods()
for (Method methIt : methods) {
String name = methIt.getName()
if (name.startsWith("super\$")) {
@@ -680,7 +627,7 @@ class ReflectionCompletor {
}
}
}
- if (! fieldnameSuggested && acceptName(name, prefix)) {
+ if (!fieldnameSuggested && acceptName(name, prefix)) {
ReflectionCompletionCandidate candidate = new ReflectionCompletionCandidate(name + (methIt.parameterTypes.length == 0 ? '()' : '('))
if (!Modifier.isStatic(modifiers) && renderBold) {
candidate.jAnsiCodes.add(Ansi.Attribute.INTENSITY_BOLD.name())
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletionCandidate.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletionCandidate.groovy
index 51e3a63..d0b53f0 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletionCandidate.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletionCandidate.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import groovy.transform.CompileStatic
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/StricterArgumentCompleter.groovy
index 7acffee..99677c1 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/StricterArgumentCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/StricterArgumentCompleter.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
import groovy.transform.CompileStatic
import jline.console.completer.ArgumentCompleter
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompleter.groovy
similarity index 84%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompleter.groovy
index 3417944..edd339c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/completion/VariableSyntaxCompleter.groovy
@@ -16,20 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.completion
+package org.apache.groovy.groovysh.completion
+import org.apache.groovy.groovysh.Groovysh
import org.codehaus.groovy.antlr.GroovySourceToken
import org.codehaus.groovy.runtime.MethodClosure
-import org.codehaus.groovy.tools.shell.Groovysh
/**
- * Completor completing variable and method names from known variables in the shell
+ * Completer completing variable and method names from known variables in the shell
*/
-class VariableSyntaxCompletor implements IdentifierCompletor {
+class VariableSyntaxCompleter implements IdentifierCompleter {
final Groovysh shell
- VariableSyntaxCompletor(final Groovysh shell) {
+ VariableSyntaxCompleter(final Groovysh shell) {
this.shell = shell
}
@@ -57,6 +57,6 @@ class VariableSyntaxCompletor implements IdentifierCompletor {
private static boolean acceptName(String name, String prefix) {
return (!prefix || name.startsWith(prefix)) &&
- (!(name.contains('$')) && !(name.startsWith('_')))
+ (!(name.contains('$')) && !(name.startsWith('_')))
}
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CommandArgumentParser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CommandArgumentParser.groovy
index f651647..9096214 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CommandArgumentParser.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CommandArgumentParser.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
import groovy.transform.CompileStatic
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexer.groovy
index 7d3ba58..8104c53 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexer.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexer.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
import org.codehaus.groovy.antlr.GroovySourceToken
import org.codehaus.groovy.antlr.SourceBuffer
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/DefaultCommandsRegistrar.groovy
index af5b662..3c7d1f0 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/DefaultCommandsRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/DefaultCommandsRegistrar.groovy
@@ -16,38 +16,37 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.Shell
-import org.codehaus.groovy.tools.shell.commands.AliasCommand
-import org.codehaus.groovy.tools.shell.commands.ClearCommand
-import org.codehaus.groovy.tools.shell.commands.DisplayCommand
-import org.codehaus.groovy.tools.shell.commands.DocCommand
-import org.codehaus.groovy.tools.shell.commands.EditCommand
-import org.codehaus.groovy.tools.shell.commands.ExitCommand
-import org.codehaus.groovy.tools.shell.commands.GrabCommand
-import org.codehaus.groovy.tools.shell.commands.HelpCommand
-import org.codehaus.groovy.tools.shell.commands.HistoryCommand
-import org.codehaus.groovy.tools.shell.commands.ImportCommand
-import org.codehaus.groovy.tools.shell.commands.InspectCommand
-import org.codehaus.groovy.tools.shell.commands.LoadCommand
-import org.codehaus.groovy.tools.shell.commands.PurgeCommand
-import org.codehaus.groovy.tools.shell.commands.RecordCommand
-import org.codehaus.groovy.tools.shell.commands.RegisterCommand
-import org.codehaus.groovy.tools.shell.commands.SaveCommand
-import org.codehaus.groovy.tools.shell.commands.SetCommand
-import org.codehaus.groovy.tools.shell.commands.ShowCommand
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.Shell
+import org.apache.groovy.groovysh.commands.AliasCommand
+import org.apache.groovy.groovysh.commands.ClearCommand
+import org.apache.groovy.groovysh.commands.DisplayCommand
+import org.apache.groovy.groovysh.commands.DocCommand
+import org.apache.groovy.groovysh.commands.EditCommand
+import org.apache.groovy.groovysh.commands.ExitCommand
+import org.apache.groovy.groovysh.commands.GrabCommand
+import org.apache.groovy.groovysh.commands.HelpCommand
+import org.apache.groovy.groovysh.commands.HistoryCommand
+import org.apache.groovy.groovysh.commands.ImportCommand
+import org.apache.groovy.groovysh.commands.InspectCommand
+import org.apache.groovy.groovysh.commands.LoadCommand
+import org.apache.groovy.groovysh.commands.PurgeCommand
+import org.apache.groovy.groovysh.commands.RecordCommand
+import org.apache.groovy.groovysh.commands.RegisterCommand
+import org.apache.groovy.groovysh.commands.SaveCommand
+import org.apache.groovy.groovysh.commands.SetCommand
+import org.apache.groovy.groovysh.commands.ShowCommand
/**
* Registers {@link Command} classes from an XML file like:
* <commands>
- * <command>org.codehaus.groovy.tools.shell.commands.HelpCommand</command>
+ * <command>org.apache.groovy.groovysh.commands.HelpCommand</command>
* ...
* </commands>
*/
-class DefaultCommandsRegistrar
-{
+class DefaultCommandsRegistrar {
private final Shell shell
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/NoExitSecurityManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/NoExitSecurityManager.groovy
index cf199cc..d4fd0eb 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/NoExitSecurityManager.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/NoExitSecurityManager.groovy
@@ -16,28 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
import java.security.Permission
/**
* Custom security manager to {@link System#exit} (and related) from being used.
*/
-public class NoExitSecurityManager
- extends SecurityManager
-{
+class NoExitSecurityManager extends SecurityManager {
private final SecurityManager parent
- public NoExitSecurityManager(final SecurityManager parent) {
+ NoExitSecurityManager(final SecurityManager parent) {
this.parent = parent
}
- public NoExitSecurityManager() {
+ NoExitSecurityManager() {
this(System.getSecurityManager())
}
@Override
- public void checkPermission(final Permission perm) {
+ void checkPermission(final Permission perm) {
if (parent != null) {
parent.checkPermission(perm)
}
@@ -47,7 +45,7 @@ public class NoExitSecurityManager
* Always throws {@link SecurityException}.
*/
@Override
- public void checkExit(final int code) {
+ void checkExit(final int code) {
throw new SecurityException('Use of System.exit() is forbidden!')
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelper.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelper.groovy
index 2855316..a6468a1 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelper.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelper.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
interface PackageHelper {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
index 7293b3e..36d16d24 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/PackageHelperImpl.groovy
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
+import org.codehaus.groovy.tools.shell.util.Logger
+import org.codehaus.groovy.tools.shell.util.Preferences
import java.util.jar.JarEntry
import java.util.jar.JarFile
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzer.groovy
index cfe2545..47e7990 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzer.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzer.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
import groovy.transform.TypeChecked
import org.codehaus.groovy.ast.ClassCodeVisitorSupport
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompleter.groovy
similarity index 93%
rename from subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompletor.groovy
rename to subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompleter.groovy
index 10f1a7b..5439930 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/SimpleCompleter.groovy
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
import jline.console.completer.Completer
import org.codehaus.groovy.runtime.InvokerHelper
/**
- * Support for simple completors.
+ * Support for simple completers.
*/
-class SimpleCompletor implements Completer {
+class SimpleCompleter implements Completer {
SortedSet<String> candidates
@@ -36,15 +36,15 @@ class SimpleCompletor implements Completer {
boolean withBlank = true
- SimpleCompletor(final String[] candidates) {
+ SimpleCompleter(final String[] candidates) {
setCandidateStrings(candidates)
}
- SimpleCompletor() {
+ SimpleCompleter() {
this(new String[0])
}
- SimpleCompletor(final Closure loader) {
+ SimpleCompleter(final Closure loader) {
this()
assert loader != null
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/WrappedInputStream.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/WrappedInputStream.groovy
index a07efd1..f1d3dbd 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/WrappedInputStream.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/WrappedInputStream.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
/**
* In order to modify JLine Behavior, we need to wrap the IO streams so we can hack into them
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/XmlCommandRegistrar.groovy
index 6083204..f0394e6 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/XmlCommandRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/util/XmlCommandRegistrar.groovy
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.codehaus.groovy.tools.shell.util
+package org.apache.groovy.groovysh.util
-import org.codehaus.groovy.tools.shell.Command
-import org.codehaus.groovy.tools.shell.Shell
+import org.apache.groovy.groovysh.Command
+import org.apache.groovy.groovysh.Shell
+import org.codehaus.groovy.tools.shell.util.Logger
/**
* Registers {@link Command} classes from an XML file like:
*
- * <pre>
- {@literal
+ * <pre>{@literal
<commands>
<!-- default commands -->
<command>org.codehaus.groovy.tools.shell.commands.HelpCommand</command>
@@ -48,7 +48,7 @@ import org.codehaus.groovy.tools.shell.Shell
<command>org.codehaus.groovy.tools.shell.commands.DocCommand</command>
<!-- custom commands -->
</commands>
- * }
+ *}
* <pre>
*/
class XmlCommandRegistrar {
@@ -73,10 +73,10 @@ class XmlCommandRegistrar {
log.debug("Registering commands from: $url")
}
- url.withReader {Reader reader ->
+ url.withReader { Reader reader ->
groovy.util.Node doc = new groovy.util.XmlParser().parse(reader)
- doc.children().each {groovy.util.Node element ->
+ doc.children().each { groovy.util.Node element ->
String classname = element.text()
Class type = classLoader.loadClass(classname)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
index dc51966..8101591 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/AnsiDetector.groovy
@@ -24,6 +24,7 @@ import jline.TerminalFactory
import java.util.concurrent.Callable
@CompileStatic
+@Deprecated
class AnsiDetector implements Callable<Boolean>
{
@Override
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
index 79a0289..0fa9f79 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/BufferManager.groovy
@@ -23,6 +23,7 @@ import org.codehaus.groovy.tools.shell.util.Logger
/**
* Manages the shells buffers.
*/
+@Deprecated
class BufferManager
{
protected final Logger log = Logger.create(this.class)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
index 455351e..c10f03c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Command.groovy
@@ -25,6 +25,7 @@ import jline.console.completer.Completer
* Provides the interface required for command extensions.
*/
@CompileStatic
+@Deprecated
interface Command
{
String getName()
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
index 8c7fdc3..a664bab 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandAlias.groovy
@@ -24,6 +24,7 @@ import jline.console.completer.Completer
/**
* Provides simple command aliasing.
*/
+@Deprecated
class CommandAlias
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
index f807677..e8b6a1f 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandException.groovy
@@ -24,6 +24,7 @@ import groovy.transform.CompileStatic
* Thrown to indicate a problem with command execution.
*/
@CompileStatic
+@Deprecated
class CommandException
extends Exception
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
index c4af3a8..c627bd9 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandRegistry.groovy
@@ -23,6 +23,7 @@ import org.codehaus.groovy.tools.shell.util.Logger
/**
* A registry of shell {@link Command} instances which may be executed.
*/
+@Deprecated
class CommandRegistry
{
protected final Logger log = Logger.create(CommandRegistry)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
index acd2d3c..e4f66ee 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/CommandSupport.groovy
@@ -29,6 +29,7 @@ import org.codehaus.groovy.tools.shell.util.MessageSource
/**
* Support for {@link Command} instances.
*/
+@Deprecated
abstract class CommandSupport
implements Command
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
index 98ddfb7..84cdaed 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ComplexCommandSupport.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
/**
* Support for more complex commands.
*/
+@Deprecated
abstract class ComplexCommandSupport
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
index 682ff02..70b2cc9 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ExitNotification.groovy
@@ -21,6 +21,7 @@ package org.codehaus.groovy.tools.shell
/**
* Notification to signal the shell to exit.
*/
+@Deprecated
class ExitNotification
extends Error
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
index db152a8..72d0765 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Groovysh.groovy
@@ -52,6 +52,7 @@ import java.util.regex.Pattern
*
* See {@link XmlCommandRegistrar}
*/
+@Deprecated
class Groovysh extends Shell {
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
index 0733ec9..11a20ac 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/InteractiveShellRunner.groovy
@@ -37,6 +37,7 @@ import org.codehaus.groovy.tools.shell.util.WrappedInputStream
/**
* Support for running a {@link Shell} interactively using the JLine library.
*/
+@Deprecated
class InteractiveShellRunner
extends ShellRunner
implements Runnable
@@ -160,6 +161,7 @@ class InteractiveShellRunner
/**
* Completer for interactive shells.
*/
+@Deprecated
class CommandsMultiCompleter
extends AggregateCompleter
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
index 31a01ca..5af886a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Interpreter.groovy
@@ -28,6 +28,7 @@ import java.lang.reflect.Method
/**
* Helper to interpret a source buffer.
*/
+@Deprecated
class Interpreter implements Evaluator
{
static final String SCRIPT_FILENAME = 'groovysh_evaluate'
@@ -105,6 +106,7 @@ class Interpreter implements Evaluator
}
}
+@Deprecated
interface Evaluator {
def evaluate(final Collection<String> buffer)
}
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
index 462dd35..1313afd 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy
@@ -46,6 +46,7 @@ import static org.apache.groovy.util.SystemUtil.setSystemPropertyFrom
*
* Main CLI entry-point for <tt>groovysh</tt>.
*/
+@Deprecated
class Main {
final Groovysh groovysh
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
index d9f6b4e..33efe3c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Parser.groovy
@@ -33,6 +33,7 @@ import org.codehaus.groovy.tools.shell.util.Preferences
import java.util.regex.Pattern
+@Deprecated
interface Parsing {
ParseStatus parse(final Collection<String> buffer)
}
@@ -40,6 +41,7 @@ interface Parsing {
/**
* Provides a facade over the parser to recognize valid Groovy syntax.
*/
+@Deprecated
class Parser
{
static final String NEWLINE = System.getProperty('line.separator')
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
index ac06f8f..3cd034b 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Shell.groovy
@@ -28,6 +28,7 @@ import static org.fusesource.jansi.Ansi.ansi
/**
* A simple shell for invoking commands from a command-line.
*/
+@Deprecated
class Shell
{
protected final Logger log = Logger.create(this.class)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
index 16f5165..8c49d43 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/ShellRunner.groovy
@@ -23,6 +23,7 @@ import org.codehaus.groovy.tools.shell.util.Logger
/**
* Support for running a {@link Shell}.
*/
+@Deprecated
abstract class ShellRunner
implements Runnable
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
index ffb32ae..427b82f 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.completion.CommandNameCompleter
/**
* The 'alias' command.
*/
+@Deprecated
class AliasCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
index 5a1ba91..5728842 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommand.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* The 'clear' command.
*/
+@Deprecated
class ClearCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
index e4a828e..f49c381 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommand.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* The 'display' command. Displays the current buffer (e.g. while method declaration was not finished).
*/
+@Deprecated
class DisplayCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
index 75a939a..7ebe503 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/DocCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
*
* @since 2.2.0
*/
+@Deprecated
class DocCommand extends CommandSupport {
public static final String COMMAND_NAME = ':doc'
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
index 8962009..11ef470 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/EditCommand.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'edit' command. Opens Editor to write into the current Buffer.
*/
+@Deprecated
class EditCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
index aa9f815..5d75c90 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommand.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* The 'exit' command.
*/
+@Deprecated
class ExitCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
index 442a60f..15c107a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* The 'grab' command.
*/
+@Deprecated
class GrabCommand extends CommandSupport {
public static final String COMMAND_NAME = ':grab'
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
index 1a27701..50100ff 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.completion.CommandNameCompleter
/**
* The 'help' command.
*/
+@Deprecated
class HelpCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
index 306c28e..0592034 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommand.groovy
@@ -26,6 +26,7 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
/**
* The 'history' command.
*/
+@Deprecated
class HistoryCommand
extends ComplexCommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
index 894d076..a9bb41e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommand.groovy
@@ -40,6 +40,7 @@ import java.util.regex.Pattern
/**
* The 'import' command.
*/
+@Deprecated
class ImportCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
index 7c56def..7242308 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommand.groovy
@@ -31,6 +31,7 @@ import java.util.List
/**
* The 'inspect' command.
*/
+@Deprecated
class InspectCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
index f8fe884..0eb6ceb 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.completion.FileNameCompleter
/**
* The 'load' command.
*/
+@Deprecated
class LoadCommand extends CommandSupport {
public static final String COMMAND_NAME = ':load'
private static final boolean isWin = Configuration.isWindows()
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
index bbec262..7d87772 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommand.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'purge' command.
*/
+@Deprecated
class PurgeCommand
extends ComplexCommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
index d7e0711..4da47c4 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommand.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* The 'record' command.
*/
+@Deprecated
class RecordCommand
extends ComplexCommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
index 57055d9..fc0de96 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
* Registers a class as a new groovysh command.
* Requires the command to have matching constructors (shell) or (shell, name, alias).
*/
+@Deprecated
class RegisterCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
index 3577bfc..f7ed5ca 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommand.groovy
@@ -26,6 +26,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* The 'save' command.
*/
+@Deprecated
class SaveCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
index 4c6ba52..b031c3a 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/SetCommand.groovy
@@ -28,6 +28,7 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
/**
* The 'set' command, used to set preferences.
*/
+@Deprecated
class SetCommand
extends CommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
index 936864c..ee9505b 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShadowCommand.groovy
@@ -26,6 +26,7 @@ import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'shadow' command.
*/
+@Deprecated
class ShadowCommand
extends ComplexCommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
index a824919..d3362b6 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommand.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.tools.shell.util.Preferences
/**
* The 'show' command.
*/
+@Deprecated
class ShowCommand
extends ComplexCommandSupport
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
index 7990891..6b5a55e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/BackslashEscapeCompleter.groovy
@@ -29,6 +29,7 @@ import static jline.internal.Preconditions.checkNotNull
*
* @since 2.4.13
*/
+@Deprecated
class BackslashEscapeCompleter implements Completer {
private static final List<String> VALID_ESCAPEES = ['r (return)', 'n (newline)', 't (tab)',
'\\ (backslash)', "' (single quote)", '" (double quote)',
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
index e13657f..92a92cd 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CommandNameCompleter.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.util.SimpleCompletor
/**
* Completor for the command.names
*/
+@Deprecated
class CommandNameCompleter extends SimpleCompletor {
private final CommandRegistry registry
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
index ead2555..26c7292 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassSyntaxCompletor.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* Completor completingclasses defined in the shell
*/
+@Deprecated
class CustomClassSyntaxCompletor implements IdentifierCompletor {
private final Groovysh shell
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
index afc8fb2..79178b4 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleter.groovy
@@ -41,6 +41,7 @@ import static jline.internal.Preconditions.checkNotNull
*
* @since 2.3
*/
+@Deprecated
class FileNameCompleter extends jline.console.completer.FileNameCompleter {
private static final boolean OS_IS_WINDOWS = Configuration.isWindows()
private final GroovyShell gs = new GroovyShell()
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
index f31ff8a4..5ba3104 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletor.groovy
@@ -63,6 +63,7 @@ import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.SPREAD_DOT
* Implements the Completor interface to provide competions for
* GroovyShell by tokenizing the buffer and invoking other classes depending on the tokens found.
*/
+@Deprecated
class GroovySyntaxCompletor implements Completer {
protected final static Logger LOG = Logger.create(GroovySyntaxCompletor)
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
index 4e3099a..9192356 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/IdentifierCompletor.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.antlr.GroovySourceToken
* (Class, variable, keyword, method, ...)
* Similar to JLine Completor, but adapted for usage in GroovySyntaxCompletor
*/
+@Deprecated
interface IdentifierCompletor {
/**
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
index 19a55df..e8c35e1 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletor.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* Completor completing imported classnames
*/
+@Deprecated
class ImportsSyntaxCompletor implements IdentifierCompletor {
final Groovysh shell
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
index dbf2e44..266c92e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/InfixKeywordSyntaxCompletor.groovy
@@ -23,6 +23,7 @@ import org.codehaus.groovy.antlr.GroovySourceToken
/**
* Completor completing groovy keywords that appear after identifiers
*/
+@Deprecated
class InfixKeywordSyntaxCompletor implements IdentifierCompletor {
// INFIX keywords can only occur after identifiers
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
index 5c3eccf..be3e179 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/KeywordSyntaxCompletor.groovy
@@ -23,6 +23,7 @@ import org.codehaus.groovy.antlr.GroovySourceToken
/**
* Completor completing Groovy keywords and special functions
*/
+@Deprecated
class KeywordSyntaxCompletor implements IdentifierCompletor {
private static final String[] KEYWORDS = [
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
index ce577de..5cbee7f 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleter.groovy
@@ -20,6 +20,7 @@ package org.codehaus.groovy.tools.shell.completion
import java.util.regex.Pattern
+@Deprecated
class NavigablePropertiesCompleter {
private static final Pattern NO_CONTROL_CHARS_PATTERN = ~'^[^\\p{Cntrl}]+$'
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
index 51e3a63..a11d3cf 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletionCandidate.groovy
@@ -24,6 +24,7 @@ import groovy.transform.CompileStatic
* A candidate as String with additional jansi formatting codes
*/
@CompileStatic
+@Deprecated
class ReflectionCompletionCandidate implements Comparable<ReflectionCompletionCandidate> {
private final String value
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
index ef013df..682bbe1 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletor.groovy
@@ -90,6 +90,7 @@ import static org.codehaus.groovy.antlr.parser.GroovyTokenTypes.STRING_LITERAL
* Does not quite respect the contract of IdentifierCompletor, as last Token may be a dot or not,
* thus also returns as int the cursor position.
*/
+@Deprecated
class ReflectionCompletor {
private static final NavigablePropertiesCompleter PROPERTIES_COMPLETER = new NavigablePropertiesCompleter()
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
index 7acffee..010ef70 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/StricterArgumentCompleter.groovy
@@ -32,6 +32,7 @@ import static jline.internal.Preconditions.checkNotNull
* See https://github.com/jline/jline2/pull/202
*/
@CompileStatic
+@Deprecated
class StricterArgumentCompleter extends ArgumentCompleter {
/**
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
index 3417944..b063c4e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/completion/VariableSyntaxCompletor.groovy
@@ -25,6 +25,7 @@ import org.codehaus.groovy.tools.shell.Groovysh
/**
* Completor completing variable and method names from known variables in the shell
*/
+@Deprecated
class VariableSyntaxCompletor implements IdentifierCompletor {
final Groovysh shell
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
index f651647..a25a00b 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParser.groovy
@@ -21,6 +21,7 @@ package org.codehaus.groovy.tools.shell.util
import groovy.transform.CompileStatic
@CompileStatic
+@Deprecated
class CommandArgumentParser {
/**
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
index 7d3ba58..ab87996 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexer.groovy
@@ -27,6 +27,7 @@ import org.codehaus.groovy.antlr.parser.GroovyTokenTypes
/**
* patching GroovyLexer to get access to Paren level
*/
+@Deprecated
class CurlyCountingGroovyLexer extends GroovyLexer {
private endReached = false
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
index af5b662..5ad8ec9 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/DefaultCommandsRegistrar.groovy
@@ -46,6 +46,7 @@ import org.codehaus.groovy.tools.shell.commands.ShowCommand
* ...
* </commands>
*/
+@Deprecated
class DefaultCommandsRegistrar
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
index cf199cc..ec8d142 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/NoExitSecurityManager.groovy
@@ -23,6 +23,7 @@ import java.security.Permission
/**
* Custom security manager to {@link System#exit} (and related) from being used.
*/
+@Deprecated
public class NoExitSecurityManager
extends SecurityManager
{
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
index 2855316..42d75a3 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelper.groovy
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.tools.shell.util
+@Deprecated
interface PackageHelper {
public static final String IMPORT_COMPLETION_PREFERENCE_KEY = 'disable-import-completion'
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
index 7293b3e..394f848 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImpl.groovy
@@ -33,6 +33,7 @@ import java.util.zip.ZipException
* Retrieves from those sources the list of subpackages and classes on demand.
*/
@CompileStatic
+@Deprecated
class PackageHelperImpl implements PreferenceChangeListener, PackageHelper {
// Pattern for regular Classnames
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
index cfe2545..a6e6fe7 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzer.groovy
@@ -38,6 +38,7 @@ import java.security.CodeSource
* Based on http://glaforge.appspot.com/article/knowing-which-variables-are-bound-or-not-in-a-groovy-script
*/
@TypeChecked
+@Deprecated
class ScriptVariableAnalyzer {
/**
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
index 10f1a7b..cf2bb4e 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/SimpleCompletor.groovy
@@ -24,6 +24,7 @@ import org.codehaus.groovy.runtime.InvokerHelper
/**
* Support for simple completors.
*/
+@Deprecated
class SimpleCompletor implements Completer {
SortedSet<String> candidates
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
index a07efd1..8a91f14 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStream.groovy
@@ -22,6 +22,7 @@ package org.codehaus.groovy.tools.shell.util
* In order to modify JLine Behavior, we need to wrap the IO streams so we can hack into them
* This allows autoindent and redisplaying the chars typed so far after exceptions during completion
*/
+@Deprecated
class WrappedInputStream extends InputStream implements Closeable {
final InputStream wrapped
diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
index 6083204..30de139 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/util/XmlCommandRegistrar.groovy
@@ -51,6 +51,7 @@ import org.codehaus.groovy.tools.shell.Shell
* }
* <pre>
*/
+@Deprecated
class XmlCommandRegistrar {
private final Logger log = Logger.create(this.class)
diff --git a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
index bb25a67..da704fd 100644
--- a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
+++ b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
@@ -544,12 +544,12 @@ will register the `Stats` command:
groovy:000> :register Stats
----
-where the `Stats` class is a class extending the `org.codehaus.groovy.tools.shell.CommandSupport` class. For example:
+where the `Stats` class is a class extending the `org.apache.groovy.groovysh.CommandSupport` class. For example:
[source,groovy]
----
-import org.codehaus.groovy.tools.shell.CommandSupport
-import org.codehaus.groovy.tools.shell.Groovysh
+import org.apache.groovy.groovysh.CommandSupport
+import org.apache.groovy.groovysh.Groovysh
class Stats extends CommandSupport {
protected Stats(final Groovysh shell) {
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AllCompletorsTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AllCompletorsTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AllCompletorsTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AllCompletorsTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AnsiDetectorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AnsiDetectorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/AnsiDetectorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/AnsiDetectorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CommandCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/CommandCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CommandCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/CommandCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CompletorTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/CompletorTestSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/CompletorTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/CompletorTestSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ErrorDisplayTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ErrorDisplayTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ErrorDisplayTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ErrorDisplayTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshParsersTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/GroovyshParsersTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshParsersTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/GroovyshParsersTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/GroovyshTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/GroovyshTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/GroovyshTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ImportCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ImportCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ImportCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ImportCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ShellRunnerTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ShellRunnerTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ShellRunnerTestSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellRunnerTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ShellRunnerTestSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ShellTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/ShellTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/ShellTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/AliasCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/AliasCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/AliasCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ClearCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ClearCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ClearCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/CommandTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/CommandTestSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/CommandTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/CommandTestSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ComplexCommandSupportTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ComplexCommandSupportTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ComplexCommandSupportTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ComplexCommandSupportTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/DisplayCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DisplayCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/DisplayCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DocCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/DocCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/DocCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/DocCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EchoCommand.properties b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/EchoCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EchoCommand.properties
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/EchoCommand.properties
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EditCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/EditCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/EditCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/EditCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ExitCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ExitCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ExitCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/GrabCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/GrabCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/GrabCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/HelpCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HelpCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/HelpCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/HistoryCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/HistoryCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/HistoryCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ImportCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ImportCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ImportCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/InspectCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/InspectCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/InspectCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/LoadCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/LoadCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/LoadCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/PurgeCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/PurgeCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/PurgeCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/RecordCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RecordCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/RecordCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/RegisterCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/RegisterCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/RegisterCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/SaveCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SaveCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/SaveCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SetCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/SetCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/SetCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/SetCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommandTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ShowCommandTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/commands/ShowCommandTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/commands/ShowCommandTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/CustomClassCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/CustomClassCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/CustomClassCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleterTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/FileNameCompleterTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/FileNameCompleterTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/FileNameCompleterTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletorTest.groovy
similarity index 99%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletorTest.groovy
index b7df087..a6c2a3e 100644
--- a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/GroovySyntaxCompletorTest.groovy
+++ b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/GroovySyntaxCompletorTest.groovy
@@ -203,7 +203,7 @@ class GroovySyntaxCompletorTest extends CompletorTestSupport {
void testAfterSemi() {
- // evaluation of all is dangerous, but the reflectionCompletor has to deal with this
+ // evaluation of all is dangerous, but the reflectionCompleter has to deal with this
reflectionCompletorMocker.demand.complete(1) { tokens, candidates ->
assert(tokens*.text == ['deletehardDisk', '(', ')', ';', 'foo', '.', 'subs']); candidates << 'substring('; 22}
@@ -221,7 +221,7 @@ class GroovySyntaxCompletorTest extends CompletorTestSupport {
}
void testAfterOperator() {
- // evaluation of all is dangerous, but the reflectionCompletor has to deal with this
+ // evaluation of all is dangerous, but the reflectionCompleter has to deal with this
reflectionCompletorMocker.demand.complete(1) { tokens, candidates ->
assert(tokens*.text == ['a', '=', 'foo', '.', 'subs']); candidates << 'substring('; 9}
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ImportsSyntaxCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/ImportsSyntaxCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/KeywordCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/KeywordCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/KeywordCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/KeywordCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleterTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleterTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/NavigablePropertiesCompleterTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/NavigablePropertiesCompleterTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/ReflectionCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/ReflectionCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/TokenUtilTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/TokenUtilTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/TokenUtilTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/TokenUtilTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/VariableCompletorTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/VariableCompletorTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/completion/VariableCompletorTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/completion/VariableCompletorTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ClassWithPrivateConstructor.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/expr/ClassWithPrivateConstructor.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ClassWithPrivateConstructor.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/expr/ClassWithPrivateConstructor.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ExprTestSupport.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/expr/ExprTestSupport.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/ExprTestSupport.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/expr/ExprTestSupport.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/TimeItTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/expr/TimeItTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/expr/TimeItTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/expr/TimeItTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParserTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/CommandArgumentParserTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CommandArgumentParserTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/CommandArgumentParserTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexerTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexerTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/CurlyCountingGroovyLexerTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/CurlyCountingGroovyLexerTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/MessageSourceTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/MessageSourceTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/MessageSourceTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/MessageSourceTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImplTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/PackageHelperImplTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/PackageHelperImplTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/PackageHelperImplTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzerTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzerTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/ScriptVariableAnalyzerTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/ScriptVariableAnalyzerTest.groovy
diff --git a/subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStreamTest.groovy b/subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/WrappedInputStreamTest.groovy
similarity index 100%
rename from subprojects/groovy-groovysh/src/test/groovy/org/codehaus/groovy/tools/shell/util/WrappedInputStreamTest.groovy
rename to subprojects/groovy-groovysh/src/test/groovy/org/apache/groovy/groovysh/util/WrappedInputStreamTest.groovy
[groovy] 08/09: Split history
main/resources/org/codehaus/groovy/tools/shell to
main/resources/org/apache/groovy/groovysh - restore name of source-file
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4293481fa8471bf38dcc086645e3e4bd5f276127
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:15:07 2019 +1000
Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - restore name of source-file
---
.../resources/org/codehaus/groovy/tools/shell}/CommandAlias.properties | 0
.../resources/org/codehaus/groovy/tools/shell}/CommandSupport.properties | 0
.../resources/org/codehaus/groovy/tools/shell}/Groovysh.properties | 0
.../resources/org/codehaus/groovy/tools/shell}/Main.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/AliasCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/ClearCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/DisplayCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/DocCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/EditCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/ExitCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/GrabCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/HelpCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/HistoryCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/ImportCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/InspectCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/LoadCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/PurgeCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/RecordCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/RegisterCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/SaveCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/SetCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/ShadowCommand.properties | 0
.../org/codehaus/groovy/tools/shell}/commands/ShowCommand.properties | 0
23 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-groovysh/src/temp/CommandAlias.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/CommandAlias.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
diff --git a/subprojects/groovy-groovysh/src/temp/CommandSupport.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/CommandSupport.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
diff --git a/subprojects/groovy-groovysh/src/temp/Groovysh.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Groovysh.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
diff --git a/subprojects/groovy-groovysh/src/temp/Main.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/Main.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/AliasCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/AliasCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ClearCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ClearCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/DocCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/DocCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/EditCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/EditCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ExitCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ExitCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/GrabCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/GrabCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/GrabCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/GrabCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/HelpCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/HelpCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ImportCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ImportCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/InspectCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/InspectCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/LoadCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/LoadCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/RecordCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/RecordCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/SaveCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/SaveCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/SetCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/SetCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
diff --git a/subprojects/groovy-groovysh/src/temp/commands/ShowCommand.properties b/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/temp/commands/ShowCommand.properties
rename to subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
[groovy] 06/09: Split history
main/resources/org/codehaus/groovy/tools/shell to
main/resources/org/apache/groovy/groovysh - rename source-file to temp
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bb7598059c76b4651d55c74f7f8b1d2b0c35a276
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 13 14:15:06 2019 +1000
Split history main/resources/org/codehaus/groovy/tools/shell to main/resources/org/apache/groovy/groovysh - rename source-file to temp
---
.../org/codehaus/groovy/tools/shell => temp}/CommandAlias.properties | 0
.../org/codehaus/groovy/tools/shell => temp}/CommandSupport.properties | 0
.../org/codehaus/groovy/tools/shell => temp}/Groovysh.properties | 0
.../resources/org/codehaus/groovy/tools/shell => temp}/Main.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/AliasCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/ClearCommand.properties | 0
.../groovy/tools/shell => temp}/commands/DisplayCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/DocCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/EditCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/ExitCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/GrabCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/HelpCommand.properties | 0
.../groovy/tools/shell => temp}/commands/HistoryCommand.properties | 0
.../groovy/tools/shell => temp}/commands/ImportCommand.properties | 0
.../groovy/tools/shell => temp}/commands/InspectCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/LoadCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/PurgeCommand.properties | 0
.../groovy/tools/shell => temp}/commands/RecordCommand.properties | 0
.../groovy/tools/shell => temp}/commands/RegisterCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/SaveCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/SetCommand.properties | 0
.../groovy/tools/shell => temp}/commands/ShadowCommand.properties | 0
.../codehaus/groovy/tools/shell => temp}/commands/ShowCommand.properties | 0
23 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties b/subprojects/groovy-groovysh/src/temp/CommandAlias.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandAlias.properties
rename to subprojects/groovy-groovysh/src/temp/CommandAlias.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties b/subprojects/groovy-groovysh/src/temp/CommandSupport.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/CommandSupport.properties
rename to subprojects/groovy-groovysh/src/temp/CommandSupport.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties b/subprojects/groovy-groovysh/src/temp/Groovysh.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Groovysh.properties
rename to subprojects/groovy-groovysh/src/temp/Groovysh.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties b/subprojects/groovy-groovysh/src/temp/Main.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/Main.properties
rename to subprojects/groovy-groovysh/src/temp/Main.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/AliasCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/AliasCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/AliasCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/ClearCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ClearCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/ClearCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DisplayCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/DisplayCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/DocCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/DocCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/DocCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/EditCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/EditCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/EditCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/ExitCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ExitCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/ExitCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/GrabCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/GrabCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/GrabCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/GrabCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/HelpCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HelpCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/HelpCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/HistoryCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/HistoryCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/ImportCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ImportCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/ImportCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/InspectCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/InspectCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/InspectCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/LoadCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/LoadCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/LoadCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/PurgeCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/PurgeCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/RecordCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RecordCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/RecordCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/RegisterCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/RegisterCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/SaveCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SaveCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/SaveCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/SetCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/SetCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/SetCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShadowCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/ShadowCommand.properties
diff --git a/subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties b/subprojects/groovy-groovysh/src/temp/commands/ShowCommand.properties
similarity index 100%
rename from subprojects/groovy-groovysh/src/main/resources/org/codehaus/groovy/tools/shell/commands/ShowCommand.properties
rename to subprojects/groovy-groovysh/src/temp/commands/ShowCommand.properties