svn commit: rev 21570 - in avalon/trunk/tools/magic/src/main/org/apache/avalon/tools: event home model project project/builder tasks

Author: mcconnell
Date: Mon Jun 21 16:15:41 2004
New Revision: 21570

Added:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java
      - copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java
Removed:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/event/
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java
Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PluginTask.java
Log:
prep for a little refactoring

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java	Mon Jun 21 16:15:41 2004
@@ -49,12 +49,11 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import org.apache.avalon.tools.event.StandardListener;
 import org.apache.avalon.tools.project.Definition;
 import org.apache.avalon.tools.project.ResourceRef;
 import org.apache.avalon.tools.project.Resource;
 import org.apache.avalon.tools.project.Plugin;
-import org.apache.avalon.tools.project.builder.XMLDefinitionBuilder;
+import org.apache.avalon.tools.project.XMLDefinitionBuilder;
 import org.apache.avalon.tools.util.ElementHelper;
 
 /**

Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/builder/XMLDefinitionBuilder.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java	Mon Jun 21 16:15:41 2004
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.avalon.tools.project.builder;
+package org.apache.avalon.tools.project;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,15 +27,9 @@
 import org.apache.avalon.tools.home.Home;
 import org.apache.avalon.tools.home.Repository;
 
-import org.apache.avalon.tools.util.ElementHelper;
-import org.apache.avalon.tools.project.Info;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
-import org.apache.avalon.tools.project.Resource;
-import org.apache.avalon.tools.project.Plugin;
 import org.apache.avalon.tools.project.Plugin.TaskDef;
 import org.apache.avalon.tools.project.Plugin.ListenerDef;
-import org.apache.avalon.tools.project.Policy;
+import org.apache.avalon.tools.util.ElementHelper;
 
 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:15:41 2004
@@ -41,7 +41,7 @@
 import org.apache.avalon.tools.project.Plugin;
 import org.apache.avalon.tools.project.Plugin.TaskDef;
 import org.apache.avalon.tools.project.Plugin.ListenerDef;
-import org.apache.avalon.tools.project.builder.XMLDefinitionBuilder;
+import org.apache.avalon.tools.project.XMLDefinitionBuilder;
 import org.apache.avalon.tools.util.ElementHelper;
 
 import org.w3c.dom.Element;