You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2001/11/04 22:58:18 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime ConverterDef.java Facility.java Import.java
donaldp 01/11/04 13:58:18
Modified: proposal/myrmidon build.xml
proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect
DefaultAspectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
DefaultConverterRegistry.java
DefaultMasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java Deployment.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java DefaultExecutionFrame.java
DefaultExecutor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/model
DefaultProject.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/role
DefaultRoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/type
DefaultTypeFactory.java DefaultTypeManager.java
MultiSourceTypeFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java ProjectEntry.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework
AbstractContainerTask.java AbstractTypeDef.java
TypeInstanceTask.java
proposal/myrmidon/src/java/org/apache/myrmidon/frontends
CLIMain.java
proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1
Ant1Tasklib.java Ant1TypeFactory.java
TaskAdapter.java
proposal/myrmidon/src/java/org/apache/myrmidon/libs/core
Property.java
proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime
ConverterDef.java Facility.java Import.java
Added: proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect
AspectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/builder
ProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer
Configurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter
ConverterRegistry.java MasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer
Deployer.java DeploymentException.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/embeddor
Embeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor
ExecutionFrame.java Executor.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model
Project.java Target.java TypeLib.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role
RoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type
TypeException.java TypeFactory.java
TypeManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace
Workspace.java
Removed: proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect
AspectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
ProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
Configurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
ConverterRegistry.java MasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
Deployer.java DeploymentException.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
Embeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
ExecutionFrame.java Executor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/model
Project.java Target.java TypeLib.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/role
RoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/type
TypeException.java TypeFactory.java
TypeManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
Workspace.java
Log:
Moved interfaces outside of main trunk.
Revision Changes Path
1.21 +0 -1 jakarta-ant/proposal/myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 2001/08/29 16:11:25 1.20
+++ build.xml 2001/11/04 21:58:15 1.21
@@ -33,7 +33,6 @@
developers this part makes no difference.
-->
<property name="build.compiler.emacs" value="on"/>
- <property name="build.compiler.warnings" value="true"/>
<property name="build.compiler.pedantic" value="true"/>
<property name="build.compiler.depend" value="true"/>
<property name="build.compiler.fulldepend" value="true"/>
1.5 +1 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
Index: DefaultAspectManager.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultAspectManager.java 2001/08/28 14:57:20 1.4
+++ DefaultAspectManager.java 2001/11/04 21:58:16 1.5
@@ -18,6 +18,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
import org.apache.myrmidon.aspects.NoopAspectHandler;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
/**
* Manage and propogate Aspects.
1.15 +4 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultProjectBuilder.java 2001/08/28 15:25:35 1.14
+++ DefaultProjectBuilder.java 2001/11/04 21:58:16 1.15
@@ -25,10 +25,11 @@
import org.apache.log.Logger;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.components.model.DefaultProject;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.model.Target;
-import org.apache.myrmidon.components.model.TypeLib;
import org.apache.myrmidon.framework.Condition;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.model.TypeLib;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
1.8 +2 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultConfigurer.java 2001/08/28 15:27:05 1.7
+++ DefaultConfigurer.java 2001/11/04 21:58:16 1.8
@@ -25,7 +25,8 @@
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.log.Logger;
-import org.apache.myrmidon.components.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
1.3 +1 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java
Index: DefaultConverterRegistry.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultConverterRegistry.java 2001/06/03 05:14:47 1.2
+++ DefaultConverterRegistry.java 2001/11/04 21:58:16 1.3
@@ -8,6 +8,7 @@
package org.apache.myrmidon.components.converter;
import java.util.HashMap;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
/**
* Default implementation of Converter registry.
1.5 +5 -4 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
Index: DefaultMasterConverter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultMasterConverter.java 2001/08/28 15:34:43 1.4
+++ DefaultMasterConverter.java 2001/11/04 21:58:16 1.5
@@ -14,10 +14,11 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.myrmidon.components.converter.MasterConverter;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
1.5 +12 -10 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultDeployer.java 2001/08/29 06:28:26 1.4
+++ DefaultDeployer.java 2001/11/04 21:58:16 1.5
@@ -14,6 +14,8 @@
import java.util.HashMap;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -23,15 +25,15 @@
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.myrmidon.api.Task;
-import org.apache.myrmidon.components.converter.ConverterRegistry;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
-import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.converter.Converter;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.role.RoleManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
/**
* This class deploys a .tsk file into a registry.
@@ -107,7 +109,7 @@
final Deployment deployment = new Deployment( file );
final Configuration descriptor = deployment.getDescriptor();
final URL[] urls = new URL[] { deployment.getURL() };
- final URLClassLoader classLoader =
+ final URLClassLoader classLoader =
new URLClassLoader( urls, Thread.currentThread().getContextClassLoader() );
try
@@ -235,8 +237,8 @@
}
}
- private DefaultTypeFactory getFactory( final String role,
- final ClassLoader classLoader,
+ private DefaultTypeFactory getFactory( final String role,
+ final ClassLoader classLoader,
final HashMap factorys )
{
DefaultTypeFactory factory = (DefaultTypeFactory)factorys.get( role );
@@ -309,7 +311,7 @@
if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
REZ.getString( "register-converter.notice", name, source, destination );
getLogger().debug( message );
}
@@ -328,7 +330,7 @@
if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
REZ.getString( "register-role.notice", role, name, className );
getLogger().debug( message );
}
1.7 +1 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
Index: Deployment.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Deployment.java 2001/08/29 06:32:52 1.6
+++ Deployment.java 2001/11/04 21:58:16 1.7
@@ -21,6 +21,7 @@
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
/**
* This class deploys a .tsk file into a registry.
1.11 +14 -13 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultEmbeddor.java 2001/08/29 15:34:57 1.10
+++ DefaultEmbeddor.java 2001/11/04 21:58:16 1.11
@@ -22,19 +22,20 @@
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.myrmidon.api.JavaVersion;
-import org.apache.myrmidon.components.aspect.AspectManager;
-import org.apache.myrmidon.components.builder.ProjectBuilder;
-import org.apache.myrmidon.components.configurer.Configurer;
-import org.apache.myrmidon.components.converter.ConverterRegistry;
-import org.apache.myrmidon.components.converter.MasterConverter;
-import org.apache.myrmidon.components.deployer.Deployer;
-import org.apache.myrmidon.components.deployer.DeploymentException;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.role.RoleManager;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
-import org.apache.myrmidon.components.workspace.Workspace;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.embeddor.Embeddor;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.role.RoleManager;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
/**
* Default implementation of Embeddor.
1.7 +2 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
Index: AspectAwareExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AspectAwareExecutor.java 2001/08/29 15:34:57 1.6
+++ AspectAwareExecutor.java 2001/11/04 21:58:16 1.7
@@ -21,7 +21,8 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
-import org.apache.myrmidon.components.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
public class AspectAwareExecutor
extends DefaultExecutor
1.5 +10 -9 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java
Index: DefaultExecutionFrame.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultExecutionFrame.java 2001/06/29 08:01:34 1.4
+++ DefaultExecutionFrame.java 2001/11/04 21:58:16 1.5
@@ -16,15 +16,16 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.log.Logger;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.components.aspect.AspectManager;
-import org.apache.myrmidon.components.builder.ProjectBuilder;
-import org.apache.myrmidon.components.configurer.Configurer;
-import org.apache.myrmidon.components.converter.ConverterRegistry;
-import org.apache.myrmidon.components.converter.MasterConverter;
-import org.apache.myrmidon.components.deployer.Deployer;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.role.RoleManager;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.role.RoleManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Frames in which tasks are executed.
1.12 +6 -4 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultExecutor.java 2001/08/29 15:34:57 1.11
+++ DefaultExecutor.java 2001/11/04 21:58:16 1.12
@@ -27,10 +27,12 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.configurer.Configurer;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
public class DefaultExecutor
extends AbstractLoggable
1.7 +3 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java
Index: DefaultProject.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultProject.java 2001/08/29 15:34:57 1.6
+++ DefaultProject.java 2001/11/04 21:58:16 1.7
@@ -13,6 +13,9 @@
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.model.TypeLib;
/**
* Default project implementation.
1.3 +2 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultRoleManager.java 2001/08/29 15:34:57 1.2
+++ DefaultRoleManager.java 2001/11/04 21:58:16 1.3
@@ -18,6 +18,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.apache.myrmidon.interfaces.role.RoleManager;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -25,7 +26,7 @@
* Interface to manage roles and mapping to names.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/29 15:34:57 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/11/04 21:58:16 $
*/
public class DefaultRoleManager
implements RoleManager, Initializable
1.4 +3 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java
Index: DefaultTypeFactory.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTypeFactory.java 2001/08/29 15:34:57 1.3
+++ DefaultTypeFactory.java 2001/11/04 21:58:16 1.4
@@ -12,12 +12,14 @@
import java.net.URLClassLoader;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeException;
/**
* Create a type instance based on name.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/29 15:34:57 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/11/04 21:58:16 $
*/
public class DefaultTypeFactory
implements TypeFactory
1.9 +3 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
Index: DefaultTypeManager.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultTypeManager.java 2001/08/29 15:34:57 1.8
+++ DefaultTypeManager.java 2001/11/04 21:58:16 1.9
@@ -10,6 +10,9 @@
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
/**
* The interface that is used to manage types.
1.4 +2 -0 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
Index: MultiSourceTypeFactory.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultiSourceTypeFactory.java 2001/08/29 15:34:57 1.3
+++ MultiSourceTypeFactory.java 2001/11/04 21:58:16 1.4
@@ -10,6 +10,8 @@
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeException;
/**
* This factory acts as a proxy to set of object factorys.
1.7 +9 -8 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultWorkspace.java 2001/08/29 15:48:00 1.6
+++ DefaultWorkspace.java 2001/11/04 21:58:16 1.7
@@ -31,16 +31,17 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.deployer.DefaultDeployer;
-import org.apache.myrmidon.components.deployer.Deployer;
-import org.apache.myrmidon.components.deployer.DeploymentException;
import org.apache.myrmidon.components.executor.DefaultExecutionFrame;
-import org.apache.myrmidon.components.executor.ExecutionFrame;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.model.Target;
-import org.apache.myrmidon.components.model.TypeLib;
-import org.apache.myrmidon.components.type.TypeManager;
import org.apache.myrmidon.framework.Condition;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.model.TypeLib;
+import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
import org.apache.myrmidon.listeners.ProjectListener;
/**
1.2 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java
Index: ProjectEntry.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectEntry.java 2001/06/29 07:57:32 1.1
+++ ProjectEntry.java 2001/11/04 21:58:16 1.2
@@ -8,8 +8,8 @@
package org.apache.myrmidon.components.workspace;
import java.util.ArrayList;
-import org.apache.myrmidon.components.executor.ExecutionFrame;
-import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.model.Project;
/**
* This contains detaisl for each project that is managed by ProjectManager.
1.5 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
Index: AbstractContainerTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractContainerTask.java 2001/08/30 03:34:36 1.4
+++ AbstractContainerTask.java 2001/11/04 21:58:17 1.5
@@ -18,9 +18,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.configurer.Configurer;
-import org.apache.myrmidon.components.converter.MasterConverter;
-import org.apache.myrmidon.components.executor.Executor;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.executor.Executor;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
1.6 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
Index: AbstractTypeDef.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTypeDef.java 2001/08/30 03:34:36 1.5
+++ AbstractTypeDef.java 2001/11/04 21:58:17 1.6
@@ -17,10 +17,10 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.role.RoleManager;
+import org.apache.myrmidon.interfaces.role.RoleManager;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Abstract task to extend to define a type.
1.4 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
Index: TypeInstanceTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeInstanceTask.java 2001/08/30 03:34:36 1.3
+++ TypeInstanceTask.java 2001/11/04 21:58:17 1.4
@@ -18,9 +18,9 @@
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* This is the property "task" to declare a binding of a datatype to a name.
1.11 +5 -5 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CLIMain.java 2001/08/30 03:34:13 1.10
+++ CLIMain.java 2001/11/04 21:58:17 1.11
@@ -36,12 +36,12 @@
import org.apache.myrmidon.Constants;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.builder.ProjectBuilder;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.embeddor.Embeddor;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
-import org.apache.myrmidon.components.workspace.Workspace;
-import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.listeners.ProjectListener;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java
Index: AspectManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.aspect;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
/**
* Manage and propogate Aspects.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface AspectManager
extends Component, AspectHandler
{
String ROLE = "org.apache.myrmidon.interfaces.aspect.AspectManager";
String[] getNames();
void dispatchAspectSettings( String name, Parameters parameters, Configuration[] elements )
throws TaskException;
void addAspectHandler( String name, AspectHandler handler )
throws TaskException;
void removeAspectHandler( String name, AspectHandler handler )
throws TaskException;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/builder/ProjectBuilder.java
Index: ProjectBuilder.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.builder;
import java.io.File;
import java.io.IOException;
import org.apache.avalon.framework.component.Component;
import org.apache.myrmidon.interfaces.model.Project;
/**
* Interface implemented by components that build projects from sources.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface ProjectBuilder
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.builder.ProjectBuilder";
/**
* build a project from source.
*
* @param source the source
* @return the constructed Project
* @exception IOException if an error occurs
* @exception AntException if an error occurs
*/
Project build( String source )
throws Exception;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java
Index: Configurer.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.configurer;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
/**
* Class used to configure tasks.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Configurer
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.configurer.Configurer";
/**
* Configure an object based on a configuration in a particular context.
* This configuring can be done in different ways for different
* configurers.
*
* @param object the object
* @param configuration the configuration
* @param context the Context
* @exception ConfigurationException if an error occurs
*/
void configure( Object object, Configuration configuration, Context context )
throws ConfigurationException;
/**
* Configure named attribute of object in a particular context.
* This configuring can be done in different ways for different
* configurers.
*
* @param object the object
* @param name the attribute name
* @param value the attribute value
* @param context the Context
* @exception ConfigurationException if an error occurs
*/
void configure( Object object, String name, String value, Context context )
throws ConfigurationException;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/ConverterRegistry.java
Index: ConverterRegistry.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.converter;
import org.apache.avalon.framework.component.Component;
/**
* Interface for registry for ConverterInfos.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface ConverterRegistry
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.converter.ConverterRegistry";
/**
* Retrieve name of ConverterInfo that describes converter that converts
* from source to destination.
*
* @param source the source classname
* @param destination the destination classname
* @return the className of converter or null if none available
*/
String getConverterName( String source, String destination );
/**
* Register a converter
*
* @param className the className of converter
* @param source the source classname
* @param destination the destination classname
*/
void registerConverter( String className, String source, String destination );
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java
Index: MasterConverter.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.converter;
import org.apache.avalon.framework.component.Component;
import org.apache.myrmidon.converter.Converter;
/**
* Master Converter to handle converting between types.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface MasterConverter
extends Component, Converter
{
String ROLE = "org.apache.myrmidon.interfaces.converter.MasterConverter";
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/Deployer.java
Index: Deployer.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.deployer;
import java.io.File;
import org.apache.avalon.framework.component.Component;
/**
* This class deploys a .tsk file into a registry.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Deployer
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.deployer.Deployer";
/**
* Deploy a library.
*
* @param file the file deployment
* @exception DeploymentException if an error occurs
*/
void deploy( File file )
throws DeploymentException;
void deployConverter( String name, File file )
throws DeploymentException;
void deployType( String role, String name, File file )
throws DeploymentException;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/DeploymentException.java
Index: DeploymentException.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.deployer;
import org.apache.avalon.framework.CascadingException;
/**
* Exception to indicate error deploying.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public final class DeploymentException
extends CascadingException
{
/**
* Construct a new <code>DeploymentException</code> instance.
*
* @param message The detail message for this exception.
*/
public DeploymentException( final String message )
{
this( message, null );
}
/**
* Construct a new <code>DeploymentException</code> instance.
*
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
public DeploymentException( final String message, final Throwable throwable )
{
super( message, throwable );
}
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java
Index: Embeddor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.embeddor;
import java.util.Map;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.interfaces.workspace.Workspace;
/**
* Interface through which you embed Myrmidon into applications.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Embeddor
extends Component, Parameterizable, Initializable, Startable, Disposable
{
String ROLE = "org.apache.myrmidon.interfaces.embeddor.Embeddor";
/**
* Create a project.
*
* @return the created Project
*/
Project createProject( String location, String type, Parameters parameters )
throws Exception;
/**
* Create a Workspace for a particular project.
*
* @param defines the defines in workspace
* @return the Workspace
*/
Workspace createWorkspace( Parameters parameters )
throws Exception;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java
Index: ExecutionFrame.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.executor;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.log.Logger;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Frames in which tasks are executed.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface ExecutionFrame
{
TypeManager getTypeManager();
Logger getLogger();
TaskContext getContext();
ComponentManager getComponentManager();
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/Executor.java
Index: Executor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.executor;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
/**
* Engine inteface that should be implemented by all tasklet engines.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Executor
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.executor.Executor";
/**
* execute a task.
*
* @param task the configruation data for task
* @exception TaskException if an error occurs
*/
void execute( Configuration task, ExecutionFrame frame )
throws TaskException;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Project.java
Index: Project.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.model;
import java.io.File;
import org.apache.avalon.framework.component.Component;
/**
* Abstraction used to interact with projects.
* Implementations may choose to structure it anyway they choose.
*
* TODO: Determine if projects should carry their own name. Breaks IOC but
* Can be useful as project files embed own name (or should that be description).
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Project
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.model.Project";
// the name of currently executing project
String PROJECT = "myrmidon.project.name";
// the name of currently executing project
//String PROJECT_FILE = "myrmidon.project.file";
// the name of currently executing target
//String TARGET = "myrmidon.target.name";
/**
* Get the imports for project.
*
* @return the imports
*/
TypeLib[] getTypeLibs();
/**
* Get names of projects referred to by this project.
*
* @return the names
*/
String[] getProjectNames();
/**
* Retrieve project reffered to by this project.
*
* @param name the project name
* @return the Project or null if none by that name
*/
Project getProject( String name );
/**
* Get name of default target.
*
* @return the default target name
*/
String getDefaultTargetName();
/**
* Retrieve implicit target.
* The implicit target is top level tasks.
* Currently restricted to property tasks.
*
* @return the Target
*/
Target getImplicitTarget();
/**
* Retrieve a target by name.
*
* @param name the name of target
* @return the Target or null if no target exists with name
*/
Target getTarget( String name );
/**
* Retrieve names of all targets in project.
*
* @return the iterator of project names
*/
String[] getTargetNames();
/**
* Retrieve base directory of project.
*
* @return the projects base directory
*/
File getBaseDirectory();
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java
Index: Target.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.model;
import java.util.ArrayList;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.myrmidon.framework.Condition;
/**
* Targets in build file.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public class Target
{
private final ArrayList m_dependencies = new ArrayList();
private final ArrayList m_tasks = new ArrayList();
private final Condition m_condition;
/**
* Constructor taking condition for target.
*
* @param condition the condition
*/
public Target( final Condition condition,
final Configuration[] tasks,
final String[] dependencies )
{
m_condition = condition;
for( int i = 0; i < tasks.length; i++ )
{
m_tasks.add( tasks[ i ] );
}
if( null != dependencies )
{
for( int i = 0; i < dependencies.length; i++ )
{
m_dependencies.add( dependencies[ i ] );
}
}
}
/**
* Get condition under which target is executed.
*
* @return the condition for target or null
*/
public final Condition getCondition()
{
return m_condition;
}
/**
* Get dependencies of target
*
* @return the dependency list
*/
public final String[] getDependencies()
{
return (String[])m_dependencies.toArray( new String[ 0 ] );
}
/**
* Get tasks in target
*
* @return the target list
*/
public final Configuration[] getTasks()
{
return (Configuration[])m_tasks.toArray( new Configuration[ 0 ] );
}
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/TypeLib.java
Index: TypeLib.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.model;
/**
* Imports in a build file.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public class TypeLib
{
//Name of library (this is location independent)
private final String m_library;
//Do we need this??
//private final String m_namespace;
//The role of object to be imported
private final String m_role;
//The name of type instance
private final String m_name;
public TypeLib( final String library )
{
this( library, null, null );
}
public TypeLib( final String library, final String role, final String name )
{
m_library = library;
m_role = role;
m_name = name;
//If only one of name or type is null, throw an exception
if( null == m_role || null == m_name )
{
if( null != m_role || null != m_name )
{
throw new IllegalArgumentException( "Can not have an import that specifies " +
"only one of; name or role" );
}
}
}
/**
* Get role
*
* @return the role
*/
public final String getRole()
{
return m_role;
}
/**
* Get name of imported
*
* @return the name
*/
public final String getName()
{
return m_name;
}
/**
* Get name of library
*
* @return the library name
*/
public final String getLibrary()
{
return m_library;
}
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleManager.java
Index: RoleManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.role;
import org.apache.avalon.framework.component.Component;
/**
* Interface to manage roles and mapping to shorthand names.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:ricardo@apache,org">Ricardo Rocha</a>
* @author <a href="mailto:giacomo@apache,org">Giacomo Pati</a>
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
* @version CVS $Revision: 1.1 $ $Date: 2001/11/04 21:58:17 $
*/
public interface RoleManager
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.role.RoleManager";
/**
* Find Role name based on shorthand name.
*
* @param shorthandName the shorthand name
* @return the role
*/
String getRoleForName( String name );
/**
* Find name based on role.
*
* @param role the role
* @return the name
*/
String getNameForRole( String role );
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeException.java
Index: TypeException.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.type;
import org.apache.avalon.framework.CascadingException;
/**
* Exception to indicate problem with type instantiating.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public final class TypeException
extends CascadingException
{
/**
* Construct a new <code>TypeException</code> instance.
*
* @param message The detail message for this exception.
*/
public TypeException( final String message )
{
this( message, null );
}
/**
* Construct a new <code>TypeException</code> instance.
*
* @param message The detail message for this exception.
* @param throwable the root cause of the exception
*/
public TypeException( final String message, final Throwable throwable )
{
super( message, throwable );
}
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeFactory.java
Index: TypeFactory.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.type;
/**
* Create an instance on name.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
* @version CVS $Revision: 1.1 $ $Date: 2001/11/04 21:58:17 $
*/
public interface TypeFactory
{
/**
* Create a type instance based on name.
*
* @param name the name
* @return the type instance
* @exception TypeException if an error occurs
*/
Object create( String name )
throws TypeException;
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeManager.java
Index: TypeManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.type;
import org.apache.avalon.framework.component.Component;
/**
* The interface that is used to manage types.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface TypeManager
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.type.TypeManager";
void registerType( String role, String shorthandName, TypeFactory factory )
throws TypeException;
TypeFactory getFactory( String role )
throws TypeException;
TypeManager createChildTypeManager();
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/Workspace.java
Index: Workspace.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.myrmidon.interfaces.workspace;
import java.util.Map;
import org.apache.avalon.framework.component.Component;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.listeners.ProjectListener;
/**
* This is the abstraction through which Projects are managed and executed.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface Workspace
extends Component
{
String ROLE = "org.apache.myrmidon.interfaces.workspace.Workspace";
/**
* Add a listener to project events.
*
* @param listener the listener
*/
void addProjectListener( ProjectListener listener );
/**
* Remove a listener from project events.
*
* @param listener the listener
*/
void removeProjectListener( ProjectListener listener );
/**
* Execute a target in a particular project.
*
* @param project the Project
* @param target the name of the target
* @param defines the defines
* @exception TaskException if an error occurs
*/
void executeProject( Project project, String target )
throws TaskException;
}
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Tasklib.java
Index: Ant1Tasklib.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Tasklib.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ant1Tasklib.java 2001/06/16 03:22:21 1.1
+++ Ant1Tasklib.java 2001/11/04 21:58:18 1.2
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Method to register a tasklib.
1.2 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
Index: Ant1TypeFactory.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ant1TypeFactory.java 2001/06/16 03:22:21 1.1
+++ Ant1TypeFactory.java 2001/11/04 21:58:18 1.2
@@ -9,7 +9,7 @@
import java.net.URL;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.tools.ant.Task;
/**
1.3 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TaskAdapter.java 2001/06/17 10:35:42 1.2
+++ TaskAdapter.java 2001/11/04 21:58:18 1.3
@@ -12,9 +12,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.tools.ant.Task;
1.3 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Property.java 2001/08/30 07:36:25 1.2
+++ Property.java 2001/11/04 21:58:18 1.3
@@ -17,9 +17,9 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.myrmidon.framework.DataType;
1.4 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
Index: ConverterDef.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConverterDef.java 2001/08/30 07:36:25 1.3
+++ ConverterDef.java 2001/11/04 21:58:18 1.4
@@ -17,9 +17,9 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.converter.Converter;
/**
1.3 +4 -4 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java
Index: Facility.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Facility.java 2001/08/30 07:36:25 1.2
+++ Facility.java 2001/11/04 21:58:18 1.3
@@ -21,10 +21,10 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
-import org.apache.myrmidon.components.aspect.AspectManager;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.framework.AbstractContainerTask;
/**
1.3 +2 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
Index: Import.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Import.java 2001/08/30 07:36:25 1.2
+++ Import.java 2001/11/04 21:58:18 1.3
@@ -17,8 +17,8 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.deployer.Deployer;
-import org.apache.myrmidon.components.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
/**
* Task to import a tasklib.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>