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/06/17 12:35:43 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/manifest builtin-ant-roles.xml
donaldp 01/06/17 03:35:43
Modified: proposal/myrmidon/src/java/org/apache/ant/modules/basic
Property.java
proposal/myrmidon/src/java/org/apache/myrmidon
Constants.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
DefaultExecutionFrame.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/manager
DefaultProjectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/model
Project.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework
AbstractTypeDef.java ItemSet.java Mapper.java
Pattern.java TypeInstanceTask.java
proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1
TaskAdapter.java
proposal/myrmidon/src/manifest builtin-ant-roles.xml
Added: proposal/myrmidon/src/java/org/apache/myrmidon/components/role
DefaultRoleManager.java RoleManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework
DataType.java
Removed: proposal/myrmidon/src/java/org/apache/myrmidon/api
DataType.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultRoleManager.java RoleManager.java
Log:
Migrated DataType interface to framework.
Migrated RoleManager to separate package.
A few other minor nits.
Revision Changes Path
1.15 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Property.java 2001/06/04 12:47:11 1.14
+++ Property.java 2001/06/17 10:35:34 1.15
@@ -14,7 +14,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.framework.AbstractContainerTask;
-import org.apache.myrmidon.api.DataType;
+import org.apache.myrmidon.framework.DataType;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.components.type.TypeManager;
1.4 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/Constants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Constants.java 2001/06/03 05:03:15 1.3
+++ Constants.java 2001/06/17 10:35:34 1.4
@@ -14,7 +14,7 @@
*/
public interface Constants
{
- //Constants to indicate the build of Ant/Myrmidon
+ //Constants to indicate the build of Myrmidon
String BUILD_DATE = "@@DATE@@";
String BUILD_VERSION = "@@VERSION@@";
1.6 +1 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultConfigurer.java 2001/06/05 07:48:33 1.5
+++ DefaultConfigurer.java 2001/06/17 10:35:35 1.6
@@ -70,7 +70,7 @@
* configurers.
* This one does it by first checking if object implements Configurable
* and if it does will pass the task the configuration - else it will use
- * ants rules to map configuration to types
+ * mapping rules to map configuration to types
*
* @param object the object
* @param configuration the configuration
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultDeployer.java 2001/06/08 09:15:30 1.2
+++ DefaultDeployer.java 2001/06/17 10:35:36 1.3
@@ -22,11 +22,11 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.myrmidon.api.DataType;
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.xml.sax.SAXException;
import org.xml.sax.XMLReader;
1.6 +2 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultEmbeddor.java 2001/06/17 00:22:23 1.5
+++ DefaultEmbeddor.java 2001/06/17 10:35:37 1.6
@@ -27,7 +27,7 @@
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.deployer.RoleManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.components.executor.Executor;
import org.apache.myrmidon.components.manager.ProjectManager;
import org.apache.myrmidon.components.type.TypeFactory;
@@ -228,7 +228,7 @@
defaults.setParameter( AspectManager.ROLE,
"org.apache.myrmidon.components.aspect.DefaultAspectManager" );
defaults.setParameter( RoleManager.ROLE,
- "org.apache.myrmidon.components.deployer.DefaultRoleManager" );
+ "org.apache.myrmidon.components.role.DefaultRoleManager" );
defaults.setParameter( MasterConverter.ROLE,
"org.apache.myrmidon.components.converter.DefaultMasterConverter" );
defaults.setParameter( ConverterRegistry.ROLE,
@@ -240,9 +240,6 @@
"org.apache.myrmidon.components.executor.AspectAwareExecutor" );
defaults.setParameter( ProjectManager.ROLE,
"org.apache.myrmidon.components.manager.DefaultProjectManager" );
- //defaults.setParameter( ProjectBuilder.ROLE,
- //"org.apache.myrmidon.components.builder.DefaultProjectBuilder" );
- //"org.apache.myrmidon.components.builder.XSLProjectBuilder" );
defaults.setParameter( Deployer.ROLE,
"org.apache.myrmidon.components.deployer.DefaultDeployer" );
defaults.setParameter( Configurer.ROLE,
1.3 +1 -33 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultExecutionFrame.java 2001/06/12 14:19:54 1.2
+++ DefaultExecutionFrame.java 2001/06/17 10:35:38 1.3
@@ -22,9 +22,9 @@
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.RoleManager;
import org.apache.myrmidon.components.executor.Executor;
import org.apache.myrmidon.components.manager.ProjectManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.components.type.TypeManager;
/**
@@ -60,38 +60,6 @@
public void compose( final ComponentManager componentManager )
throws ComponentException
{
-/*
- final RoleManager roleManager = (RoleManager)componentManager.lookup( RoleManager.ROLE );
- m_componentManager.put( RoleManager.ROLE, roleManager );
-
- final Configurer configurer = (Configurer)componentManager.lookup( Configurer.ROLE );
- m_componentManager.put( Configurer.ROLE, configurer );
-
- final MasterConverter masterConverter =
- (MasterConverter)componentManager.lookup( MasterConverter.ROLE );
- m_componentManager.put( MasterConverter.ROLE, masterConverter );
-
- final AspectManager aspectManager = (AspectManager)componentManager.lookup( AspectManager.ROLE );
- m_componentManager.put( AspectManager.ROLE, aspectManager );
-
- final Deployer deployer = (Deployer)componentManager.lookup( Deployer.ROLE );
- m_componentManager.put( Deployer.ROLE, deployer );
-
- final Executor executor = (Executor)componentManager.lookup( Executor.ROLE );
- m_componentManager.put( Executor.ROLE, executor );
-
- final ProjectManager projectManager =
- (ProjectManager)componentManager.lookup( ProjectManager.ROLE );
- m_componentManager.put( ProjectManager.ROLE, projectManager );
-
- final ProjectBuilder projectBuilder =
- (ProjectBuilder)componentManager.lookup( ProjectBuilder.ROLE );
- m_componentManager.put( ProjectBuilder.ROLE, projectBuilder );
-
- final ConverterRegistry converterRegistry =
- (ConverterRegistry)componentManager.lookup( ConverterRegistry.ROLE );
- m_componentManager.put( ConverterRegistry.ROLE, converterRegistry );
-*/
m_componentManager = componentManager;
m_typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE );
1.9 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java
Index: DefaultProjectManager.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultProjectManager.java 2001/06/14 12:08:54 1.8
+++ DefaultProjectManager.java 2001/06/17 10:35:39 1.9
@@ -157,7 +157,7 @@
componentManager.put( TypeManager.ROLE, m_typeManager.createChildTypeManager() );
//We need to place projects and ProjectManager
- //in ComponentManager so as to support project-local antcall
+ //in ComponentManager so as to support project-local call()
componentManager.put( ProjectManager.ROLE, this );
componentManager.put( Project.ROLE, project );
1.4 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Project.java 2001/06/12 13:41:39 1.3
+++ Project.java 2001/06/17 10:35:39 1.4
@@ -25,13 +25,13 @@
String ROLE = "org.apache.myrmidon.components.model.Project";
// the name of currently executing project
- String PROJECT = "ant.project.name";
+ String PROJECT = "myrmidon.project.name";
// the name of currently executing project
- //String PROJECT_FILE = "ant.project.file";
+ //String PROJECT_FILE = "myrmidon.project.file";
// the name of currently executing target
- //String TARGET = "ant.target.name";
+ //String TARGET = "myrmidon.target.name";
/**
* Get the imports for project.
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
Index: DefaultRoleManager.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.components.role;
import java.net.URL;
import java.util.Enumeration;
import java.util.HashMap;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
/**
* Interface to manage roles and mapping to names.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
* @version CVS $Revision: 1.1 $ $Date: 2001/06/17 10:35:40 $
*/
public class DefaultRoleManager
implements RoleManager, Initializable
{
private final static String ROLE_DESCRIPTOR = "META-INF/ant-roles.xml";
/** Parent <code>RoleManager</code> for nested resolution */
private final RoleManager m_parent;
/** Map for name to role mapping */
private final HashMap m_names = new HashMap();
/** Map for role to name mapping */
private final HashMap m_roles = new HashMap();
/**
* constructor--this RoleManager has no parent.
*/
public DefaultRoleManager()
{
this( null );
}
/**
* Alternate constructor--this RoleManager has the specified
* parent.
*
* @param parent The parent <code>RoleManager</code>.
*/
public DefaultRoleManager( final RoleManager parent )
{
m_parent = parent;
}
/**
* initialize the RoleManager.
* This involves reading all Role descriptors in common classloader.
*
* @exception Exception if an error occurs
*/
public void initialize()
throws Exception
{
final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
final SAXParser saxParser = saxParserFactory.newSAXParser();
final XMLReader parser = saxParser.getXMLReader();
//parser.setFeature( "http://xml.org/sax/features/namespace-prefixes", false );
final SAXConfigurationHandler handler = new SAXConfigurationHandler();
parser.setContentHandler( handler );
parser.setErrorHandler( handler );
final Enumeration enum = getClass().getClassLoader().getResources( ROLE_DESCRIPTOR );
while( enum.hasMoreElements() )
{
final URL url = (URL)enum.nextElement();
parser.parse( url.toString() );
handleDescriptor( handler.getConfiguration() );
}
}
/**
* Configure RoleManager based on contents of single descriptor.
*
* @param descriptor the descriptor
* @exception ConfigurationException if an error occurs
*/
private void handleDescriptor( final Configuration descriptor )
throws ConfigurationException
{
final Configuration[] types = descriptor.getChildren( "role" );
for( int i = 0; i < types.length; i++ )
{
final String name = types[ i ].getAttribute( "shorthand" );
final String role = types[ i ].getAttribute( "name" );
addNameRoleMapping( name, role );
}
}
/**
* Find Role name based on shorthand name.
*
* @param name the shorthand name
* @return the role
*/
public String getRoleForName( final String name )
{
final String role = (String)m_names.get( name );
if( null == role && null != m_parent )
{
return m_parent.getRoleForName( name );
}
return role;
}
/**
* Find name based on role.
*
* @param role the role
* @return the name
*/
public String getNameForRole( final String role )
{
final String name = (String)m_roles.get( role );
if( null == name && null != m_parent )
{
return m_parent.getNameForRole( name );
}
return name;
}
/**
* Add a mapping between name and role
*
* @param name the shorthand name
* @param role the role
* @exception IllegalArgumentException if an name is already mapped to a different role
*/
public void addNameRoleMapping( final String name, final String role )
throws IllegalArgumentException
{
final String oldRole = (String)m_names.get( name );
if( null != oldRole && oldRole.equals( role ) )
{
throw new IllegalArgumentException( "Name already mapped to another role (" +
oldRole + ")" );
}
final String oldName = (String)m_roles.get( role );
if( null != oldName && oldName.equals( name ) )
{
throw new IllegalArgumentException( "Role already mapped to another name (" +
oldName + ")" );
}
m_names.put( name, role );
m_roles.put( role, name );
}
}
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/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.components.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/06/17 10:35:40 $
*/
public interface RoleManager
extends Component
{
String ROLE = "org.apache.myrmidon.components.deployer.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.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractTypeDef.java 2001/06/12 13:36:13 1.2
+++ AbstractTypeDef.java 2001/06/17 10:35:40 1.3
@@ -15,7 +15,7 @@
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.RoleManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
import org.apache.myrmidon.components.type.TypeException;
import org.apache.myrmidon.components.type.TypeManager;
1.3 +0 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ItemSet.java
Index: ItemSet.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ItemSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ItemSet.java 2001/06/02 14:28:43 1.2
+++ ItemSet.java 2001/06/17 10:35:41 1.3
@@ -7,8 +7,6 @@
*/
package org.apache.myrmidon.framework;
-import org.apache.myrmidon.api.DataType;
-
/**
* Interface for ItemSet.
* An item set contains a number of items. Example item sets include
1.3 +0 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Mapper.java
Index: Mapper.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Mapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mapper.java 2001/06/02 14:28:43 1.2
+++ Mapper.java 2001/06/17 10:35:41 1.3
@@ -7,8 +7,6 @@
*/
package org.apache.myrmidon.framework;
-import org.apache.myrmidon.api.DataType;
-
/**
* Interface for Mappers.
* Mappers are responsible for mapping source items to targets items.
1.2 +1 -2 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
Index: Pattern.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Pattern.java 2001/06/16 03:17:47 1.1
+++ Pattern.java 2001/06/17 10:35:41 1.2
@@ -7,7 +7,6 @@
*/
package org.apache.myrmidon.framework;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.model.Condition;
@@ -44,7 +43,7 @@
/**
* Setter method for name/value of pattern.
- * Conforms to ant setter patterns
+ * Conforms to setter patterns
*
* @param name the value
*/
1.2 +0 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeInstanceTask.java 2001/06/08 09:05:55 1.1
+++ TypeInstanceTask.java 2001/06/17 10:35:41 1.2
@@ -14,7 +14,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.type.TypeException;
1.1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/DataType.java
Index: DataType.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.framework;
/**
* Base class for those classes that can appear inside the build file
* as stand alone data types.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
public interface DataType
{
String ROLE = "org.apache.myrmidon.api.DataType";
}
1.2 +5 -6 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TaskAdapter.java 2001/06/16 03:22:21 1.1
+++ TaskAdapter.java 2001/06/17 10:35:42 1.2
@@ -10,7 +10,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.type.TypeException;
@@ -20,7 +19,7 @@
import org.apache.tools.ant.Task;
/**
- * Adapter of Ant1 tasks to ant2.
+ * Adapter of Ant1 tasks to myrmidon.
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/
@@ -28,17 +27,17 @@
extends AbstractContainerTask
implements Configurable
{
- private Task m_ant1Task;
+ private Task m_task;
private Ant1Project m_project = new Ant1Project();
- public TaskAdapter( final Task ant1Task )
+ public TaskAdapter( final Task task )
{
- m_ant1Task = ant1Task;
+ m_task = task;
}
protected final Task getTask()
{
- return m_ant1Task;
+ return m_task;
}
protected final Ant1Project getProject()
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/manifest/builtin-ant-roles.xml
Index: builtin-ant-roles.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/manifest/builtin-ant-roles.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- builtin-ant-roles.xml 2001/06/17 00:23:53 1.2
+++ builtin-ant-roles.xml 2001/06/17 10:35:43 1.3
@@ -1,6 +1,6 @@
<roles>
<role shorthand="task" name="org.apache.myrmidon.api.Task"/>
- <role shorthand="data-type" name="org.apache.myrmidon.api.DataType"/>
+ <role shorthand="data-type" name="org.apache.myrmidon.framework.DataType"/>
<role shorthand="listener" name="org.apache.myrmidon.listeners.ProjectListener"/>
<role shorthand="aspect" name="org.apache.myrmidon.aspects.AspectHandler"/>
<role shorthand="project-builder" name="org.apache.myrmidon.components.builder.ProjectBuilder"/>