You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/22 01:36:38 UTC
svn commit: rev 21572 - in avalon/trunk/tools/magic/src/main/org/apache/avalon/tools: . home model project tasks
Author: mcconnell
Date: Mon Jun 21 16:36:38 2004
New Revision: 21572
Added:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Context.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Definition.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java
- copied, changed from rev 21570, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Organization.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Organization.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Plugin.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Plugin.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Policy.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Policy.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Repository.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Repository.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Resource.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/ResourceRef.java
- copied, changed from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/ResourceRef.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java
- copied, changed from rev 21570, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java
Removed:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Organization.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Repository.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Plugin.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Policy.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Resource.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/ResourceRef.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java
Modified:
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/AbstractDeliverableTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ArtifactTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/BarTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/CleanTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ContextualTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/DeclareTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InitializeTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PluginTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/SystemTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
Log:
refactoring - basically simplifying the directory substructures
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml Mon Jun 21 16:36:38 2004
@@ -1,9 +1,7 @@
<?xml version="1.0"?>
<antlib xmlns:current="ant:current">
- <taskdef name="context" classname="org.apache.avalon.tools.home.Context"/>
<taskdef name="home" classname="org.apache.avalon.tools.tasks.HomeTask"/>
-
<taskdef name="clean" classname="org.apache.avalon.tools.tasks.CleanTask"/>
<taskdef name="prepare" classname="org.apache.avalon.tools.tasks.PrepareTask"/>
<taskdef name="init" classname="org.apache.avalon.tools.tasks.InitializeTask"/>
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Context.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Context.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.home;
+package org.apache.avalon.tools.model;
import java.io.File;
import java.io.IOException;
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Definition.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Definition.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
import java.io.File;
import java.util.List;
@@ -24,8 +24,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.FileSet;
-
-import org.apache.avalon.tools.home.Home;
/**
* Defintion of a project.
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Home.java (from rev 21570, 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/model/Home.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.home;
+package org.apache.avalon.tools.model;
import java.io.File;
import java.io.IOException;
@@ -49,11 +49,11 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-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.XMLDefinitionBuilder;
+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;
/**
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Info.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
import org.apache.tools.ant.BuildException;
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Organization.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Organization.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Organization.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Organization.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.home;
+package org.apache.avalon.tools.model;
/**
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Plugin.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Plugin.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Plugin.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Plugin.java Mon Jun 21 16:36:38 2004
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
import java.io.File;
-
-import org.apache.avalon.tools.home.Home;
/**
* Defintion of a project.
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Policy.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Policy.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Policy.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Policy.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
/**
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Repository.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Repository.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Repository.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Repository.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.home;
+package org.apache.avalon.tools.model;
import java.io.File;
import java.io.IOException;
@@ -40,10 +40,10 @@
import org.apache.tools.ant.types.FileList;
import org.apache.tools.ant.taskdefs.optional.net.SetProxy;
-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.Policy;
+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.Policy;
/**
*
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Resource.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Resource.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Resource.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
import java.io.File;
import java.io.FileNotFoundException;
@@ -24,8 +24,6 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Get;
-
-import org.apache.avalon.tools.home.Home;
/**
* Defintion of a resource.
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/ResourceRef.java (from rev 21555, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/ResourceRef.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/ResourceRef.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/ResourceRef.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
/**
* Delcaration of a repository resource reference.
Copied: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java (from rev 21570, avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java)
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/XMLDefinitionBuilder.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/XMLDefinitionBuilder.java Mon Jun 21 16:36:38 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.avalon.tools.project;
+package org.apache.avalon.tools.model;
import java.io.File;
import java.io.IOException;
@@ -24,11 +24,8 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Sequential;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Repository;
-
-import org.apache.avalon.tools.project.Plugin.TaskDef;
-import org.apache.avalon.tools.project.Plugin.ListenerDef;
+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.w3c.dom.Element;
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/AbstractDeliverableTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/AbstractDeliverableTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/AbstractDeliverableTask.java Mon Jun 21 16:36:38 2004
@@ -35,10 +35,10 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ArtifactTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ArtifactTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ArtifactTask.java Mon Jun 21 16:36:38 2004
@@ -34,13 +34,13 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Context;
-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.Policy;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Info;
+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.Policy;
/**
* Create a repository plugin meta data descriptor in the form of a
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/BarTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/BarTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/BarTask.java Mon Jun 21 16:36:38 2004
@@ -34,10 +34,10 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/CleanTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/CleanTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/CleanTask.java Mon Jun 21 16:36:38 2004
@@ -24,7 +24,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Delete;
-import org.apache.avalon.tools.home.Context;
+import org.apache.avalon.tools.model.Context;
/**
* Clean the project by removing the target directory.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ContextualTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ContextualTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ContextualTask.java Mon Jun 21 16:36:38 2004
@@ -33,9 +33,9 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.home.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/DeclareTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/DeclareTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/DeclareTask.java Mon Jun 21 16:36:38 2004
@@ -29,16 +29,16 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Mkdir;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.Resource;
-import org.apache.avalon.tools.project.ResourceRef;
-import org.apache.avalon.tools.project.Info;
-import org.apache.avalon.tools.project.Policy;
-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.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.Resource;
+import org.apache.avalon.tools.model.ResourceRef;
+import org.apache.avalon.tools.model.Info;
+import org.apache.avalon.tools.model.Policy;
+import org.apache.avalon.tools.model.Plugin;
+import org.apache.avalon.tools.model.Plugin.TaskDef;
+import org.apache.avalon.tools.model.Plugin.ListenerDef;
/**
* Load a plugin.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/FilterTask.java Mon Jun 21 16:36:38 2004
@@ -30,12 +30,12 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Filter;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Resource;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
-import org.apache.avalon.tools.project.Policy;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Resource;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
+import org.apache.avalon.tools.model.Policy;
/**
* Build a set of projects taking into account dependencies within the
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java Mon Jun 21 16:36:38 2004
@@ -30,9 +30,9 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.project.Definition;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InitializeTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InitializeTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InitializeTask.java Mon Jun 21 16:36:38 2004
@@ -30,10 +30,10 @@
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
-import org.apache.avalon.tools.home.Context;
-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.model.Context;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
+import org.apache.avalon.tools.model.Resource;
/**
* The initialize task loads and plugins that a project
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java Mon Jun 21 16:36:38 2004
@@ -28,9 +28,9 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.project.Definition;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
/**
* Install the ${basedir}/target/deliverables content into the local
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java Mon Jun 21 16:36:38 2004
@@ -34,10 +34,10 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.Policy;
-import org.apache.avalon.tools.home.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.Policy;
+import org.apache.avalon.tools.model.Context;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java Mon Jun 21 16:36:38 2004
@@ -34,10 +34,10 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavacTask.java Mon Jun 21 16:36:38 2004
@@ -29,11 +29,11 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.Policy;
-import org.apache.avalon.tools.project.ResourceRef;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.Policy;
+import org.apache.avalon.tools.model.ResourceRef;
/**
* Compile sources.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java Mon Jun 21 16:36:38 2004
@@ -30,12 +30,12 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.taskdefs.Javadoc;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-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.Policy;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+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.Policy;
/**
* Build the javadoc for a project.
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:36:38 2004
@@ -33,15 +33,15 @@
import org.apache.tools.ant.UnknownElement;
import org.apache.tools.ant.BuildListener;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.Info;
-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.XMLDefinitionBuilder;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.Info;
+import org.apache.avalon.tools.model.Resource;
+import org.apache.avalon.tools.model.Plugin;
+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.w3c.dom.Element;
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PrepareTask.java Mon Jun 21 16:36:38 2004
@@ -30,10 +30,10 @@
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
-import org.apache.avalon.tools.project.Plugin;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
+import org.apache.avalon.tools.model.Plugin;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java Mon Jun 21 16:36:38 2004
@@ -24,9 +24,9 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Definition;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Definition;
public class PublishTask extends SystemTask
{
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/ReactorTask.java Mon Jun 21 16:36:38 2004
@@ -40,11 +40,11 @@
import org.apache.tools.ant.types.DirSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.project.Plugin;
-import org.apache.avalon.tools.project.Definition;
-import org.apache.avalon.tools.project.ResourceRef;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Plugin;
+import org.apache.avalon.tools.model.Definition;
+import org.apache.avalon.tools.model.ResourceRef;
/**
* Build a set of projects taking into account dependencies within the
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/SystemTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/SystemTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/SystemTask.java Mon Jun 21 16:36:38 2004
@@ -28,9 +28,9 @@
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.avalon.tools.home.Home;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.project.Definition;
+import org.apache.avalon.tools.model.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Definition;
/**
* Load a goal.
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java Mon Jun 21 16:36:38 2004
@@ -42,8 +42,8 @@
import org.apache.tools.ant.taskdefs.XSLTProcess;
import org.apache.tools.ant.taskdefs.Mkdir;
-import org.apache.avalon.tools.home.Context;
-import org.apache.avalon.tools.home.Home;
+import org.apache.avalon.tools.model.Context;
+import org.apache.avalon.tools.model.Home;
public class XdocTask extends SystemTask
{
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org