From 5a941fc4bea8779625f1d72b9af05244823212a7 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Sat, 14 Jul 2012 08:31:25 -0400
Subject: [PATCH] SHL-44 - Diagonalize DSM matrix

---
 .../java/org/springframework/roo/shell/AbstractShell.java    | 1 +
 .../org/springframework/roo/shell/ExecutionStrategy.java     | 2 ++
 src/main/java/org/springframework/roo/shell/Parser.java      | 2 ++
 .../java/org/springframework/roo/shell/SimpleParser.java     | 1 +
 .../roo/shell/event/AbstractShellStatusPublisher.java        | 1 -
 .../springframework/roo/shell/{ => event}/ParseResult.java   | 3 ++-
 .../org/springframework/roo/shell/event/ShellStatus.java     | 1 -
 .../roo/support/{util => logging}/MessageDisplayUtils.java   | 5 +++--
 .../roo/support/{ant => util}/AntPatchStringMatcher.java     | 2 +-
 .../roo/support/{ant => util}/AntPathMatcher.java            | 4 +---
 .../java/org/springframework/roo/support/util/FileUtils.java | 2 --
 .../roo/support/{ant => util}/PathMatcher.java               | 2 +-
 .../java/org/springframework/shell/ExecutionProcessor.java   | 2 +-
 .../org/springframework/shell/SimpleExecutionStrategy.java   | 2 +-
 .../springframework/shell/SimpleExecutionStrategyTest.java   | 2 +-
 15 files changed, 17 insertions(+), 15 deletions(-)
 rename src/main/java/org/springframework/roo/shell/{ => event}/ParseResult.java (96%)
 rename src/main/java/org/springframework/roo/support/{util => logging}/MessageDisplayUtils.java (93%)
 rename src/main/java/org/springframework/roo/support/{ant => util}/AntPatchStringMatcher.java (99%)
 rename src/main/java/org/springframework/roo/support/{ant => util}/AntPathMatcher.java (98%)
 rename src/main/java/org/springframework/roo/support/{ant => util}/PathMatcher.java (98%)

diff --git a/src/main/java/org/springframework/roo/shell/AbstractShell.java b/src/main/java/org/springframework/roo/shell/AbstractShell.java
index 6551d2e9..fdc1eaa1 100644
--- a/src/main/java/org/springframework/roo/shell/AbstractShell.java
+++ b/src/main/java/org/springframework/roo/shell/AbstractShell.java
@@ -22,6 +22,7 @@ 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;
diff --git a/src/main/java/org/springframework/roo/shell/ExecutionStrategy.java b/src/main/java/org/springframework/roo/shell/ExecutionStrategy.java
index 39957cdb..ee4ddc76 100644
--- a/src/main/java/org/springframework/roo/shell/ExecutionStrategy.java
+++ b/src/main/java/org/springframework/roo/shell/ExecutionStrategy.java
@@ -1,5 +1,7 @@
 package org.springframework.roo.shell;
 
+import org.springframework.roo.shell.event.ParseResult;
+
 /**
  * Strategy interface to permit the controlled execution of methods.
  *
diff --git a/src/main/java/org/springframework/roo/shell/Parser.java b/src/main/java/org/springframework/roo/shell/Parser.java
index d22a7e0d..827ca982 100644
--- a/src/main/java/org/springframework/roo/shell/Parser.java
+++ b/src/main/java/org/springframework/roo/shell/Parser.java
@@ -2,6 +2,8 @@ package org.springframework.roo.shell;
 
 import java.util.List;
 
+import org.springframework.roo.shell.event.ParseResult;
+
 /**
  * Interface for {@link SimpleParser}.
  *
diff --git a/src/main/java/org/springframework/roo/shell/SimpleParser.java b/src/main/java/org/springframework/roo/shell/SimpleParser.java
index 4b70124f..8ab53219 100644
--- a/src/main/java/org/springframework/roo/shell/SimpleParser.java
+++ b/src/main/java/org/springframework/roo/shell/SimpleParser.java
@@ -28,6 +28,7 @@ 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;
diff --git a/src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java b/src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java
index cdc9056e..86eddd52 100644
--- a/src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java
+++ b/src/main/java/org/springframework/roo/shell/event/AbstractShellStatusPublisher.java
@@ -3,7 +3,6 @@ package org.springframework.roo.shell.event;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.springframework.roo.shell.ParseResult;
 import org.springframework.roo.shell.event.ShellStatus.Status;
 import org.springframework.roo.support.util.Assert;
 
diff --git a/src/main/java/org/springframework/roo/shell/ParseResult.java b/src/main/java/org/springframework/roo/shell/event/ParseResult.java
similarity index 96%
rename from src/main/java/org/springframework/roo/shell/ParseResult.java
rename to src/main/java/org/springframework/roo/shell/event/ParseResult.java
index 7492780b..bbd4f2c5 100644
--- a/src/main/java/org/springframework/roo/shell/ParseResult.java
+++ b/src/main/java/org/springframework/roo/shell/event/ParseResult.java
@@ -1,8 +1,9 @@
-package org.springframework.roo.shell;
+package org.springframework.roo.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;
diff --git a/src/main/java/org/springframework/roo/shell/event/ShellStatus.java b/src/main/java/org/springframework/roo/shell/event/ShellStatus.java
index 0e160c7e..fc34f409 100644
--- a/src/main/java/org/springframework/roo/shell/event/ShellStatus.java
+++ b/src/main/java/org/springframework/roo/shell/event/ShellStatus.java
@@ -1,6 +1,5 @@
 package org.springframework.roo.shell.event;
 
-import org.springframework.roo.shell.ParseResult;
 
 /**
  * Represents the different states that a shell can legally be in.
diff --git a/src/main/java/org/springframework/roo/support/util/MessageDisplayUtils.java b/src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java
similarity index 93%
rename from src/main/java/org/springframework/roo/support/util/MessageDisplayUtils.java
rename to src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java
index 0f8d9f37..4ce5aa62 100644
--- a/src/main/java/org/springframework/roo/support/util/MessageDisplayUtils.java
+++ b/src/main/java/org/springframework/roo/support/logging/MessageDisplayUtils.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.support.util;
+package org.springframework.roo.support.logging;
 
 import java.io.BufferedInputStream;
 import java.io.InputStream;
@@ -6,7 +6,8 @@ import java.io.InputStreamReader;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.springframework.roo.support.logging.HandlerUtils;
+import org.springframework.roo.support.util.FileCopyUtils;
+import org.springframework.roo.support.util.IOUtils;
 
 /**
  * Retrieves text files from the classloader and displays them on-screen.
diff --git a/src/main/java/org/springframework/roo/support/ant/AntPatchStringMatcher.java b/src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java
similarity index 99%
rename from src/main/java/org/springframework/roo/support/ant/AntPatchStringMatcher.java
rename to src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java
index accb678a..a63ca280 100644
--- a/src/main/java/org/springframework/roo/support/ant/AntPatchStringMatcher.java
+++ b/src/main/java/org/springframework/roo/support/util/AntPatchStringMatcher.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.support.ant;
+package org.springframework.roo.support.util;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/springframework/roo/support/ant/AntPathMatcher.java b/src/main/java/org/springframework/roo/support/util/AntPathMatcher.java
similarity index 98%
rename from src/main/java/org/springframework/roo/support/ant/AntPathMatcher.java
rename to src/main/java/org/springframework/roo/support/util/AntPathMatcher.java
index 23148a01..c8c5d0a4 100644
--- a/src/main/java/org/springframework/roo/support/ant/AntPathMatcher.java
+++ b/src/main/java/org/springframework/roo/support/util/AntPathMatcher.java
@@ -1,10 +1,8 @@
-package org.springframework.roo.support.ant;
+package org.springframework.roo.support.util;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.springframework.roo.support.util.Assert;
-import org.springframework.roo.support.util.StringUtils;
 
 /**
  * PathMatcher implementation for Ant-style path patterns.
diff --git a/src/main/java/org/springframework/roo/support/util/FileUtils.java b/src/main/java/org/springframework/roo/support/util/FileUtils.java
index e7966223..38efd78e 100644
--- a/src/main/java/org/springframework/roo/support/util/FileUtils.java
+++ b/src/main/java/org/springframework/roo/support/util/FileUtils.java
@@ -9,8 +9,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.regex.Pattern;
 
-import org.springframework.roo.support.ant.AntPathMatcher;
-import org.springframework.roo.support.ant.PathMatcher;
 
 /**
  * Utilities for handling {@link File} instances.
diff --git a/src/main/java/org/springframework/roo/support/ant/PathMatcher.java b/src/main/java/org/springframework/roo/support/util/PathMatcher.java
similarity index 98%
rename from src/main/java/org/springframework/roo/support/ant/PathMatcher.java
rename to src/main/java/org/springframework/roo/support/util/PathMatcher.java
index 22e795ac..ea573a7a 100644
--- a/src/main/java/org/springframework/roo/support/ant/PathMatcher.java
+++ b/src/main/java/org/springframework/roo/support/util/PathMatcher.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.support.ant;
+package org.springframework.roo.support.util;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/springframework/shell/ExecutionProcessor.java b/src/main/java/org/springframework/shell/ExecutionProcessor.java
index a2b632df..915ac1cc 100644
--- a/src/main/java/org/springframework/shell/ExecutionProcessor.java
+++ b/src/main/java/org/springframework/shell/ExecutionProcessor.java
@@ -16,7 +16,7 @@
 package org.springframework.shell;
 
 import org.springframework.roo.shell.CommandMarker;
-import org.springframework.roo.shell.ParseResult;
+import org.springframework.roo.shell.event.ParseResult;
 
 /**
  * Extension interface allowing command provider to be called
diff --git a/src/main/java/org/springframework/shell/SimpleExecutionStrategy.java b/src/main/java/org/springframework/shell/SimpleExecutionStrategy.java
index 79925aec..e12a32b5 100644
--- a/src/main/java/org/springframework/shell/SimpleExecutionStrategy.java
+++ b/src/main/java/org/springframework/shell/SimpleExecutionStrategy.java
@@ -2,7 +2,7 @@ package org.springframework.shell;
 
 import org.springframework.roo.shell.CommandMarker;
 import org.springframework.roo.shell.ExecutionStrategy;
-import org.springframework.roo.shell.ParseResult;
+import org.springframework.roo.shell.event.ParseResult;
 import org.springframework.roo.support.util.Assert;
 import org.springframework.roo.support.util.ReflectionUtils;
 
diff --git a/src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java b/src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java
index 17975c13..589dcc3c 100644
--- a/src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java
+++ b/src/test/java/org/springframework/shell/SimpleExecutionStrategyTest.java
@@ -18,7 +18,7 @@ package org.springframework.shell;
 import java.lang.reflect.Method;
 
 import org.junit.Test;
-import org.springframework.roo.shell.ParseResult;
+import org.springframework.roo.shell.event.ParseResult;
 import org.springframework.util.ReflectionUtils;
 
 import static org.junit.Assert.*;