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

src/test/java/org/springframework/roo/support/util/loader/Loader.java

@@ -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 {}

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

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}

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}

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

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}

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.

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}

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;
 

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

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

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

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}

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}

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.

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

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;
 

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