SHL-42 - Refactor package name to remove reference to roo

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;
 

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");

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
  */

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

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;
 
 /**

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

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;
 
 /**

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;
 
 /**

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;
 
 /**

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

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.

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}.

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}.

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}.

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}.

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}.

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}.

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}.

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}.

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}.

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}.

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

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}.

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}.

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

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

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

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}.

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.

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

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.

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.

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 {
 

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
  *

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

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.

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.

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;
 

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}.

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}.

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;
 
 
 /**

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;

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.

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}.

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.

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.

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}.

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.

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;

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.

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;

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 {

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.

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.

src/main/java/org/springframework/shell/event/ShellStatus.java

@@ -1,4 +1,4 @@
-package org.springframework.roo.shell.event;
+package org.springframework.shell.event;
 
 
 /**

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.

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.

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);

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;
 

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.

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.

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}

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.

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 <code>toString()</code> styler.

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,

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

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 <code>toString()</code> methods

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 <code>toString()</code> methods.

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

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

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;
 

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;

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.

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;

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.

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.

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;

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.

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;

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;

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.

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.

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;

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

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;
 

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;

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;

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.

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.

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;

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;
 

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;

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;

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;
 

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;

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;
 
 
 

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;

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;

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;

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;