svn commit: rev 21574 - in avalon/trunk/tools/magic/src/main/org/apache/avalon/tools: model tasks util

Author: mcconnell
Date: Mon Jun 21 16:48:10 2004
New Revision: 21574

Added:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/ElementHelper.java
      - copied, changed from rev 21573, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/util/ElementHelper.java
Removed:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/util/
Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PluginTask.java
Log:
more cleaning and refactoring

Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/ElementHelper.java (from rev 21573, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/util/ElementHelper.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/util/ElementHelper.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/ElementHelper.java	Mon Jun 21 16:48:10 2004
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.avalon.tools.util;
+package org.apache.avalon.tools.model;
 
 import java.io.File;
 import java.io.IOException;

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java	Mon Jun 21 16:48:10 2004
@@ -49,13 +49,6 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import org.apache.avalon.tools.model.Definition;
-import org.apache.avalon.tools.model.ResourceRef;
-import org.apache.avalon.tools.model.Resource;
-import org.apache.avalon.tools.model.Plugin;
-import org.apache.avalon.tools.model.XMLDefinitionBuilder;
-import org.apache.avalon.tools.util.ElementHelper;
-
 /**
  *
  * @author <a href="mailto:[email protected]">Avalon Development Team</a>

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java	Mon Jun 21 16:48:10 2004
@@ -24,9 +24,8 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Sequential;
 
-import org.apache.avalon.tools.model.Plugin.TaskDef;
 import org.apache.avalon.tools.model.Plugin.ListenerDef;
-import org.apache.avalon.tools.util.ElementHelper;
+import org.apache.avalon.tools.model.Plugin.TaskDef;
 
 import org.w3c.dom.Element;
 

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PluginTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PluginTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PluginTask.java	Mon Jun 21 16:48:10 2004
@@ -42,7 +42,7 @@
 import org.apache.avalon.tools.model.Plugin.TaskDef;
 import org.apache.avalon.tools.model.Plugin.ListenerDef;
 import org.apache.avalon.tools.model.XMLDefinitionBuilder;
-import org.apache.avalon.tools.util.ElementHelper;
+import org.apache.avalon.tools.model.ElementHelper;
 
 import org.w3c.dom.Element;