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/12/22 13:34:15 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace DefaultTaskContext.java DefaultWorkspace.java LogTargetToListenerAdapter.java ProjectEntry.java ProjectListenerSupport.java
donaldp 01/12/22 04:34:15
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
ATIProjectBuilder.java DefaultProjectBuilder.java
ReactorPIHandler.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 PrintingExecutor.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
DefaultTypeManager.java MultiSourceTypeFactory.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultTaskContext.java DefaultWorkspace.java
LogTargetToListenerAdapter.java ProjectEntry.java
ProjectListenerSupport.java
Log:
Restyled.
Revision Changes Path
1.5 +14 -11 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java
Index: ATIProjectBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ATIProjectBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ATIProjectBuilder.java 2001/11/19 12:37:25 1.4
+++ ATIProjectBuilder.java 2001/12/22 12:34:14 1.5
@@ -13,13 +13,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
@@ -41,8 +36,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( ATIProjectBuilder.class );
- private Parameters m_parameters;
- private URL m_systemID;
+ private Parameters m_parameters;
+ private URL m_systemID;
public void parameterize( final Parameters parameters )
{
@@ -62,7 +57,10 @@
final ReactorPIHandler reactorHandler = new ReactorPIHandler();
reader.setContentHandler( reactorHandler );
- try { reader.parse( sourceID.toString() ); }
+ try
+ {
+ reader.parse( sourceID.toString() );
+ }
catch( final StopParsingException spe )
{
//Ignore me
@@ -76,8 +74,10 @@
final String target = reactorHandler.getTarget( i );
final String data = reactorHandler.getData( i );
- if( target.equals( "xsl-param" ) ) handleParameter( data );
- else if( target.equals( "xsl-params" ) ) handleParameters( data, sourceID );
+ if( target.equals( "xsl-param" ) )
+ handleParameter( data );
+ else if( target.equals( "xsl-params" ) )
+ handleParameters( data, sourceID );
else if( target.equals( "xsl-stylesheet" ) )
{
if( null != transformer )
@@ -180,7 +180,10 @@
throw new SAXException( message );
}
- try { return new URL( baseSource, stylesheet[ 1 ] ).toString(); }
+ try
+ {
+ return new URL( baseSource, stylesheet[ 1 ] ).toString();
+ }
catch( final Exception e )
{
final String message =
1.20 +11 -15 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultProjectBuilder.java 2001/12/08 23:10:46 1.19
+++ DefaultProjectBuilder.java 2001/12/22 12:34:14 1.20
@@ -8,7 +8,6 @@
package org.apache.myrmidon.components.builder;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
@@ -16,22 +15,16 @@
import javax.xml.parsers.SAXParserFactory;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.excalibur.util.StringUtil;
import org.apache.avalon.framework.ExceptionUtil;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log.Logger;
-import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.components.model.DefaultProject;
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;
/**
@@ -46,10 +39,10 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultProjectBuilder.class );
- private final static int PROJECT_REFERENCES = 0;
- private final static int LIBRARY_IMPORTS = 1;
- private final static int IMPLICIT_TASKS = 2;
- private final static int TARGETS = 3;
+ private final static int PROJECT_REFERENCES = 0;
+ private final static int LIBRARY_IMPORTS = 1;
+ private final static int IMPLICIT_TASKS = 2;
+ private final static int TARGETS = 3;
/**
* build a project from file.
@@ -135,7 +128,7 @@
//determine base directory for project
final File baseDirectory =
- (new File( file.getParentFile(), baseDirectoryName )).getAbsoluteFile();
+ ( new File( file.getParentFile(), baseDirectoryName ) ).getAbsoluteFile();
if( getLogger().isDebugEnabled() )
{
@@ -214,7 +207,8 @@
}
}
- if( name.equals( "target" ) ) buildTarget( project, element );
+ if( name.equals( "target" ) )
+ buildTarget( project, element );
else
{
final String message =
@@ -406,7 +400,9 @@
protected boolean validName( final String name )
{
- if( -1 != name.indexOf( "->" ) ) return false;
- else return true;
+ if( -1 != name.indexOf( "->" ) )
+ return false;
+ else
+ return true;
}
}
1.3 +3 -3 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ReactorPIHandler.java
Index: ReactorPIHandler.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ReactorPIHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReactorPIHandler.java 2001/11/19 12:37:25 1.2
+++ ReactorPIHandler.java 2001/12/22 12:34:14 1.3
@@ -22,8 +22,8 @@
public class ReactorPIHandler
extends DefaultHandler
{
- private ArrayList m_targets = new ArrayList();
- private ArrayList m_data = new ArrayList();
+ private ArrayList m_targets = new ArrayList();
+ private ArrayList m_data = new ArrayList();
public int getPICount()
{
@@ -46,7 +46,7 @@
m_targets.add( target );
m_data.add( data );
}
-
+
public void startElement( final String uri,
final String localName,
final String qName,
1.12 +19 -11 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultConfigurer.java 2001/12/19 10:36:24 1.11
+++ DefaultConfigurer.java 2001/12/22 12:34:14 1.12
@@ -92,7 +92,7 @@
getLogger().debug( "Configuring object via Configurable interface" );
}
- ((Configurable)object).configure( configuration );
+ ( (Configurable)object ).configure( configuration );
}
else
{
@@ -317,14 +317,22 @@
private Class getComplexTypeFor( final Class clazz )
{
- if( String.class == clazz ) return String.class;
- else if( Integer.TYPE.equals( clazz ) ) return Integer.class;
- else if( Long.TYPE.equals( clazz ) ) return Long.class;
- else if( Short.TYPE.equals( clazz ) ) return Short.class;
- else if( Byte.TYPE.equals( clazz ) ) return Byte.class;
- else if( Boolean.TYPE.equals( clazz ) ) return Boolean.class;
- else if( Float.TYPE.equals( clazz ) ) return Float.class;
- else if( Double.TYPE.equals( clazz ) ) return Double.class;
+ if( String.class == clazz )
+ return String.class;
+ else if( Integer.TYPE.equals( clazz ) )
+ return Integer.class;
+ else if( Long.TYPE.equals( clazz ) )
+ return Long.class;
+ else if( Short.TYPE.equals( clazz ) )
+ return Short.class;
+ else if( Byte.TYPE.equals( clazz ) )
+ return Byte.class;
+ else if( Boolean.TYPE.equals( clazz ) )
+ return Boolean.class;
+ else if( Float.TYPE.equals( clazz ) )
+ return Float.class;
+ else if( Double.TYPE.equals( clazz ) )
+ return Double.class;
else
{
final String message = REZ.getString( "no-complex-type.error", clazz.getName() );
@@ -341,7 +349,7 @@
{
final Method method = methods[ i ];
if( methodName.equals( method.getName() ) &&
- Method.PUBLIC == (method.getModifiers() & Method.PUBLIC) )
+ Method.PUBLIC == ( method.getModifiers() & Method.PUBLIC ) )
{
if( method.getReturnType().equals( Void.TYPE ) )
{
@@ -366,7 +374,7 @@
{
final Method method = methods[ i ];
if( methodName.equals( method.getName() ) &&
- Method.PUBLIC == (method.getModifiers() & Method.PUBLIC) )
+ Method.PUBLIC == ( method.getModifiers() & Method.PUBLIC ) )
{
final Class returnType = method.getReturnType();
if( !returnType.equals( Void.TYPE ) &&
1.5 +3 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultConverterRegistry.java 2001/11/19 12:37:25 1.4
+++ DefaultConverterRegistry.java 2001/12/22 12:34:14 1.5
@@ -18,7 +18,7 @@
public class DefaultConverterRegistry
implements ConverterRegistry
{
- private final HashMap m_mapping = new HashMap();
+ private final HashMap m_mapping = new HashMap();
public String getConverterName( final String source, final String destination )
{
@@ -27,8 +27,8 @@
return (String)map.get( destination );
}
- public void registerConverter( final String className,
- final String source,
+ public void registerConverter( final String className,
+ final String source,
final String destination )
{
HashMap map = (HashMap)m_mapping.get( source );
1.8 +18 -15 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultMasterConverter.java 2001/11/26 11:35:51 1.7
+++ DefaultMasterConverter.java 2001/12/22 12:34:14 1.8
@@ -7,20 +7,20 @@
*/
package org.apache.myrmidon.components.converter;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.converter.Converter;
+import org.apache.myrmidon.converter.ConverterException;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
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;
/**
* Converter engine to handle converting between types.
@@ -34,10 +34,10 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultMasterConverter.class );
- private final static boolean DEBUG = false;
+ private final static boolean DEBUG = false;
- private ConverterRegistry m_registry;
- private TypeFactory m_factory;
+ private ConverterRegistry m_registry;
+ private TypeFactory m_factory;
/**
* Retrieve relevent services needed to deploy.
@@ -51,7 +51,10 @@
m_registry = (ConverterRegistry)componentManager.lookup( ConverterRegistry.ROLE );
final TypeManager typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE );
- try { m_factory = typeManager.getFactory( Converter.ROLE ); }
+ try
+ {
+ m_factory = typeManager.getFactory( Converter.ROLE );
+ }
catch( final TypeException te )
{
final String message = REZ.getString( "no-converter-factory.error" );
@@ -80,9 +83,9 @@
if( DEBUG )
{
- final String message =
- REZ.getString( "converter-lookup.notice",
- originalClass.getName(),
+ final String message =
+ REZ.getString( "converter-lookup.notice",
+ originalClass.getName(),
destination.getName() );
getLogger().debug( message );
}
@@ -93,9 +96,9 @@
if( null == name )
{
- final String message =
- REZ.getString( "no-converter.notice",
- originalClass.getName(),
+ final String message =
+ REZ.getString( "no-converter.notice",
+ originalClass.getName(),
destination.getName() );
throw new ConverterException( message );
}
1.11 +19 -21 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultDeployer.java 2001/12/08 23:10:46 1.10
+++ DefaultDeployer.java 2001/12/22 12:34:14 1.11
@@ -8,31 +8,30 @@
package org.apache.myrmidon.components.deployer;
import java.io.File;
-import java.net.URL;
+import java.net.JarURLConnection;
import java.net.MalformedURLException;
+import java.net.URL;
import java.net.URLClassLoader;
-import java.net.JarURLConnection;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Enumeration;
-import java.util.jar.Manifest;
import java.util.HashMap;
+import java.util.jar.Manifest;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.avalon.excalibur.extension.PackageManager;
-import org.apache.avalon.excalibur.extension.OptionalPackage;
import org.apache.avalon.excalibur.extension.Extension;
+import org.apache.avalon.excalibur.extension.OptionalPackage;
+import org.apache.avalon.excalibur.extension.PackageManager;
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;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.interfaces.deployer.Deployer;
@@ -41,7 +40,6 @@
import org.apache.myrmidon.interfaces.role.RoleManager;
import org.apache.myrmidon.interfaces.type.DefaultTypeFactory;
import org.apache.myrmidon.interfaces.type.TypeManager;
-import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
/**
@@ -58,10 +56,10 @@
private final static String TYPE_DESCRIPTOR = "META-INF/ant-types.xml";
- private ConverterRegistry m_converterRegistry;
- private TypeManager m_typeManager;
- private RoleManager m_roleManager;
- private PackageManager m_packageManager;
+ private ConverterRegistry m_converterRegistry;
+ private TypeManager m_typeManager;
+ private RoleManager m_roleManager;
+ private PackageManager m_packageManager;
/**
* Retrieve relevent services needed to deploy.
@@ -126,7 +124,7 @@
final URL[] urls = buildClasspath( file, extensions );
final Deployment deployment = new Deployment( file );
final Configuration descriptor = deployment.getDescriptor();
-
+
final URLClassLoader classLoader =
new URLClassLoader( urls, Thread.currentThread().getContextClassLoader() );
@@ -218,7 +216,7 @@
throws MalformedURLException
{
final URL[] urls = new URL[ dependencies.length + 1 ];
-
+
for( int i = 0; i < dependencies.length; i++ )
{
urls[ i ] = dependencies[ i ].toURL();
@@ -247,10 +245,10 @@
if( getLogger().isDebugEnabled() )
{
- final String message1 =
+ final String message1 =
REZ.getString( "available-extensions", Arrays.asList( available ) );
getLogger().debug( message1 );
- final String message2 =
+ final String message2 =
REZ.getString( "required-extensions", Arrays.asList( required ) );
getLogger().debug( message2 );
}
@@ -271,12 +269,12 @@
final Extension extension = (Extension)unsatisfied.get( i );
final Object[] params = new Object[]
{
- extension.getExtensionName(),
- extension.getSpecificationVendor(),
+ extension.getExtensionName(),
+ extension.getSpecificationVendor(),
extension.getSpecificationVersion(),
- extension.getImplementationVendor(),
+ extension.getImplementationVendor(),
extension.getImplementationVendorId(),
- extension.getImplementationVersion(),
+ extension.getImplementationVersion(),
extension.getImplementationURL()
};
final String message = REZ.format( "missing.extension", params );
1.9 +9 -8 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Deployment.java 2001/11/19 12:37:25 1.8
+++ Deployment.java 2001/12/22 12:34:14 1.9
@@ -9,7 +9,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
@@ -17,11 +16,10 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
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.deployer.DeploymentException;
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.
@@ -33,17 +31,17 @@
private static final Resources REZ =
ResourceManager.getPackageResources( Deployment.class );
- public final static String DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml";
+ public final static String DESCRIPTOR_NAME = "META-INF/ant-descriptor.xml";
- private File m_file;
+ private File m_file;
- private Configuration m_descriptor;
+ private Configuration m_descriptor;
public Deployment( final File file )
{
m_file = file;
}
-
+
public Configuration getDescriptor()
throws DeploymentException
{
@@ -58,7 +56,10 @@
public URL getURL()
throws DeploymentException
{
- try { return m_file.getCanonicalFile().toURL(); }
+ try
+ {
+ return m_file.getCanonicalFile().toURL();
+ }
catch( final IOException ioe )
{
final String message = REZ.getString( "bad-url.error", m_file );
1.15 +33 -33 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultEmbeddor.java 2001/11/26 11:35:51 1.14
+++ DefaultEmbeddor.java 2001/12/22 12:34:14 1.15
@@ -9,7 +9,6 @@
import java.io.File;
import java.io.FilenameFilter;
-import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.ExtensionFileFilter;
@@ -29,9 +28,9 @@
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.embeddor.Embeddor;
import org.apache.myrmidon.interfaces.executor.Executor;
import org.apache.myrmidon.interfaces.extensions.ExtensionManager;
-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;
@@ -51,26 +50,26 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultEmbeddor.class );
- private Deployer m_deployer;
- private RoleManager m_roleManager;
+ private Deployer m_deployer;
+ private RoleManager m_roleManager;
- private AspectManager m_aspectManager;
- private TypeManager m_typeManager;
- private MasterConverter m_converter;
- private ConverterRegistry m_converterRegistry;
- private ExtensionManager m_extensionManager;
-
- private Executor m_executor;
- private Configurer m_configurer;
-
- private DefaultComponentManager m_componentManager;
- private Parameters m_parameters;
- private Parameters m_defaults;
-
- private File m_homeDir;
- private File m_binDir;
- private File m_libDir;
- private File m_taskLibDir;
+ private AspectManager m_aspectManager;
+ private TypeManager m_typeManager;
+ private MasterConverter m_converter;
+ private ConverterRegistry m_converterRegistry;
+ private ExtensionManager m_extensionManager;
+
+ private Executor m_executor;
+ private Configurer m_configurer;
+
+ private DefaultComponentManager m_componentManager;
+ private Parameters m_parameters;
+ private Parameters m_defaults;
+
+ private File m_homeDir;
+ private File m_binDir;
+ private File m_libDir;
+ private File m_taskLibDir;
/**
* Setup basic properties of engine.
@@ -114,17 +113,17 @@
if( builder instanceof Composable )
{
- ((Composable)builder).compose( m_componentManager );
+ ( (Composable)builder ).compose( m_componentManager );
}
if( builder instanceof Parameterizable )
{
- ((Parameterizable)builder).parameterize( parameters );
+ ( (Parameterizable)builder ).parameterize( parameters );
}
if( builder instanceof Initializable )
{
- ((Initializable)builder).initialize();
+ ( (Initializable)builder ).initialize();
}
return builder;
@@ -139,20 +138,19 @@
setupLogger( workspace );
-
if( workspace instanceof Composable )
{
- ((Composable)workspace).compose( m_componentManager );
+ ( (Composable)workspace ).compose( m_componentManager );
}
if( workspace instanceof Parameterizable )
{
- ((Parameterizable)workspace).parameterize( parameters );
+ ( (Parameterizable)workspace ).parameterize( parameters );
}
if( workspace instanceof Initializable )
{
- ((Initializable)workspace).initialize();
+ ( (Initializable)workspace ).initialize();
}
return workspace;
@@ -350,17 +348,17 @@
if( component instanceof Composable )
{
- ((Composable)component).compose( m_componentManager );
+ ( (Composable)component ).compose( m_componentManager );
}
if( component instanceof Parameterizable )
{
- ((Parameterizable)component).parameterize( m_parameters );
+ ( (Parameterizable)component ).parameterize( m_parameters );
}
if( component instanceof Initializable )
{
- ((Initializable)component).initialize();
+ ( (Initializable)component ).initialize();
}
}
@@ -373,7 +371,7 @@
String filepath = null;
filepath = getParameter( "myrmidon.home" );
- m_homeDir = (new File( filepath )).getAbsoluteFile();
+ m_homeDir = ( new File( filepath ) ).getAbsoluteFile();
checkDirectory( m_homeDir, "home" );
filepath = getParameter( "myrmidon.bin.path" );
@@ -456,8 +454,10 @@
version = JavaVersion.JAVA1_2;
Class.forName( "java.lang.StrictMath" );
version = JavaVersion.JAVA1_3;
+ }
+ catch( final ClassNotFoundException cnfe )
+ {
}
- catch( final ClassNotFoundException cnfe ) {}
return version;
}
1.10 +9 -10 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AspectAwareExecutor.java 2001/12/19 10:37:00 1.9
+++ AspectAwareExecutor.java 2001/12/22 12:34:14 1.10
@@ -14,15 +14,12 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.myrmidon.api.Task;
-import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.aspects.AspectHandler;
import org.apache.myrmidon.interfaces.aspect.AspectManager;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
@@ -32,8 +29,8 @@
private static final Resources REZ =
ResourceManager.getPackageResources( AspectAwareExecutor.class );
- private final static Parameters EMPTY_PARAMETERS;
- private final static Configuration[] EMPTY_ELEMENTS = new Configuration[ 0 ];
+ private final static Parameters EMPTY_PARAMETERS;
+ private final static Configuration[] EMPTY_ELEMENTS = new Configuration[ 0 ];
static
{
@@ -41,7 +38,7 @@
EMPTY_PARAMETERS.makeReadOnly();
}
- private AspectManager m_aspectManager;
+ private AspectManager m_aspectManager;
/**
* Retrieve relevent services.
@@ -158,7 +155,8 @@
if( null == parameters ) parameters = EMPTY_PARAMETERS;
Configuration[] elements = null;
- if( null == elementList ) elements = EMPTY_ELEMENTS;
+ if( null == elementList )
+ elements = EMPTY_ELEMENTS;
else
{
elements = (Configuration[])elementList.toArray( EMPTY_ELEMENTS );
@@ -185,7 +183,8 @@
Configuration[] elements = null;
- if( null == elementList ) elements = EMPTY_ELEMENTS;
+ if( null == elementList )
+ elements = EMPTY_ELEMENTS;
else
{
elements = (Configuration[])elementList.toArray( EMPTY_ELEMENTS );
1.8 +4 -13 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultExecutionFrame.java 2001/11/26 11:35:51 1.7
+++ DefaultExecutionFrame.java 2001/12/22 12:34:14 1.8
@@ -10,21 +10,12 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.DefaultComponentManager;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.myrmidon.api.TaskContext;
-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;
/**
@@ -35,11 +26,11 @@
public class DefaultExecutionFrame
implements ExecutionFrame, LogEnabled, Contextualizable, Composable
{
- private TypeManager m_typeManager;
+ private TypeManager m_typeManager;
- private Logger m_logger;
- private TaskContext m_context;
- private ComponentManager m_componentManager;
+ private Logger m_logger;
+ private TaskContext m_context;
+ private ComponentManager m_componentManager;
public void enableLogging( final Logger logger )
{
1.14 +22 -13 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultExecutor.java 2001/11/26 11:35:51 1.13
+++ DefaultExecutor.java 2001/12/22 12:34:14 1.14
@@ -11,14 +11,10 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.component.DefaultComponentManager;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
@@ -26,13 +22,11 @@
import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
import org.apache.myrmidon.interfaces.executor.Executor;
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 AbstractLogEnabled
@@ -41,7 +35,7 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultExecutor.class );
- private Configurer m_configurer;
+ private Configurer m_configurer;
/**
* Retrieve relevent services needed to deploy.
@@ -112,7 +106,10 @@
final TaskContext context )
throws TaskException
{
- try { m_configurer.configure( task, taskModel, context ); }
+ try
+ {
+ m_configurer.configure( task, taskModel, context );
+ }
catch( final Throwable throwable )
{
final String message =
@@ -131,7 +128,10 @@
{
if( task instanceof Composable )
{
- try { ((Composable)task).compose( componentManager ); }
+ try
+ {
+ ( (Composable)task ).compose( componentManager );
+ }
catch( final Throwable throwable )
{
final String message =
@@ -153,7 +153,7 @@
{
if( task instanceof Contextualizable )
{
- ((Contextualizable)task).contextualize( context );
+ ( (Contextualizable)task ).contextualize( context );
}
}
catch( final Throwable throwable )
@@ -172,7 +172,10 @@
{
if( task instanceof Disposable )
{
- try { ((Disposable)task).dispose(); }
+ try
+ {
+ ( (Disposable)task ).dispose();
+ }
catch( final Throwable throwable )
{
final String message =
@@ -192,7 +195,10 @@
{
if( task instanceof LogEnabled )
{
- try { ((LogEnabled)task).enableLogging( logger ); }
+ try
+ {
+ ( (LogEnabled)task ).enableLogging( logger );
+ }
catch( final Throwable throwable )
{
final String message =
@@ -210,7 +216,10 @@
{
if( task instanceof Initializable )
{
- try { ((Initializable)task).initialize(); }
+ try
+ {
+ ( (Initializable)task ).initialize();
+ }
catch( final Throwable throwable )
{
final String message =
1.2 +5 -6 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/PrintingExecutor.java
Index: PrintingExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/PrintingExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PrintingExecutor.java 2001/06/27 00:50:06 1.1
+++ PrintingExecutor.java 2001/12/22 12:34:14 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.myrmidon.components.executor;
+import org.apache.avalon.framework.configuration.Configuration;
import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.api.TaskException;
-import org.apache.avalon.framework.configuration.Configuration;
public class PrintingExecutor
extends AspectAwareExecutor
@@ -19,22 +19,21 @@
{
final StringBuffer sb = new StringBuffer();
printConfiguration( taskModel, 0, sb );
-
+
System.out.println( sb.toString() );
}
- private void printConfiguration( final Configuration taskModel,
- final int level,
+ private void printConfiguration( final Configuration taskModel,
+ final int level,
final StringBuffer sb )
{
for( int i = 0; i < level; i++ )
{
sb.append( ' ' );
}
-
+
sb.append( '<' );
sb.append( taskModel.getName() );
-
final String[] names = taskModel.getAttributeNames();
for( int i = 0; i < names.length; i++ )
1.9 +6 -7 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultProject.java 2001/11/19 12:37:26 1.8
+++ DefaultProject.java 2001/12/22 12:34:14 1.9
@@ -8,7 +8,6 @@
package org.apache.myrmidon.components.model;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
@@ -29,22 +28,22 @@
ResourceManager.getPackageResources( DefaultProject.class );
///The imports
- private final ArrayList m_imports = new ArrayList();
+ private final ArrayList m_imports = new ArrayList();
///The projects refferred to by this project
- private final HashMap m_projects = new HashMap();
+ private final HashMap m_projects = new HashMap();
///The targets contained by this project
- private final HashMap m_targets = new HashMap();
+ private final HashMap m_targets = new HashMap();
///The implicit target (not present in m_targets)
- private Target m_implicitTarget;
+ private Target m_implicitTarget;
///The name of the default target
- private String m_defaultTarget;
+ private String m_defaultTarget;
///The base directory of project
- private File m_baseDirectory;
+ private File m_baseDirectory;
/**
* Get the imports for project.
1.5 +4 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultRoleManager.java 2001/11/19 12:37:26 1.4
+++ DefaultRoleManager.java 2001/12/22 12:34:14 1.5
@@ -19,14 +19,13 @@
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;
/**
* Interface to manage roles and mapping to names.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/11/19 12:37:26 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/12/22 12:34:14 $
*/
public class DefaultRoleManager
implements RoleManager, Initializable
@@ -37,13 +36,13 @@
private final static String ROLE_DESCRIPTOR = "META-INF/ant-roles.xml";
/** Parent <code>RoleManager</code> for nested resolution */
- private final RoleManager m_parent;
+ private final RoleManager m_parent;
/** Map for name to role mapping */
- private final HashMap m_names = new HashMap();
+ private final HashMap m_names = new HashMap();
/** Map for role to name mapping */
- private final HashMap m_roles = new HashMap();
+ private final HashMap m_roles = new HashMap();
/**
* constructor--this RoleManager has no parent.
1.11 +11 -11 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultTypeManager.java 2001/11/19 12:37:26 1.10
+++ DefaultTypeManager.java 2001/12/22 12:34:14 1.11
@@ -10,9 +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.TypeException;
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.
@@ -26,10 +26,10 @@
ResourceManager.getPackageResources( DefaultTypeManager.class );
///Parent type manager to inherit values from.
- private final DefaultTypeManager m_parent;
+ private final DefaultTypeManager m_parent;
///Maps role to MultiSourceTypeFactory.
- private final HashMap m_roleMap = new HashMap();
+ private final HashMap m_roleMap = new HashMap();
public DefaultTypeManager()
{
@@ -41,9 +41,9 @@
m_parent = parent;
}
- public void registerType( final String role,
- final String shorthandName,
- final TypeFactory factory )
+ public void registerType( final String role,
+ final String shorthandName,
+ final TypeFactory factory )
throws TypeException
{
final MultiSourceTypeFactory msFactory = createFactory( role );
@@ -72,18 +72,18 @@
*
* @param role the role name(must be name of work interface)
* @return the Factory for interface
- * @exception TypeException role does not specify accessible work interface
+ * @exception TypeException role does not specify accessible work interface
*/
private MultiSourceTypeFactory createFactory( final String role )
throws TypeException
{
MultiSourceTypeFactory factory = (MultiSourceTypeFactory)m_roleMap.get( role );
- if( null != factory )
+ if( null != factory )
{
return factory;
}
- final MultiSourceTypeFactory parentFactory = getParentTypedFactory( role );
+ final MultiSourceTypeFactory parentFactory = getParentTypedFactory( role );
if( null != parentFactory )
{
factory = new MultiSourceTypeFactory( parentFactory );
@@ -103,7 +103,7 @@
final String message = REZ.getString( "no-work-interface.error", role );
throw new TypeException( message );
}
- }
+ }
m_roleMap.put( role, factory );
@@ -117,7 +117,7 @@
return m_parent.lookupFactory( role );
}
else
- {
+ {
return null;
}
}
1.6 +4 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultiSourceTypeFactory.java 2001/11/19 12:37:26 1.5
+++ MultiSourceTypeFactory.java 2001/12/22 12:34:14 1.6
@@ -10,8 +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;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
/**
* This factory acts as a proxy to set of object factorys.
@@ -25,13 +25,13 @@
ResourceManager.getPackageResources( MultiSourceTypeFactory.class );
///Parent Selector
- private final MultiSourceTypeFactory m_parent;
+ private final MultiSourceTypeFactory m_parent;
///Map of name->factory list
- private final HashMap m_factorys = new HashMap();
+ private final HashMap m_factorys = new HashMap();
///Type expected to be created from factorys
- private final Class m_type;
+ private final Class m_type;
public MultiSourceTypeFactory( final Class type )
{
1.4 +22 -12 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
Index: DefaultTaskContext.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultTaskContext.java 2001/11/19 12:37:26 1.3
+++ DefaultTaskContext.java 2001/12/22 12:34:14 1.4
@@ -12,8 +12,6 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.excalibur.io.FileUtil;
-import org.apache.avalon.excalibur.property.PropertyException;
-import org.apache.avalon.excalibur.property.PropertyUtil;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.myrmidon.api.JavaVersion;
@@ -63,7 +61,10 @@
*/
public JavaVersion getJavaVersion()
{
- try { return (JavaVersion)get( JAVA_VERSION ); }
+ try
+ {
+ return (JavaVersion)get( JAVA_VERSION );
+ }
catch( final ContextException ce )
{
final String message = REZ.getString( "no-version.error" );
@@ -71,7 +72,6 @@
}
}
-
/**
* Retrieve Name of tasklet.
*
@@ -79,7 +79,10 @@
*/
public String getName()
{
- try { return (String)get( NAME ); }
+ try
+ {
+ return (String)get( NAME );
+ }
catch( final ContextException ce )
{
final String message = REZ.getString( "no-name.error" );
@@ -94,7 +97,10 @@
*/
public File getBaseDirectory()
{
- try { return (File)get( BASE_DIRECTORY ); }
+ try
+ {
+ return (File)get( BASE_DIRECTORY );
+ }
catch( final ContextException ce )
{
final String message = REZ.getString( "no-dir.error" );
@@ -125,7 +131,10 @@
*/
public Object getProperty( final String name )
{
- try { return get( name ); }
+ try
+ {
+ return get( name );
+ }
catch( final ContextException ce )
{
return null;
@@ -154,7 +163,8 @@
{
checkPropertyValid( name, value );
- if( CURRENT == scope ) put( name, value );
+ if( CURRENT == scope )
+ put( name, value );
else if( PARENT == scope )
{
if( null == getParent() )
@@ -164,7 +174,7 @@
}
else
{
- ((TaskContext)getParent()).setProperty( name, value );
+ ( (TaskContext)getParent() ).setProperty( name, value );
}
}
else if( TOP_LEVEL == scope )
@@ -217,19 +227,19 @@
{
if( BASE_DIRECTORY.equals( name ) && !( value instanceof File ) )
{
- final String message =
+ final String message =
REZ.getString( "bad-property.error", BASE_DIRECTORY, File.class.getName() );
throw new TaskException( message );
}
else if( NAME.equals( name ) && !( value instanceof String ) )
{
- final String message =
+ final String message =
REZ.getString( "bad-property.error", NAME, String.class.getName() );
throw new TaskException( message );
}
else if( JAVA_VERSION.equals( name ) && !( value instanceof JavaVersion ) )
{
- final String message =
+ final String message =
REZ.getString( "bad-property.error", JAVA_VERSION, JavaVersion.class.getName() );
throw new TaskException( message );
}
1.10 +13 -13 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultWorkspace.java 2001/11/26 11:35:51 1.9
+++ DefaultWorkspace.java 2001/12/22 12:34:14 1.10
@@ -8,13 +8,11 @@
package org.apache.myrmidon.components.workspace;
import java.io.File;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -57,15 +55,15 @@
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultWorkspace.class );
- private Executor m_executor;
- private ProjectListenerSupport m_listenerSupport = new ProjectListenerSupport();
- private ComponentManager m_componentManager;
- private Parameters m_parameters;
- private TaskContext m_baseContext;
- private HashMap m_entrys = new HashMap();
- private TypeManager m_typeManager;
- private Hierarchy m_hierarchy;
- private int m_projectID;
+ private Executor m_executor;
+ private ProjectListenerSupport m_listenerSupport = new ProjectListenerSupport();
+ private ComponentManager m_componentManager;
+ private Parameters m_parameters;
+ private TaskContext m_baseContext;
+ private HashMap m_entrys = new HashMap();
+ private TypeManager m_typeManager;
+ private Hierarchy m_hierarchy;
+ private int m_projectID;
/**
* Add a listener to project events.
@@ -140,7 +138,6 @@
m_listenerSupport.projectFinished();
}
-
private TaskContext createBaseContext()
throws TaskException
{
@@ -239,7 +236,10 @@
final DefaultDeployer deployer = new DefaultDeployer();
deployer.enableLogging( getLogger() );
- try { deployer.compose( componentManager ); }
+ try
+ {
+ deployer.compose( componentManager );
+ }
catch( final ComponentException ce )
{
final String message = REZ.getString( "bad-deployer-config.error" );
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/LogTargetToListenerAdapter.java
Index: LogTargetToListenerAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/LogTargetToListenerAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogTargetToListenerAdapter.java 2001/11/19 12:37:26 1.2
+++ LogTargetToListenerAdapter.java 2001/12/22 12:34:14 1.3
@@ -19,7 +19,7 @@
public class LogTargetToListenerAdapter
implements LogTarget
{
- private final ProjectListener m_listener;
+ private final ProjectListener m_listener;
/**
* Constructor taking listener to convert to.
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProjectEntry.java 2001/11/19 12:37:26 1.3
+++ ProjectEntry.java 2001/12/22 12:34:14 1.4
@@ -18,9 +18,9 @@
*/
public final class ProjectEntry
{
- private final Project m_project;
- private final ExecutionFrame m_frame;
- private final ArrayList m_targetsCompleted = new ArrayList();
+ private final Project m_project;
+ private final ExecutionFrame m_frame;
+ private final ArrayList m_targetsCompleted = new ArrayList();
public ProjectEntry( final Project project,
final ExecutionFrame frame )
1.3 +1 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java
Index: ProjectListenerSupport.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectListenerSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectListenerSupport.java 2001/11/19 12:37:26 1.2
+++ ProjectListenerSupport.java 2001/12/22 12:34:14 1.3
@@ -17,7 +17,7 @@
public class ProjectListenerSupport
implements ProjectListener
{
- private ProjectListener[] m_listeners = new ProjectListener[ 0 ];
+ private ProjectListener[] m_listeners = new ProjectListener[ 0 ];
/**
* Add an extra project listener that wants to receive notification of listener events.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>