diff --git a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java index 6a8cb0f3..e553478e 100644 --- a/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java +++ b/samples/helloworld/src/main/java/org/springframework/shell/samples/helloworld/commands/MyBannerProvider.java @@ -19,7 +19,7 @@ import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.roo.shell.CliCommand; import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.support.util.StringUtils; import org.springframework.shell.plugin.support.DefaultBannerProvider; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/springframework/shell/Bootstrap.java b/src/main/java/org/springframework/shell/Bootstrap.java index a973bd27..2fa03a3f 100644 --- a/src/main/java/org/springframework/shell/Bootstrap.java +++ b/src/main/java/org/springframework/shell/Bootstrap.java @@ -13,10 +13,12 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.ExitShellRequest; -import org.springframework.roo.support.logging.HandlerUtils; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.ExitShellRequest; +import org.springframework.shell.core.JLineShellComponent; +import org.springframework.shell.core.Shell; +import org.springframework.shell.support.logging.HandlerUtils; import org.springframework.util.StopWatch; /** @@ -81,23 +83,23 @@ public class Bootstrap { private void createApplicationContext() { // create parent/base ctx AnnotationConfigApplicationContext annctx = new AnnotationConfigApplicationContext(); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.StringConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.StringConverter.class); createAndRegisterBeanDefinition(annctx, - org.springframework.roo.shell.converters.AvailableCommandsConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.BigDecimalConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.BigIntegerConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.BooleanConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.CharacterConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.DateConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.DoubleConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.EnumConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.FloatConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.IntegerConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.LocaleConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.LongConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.ShortConverter.class); - createAndRegisterBeanDefinition(annctx, org.springframework.roo.shell.converters.StaticFieldConverterImpl.class); - createAndRegisterBeanDefinition(annctx, org.springframework.shell.JLineShellComponent.class, "shell"); + org.springframework.shell.converters.AvailableCommandsConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.BigDecimalConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.BigIntegerConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.BooleanConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.CharacterConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.DateConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.DoubleConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.EnumConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.FloatConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.IntegerConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.LocaleConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.LongConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.ShortConverter.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.StaticFieldConverterImpl.class); + createAndRegisterBeanDefinition(annctx, org.springframework.shell.core.JLineShellComponent.class, "shell"); createAndRegisterBeanDefinition(annctx, org.springframework.shell.converters.SimpleFileConverter.class); annctx.scan("org.springframework.shell.commands"); diff --git a/src/main/java/org/springframework/shell/SimpleShellCommandLineOptions.java b/src/main/java/org/springframework/shell/SimpleShellCommandLineOptions.java index 72475f11..e3f49856 100644 --- a/src/main/java/org/springframework/shell/SimpleShellCommandLineOptions.java +++ b/src/main/java/org/springframework/shell/SimpleShellCommandLineOptions.java @@ -12,11 +12,10 @@ import java.util.Map; import java.util.logging.Logger; import org.apache.commons.io.FileUtils; -import org.springframework.roo.support.logging.HandlerUtils; -import org.springframework.shell.commands.OsCommands; +import org.springframework.shell.support.logging.HandlerUtils; /** - * Not really used much, but keeping for future use + * Used to pass in command line options to customize the shell on launch * * @author vnagaraja */ diff --git a/src/main/java/org/springframework/shell/commands/EssentialCommands.java b/src/main/java/org/springframework/shell/commands/EssentialCommands.java index dee2ec34..a7f0cd45 100644 --- a/src/main/java/org/springframework/shell/commands/EssentialCommands.java +++ b/src/main/java/org/springframework/shell/commands/EssentialCommands.java @@ -1,8 +1,8 @@ package org.springframework.shell.commands; -import org.springframework.roo.shell.CliCommand; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.shell.ExitShellRequest; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.ExitShellRequest; +import org.springframework.shell.core.annotation.CliCommand; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/springframework/shell/commands/HelpCommands.java b/src/main/java/org/springframework/shell/commands/HelpCommands.java index 1489be29..7e79e70e 100644 --- a/src/main/java/org/springframework/shell/commands/HelpCommands.java +++ b/src/main/java/org/springframework/shell/commands/HelpCommands.java @@ -3,11 +3,11 @@ package org.springframework.shell.commands; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.roo.shell.CliCommand; -import org.springframework.roo.shell.CliOption; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.shell.SimpleParser; -import org.springframework.shell.JLineShellComponent; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.JLineShellComponent; +import org.springframework.shell.core.SimpleParser; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/org/springframework/shell/commands/HintCommands.java b/src/main/java/org/springframework/shell/commands/HintCommands.java index ef33deb4..1a35c491 100644 --- a/src/main/java/org/springframework/shell/commands/HintCommands.java +++ b/src/main/java/org/springframework/shell/commands/HintCommands.java @@ -1,9 +1,9 @@ package org.springframework.shell.commands; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.roo.shell.CliCommand; -import org.springframework.roo.shell.CliOption; -import org.springframework.roo.shell.CommandMarker; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/springframework/shell/commands/HintConverter.java b/src/main/java/org/springframework/shell/commands/HintConverter.java index 1aa100ee..54c6eecb 100644 --- a/src/main/java/org/springframework/shell/commands/HintConverter.java +++ b/src/main/java/org/springframework/shell/commands/HintConverter.java @@ -3,9 +3,9 @@ package org.springframework.shell.commands; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/org/springframework/shell/commands/OsCommands.java b/src/main/java/org/springframework/shell/commands/OsCommands.java index 33c11836..8bbe293b 100644 --- a/src/main/java/org/springframework/shell/commands/OsCommands.java +++ b/src/main/java/org/springframework/shell/commands/OsCommands.java @@ -3,10 +3,10 @@ package org.springframework.shell.commands; import java.io.IOException; import java.util.logging.Logger; -import org.springframework.roo.shell.CliCommand; -import org.springframework.roo.shell.CliOption; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.support.logging.HandlerUtils; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; +import org.springframework.shell.support.logging.HandlerUtils; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/org/springframework/shell/commands/OsOperationsImpl.java b/src/main/java/org/springframework/shell/commands/OsOperationsImpl.java index 93288e0f..802957ac 100644 --- a/src/main/java/org/springframework/shell/commands/OsOperationsImpl.java +++ b/src/main/java/org/springframework/shell/commands/OsOperationsImpl.java @@ -7,7 +7,7 @@ import java.io.Reader; import java.util.logging.Logger; import org.apache.commons.io.IOUtils; -import org.springframework.roo.support.logging.HandlerUtils; +import org.springframework.shell.support.logging.HandlerUtils; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/org/springframework/shell/commands/ResourceBundleHintOperations.java b/src/main/java/org/springframework/shell/commands/ResourceBundleHintOperations.java index 865a8b3d..d34821c6 100644 --- a/src/main/java/org/springframework/shell/commands/ResourceBundleHintOperations.java +++ b/src/main/java/org/springframework/shell/commands/ResourceBundleHintOperations.java @@ -6,8 +6,8 @@ import java.util.ResourceBundle; import java.util.SortedSet; import java.util.TreeSet; -import org.springframework.roo.shell.AbstractShell; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.core.AbstractShell; +import org.springframework.shell.support.util.StringUtils; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/springframework/roo/shell/converters/AvailableCommandsConverter.java b/src/main/java/org/springframework/shell/converters/AvailableCommandsConverter.java similarity index 81% rename from src/main/java/org/springframework/roo/shell/converters/AvailableCommandsConverter.java rename to src/main/java/org/springframework/shell/converters/AvailableCommandsConverter.java index b8dc4a9e..ec82e439 100644 --- a/src/main/java/org/springframework/roo/shell/converters/AvailableCommandsConverter.java +++ b/src/main/java/org/springframework/shell/converters/AvailableCommandsConverter.java @@ -1,11 +1,11 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; -import org.springframework.roo.shell.SimpleParser; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; +import org.springframework.shell.core.SimpleParser; /** * Available commands converter. diff --git a/src/main/java/org/springframework/roo/shell/converters/BigDecimalConverter.java b/src/main/java/org/springframework/shell/converters/BigDecimalConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/BigDecimalConverter.java rename to src/main/java/org/springframework/shell/converters/BigDecimalConverter.java index be606d43..fd1be436 100644 --- a/src/main/java/org/springframework/roo/shell/converters/BigDecimalConverter.java +++ b/src/main/java/org/springframework/shell/converters/BigDecimalConverter.java @@ -1,11 +1,11 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.math.BigDecimal; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link BigDecimal}. diff --git a/src/main/java/org/springframework/roo/shell/converters/BigIntegerConverter.java b/src/main/java/org/springframework/shell/converters/BigIntegerConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/BigIntegerConverter.java rename to src/main/java/org/springframework/shell/converters/BigIntegerConverter.java index 2ddb6c8f..99b68b69 100644 --- a/src/main/java/org/springframework/roo/shell/converters/BigIntegerConverter.java +++ b/src/main/java/org/springframework/shell/converters/BigIntegerConverter.java @@ -1,11 +1,11 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.math.BigInteger; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link BigInteger}. diff --git a/src/main/java/org/springframework/roo/shell/converters/BooleanConverter.java b/src/main/java/org/springframework/shell/converters/BooleanConverter.java similarity index 86% rename from src/main/java/org/springframework/roo/shell/converters/BooleanConverter.java rename to src/main/java/org/springframework/shell/converters/BooleanConverter.java index 972106a9..38ca0e58 100644 --- a/src/main/java/org/springframework/roo/shell/converters/BooleanConverter.java +++ b/src/main/java/org/springframework/shell/converters/BooleanConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Boolean}. diff --git a/src/main/java/org/springframework/roo/shell/converters/CharacterConverter.java b/src/main/java/org/springframework/shell/converters/CharacterConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/CharacterConverter.java rename to src/main/java/org/springframework/shell/converters/CharacterConverter.java index 085f1059..f9604a8e 100644 --- a/src/main/java/org/springframework/roo/shell/converters/CharacterConverter.java +++ b/src/main/java/org/springframework/shell/converters/CharacterConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Character}. diff --git a/src/main/java/org/springframework/roo/shell/converters/DateConverter.java b/src/main/java/org/springframework/shell/converters/DateConverter.java similarity index 85% rename from src/main/java/org/springframework/roo/shell/converters/DateConverter.java rename to src/main/java/org/springframework/shell/converters/DateConverter.java index e30ce63a..b32f8f0f 100644 --- a/src/main/java/org/springframework/roo/shell/converters/DateConverter.java +++ b/src/main/java/org/springframework/shell/converters/DateConverter.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.text.DateFormat; import java.text.ParseException; @@ -6,9 +6,9 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Date}. diff --git a/src/main/java/org/springframework/roo/shell/converters/DoubleConverter.java b/src/main/java/org/springframework/shell/converters/DoubleConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/DoubleConverter.java rename to src/main/java/org/springframework/shell/converters/DoubleConverter.java index c3fa7869..45a944f6 100644 --- a/src/main/java/org/springframework/roo/shell/converters/DoubleConverter.java +++ b/src/main/java/org/springframework/shell/converters/DoubleConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Double}. diff --git a/src/main/java/org/springframework/roo/shell/converters/EnumConverter.java b/src/main/java/org/springframework/shell/converters/EnumConverter.java similarity index 86% rename from src/main/java/org/springframework/roo/shell/converters/EnumConverter.java rename to src/main/java/org/springframework/shell/converters/EnumConverter.java index 10227e9e..0a127d13 100644 --- a/src/main/java/org/springframework/roo/shell/converters/EnumConverter.java +++ b/src/main/java/org/springframework/shell/converters/EnumConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Enum}. diff --git a/src/main/java/org/springframework/roo/shell/converters/FileConverter.java b/src/main/java/org/springframework/shell/converters/FileConverter.java similarity index 93% rename from src/main/java/org/springframework/roo/shell/converters/FileConverter.java rename to src/main/java/org/springframework/shell/converters/FileConverter.java index ba5c6f9c..07758ae6 100644 --- a/src/main/java/org/springframework/roo/shell/converters/FileConverter.java +++ b/src/main/java/org/springframework/shell/converters/FileConverter.java @@ -1,13 +1,13 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.io.File; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.FileUtils; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.FileUtils; /** * {@link Converter} for {@link File}. diff --git a/src/main/java/org/springframework/roo/shell/converters/FloatConverter.java b/src/main/java/org/springframework/shell/converters/FloatConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/FloatConverter.java rename to src/main/java/org/springframework/shell/converters/FloatConverter.java index 684e5d33..4539f78b 100644 --- a/src/main/java/org/springframework/roo/shell/converters/FloatConverter.java +++ b/src/main/java/org/springframework/shell/converters/FloatConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Float}. diff --git a/src/main/java/org/springframework/roo/shell/converters/IntegerConverter.java b/src/main/java/org/springframework/shell/converters/IntegerConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/IntegerConverter.java rename to src/main/java/org/springframework/shell/converters/IntegerConverter.java index 0723c597..b31d83a3 100644 --- a/src/main/java/org/springframework/roo/shell/converters/IntegerConverter.java +++ b/src/main/java/org/springframework/shell/converters/IntegerConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Integer}. diff --git a/src/main/java/org/springframework/roo/shell/converters/LocaleConverter.java b/src/main/java/org/springframework/shell/converters/LocaleConverter.java similarity index 84% rename from src/main/java/org/springframework/roo/shell/converters/LocaleConverter.java rename to src/main/java/org/springframework/shell/converters/LocaleConverter.java index 5680d366..38c6bae4 100644 --- a/src/main/java/org/springframework/roo/shell/converters/LocaleConverter.java +++ b/src/main/java/org/springframework/shell/converters/LocaleConverter.java @@ -1,11 +1,11 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; import java.util.Locale; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Locale}. Supports locales diff --git a/src/main/java/org/springframework/roo/shell/converters/LongConverter.java b/src/main/java/org/springframework/shell/converters/LongConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/LongConverter.java rename to src/main/java/org/springframework/shell/converters/LongConverter.java index 795fafff..018e277f 100644 --- a/src/main/java/org/springframework/roo/shell/converters/LongConverter.java +++ b/src/main/java/org/springframework/shell/converters/LongConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Long}. diff --git a/src/main/java/org/springframework/roo/shell/converters/ShortConverter.java b/src/main/java/org/springframework/shell/converters/ShortConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/ShortConverter.java rename to src/main/java/org/springframework/shell/converters/ShortConverter.java index f3eadd05..f4d89836 100644 --- a/src/main/java/org/springframework/roo/shell/converters/ShortConverter.java +++ b/src/main/java/org/springframework/shell/converters/ShortConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link Short}. diff --git a/src/main/java/org/springframework/shell/converters/SimpleFileConverter.java b/src/main/java/org/springframework/shell/converters/SimpleFileConverter.java index b852315c..a57c5906 100644 --- a/src/main/java/org/springframework/shell/converters/SimpleFileConverter.java +++ b/src/main/java/org/springframework/shell/converters/SimpleFileConverter.java @@ -3,8 +3,7 @@ package org.springframework.shell.converters; import java.io.File; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.roo.shell.Shell; -import org.springframework.roo.shell.converters.FileConverter; +import org.springframework.shell.core.Shell; import org.springframework.stereotype.Component; //@Component diff --git a/src/main/java/org/springframework/roo/shell/converters/StaticFieldConverter.java b/src/main/java/org/springframework/shell/converters/StaticFieldConverter.java similarity index 75% rename from src/main/java/org/springframework/roo/shell/converters/StaticFieldConverter.java rename to src/main/java/org/springframework/shell/converters/StaticFieldConverter.java index b99e9ced..4a3e5d82 100644 --- a/src/main/java/org/springframework/roo/shell/converters/StaticFieldConverter.java +++ b/src/main/java/org/springframework/shell/converters/StaticFieldConverter.java @@ -1,6 +1,6 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; -import org.springframework.roo.shell.Converter; +import org.springframework.shell.core.Converter; /** * Interface for adding and removing classes that provide static fields which should diff --git a/src/main/java/org/springframework/roo/shell/converters/StaticFieldConverterImpl.java b/src/main/java/org/springframework/shell/converters/StaticFieldConverterImpl.java similarity index 89% rename from src/main/java/org/springframework/roo/shell/converters/StaticFieldConverterImpl.java rename to src/main/java/org/springframework/shell/converters/StaticFieldConverterImpl.java index fe475a03..cb31cb07 100644 --- a/src/main/java/org/springframework/roo/shell/converters/StaticFieldConverterImpl.java +++ b/src/main/java/org/springframework/shell/converters/StaticFieldConverterImpl.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -6,11 +6,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.StringUtils; /** * A simple {@link Converter} for those classes which provide public static fields to represent possible diff --git a/src/main/java/org/springframework/roo/shell/converters/StringConverter.java b/src/main/java/org/springframework/shell/converters/StringConverter.java similarity index 78% rename from src/main/java/org/springframework/roo/shell/converters/StringConverter.java rename to src/main/java/org/springframework/shell/converters/StringConverter.java index 7b1fc0b9..92d40e3d 100644 --- a/src/main/java/org/springframework/roo/shell/converters/StringConverter.java +++ b/src/main/java/org/springframework/shell/converters/StringConverter.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.converters; +package org.springframework.shell.converters; import java.util.List; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.shell.MethodTarget; +import org.springframework.shell.core.Completion; +import org.springframework.shell.core.Converter; +import org.springframework.shell.core.MethodTarget; /** * {@link Converter} for {@link String}. diff --git a/src/main/java/org/springframework/roo/shell/AbstractShell.java b/src/main/java/org/springframework/shell/core/AbstractShell.java similarity index 95% rename from src/main/java/org/springframework/roo/shell/AbstractShell.java rename to src/main/java/org/springframework/shell/core/AbstractShell.java index fdc1eaa1..bca5b453 100644 --- a/src/main/java/org/springframework/roo/shell/AbstractShell.java +++ b/src/main/java/org/springframework/shell/core/AbstractShell.java @@ -1,6 +1,6 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; -import static org.springframework.roo.support.util.StringUtils.LINE_SEPARATOR; +import static org.springframework.shell.support.util.StringUtils.LINE_SEPARATOR; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -21,16 +21,18 @@ import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; -import org.springframework.roo.shell.event.AbstractShellStatusPublisher; -import org.springframework.roo.shell.event.ParseResult; -import org.springframework.roo.shell.event.ShellStatus; -import org.springframework.roo.shell.event.ShellStatus.Status; -import org.springframework.roo.support.logging.HandlerUtils; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.IOUtils; -import org.springframework.roo.support.util.MathUtils; -import org.springframework.roo.support.util.StringUtils; -import org.springframework.roo.support.util.VersionUtils; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; +import org.springframework.shell.event.AbstractShellStatusPublisher; +import org.springframework.shell.event.ParseResult; +import org.springframework.shell.event.ShellStatus; +import org.springframework.shell.event.ShellStatus.Status; +import org.springframework.shell.support.logging.HandlerUtils; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.IOUtils; +import org.springframework.shell.support.util.MathUtils; +import org.springframework.shell.support.util.StringUtils; +import org.springframework.shell.support.util.VersionUtils; /** * Provides a base {@link Shell} implementation. diff --git a/src/main/java/org/springframework/roo/shell/CliOptionContext.java b/src/main/java/org/springframework/shell/core/CliOptionContext.java similarity index 95% rename from src/main/java/org/springframework/roo/shell/CliOptionContext.java rename to src/main/java/org/springframework/shell/core/CliOptionContext.java index 895eeb4a..a4aeb31f 100644 --- a/src/main/java/org/springframework/roo/shell/CliOptionContext.java +++ b/src/main/java/org/springframework/shell/core/CliOptionContext.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; /** * Utility methods relating to shell option contexts diff --git a/src/main/java/org/springframework/roo/shell/CliSimpleParserContext.java b/src/main/java/org/springframework/shell/core/CliSimpleParserContext.java similarity index 94% rename from src/main/java/org/springframework/roo/shell/CliSimpleParserContext.java rename to src/main/java/org/springframework/shell/core/CliSimpleParserContext.java index c0496c47..954889bd 100644 --- a/src/main/java/org/springframework/roo/shell/CliSimpleParserContext.java +++ b/src/main/java/org/springframework/shell/core/CliSimpleParserContext.java @@ -1,4 +1,5 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; + /** * Utility methods relating to shell simple parser contexts. diff --git a/src/main/java/org/springframework/roo/shell/CommandMarker.java b/src/main/java/org/springframework/shell/core/CommandMarker.java similarity index 74% rename from src/main/java/org/springframework/roo/shell/CommandMarker.java rename to src/main/java/org/springframework/shell/core/CommandMarker.java index 81bb3adc..ee74f1df 100644 --- a/src/main/java/org/springframework/roo/shell/CommandMarker.java +++ b/src/main/java/org/springframework/shell/core/CommandMarker.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; /** * Marker interface indicating a provider of one or more shell commands. diff --git a/src/main/java/org/springframework/roo/shell/Completion.java b/src/main/java/org/springframework/shell/core/Completion.java similarity index 92% rename from src/main/java/org/springframework/roo/shell/Completion.java rename to src/main/java/org/springframework/shell/core/Completion.java index eb1e3994..513d4726 100644 --- a/src/main/java/org/springframework/roo/shell/Completion.java +++ b/src/main/java/org/springframework/shell/core/Completion.java @@ -1,7 +1,7 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; -import org.springframework.roo.support.util.AnsiEscapeCode; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.support.util.AnsiEscapeCode; +import org.springframework.shell.support.util.StringUtils; public class Completion { diff --git a/src/main/java/org/springframework/roo/shell/Converter.java b/src/main/java/org/springframework/shell/core/Converter.java similarity index 93% rename from src/main/java/org/springframework/roo/shell/Converter.java rename to src/main/java/org/springframework/shell/core/Converter.java index 944deef9..5645053a 100644 --- a/src/main/java/org/springframework/roo/shell/Converter.java +++ b/src/main/java/org/springframework/shell/core/Converter.java @@ -1,7 +1,11 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import java.util.List; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; + + /** * Converts between Strings (as displayed by and entered via the shell) and Java objects * diff --git a/src/main/java/org/springframework/shell/ExecutionProcessor.java b/src/main/java/org/springframework/shell/core/ExecutionProcessor.java similarity index 92% rename from src/main/java/org/springframework/shell/ExecutionProcessor.java rename to src/main/java/org/springframework/shell/core/ExecutionProcessor.java index 915ac1cc..d98ee81d 100644 --- a/src/main/java/org/springframework/shell/ExecutionProcessor.java +++ b/src/main/java/org/springframework/shell/core/ExecutionProcessor.java @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell; +package org.springframework.shell.core; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.shell.event.ParseResult; +import org.springframework.shell.event.ParseResult; /** * Extension interface allowing command provider to be called diff --git a/src/main/java/org/springframework/roo/shell/ExecutionStrategy.java b/src/main/java/org/springframework/shell/core/ExecutionStrategy.java similarity index 93% rename from src/main/java/org/springframework/roo/shell/ExecutionStrategy.java rename to src/main/java/org/springframework/shell/core/ExecutionStrategy.java index ee4ddc76..3cbf137b 100644 --- a/src/main/java/org/springframework/roo/shell/ExecutionStrategy.java +++ b/src/main/java/org/springframework/shell/core/ExecutionStrategy.java @@ -1,6 +1,6 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; -import org.springframework.roo.shell.event.ParseResult; +import org.springframework.shell.event.ParseResult; /** * Strategy interface to permit the controlled execution of methods. diff --git a/src/main/java/org/springframework/roo/shell/ExitShellRequest.java b/src/main/java/org/springframework/shell/core/ExitShellRequest.java similarity index 95% rename from src/main/java/org/springframework/roo/shell/ExitShellRequest.java rename to src/main/java/org/springframework/shell/core/ExitShellRequest.java index 08746dc3..b9014576 100644 --- a/src/main/java/org/springframework/roo/shell/ExitShellRequest.java +++ b/src/main/java/org/springframework/shell/core/ExitShellRequest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; /** * An immutable representation of a request to exit the shell. diff --git a/src/main/java/org/springframework/shell/IdeTerminal.java b/src/main/java/org/springframework/shell/core/IdeTerminal.java similarity index 95% rename from src/main/java/org/springframework/shell/IdeTerminal.java rename to src/main/java/org/springframework/shell/core/IdeTerminal.java index e1bfa06d..36764676 100644 --- a/src/main/java/org/springframework/shell/IdeTerminal.java +++ b/src/main/java/org/springframework/shell/core/IdeTerminal.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell; +package org.springframework.shell.core; import jline.UnsupportedTerminal; diff --git a/src/main/java/org/springframework/shell/JLineCompletorAdapter.java b/src/main/java/org/springframework/shell/core/JLineCompletorAdapter.java similarity index 84% rename from src/main/java/org/springframework/shell/JLineCompletorAdapter.java rename to src/main/java/org/springframework/shell/core/JLineCompletorAdapter.java index fab5ae49..64ef78d9 100644 --- a/src/main/java/org/springframework/shell/JLineCompletorAdapter.java +++ b/src/main/java/org/springframework/shell/core/JLineCompletorAdapter.java @@ -1,13 +1,11 @@ -package org.springframework.shell; +package org.springframework.shell.core; import java.util.ArrayList; import java.util.List; import jline.Completor; -import org.springframework.roo.shell.Completion; -import org.springframework.roo.shell.Parser; -import org.springframework.roo.support.util.Assert; +import org.springframework.shell.support.util.Assert; /** * An implementation of JLine's {@link Completor} interface that delegates to a {@link Parser}. diff --git a/src/main/java/org/springframework/shell/JLineLogHandler.java b/src/main/java/org/springframework/shell/core/JLineLogHandler.java similarity index 95% rename from src/main/java/org/springframework/shell/JLineLogHandler.java rename to src/main/java/org/springframework/shell/core/JLineLogHandler.java index 186cba1b..8895de66 100644 --- a/src/main/java/org/springframework/shell/JLineLogHandler.java +++ b/src/main/java/org/springframework/shell/core/JLineLogHandler.java @@ -1,4 +1,4 @@ -package org.springframework.shell; +package org.springframework.shell.core; import java.io.PrintWriter; import java.io.StringWriter; @@ -10,11 +10,10 @@ import java.util.logging.LogRecord; import jline.ANSIBuffer; import jline.ConsoleReader; -import org.springframework.roo.shell.ShellPromptAccessor; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.IOUtils; -import org.springframework.roo.support.util.OsUtils; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.IOUtils; +import org.springframework.shell.support.util.OsUtils; +import org.springframework.shell.support.util.StringUtils; /** * JDK logging {@link Handler} that emits log messages to a JLine {@link ConsoleReader}. diff --git a/src/main/java/org/springframework/shell/JLineShell.java b/src/main/java/org/springframework/shell/core/JLineShell.java similarity index 96% rename from src/main/java/org/springframework/shell/JLineShell.java rename to src/main/java/org/springframework/shell/core/JLineShell.java index 4d2119df..8ca40fe4 100644 --- a/src/main/java/org/springframework/shell/JLineShell.java +++ b/src/main/java/org/springframework/shell/core/JLineShell.java @@ -1,4 +1,4 @@ -package org.springframework.shell; +package org.springframework.shell.core; import java.io.File; import java.io.FileDescriptor; @@ -28,19 +28,15 @@ import jline.ConsoleReader; import jline.WindowsTerminal; import org.apache.commons.io.input.ReversedLinesFileReader; -import org.springframework.roo.shell.AbstractShell; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.shell.ExitShellRequest; -import org.springframework.roo.shell.Shell; -import org.springframework.roo.shell.event.ShellStatus; -import org.springframework.roo.shell.event.ShellStatus.Status; -import org.springframework.roo.shell.event.ShellStatusListener; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.ClassUtils; -import org.springframework.roo.support.util.IOUtils; -import org.springframework.roo.support.util.OsUtils; -import org.springframework.roo.support.util.StringUtils; -import org.springframework.roo.support.util.VersionUtils; +import org.springframework.shell.event.ShellStatus; +import org.springframework.shell.event.ShellStatusListener; +import org.springframework.shell.event.ShellStatus.Status; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.ClassUtils; +import org.springframework.shell.support.util.IOUtils; +import org.springframework.shell.support.util.OsUtils; +import org.springframework.shell.support.util.StringUtils; +import org.springframework.shell.support.util.VersionUtils; /** diff --git a/src/main/java/org/springframework/shell/JLineShellComponent.java b/src/main/java/org/springframework/shell/core/JLineShellComponent.java similarity index 96% rename from src/main/java/org/springframework/shell/JLineShellComponent.java rename to src/main/java/org/springframework/shell/core/JLineShellComponent.java index e5b3525b..fa2f2519 100644 --- a/src/main/java/org/springframework/shell/JLineShellComponent.java +++ b/src/main/java/org/springframework/shell/core/JLineShellComponent.java @@ -1,4 +1,4 @@ -package org.springframework.shell; +package org.springframework.shell.core; import java.io.IOException; import java.net.URL; @@ -14,9 +14,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.Lifecycle; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.core.io.Resource; -import org.springframework.roo.shell.ExecutionStrategy; -import org.springframework.roo.shell.Parser; -import org.springframework.roo.shell.SimpleParser; import org.springframework.shell.plugin.BannerProvider; import org.springframework.shell.plugin.HistoryFileNameProvider; import org.springframework.shell.plugin.PluginProvider; diff --git a/src/main/java/org/springframework/roo/shell/MethodTarget.java b/src/main/java/org/springframework/shell/core/MethodTarget.java similarity index 89% rename from src/main/java/org/springframework/roo/shell/MethodTarget.java rename to src/main/java/org/springframework/shell/core/MethodTarget.java index 959e317b..e5fd8d7c 100644 --- a/src/main/java/org/springframework/roo/shell/MethodTarget.java +++ b/src/main/java/org/springframework/shell/core/MethodTarget.java @@ -1,11 +1,11 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import java.lang.reflect.Method; -import org.springframework.roo.support.style.ToStringCreator; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.ObjectUtils; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.support.style.ToStringCreator; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.ObjectUtils; +import org.springframework.shell.support.util.StringUtils; /** * A method that can be executed via a shell command. diff --git a/src/main/java/org/springframework/roo/shell/Parser.java b/src/main/java/org/springframework/shell/core/Parser.java similarity index 87% rename from src/main/java/org/springframework/roo/shell/Parser.java rename to src/main/java/org/springframework/shell/core/Parser.java index 827ca982..7bd97d67 100644 --- a/src/main/java/org/springframework/roo/shell/Parser.java +++ b/src/main/java/org/springframework/shell/core/Parser.java @@ -1,8 +1,8 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import java.util.List; -import org.springframework.roo.shell.event.ParseResult; +import org.springframework.shell.event.ParseResult; /** * Interface for {@link SimpleParser}. diff --git a/src/main/java/org/springframework/roo/shell/ParserUtils.java b/src/main/java/org/springframework/shell/core/ParserUtils.java similarity index 98% rename from src/main/java/org/springframework/roo/shell/ParserUtils.java rename to src/main/java/org/springframework/shell/core/ParserUtils.java index fbf483a3..aa780ace 100644 --- a/src/main/java/org/springframework/roo/shell/ParserUtils.java +++ b/src/main/java/org/springframework/shell/core/ParserUtils.java @@ -1,9 +1,9 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.roo.support.util.Assert; +import org.springframework.shell.support.util.Assert; /** * Utilities for parsing. diff --git a/src/main/java/org/springframework/roo/shell/Shell.java b/src/main/java/org/springframework/shell/core/Shell.java similarity index 97% rename from src/main/java/org/springframework/roo/shell/Shell.java rename to src/main/java/org/springframework/shell/core/Shell.java index dd3c6e04..21370022 100644 --- a/src/main/java/org/springframework/roo/shell/Shell.java +++ b/src/main/java/org/springframework/shell/core/Shell.java @@ -1,9 +1,9 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import java.io.File; import java.util.logging.Level; -import org.springframework.roo.shell.event.ShellStatusProvider; +import org.springframework.shell.event.ShellStatusProvider; /** * Specifies the contract for an interactive shell. diff --git a/src/main/java/org/springframework/roo/shell/ShellPromptAccessor.java b/src/main/java/org/springframework/shell/core/ShellPromptAccessor.java similarity index 88% rename from src/main/java/org/springframework/roo/shell/ShellPromptAccessor.java rename to src/main/java/org/springframework/shell/core/ShellPromptAccessor.java index fc7f597b..bf3c7196 100644 --- a/src/main/java/org/springframework/roo/shell/ShellPromptAccessor.java +++ b/src/main/java/org/springframework/shell/core/ShellPromptAccessor.java @@ -1,4 +1,5 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; + /** * Obtains the prompt used by a {@link Shell}. diff --git a/src/main/java/org/springframework/shell/SimpleExecutionStrategy.java b/src/main/java/org/springframework/shell/core/SimpleExecutionStrategy.java similarity index 83% rename from src/main/java/org/springframework/shell/SimpleExecutionStrategy.java rename to src/main/java/org/springframework/shell/core/SimpleExecutionStrategy.java index e12a32b5..89a425da 100644 --- a/src/main/java/org/springframework/shell/SimpleExecutionStrategy.java +++ b/src/main/java/org/springframework/shell/core/SimpleExecutionStrategy.java @@ -1,10 +1,8 @@ -package org.springframework.shell; +package org.springframework.shell.core; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.shell.ExecutionStrategy; -import org.springframework.roo.shell.event.ParseResult; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.ReflectionUtils; +import org.springframework.shell.event.ParseResult; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.ReflectionUtils; /** * Simple execution strategy for invoking a target method. diff --git a/src/main/java/org/springframework/roo/shell/SimpleParser.java b/src/main/java/org/springframework/shell/core/SimpleParser.java similarity index 98% rename from src/main/java/org/springframework/roo/shell/SimpleParser.java rename to src/main/java/org/springframework/shell/core/SimpleParser.java index 8ab53219..3e504568 100644 --- a/src/main/java/org/springframework/roo/shell/SimpleParser.java +++ b/src/main/java/org/springframework/shell/core/SimpleParser.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import java.io.ByteArrayOutputStream; import java.io.File; @@ -28,16 +28,20 @@ import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilder; import javax.xml.transform.Transformer; -import org.springframework.roo.shell.event.ParseResult; -import org.springframework.roo.support.logging.HandlerUtils; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.CollectionUtils; -import org.springframework.roo.support.util.ExceptionUtils; -import org.springframework.roo.support.util.FileCopyUtils; -import org.springframework.roo.support.util.StringUtils; -import org.springframework.roo.support.util.VersionUtils; -import org.springframework.roo.support.util.XmlElementBuilder; -import org.springframework.roo.support.util.XmlUtils; +import org.springframework.shell.core.annotation.CliAvailabilityIndicator; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; +import org.springframework.shell.event.ParseResult; +import org.springframework.shell.support.logging.HandlerUtils; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.CollectionUtils; +import org.springframework.shell.support.util.ExceptionUtils; +import org.springframework.shell.support.util.FileCopyUtils; +import org.springframework.shell.support.util.NaturalOrderComparator; +import org.springframework.shell.support.util.StringUtils; +import org.springframework.shell.support.util.VersionUtils; +import org.springframework.shell.support.util.XmlElementBuilder; +import org.springframework.shell.support.util.XmlUtils; import org.w3c.dom.CDATASection; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/main/java/org/springframework/roo/shell/CliAvailabilityIndicator.java b/src/main/java/org/springframework/shell/core/annotation/CliAvailabilityIndicator.java similarity index 96% rename from src/main/java/org/springframework/roo/shell/CliAvailabilityIndicator.java rename to src/main/java/org/springframework/shell/core/annotation/CliAvailabilityIndicator.java index 207c2934..9e82c86e 100644 --- a/src/main/java/org/springframework/roo/shell/CliAvailabilityIndicator.java +++ b/src/main/java/org/springframework/shell/core/annotation/CliAvailabilityIndicator.java @@ -1,10 +1,11 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + /** * Annotates a method that can indicate whether a particular command is presently * available or not. diff --git a/src/main/java/org/springframework/roo/shell/CliCommand.java b/src/main/java/org/springframework/shell/core/annotation/CliCommand.java similarity index 92% rename from src/main/java/org/springframework/roo/shell/CliCommand.java rename to src/main/java/org/springframework/shell/core/annotation/CliCommand.java index 67c091b5..36ae3ca0 100644 --- a/src/main/java/org/springframework/roo/shell/CliCommand.java +++ b/src/main/java/org/springframework/shell/core/annotation/CliCommand.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/springframework/roo/shell/CliOption.java b/src/main/java/org/springframework/shell/core/annotation/CliOption.java similarity index 95% rename from src/main/java/org/springframework/roo/shell/CliOption.java rename to src/main/java/org/springframework/shell/core/annotation/CliOption.java index 8b370ce9..03b13ffd 100644 --- a/src/main/java/org/springframework/roo/shell/CliOption.java +++ b/src/main/java/org/springframework/shell/core/annotation/CliOption.java @@ -1,10 +1,13 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.shell.core.Converter; + + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) public @interface CliOption { diff --git a/src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java b/src/main/java/org/springframework/shell/event/AbstractShellStatusPublisher.java similarity index 91% rename from src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java rename to src/main/java/org/springframework/shell/event/AbstractShellStatusPublisher.java index 86eddd52..7e51d2d0 100644 --- a/src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java +++ b/src/main/java/org/springframework/shell/event/AbstractShellStatusPublisher.java @@ -1,10 +1,10 @@ -package org.springframework.roo.shell.event; +package org.springframework.shell.event; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; -import org.springframework.roo.shell.event.ShellStatus.Status; -import org.springframework.roo.support.util.Assert; +import org.springframework.shell.event.ShellStatus.Status; +import org.springframework.shell.support.util.Assert; /** * Provides a convenience superclass for those shells wishing to publish status messages. diff --git a/src/main/java/org/springframework/roo/shell/event/ParseResult.java b/src/main/java/org/springframework/shell/event/ParseResult.java similarity index 90% rename from src/main/java/org/springframework/roo/shell/event/ParseResult.java rename to src/main/java/org/springframework/shell/event/ParseResult.java index bbd4f2c5..b9171c87 100644 --- a/src/main/java/org/springframework/roo/shell/event/ParseResult.java +++ b/src/main/java/org/springframework/shell/event/ParseResult.java @@ -1,12 +1,12 @@ -package org.springframework.roo.shell.event; +package org.springframework.shell.event; import java.lang.reflect.Method; import java.util.Arrays; -import org.springframework.roo.shell.Converter; -import org.springframework.roo.support.style.ToStringCreator; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.core.Converter; +import org.springframework.shell.support.style.ToStringCreator; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.StringUtils; /** * Immutable representation of the outcome of parsing a given shell line. diff --git a/src/main/java/org/springframework/roo/shell/event/ShellStatus.java b/src/main/java/org/springframework/shell/event/ShellStatus.java similarity index 97% rename from src/main/java/org/springframework/roo/shell/event/ShellStatus.java rename to src/main/java/org/springframework/shell/event/ShellStatus.java index fc34f409..ccb602a9 100644 --- a/src/main/java/org/springframework/roo/shell/event/ShellStatus.java +++ b/src/main/java/org/springframework/shell/event/ShellStatus.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell.event; +package org.springframework.shell.event; /** diff --git a/src/main/java/org/springframework/roo/shell/event/ShellStatusListener.java b/src/main/java/org/springframework/shell/event/ShellStatusListener.java similarity index 89% rename from src/main/java/org/springframework/roo/shell/event/ShellStatusListener.java rename to src/main/java/org/springframework/shell/event/ShellStatusListener.java index 8acee67b..5963510f 100644 --- a/src/main/java/org/springframework/roo/shell/event/ShellStatusListener.java +++ b/src/main/java/org/springframework/shell/event/ShellStatusListener.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell.event; +package org.springframework.shell.event; /** * Implemented by classes that wish to be notified of shell status changes. diff --git a/src/main/java/org/springframework/roo/shell/event/ShellStatusProvider.java b/src/main/java/org/springframework/shell/event/ShellStatusProvider.java similarity index 96% rename from src/main/java/org/springframework/roo/shell/event/ShellStatusProvider.java rename to src/main/java/org/springframework/shell/event/ShellStatusProvider.java index 660d7490..fc1fc644 100644 --- a/src/main/java/org/springframework/roo/shell/event/ShellStatusProvider.java +++ b/src/main/java/org/springframework/shell/event/ShellStatusProvider.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell.event; +package org.springframework.shell.event; /** * Implemented by shells that support the publication of shell status changes. diff --git a/src/main/java/org/springframework/shell/plugin/support/DefaultBannerProvider.java b/src/main/java/org/springframework/shell/plugin/support/DefaultBannerProvider.java index 2df39d63..28bc94d4 100644 --- a/src/main/java/org/springframework/shell/plugin/support/DefaultBannerProvider.java +++ b/src/main/java/org/springframework/shell/plugin/support/DefaultBannerProvider.java @@ -15,15 +15,14 @@ */ package org.springframework.shell.plugin.support; +import static org.springframework.shell.support.util.StringUtils.LINE_SEPARATOR; + import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import org.springframework.roo.shell.CommandMarker; -import org.springframework.roo.support.util.VersionUtils; import org.springframework.shell.plugin.BannerProvider; +import org.springframework.shell.support.util.VersionUtils; import org.springframework.stereotype.Component; -import static org.springframework.roo.support.util.StringUtils.*; - /** * Default Banner provider. * @@ -32,9 +31,8 @@ import static org.springframework.roo.support.util.StringUtils.*; */ @Component @Order(Ordered.LOWEST_PRECEDENCE) -public class DefaultBannerProvider implements BannerProvider, CommandMarker { +public class DefaultBannerProvider implements BannerProvider { - //@CliCommand(value = { "shell-version" }, help = "Displays shell version") public String getBanner() { StringBuilder sb = new StringBuilder(); sb.append(" _____ _ ").append(LINE_SEPARATOR); diff --git a/src/main/java/org/springframework/roo/support/api/AddOnSearch.java b/src/main/java/org/springframework/shell/support/api/AddOnSearch.java similarity index 97% rename from src/main/java/org/springframework/roo/support/api/AddOnSearch.java rename to src/main/java/org/springframework/shell/support/api/AddOnSearch.java index 972c7591..d99b164b 100644 --- a/src/main/java/org/springframework/roo/support/api/AddOnSearch.java +++ b/src/main/java/org/springframework/shell/support/api/AddOnSearch.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.api; +package org.springframework.shell.support.api; import java.util.logging.Logger; diff --git a/src/main/java/org/springframework/roo/support/logging/DeferredLogHandler.java b/src/main/java/org/springframework/shell/support/logging/DeferredLogHandler.java similarity index 97% rename from src/main/java/org/springframework/roo/support/logging/DeferredLogHandler.java rename to src/main/java/org/springframework/shell/support/logging/DeferredLogHandler.java index 0c30bb0d..78b3f7f8 100644 --- a/src/main/java/org/springframework/roo/support/logging/DeferredLogHandler.java +++ b/src/main/java/org/springframework/shell/support/logging/DeferredLogHandler.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.logging; +package org.springframework.shell.support.logging; import java.util.ArrayList; import java.util.Collections; @@ -7,7 +7,7 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; -import org.springframework.roo.support.util.Assert; +import org.springframework.shell.support.util.Assert; /** * Defers the publication of JDK {@link LogRecord} instances until a target {@link Handler} is registered. diff --git a/src/main/java/org/springframework/roo/support/logging/HandlerUtils.java b/src/main/java/org/springframework/shell/support/logging/HandlerUtils.java similarity index 96% rename from src/main/java/org/springframework/roo/support/logging/HandlerUtils.java rename to src/main/java/org/springframework/shell/support/logging/HandlerUtils.java index f7c6067c..9017f783 100644 --- a/src/main/java/org/springframework/roo/support/logging/HandlerUtils.java +++ b/src/main/java/org/springframework/shell/support/logging/HandlerUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.logging; +package org.springframework.shell.support.logging; import java.util.ArrayList; import java.util.List; @@ -9,8 +9,8 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.StringUtils; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.StringUtils; /** * Utility methods for dealing with {@link Handler} objects. diff --git a/src/main/java/org/springframework/roo/support/logging/LoggingOutputStream.java b/src/main/java/org/springframework/shell/support/logging/LoggingOutputStream.java similarity index 91% rename from src/main/java/org/springframework/roo/support/logging/LoggingOutputStream.java rename to src/main/java/org/springframework/shell/support/logging/LoggingOutputStream.java index a808eb60..2794fb9f 100644 --- a/src/main/java/org/springframework/roo/support/logging/LoggingOutputStream.java +++ b/src/main/java/org/springframework/shell/support/logging/LoggingOutputStream.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.logging; +package org.springframework.shell.support.logging; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,8 +7,8 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.IOUtils; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.IOUtils; /** * Wraps an {@link OutputStream} and automatically passes each line to the {@link Logger} diff --git a/src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java b/src/main/java/org/springframework/shell/support/logging/MessageDisplayUtils.java similarity index 93% rename from src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java rename to src/main/java/org/springframework/shell/support/logging/MessageDisplayUtils.java index 4ce5aa62..981f0e33 100644 --- a/src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java +++ b/src/main/java/org/springframework/shell/support/logging/MessageDisplayUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.logging; +package org.springframework.shell.support.logging; import java.io.BufferedInputStream; import java.io.InputStream; @@ -6,8 +6,8 @@ import java.io.InputStreamReader; import java.util.logging.Level; import java.util.logging.Logger; -import org.springframework.roo.support.util.FileCopyUtils; -import org.springframework.roo.support.util.IOUtils; +import org.springframework.shell.support.util.FileCopyUtils; +import org.springframework.shell.support.util.IOUtils; /** * Retrieves text files from the classloader and displays them on-screen. diff --git a/src/main/java/org/springframework/roo/support/style/DefaultToStringStyler.java b/src/main/java/org/springframework/shell/support/style/DefaultToStringStyler.java similarity index 92% rename from src/main/java/org/springframework/roo/support/style/DefaultToStringStyler.java rename to src/main/java/org/springframework/shell/support/style/DefaultToStringStyler.java index c67e5392..171e9611 100644 --- a/src/main/java/org/springframework/roo/support/style/DefaultToStringStyler.java +++ b/src/main/java/org/springframework/shell/support/style/DefaultToStringStyler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.roo.support.style; +package org.springframework.shell.support.style; -import org.springframework.roo.support.util.Assert; -import org.springframework.roo.support.util.ClassUtils; -import org.springframework.roo.support.util.ObjectUtils; +import org.springframework.shell.support.util.Assert; +import org.springframework.shell.support.util.ClassUtils; +import org.springframework.shell.support.util.ObjectUtils; /** * Spring's default toString() styler. diff --git a/src/main/java/org/springframework/roo/support/style/DefaultValueStyler.java b/src/main/java/org/springframework/shell/support/style/DefaultValueStyler.java similarity index 96% rename from src/main/java/org/springframework/roo/support/style/DefaultValueStyler.java rename to src/main/java/org/springframework/shell/support/style/DefaultValueStyler.java index 3e256283..fedd067d 100644 --- a/src/main/java/org/springframework/roo/support/style/DefaultValueStyler.java +++ b/src/main/java/org/springframework/shell/support/style/DefaultValueStyler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.roo.support.style; +package org.springframework.shell.support.style; import java.lang.reflect.Method; import java.util.Collection; @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.springframework.roo.support.util.ClassUtils; -import org.springframework.roo.support.util.ObjectUtils; +import org.springframework.shell.support.util.ClassUtils; +import org.springframework.shell.support.util.ObjectUtils; /** * Converts objects to String form, generally for debugging purposes, diff --git a/src/main/java/org/springframework/roo/support/style/StylerUtils.java b/src/main/java/org/springframework/shell/support/style/StylerUtils.java similarity index 96% rename from src/main/java/org/springframework/roo/support/style/StylerUtils.java rename to src/main/java/org/springframework/shell/support/style/StylerUtils.java index 449bc108..adf1dcac 100644 --- a/src/main/java/org/springframework/roo/support/style/StylerUtils.java +++ b/src/main/java/org/springframework/shell/support/style/StylerUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.roo.support.style; +package org.springframework.shell.support.style; /** * Simple utility class to allow for convenient access to value diff --git a/src/main/java/org/springframework/roo/support/style/ToStringCreator.java b/src/main/java/org/springframework/shell/support/style/ToStringCreator.java similarity index 98% rename from src/main/java/org/springframework/roo/support/style/ToStringCreator.java rename to src/main/java/org/springframework/shell/support/style/ToStringCreator.java index 0f58209e..19c42a7d 100644 --- a/src/main/java/org/springframework/roo/support/style/ToStringCreator.java +++ b/src/main/java/org/springframework/shell/support/style/ToStringCreator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.roo.support.style; +package org.springframework.shell.support.style; -import org.springframework.roo.support.util.Assert; +import org.springframework.shell.support.util.Assert; /** * Utility class that builds pretty-printing toString() methods diff --git a/src/main/java/org/springframework/roo/support/style/ToStringStyler.java b/src/main/java/org/springframework/shell/support/style/ToStringStyler.java similarity index 97% rename from src/main/java/org/springframework/roo/support/style/ToStringStyler.java rename to src/main/java/org/springframework/shell/support/style/ToStringStyler.java index c1f999e6..703c7252 100644 --- a/src/main/java/org/springframework/roo/support/style/ToStringStyler.java +++ b/src/main/java/org/springframework/shell/support/style/ToStringStyler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.roo.support.style; +package org.springframework.shell.support.style; /** * A strategy interface for pretty-printing toString() methods. diff --git a/src/main/java/org/springframework/roo/support/style/ValueStyler.java b/src/main/java/org/springframework/shell/support/style/ValueStyler.java similarity index 95% rename from src/main/java/org/springframework/roo/support/style/ValueStyler.java rename to src/main/java/org/springframework/shell/support/style/ValueStyler.java index 4ec3aca3..4e213ef5 100644 --- a/src/main/java/org/springframework/roo/support/style/ValueStyler.java +++ b/src/main/java/org/springframework/shell/support/style/ValueStyler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.roo.support.style; +package org.springframework.shell.support.style; /** * Strategy that encapsulates value String styling algorithms diff --git a/src/main/java/org/springframework/roo/support/util/AnsiEscapeCode.java b/src/main/java/org/springframework/shell/support/util/AnsiEscapeCode.java similarity index 96% rename from src/main/java/org/springframework/roo/support/util/AnsiEscapeCode.java rename to src/main/java/org/springframework/shell/support/util/AnsiEscapeCode.java index e84d68ad..3ae8aada 100644 --- a/src/main/java/org/springframework/roo/support/util/AnsiEscapeCode.java +++ b/src/main/java/org/springframework/shell/support/util/AnsiEscapeCode.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * ANSI escape codes supported by JLine diff --git a/src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java b/src/main/java/org/springframework/shell/support/util/AntPatchStringMatcher.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java rename to src/main/java/org/springframework/shell/support/util/AntPatchStringMatcher.java index a63ca280..679588a2 100644 --- a/src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java +++ b/src/main/java/org/springframework/shell/support/util/AntPatchStringMatcher.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.Map; diff --git a/src/main/java/org/springframework/roo/support/util/AntPathMatcher.java b/src/main/java/org/springframework/shell/support/util/AntPathMatcher.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/AntPathMatcher.java rename to src/main/java/org/springframework/shell/support/util/AntPathMatcher.java index c8c5d0a4..450cd870 100644 --- a/src/main/java/org/springframework/roo/support/util/AntPathMatcher.java +++ b/src/main/java/org/springframework/shell/support/util/AntPathMatcher.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/org/springframework/roo/support/util/Assert.java b/src/main/java/org/springframework/shell/support/util/Assert.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/Assert.java rename to src/main/java/org/springframework/shell/support/util/Assert.java index 695eae4c..54025b38 100644 --- a/src/main/java/org/springframework/roo/support/util/Assert.java +++ b/src/main/java/org/springframework/shell/support/util/Assert.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /* * Copyright 2002-2007 the original author or authors. diff --git a/src/main/java/org/springframework/roo/support/util/Base64.java b/src/main/java/org/springframework/shell/support/util/Base64.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/Base64.java rename to src/main/java/org/springframework/shell/support/util/Base64.java index 83f27fae..fb4237ab 100644 --- a/src/main/java/org/springframework/roo/support/util/Base64.java +++ b/src/main/java/org/springframework/shell/support/util/Base64.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/src/main/java/org/springframework/roo/support/util/ClassUtils.java b/src/main/java/org/springframework/shell/support/util/ClassUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/ClassUtils.java rename to src/main/java/org/springframework/shell/support/util/ClassUtils.java index c4d4a21c..bbc15833 100644 --- a/src/main/java/org/springframework/roo/support/util/ClassUtils.java +++ b/src/main/java/org/springframework/shell/support/util/ClassUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /* * Copyright 2002-2010 the original author or authors. diff --git a/src/main/java/org/springframework/roo/support/util/CollectionUtils.java b/src/main/java/org/springframework/shell/support/util/CollectionUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/CollectionUtils.java rename to src/main/java/org/springframework/shell/support/util/CollectionUtils.java index af2a4588..84b44e34 100644 --- a/src/main/java/org/springframework/roo/support/util/CollectionUtils.java +++ b/src/main/java/org/springframework/shell/support/util/CollectionUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /* * Copyright 2002-2008 the original author or authors. diff --git a/src/main/java/org/springframework/roo/support/util/DomUtils.java b/src/main/java/org/springframework/shell/support/util/DomUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/DomUtils.java rename to src/main/java/org/springframework/shell/support/util/DomUtils.java index af8b4649..09cc328f 100644 --- a/src/main/java/org/springframework/roo/support/util/DomUtils.java +++ b/src/main/java/org/springframework/shell/support/util/DomUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/springframework/roo/support/util/ExceptionUtils.java b/src/main/java/org/springframework/shell/support/util/ExceptionUtils.java similarity index 92% rename from src/main/java/org/springframework/roo/support/util/ExceptionUtils.java rename to src/main/java/org/springframework/shell/support/util/ExceptionUtils.java index 49470753..769c8b73 100644 --- a/src/main/java/org/springframework/roo/support/util/ExceptionUtils.java +++ b/src/main/java/org/springframework/shell/support/util/ExceptionUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * Methods for working with exceptions. diff --git a/src/main/java/org/springframework/roo/support/util/FileCopyUtils.java b/src/main/java/org/springframework/shell/support/util/FileCopyUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/FileCopyUtils.java rename to src/main/java/org/springframework/shell/support/util/FileCopyUtils.java index d4c1bc0a..da19d1d9 100644 --- a/src/main/java/org/springframework/roo/support/util/FileCopyUtils.java +++ b/src/main/java/org/springframework/shell/support/util/FileCopyUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/src/main/java/org/springframework/roo/support/util/FileUtils.java b/src/main/java/org/springframework/shell/support/util/FileUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/FileUtils.java rename to src/main/java/org/springframework/shell/support/util/FileUtils.java index 38efd78e..68968c28 100644 --- a/src/main/java/org/springframework/roo/support/util/FileUtils.java +++ b/src/main/java/org/springframework/shell/support/util/FileUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/springframework/roo/support/util/Filter.java b/src/main/java/org/springframework/shell/support/util/Filter.java similarity index 89% rename from src/main/java/org/springframework/roo/support/util/Filter.java rename to src/main/java/org/springframework/shell/support/util/Filter.java index 05de67c1..7142c1d0 100644 --- a/src/main/java/org/springframework/roo/support/util/Filter.java +++ b/src/main/java/org/springframework/shell/support/util/Filter.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * Allows filtering of objects of type T. diff --git a/src/main/java/org/springframework/roo/support/util/HexUtils.java b/src/main/java/org/springframework/shell/support/util/HexUtils.java similarity index 95% rename from src/main/java/org/springframework/roo/support/util/HexUtils.java rename to src/main/java/org/springframework/shell/support/util/HexUtils.java index a8def105..f076d6ee 100644 --- a/src/main/java/org/springframework/roo/support/util/HexUtils.java +++ b/src/main/java/org/springframework/shell/support/util/HexUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * Encodes a given byte array as hex. diff --git a/src/main/java/org/springframework/roo/support/util/IOUtils.java b/src/main/java/org/springframework/shell/support/util/IOUtils.java similarity index 96% rename from src/main/java/org/springframework/roo/support/util/IOUtils.java rename to src/main/java/org/springframework/shell/support/util/IOUtils.java index 1548f2a9..372a64c9 100644 --- a/src/main/java/org/springframework/roo/support/util/IOUtils.java +++ b/src/main/java/org/springframework/shell/support/util/IOUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/org/springframework/roo/support/util/MathUtils.java b/src/main/java/org/springframework/shell/support/util/MathUtils.java similarity index 90% rename from src/main/java/org/springframework/roo/support/util/MathUtils.java rename to src/main/java/org/springframework/shell/support/util/MathUtils.java index af2ab44d..1c4029eb 100644 --- a/src/main/java/org/springframework/roo/support/util/MathUtils.java +++ b/src/main/java/org/springframework/shell/support/util/MathUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * A class which contains a number of number manipulation operations diff --git a/src/main/java/org/springframework/roo/shell/NaturalOrderComparator.java b/src/main/java/org/springframework/shell/support/util/NaturalOrderComparator.java similarity index 98% rename from src/main/java/org/springframework/roo/shell/NaturalOrderComparator.java rename to src/main/java/org/springframework/shell/support/util/NaturalOrderComparator.java index eb4900a8..210cd28e 100644 --- a/src/main/java/org/springframework/roo/shell/NaturalOrderComparator.java +++ b/src/main/java/org/springframework/shell/support/util/NaturalOrderComparator.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.support.util; import java.util.Comparator; diff --git a/src/main/java/org/springframework/roo/support/util/NumberUtils.java b/src/main/java/org/springframework/shell/support/util/NumberUtils.java similarity index 97% rename from src/main/java/org/springframework/roo/support/util/NumberUtils.java rename to src/main/java/org/springframework/shell/support/util/NumberUtils.java index fa7d9363..80416f15 100644 --- a/src/main/java/org/springframework/roo/support/util/NumberUtils.java +++ b/src/main/java/org/springframework/shell/support/util/NumberUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/springframework/roo/support/util/ObjectUtils.java b/src/main/java/org/springframework/shell/support/util/ObjectUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/ObjectUtils.java rename to src/main/java/org/springframework/shell/support/util/ObjectUtils.java index ba39e969..ea075ee3 100644 --- a/src/main/java/org/springframework/roo/support/util/ObjectUtils.java +++ b/src/main/java/org/springframework/shell/support/util/ObjectUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/src/main/java/org/springframework/roo/support/util/OsUtils.java b/src/main/java/org/springframework/shell/support/util/OsUtils.java similarity index 86% rename from src/main/java/org/springframework/roo/support/util/OsUtils.java rename to src/main/java/org/springframework/shell/support/util/OsUtils.java index 3da4cd38..de2e2e30 100644 --- a/src/main/java/org/springframework/roo/support/util/OsUtils.java +++ b/src/main/java/org/springframework/shell/support/util/OsUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * Utilities for handling OS-specific behavior. diff --git a/src/main/java/org/springframework/roo/support/util/Pair.java b/src/main/java/org/springframework/shell/support/util/Pair.java similarity index 96% rename from src/main/java/org/springframework/roo/support/util/Pair.java rename to src/main/java/org/springframework/shell/support/util/Pair.java index 029cc524..c6d55e8d 100644 --- a/src/main/java/org/springframework/roo/support/util/Pair.java +++ b/src/main/java/org/springframework/shell/support/util/Pair.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; /** * A pair with a key of type "K" and a value of type "V". Instances are immutable. diff --git a/src/main/java/org/springframework/roo/support/util/PairList.java b/src/main/java/org/springframework/shell/support/util/PairList.java similarity index 98% rename from src/main/java/org/springframework/roo/support/util/PairList.java rename to src/main/java/org/springframework/shell/support/util/PairList.java index 730f88da..43530cb7 100644 --- a/src/main/java/org/springframework/roo/support/util/PairList.java +++ b/src/main/java/org/springframework/shell/support/util/PairList.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/springframework/roo/support/util/PathMatcher.java b/src/main/java/org/springframework/shell/support/util/PathMatcher.java similarity index 98% rename from src/main/java/org/springframework/roo/support/util/PathMatcher.java rename to src/main/java/org/springframework/shell/support/util/PathMatcher.java index ea573a7a..dd1c0a18 100644 --- a/src/main/java/org/springframework/roo/support/util/PathMatcher.java +++ b/src/main/java/org/springframework/shell/support/util/PathMatcher.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.Map; diff --git a/src/main/java/org/springframework/roo/support/util/ReflectionUtils.java b/src/main/java/org/springframework/shell/support/util/ReflectionUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/ReflectionUtils.java rename to src/main/java/org/springframework/shell/support/util/ReflectionUtils.java index 89caaa9d..247ea70f 100644 --- a/src/main/java/org/springframework/roo/support/util/ReflectionUtils.java +++ b/src/main/java/org/springframework/shell/support/util/ReflectionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/org/springframework/roo/support/util/StringUtils.java b/src/main/java/org/springframework/shell/support/util/StringUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/StringUtils.java rename to src/main/java/org/springframework/shell/support/util/StringUtils.java index ed0891cd..2ede0413 100644 --- a/src/main/java/org/springframework/roo/support/util/StringUtils.java +++ b/src/main/java/org/springframework/shell/support/util/StringUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/springframework/roo/support/util/TemplateUtils.java b/src/main/java/org/springframework/shell/support/util/TemplateUtils.java similarity index 96% rename from src/main/java/org/springframework/roo/support/util/TemplateUtils.java rename to src/main/java/org/springframework/shell/support/util/TemplateUtils.java index 5ddf9365..81f788d1 100644 --- a/src/main/java/org/springframework/roo/support/util/TemplateUtils.java +++ b/src/main/java/org/springframework/shell/support/util/TemplateUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.io.InputStream; diff --git a/src/main/java/org/springframework/roo/support/util/UrlUtils.java b/src/main/java/org/springframework/shell/support/util/UrlUtils.java similarity index 93% rename from src/main/java/org/springframework/roo/support/util/UrlUtils.java rename to src/main/java/org/springframework/shell/support/util/UrlUtils.java index c5ce0a5f..0bbf8d1c 100644 --- a/src/main/java/org/springframework/roo/support/util/UrlUtils.java +++ b/src/main/java/org/springframework/shell/support/util/UrlUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.net.MalformedURLException; import java.net.URI; diff --git a/src/main/java/org/springframework/roo/support/util/VersionUtils.java b/src/main/java/org/springframework/shell/support/util/VersionUtils.java similarity index 95% rename from src/main/java/org/springframework/roo/support/util/VersionUtils.java rename to src/main/java/org/springframework/shell/support/util/VersionUtils.java index a4495e3f..a9e87608 100644 --- a/src/main/java/org/springframework/roo/support/util/VersionUtils.java +++ b/src/main/java/org/springframework/shell/support/util/VersionUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; diff --git a/src/main/java/org/springframework/roo/support/util/WebXmlUtils.java b/src/main/java/org/springframework/shell/support/util/WebXmlUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/WebXmlUtils.java rename to src/main/java/org/springframework/shell/support/util/WebXmlUtils.java index f17842d9..1b00b5dc 100644 --- a/src/main/java/org/springframework/roo/support/util/WebXmlUtils.java +++ b/src/main/java/org/springframework/shell/support/util/WebXmlUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/springframework/roo/support/util/XmlElementBuilder.java b/src/main/java/org/springframework/shell/support/util/XmlElementBuilder.java similarity index 97% rename from src/main/java/org/springframework/roo/support/util/XmlElementBuilder.java rename to src/main/java/org/springframework/shell/support/util/XmlElementBuilder.java index ab976767..c6b174c8 100644 --- a/src/main/java/org/springframework/roo/support/util/XmlElementBuilder.java +++ b/src/main/java/org/springframework/shell/support/util/XmlElementBuilder.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/main/java/org/springframework/roo/support/util/XmlRoundTripUtils.java b/src/main/java/org/springframework/shell/support/util/XmlRoundTripUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/XmlRoundTripUtils.java rename to src/main/java/org/springframework/shell/support/util/XmlRoundTripUtils.java index fb33c232..29db5926 100644 --- a/src/main/java/org/springframework/roo/support/util/XmlRoundTripUtils.java +++ b/src/main/java/org/springframework/shell/support/util/XmlRoundTripUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/src/main/java/org/springframework/roo/support/util/XmlUtils.java b/src/main/java/org/springframework/shell/support/util/XmlUtils.java similarity index 99% rename from src/main/java/org/springframework/roo/support/util/XmlUtils.java rename to src/main/java/org/springframework/shell/support/util/XmlUtils.java index 34532431..b87586d0 100644 --- a/src/main/java/org/springframework/roo/support/util/XmlUtils.java +++ b/src/main/java/org/springframework/shell/support/util/XmlUtils.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/test/java/org/springframework/roo/support/util/loader/Loader.java b/src/test/java/org/springframework/roo/support/util/loader/Loader.java deleted file mode 100644 index ec7b1a56..00000000 --- a/src/test/java/org/springframework/roo/support/util/loader/Loader.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.springframework.roo.support.util.loader; - -import org.springframework.roo.support.util.FileUtilsTest; - -/** - * Required for {@link FileUtilsTest}. - * - * @author Andrew Swan - * @since 1.2.0 - */ -public class Loader {} diff --git a/src/test/java/org/springframework/roo/shell/AbstractShellTest.java b/src/test/java/org/springframework/shell/core/AbstractShellTest.java similarity index 86% rename from src/test/java/org/springframework/roo/shell/AbstractShellTest.java rename to src/test/java/org/springframework/shell/core/AbstractShellTest.java index 0030b52c..b919e86d 100644 --- a/src/test/java/org/springframework/roo/shell/AbstractShellTest.java +++ b/src/test/java/org/springframework/shell/core/AbstractShellTest.java @@ -1,10 +1,11 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.junit.Test; +import org.springframework.shell.core.AbstractShell; /** diff --git a/src/test/java/org/springframework/roo/shell/CliOptionContextTest.java b/src/test/java/org/springframework/shell/core/CliOptionContextTest.java similarity index 90% rename from src/test/java/org/springframework/roo/shell/CliOptionContextTest.java rename to src/test/java/org/springframework/shell/core/CliOptionContextTest.java index 461de817..897853fc 100644 --- a/src/test/java/org/springframework/roo/shell/CliOptionContextTest.java +++ b/src/test/java/org/springframework/shell/core/CliOptionContextTest.java @@ -1,9 +1,10 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; +import org.springframework.shell.core.CliOptionContext; /** * Unit test of {@link CliOptionContext} diff --git a/src/test/java/org/springframework/roo/shell/MethodTargetTest.java b/src/test/java/org/springframework/shell/core/MethodTargetTest.java similarity index 91% rename from src/test/java/org/springframework/roo/shell/MethodTargetTest.java rename to src/test/java/org/springframework/shell/core/MethodTargetTest.java index 179aa2ba..7e2f7a51 100644 --- a/src/test/java/org/springframework/roo/shell/MethodTargetTest.java +++ b/src/test/java/org/springframework/shell/core/MethodTargetTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -6,6 +6,8 @@ import static org.junit.Assert.assertFalse; import java.lang.reflect.Method; import org.junit.Test; +import org.springframework.shell.core.CommandMarker; +import org.springframework.shell.core.MethodTarget; /** * Unit test of {@link MethodTarget} diff --git a/src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java b/src/test/java/org/springframework/shell/core/SimpleExecutionStrategyTest.java similarity index 91% rename from src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java rename to src/test/java/org/springframework/shell/core/SimpleExecutionStrategyTest.java index 589dcc3c..ada58c6a 100644 --- a/src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java +++ b/src/test/java/org/springframework/shell/core/SimpleExecutionStrategyTest.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.shell; +package org.springframework.shell.core; import java.lang.reflect.Method; import org.junit.Test; -import org.springframework.roo.shell.event.ParseResult; +import org.springframework.shell.core.ExecutionProcessor; +import org.springframework.shell.core.SimpleExecutionStrategy; +import org.springframework.shell.event.ParseResult; import org.springframework.util.ReflectionUtils; import static org.junit.Assert.*; diff --git a/src/test/java/org/springframework/roo/shell/SimpleParserTest.java b/src/test/java/org/springframework/shell/core/SimpleParserTest.java similarity index 91% rename from src/test/java/org/springframework/roo/shell/SimpleParserTest.java rename to src/test/java/org/springframework/shell/core/SimpleParserTest.java index 75fa1491..32f7f4a8 100644 --- a/src/test/java/org/springframework/roo/shell/SimpleParserTest.java +++ b/src/test/java/org/springframework/shell/core/SimpleParserTest.java @@ -1,8 +1,9 @@ -package org.springframework.roo.shell; +package org.springframework.shell.core; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.springframework.shell.core.SimpleParser; /** * Unit test of {@link SimpleParser} diff --git a/src/test/java/org/springframework/roo/support/util/AnsiEscapeCodeTest.java b/src/test/java/org/springframework/shell/support/util/AnsiEscapeCodeTest.java similarity index 91% rename from src/test/java/org/springframework/roo/support/util/AnsiEscapeCodeTest.java rename to src/test/java/org/springframework/shell/support/util/AnsiEscapeCodeTest.java index 370ec937..5d06e98a 100644 --- a/src/test/java/org/springframework/roo/support/util/AnsiEscapeCodeTest.java +++ b/src/test/java/org/springframework/shell/support/util/AnsiEscapeCodeTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -8,6 +8,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; +import org.springframework.shell.support.util.AnsiEscapeCode; /** * Unit test for the {@link AnsiEscapeCode} enum. diff --git a/src/test/java/org/springframework/roo/support/util/CollectionUtilsTest.java b/src/test/java/org/springframework/shell/support/util/CollectionUtilsTest.java similarity index 94% rename from src/test/java/org/springframework/roo/support/util/CollectionUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/CollectionUtilsTest.java index 5295a3bd..cbae439c 100644 --- a/src/test/java/org/springframework/roo/support/util/CollectionUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/CollectionUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,6 +12,9 @@ import java.util.Collections; import java.util.List; import org.junit.Test; +import org.springframework.shell.support.util.CollectionUtils; +import org.springframework.shell.support.util.Filter; +import org.springframework.shell.support.util.StringUtils; /** * Unit test of {@link CollectionUtils} diff --git a/src/test/java/org/springframework/roo/support/util/DomUtilsTest.java b/src/test/java/org/springframework/shell/support/util/DomUtilsTest.java similarity index 91% rename from src/test/java/org/springframework/roo/support/util/DomUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/DomUtilsTest.java index b1796374..6118a730 100644 --- a/src/test/java/org/springframework/roo/support/util/DomUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/DomUtilsTest.java @@ -1,10 +1,13 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.junit.Test; +import org.springframework.shell.support.util.DomUtils; +import org.springframework.shell.support.util.StringUtils; +import org.springframework.shell.support.util.XmlUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/test/java/org/springframework/roo/support/util/FileUtilsTest.java b/src/test/java/org/springframework/shell/support/util/FileUtilsTest.java similarity index 93% rename from src/test/java/org/springframework/roo/support/util/FileUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/FileUtilsTest.java index 38c5eb5e..0d672afc 100644 --- a/src/test/java/org/springframework/roo/support/util/FileUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/FileUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -12,7 +12,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import org.junit.Test; -import org.springframework.roo.support.util.loader.Loader; +import org.springframework.shell.support.util.FileCopyUtils; +import org.springframework.shell.support.util.FileUtils; +import org.springframework.shell.support.util.StringUtils; +import org.springframework.shell.support.util.loader.Loader; /** * Unit test of {@link FileUtils} @@ -171,7 +174,7 @@ public class FileUtilsTest { @Test public void testGetPath() { - assertEquals("/org/springframework/roo/support/util/loader/sub/file-utils-test.txt", FileUtils.getPath(Loader.class, "sub/file-utils-test.txt")); + assertEquals("/org/springframework/shell/support/util/loader/sub/file-utils-test.txt", FileUtils.getPath(Loader.class, "sub/file-utils-test.txt")); } @Test diff --git a/src/test/java/org/springframework/roo/support/util/IOUtilsTest.java b/src/test/java/org/springframework/shell/support/util/IOUtilsTest.java similarity index 91% rename from src/test/java/org/springframework/roo/support/util/IOUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/IOUtilsTest.java index d233836d..7b406870 100644 --- a/src/test/java/org/springframework/roo/support/util/IOUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/IOUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -8,6 +8,7 @@ import java.io.Closeable; import java.io.IOException; import org.junit.Test; +import org.springframework.shell.support.util.IOUtils; /** * Unit test of {@link IOUtils}. diff --git a/src/test/java/org/springframework/roo/support/util/NumberUtilsTest.java b/src/test/java/org/springframework/shell/support/util/NumberUtilsTest.java similarity index 93% rename from src/test/java/org/springframework/roo/support/util/NumberUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/NumberUtilsTest.java index 849af69c..f19d8725 100644 --- a/src/test/java/org/springframework/roo/support/util/NumberUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/NumberUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -7,6 +7,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.junit.Test; +import org.springframework.shell.support.util.NumberUtils; /** * Unit test of {@link NumberUtils}. diff --git a/src/test/java/org/springframework/roo/support/util/ObjectUtilsTest.java b/src/test/java/org/springframework/shell/support/util/ObjectUtilsTest.java similarity index 95% rename from src/test/java/org/springframework/roo/support/util/ObjectUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/ObjectUtilsTest.java index 8195e553..56bba1ac 100644 --- a/src/test/java/org/springframework/roo/support/util/ObjectUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/ObjectUtilsTest.java @@ -1,10 +1,11 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.shell.support.util.ObjectUtils; /** * Unit test of {@link ObjectUtils} diff --git a/src/test/java/org/springframework/roo/support/util/PairListTest.java b/src/test/java/org/springframework/shell/support/util/PairListTest.java similarity index 91% rename from src/test/java/org/springframework/roo/support/util/PairListTest.java rename to src/test/java/org/springframework/shell/support/util/PairListTest.java index 3c1fa193..aadeb46e 100644 --- a/src/test/java/org/springframework/roo/support/util/PairListTest.java +++ b/src/test/java/org/springframework/shell/support/util/PairListTest.java @@ -1,10 +1,12 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import java.util.Arrays; import org.junit.Test; +import org.springframework.shell.support.util.Pair; +import org.springframework.shell.support.util.PairList; /** * Unit test of {@link PairList} diff --git a/src/test/java/org/springframework/roo/support/util/PairTest.java b/src/test/java/org/springframework/shell/support/util/PairTest.java similarity index 91% rename from src/test/java/org/springframework/roo/support/util/PairTest.java rename to src/test/java/org/springframework/shell/support/util/PairTest.java index 7970b46b..bf5fc5ef 100644 --- a/src/test/java/org/springframework/roo/support/util/PairTest.java +++ b/src/test/java/org/springframework/shell/support/util/PairTest.java @@ -1,9 +1,10 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import org.junit.Test; +import org.springframework.shell.support.util.Pair; /** * Unit test of the {@link Pair} class. diff --git a/src/test/java/org/springframework/roo/support/util/StringUtilsTest.java b/src/test/java/org/springframework/shell/support/util/StringUtilsTest.java similarity index 99% rename from src/test/java/org/springframework/roo/support/util/StringUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/StringUtilsTest.java index 837e3104..59a62331 100644 --- a/src/test/java/org/springframework/roo/support/util/StringUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/StringUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -9,6 +9,7 @@ import java.util.Arrays; import java.util.Collections; import org.junit.Test; +import org.springframework.shell.support.util.StringUtils; /** * Unit tests for {@link StringUtils}. diff --git a/src/test/java/org/springframework/roo/support/util/WebXmlUtilsTest.java b/src/test/java/org/springframework/shell/support/util/WebXmlUtilsTest.java similarity index 98% rename from src/test/java/org/springframework/roo/support/util/WebXmlUtilsTest.java rename to src/test/java/org/springframework/shell/support/util/WebXmlUtilsTest.java index da88ed61..333fc457 100644 --- a/src/test/java/org/springframework/roo/support/util/WebXmlUtilsTest.java +++ b/src/test/java/org/springframework/shell/support/util/WebXmlUtilsTest.java @@ -1,4 +1,4 @@ -package org.springframework.roo.support.util; +package org.springframework.shell.support.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -10,7 +10,9 @@ import javax.xml.parsers.DocumentBuilder; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.roo.support.util.WebXmlUtils.WebXmlParam; +import org.springframework.shell.support.util.WebXmlUtils; +import org.springframework.shell.support.util.XmlUtils; +import org.springframework.shell.support.util.WebXmlUtils.WebXmlParam; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/src/test/java/org/springframework/shell/support/util/loader/Loader.java b/src/test/java/org/springframework/shell/support/util/loader/Loader.java new file mode 100644 index 00000000..444f3baf --- /dev/null +++ b/src/test/java/org/springframework/shell/support/util/loader/Loader.java @@ -0,0 +1,11 @@ +package org.springframework.shell.support.util.loader; + +import org.springframework.shell.support.util.FileUtilsTest; + +/** + * Required for {@link FileUtilsTest}. + * + * @author Andrew Swan + * @since 1.2.0 + */ +public class Loader {} diff --git a/src/test/resources/org/springframework/roo/support/util/loader/sub/file-utils-test.txt b/src/test/resources/org/springframework/shell/support/util/loader/sub/file-utils-test.txt similarity index 100% rename from src/test/resources/org/springframework/roo/support/util/loader/sub/file-utils-test.txt rename to src/test/resources/org/springframework/shell/support/util/loader/sub/file-utils-test.txt