adammurdoch 02/03/21 00:03:56
Modified: proposal/myrmidon build.xml
proposal/myrmidon/src/java/org/apache/antlib/core
AbstractAvailableCondition.java
StringToBooleanConverter.java
proposal/myrmidon/src/java/org/apache/antlib/dotnet
CSharp.java
proposal/myrmidon/src/java/org/apache/antlib/xml
XMLValidateTask.java XSLTProcess.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework
Execute.java Resources.properties
proposal/myrmidon/src/manifest ant1-ant-descriptor.xml
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs
ANTLR.java IContract.java Javah.java
PathConvert.java Property.java SQLExec.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac
DefaultCompilerAdapter.java Gcj.java Javac.java
Jikes.java Jvc.java Kjc.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc
JJTree.java JavaCC.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc
DocletInfo.java Javadoc.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend
JDependTask.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp
JspC.java WLJspc.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers
JasperC.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit
JUnitTask.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata
AbstractMetamataTask.java MAudit.java MMetrics.java
MParse.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic
DefaultRmicAdapter.java Rmic.java RmicAdapter.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka
CovReport.java Coverage.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook
StyleBook.java
proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss
MSVSSGET.java
proposal/myrmidon/src/todo/org/apache/tools/todo/types
Argument.java EnvironmentVariable.java
PathUtil.java
Added: proposal/myrmidon/src/java/org/apache/antlib/java
JavaTask.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/file
ArrayFileList.java FileList.java
FileListToStringConverter.java
ParsedPathElement.java Path.java
StringToPathConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/framework/java
ExecuteJava.java Resources.properties
Removed: proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs
ExecuteJava.java Java.java
proposal/myrmidon/src/todo/org/apache/tools/todo/types
ArrayFileList.java FileList.java
ParsedPathElement.java Path.java
proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters
FileListToStringConverter.java
StringToPathConverter.java
Log:
* Moved ExecuteJava -> framework.java package. Added a bunch of Javadocs,
and i18n-ed the error and log messages.
* Moved Java -> antlib.java.JavaTask.
* Moved Path and friends -> framework.file package.
Revision Changes Path
1.84 +4 -0 jakarta-ant/proposal/myrmidon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/build.xml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- build.xml 20 Mar 2002 08:19:42 -0000 1.83
+++ build.xml 21 Mar 2002 08:03:54 -0000 1.84
@@ -506,6 +506,10 @@
<ant antfile="antlib.xml">
<property name="antlib.name" value="vfile"/>
</ant>
+
+ <ant antfile="antlib.xml">
+ <property name="antlib.name" value="java"/>
+ </ant>
</target>
<!-- Compiles and runs the unit tests -->
1.3 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java
Index: AbstractAvailableCondition.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAvailableCondition.java 21 Mar 2002 06:38:12 -0000 1.2
+++ AbstractAvailableCondition.java 21 Mar 2002 08:03:54 -0000 1.3
@@ -12,7 +12,7 @@
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.conditions.Condition;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
@@ -20,7 +20,7 @@
* resource in a classpath.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
- * @version $Revision: 1.2 $ $Date: 2002/03/21 06:38:12 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/21 08:03:54 $
*/
public abstract class AbstractAvailableCondition
implements Condition
1.7 +4 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
Index: StringToBooleanConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StringToBooleanConverter.java 25 Feb 2002 09:47:19 -0000 1.6
+++ StringToBooleanConverter.java 21 Mar 2002 08:03:54 -0000 1.7
@@ -33,11 +33,13 @@
throws ConverterException
{
final String string = (String)object;
- if( string.equals( "true" ) )
+ if( string.equalsIgnoreCase( "true" )
+ || string.equalsIgnoreCase( "yes" ) )
{
return Boolean.TRUE;
}
- else if( string.equals( "false" ) )
+ else if( string.equalsIgnoreCase( "false" )
+ || string.equalsIgnoreCase( "no" ) )
{
return Boolean.FALSE;
}
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CSharp.java 19 Mar 2002 02:44:36 -0000 1.7
+++ CSharp.java 21 Mar 2002 08:03:54 -0000 1.8
@@ -13,7 +13,7 @@
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
/**
* This task compiles CSharp source into executables or modules. The task
will
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java
Index: JavaTask.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.txt file.
*/
package org.apache.antlib.java;
import java.io.File;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.EnvironmentVariable;
import org.apache.myrmidon.framework.file.Path;
/**
* This task acts as a loader for java applications but allows to use the same
* JVM for the called application thus resulting in much faster operation.
*
* @author Stefano Mazzocchi <a href="mailto:[EMAIL PROTECTED]">
* [EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*
* @ant:task name="java"
*/
public class JavaTask
extends AbstractTask
{
private final ExecuteJava m_exec = new ExecuteJava();
/**
* Set the class name.
*/
public void setClassname( final String className )
{
m_exec.setClassName( className );
}
/**
* Add a classpath element.
*/
public void addClasspath( final Path classpath )
throws TaskException
{
m_exec.getClassPath().addPath( classpath );
}
/**
* The working directory of the process
*
* @param dir The new Dir value
*/
public void setDir( final File dir )
{
m_exec.setWorkingDirectory( dir );
}
/**
* Set the forking flag.
*/
public void setFork( final boolean fork )
{
m_exec.setFork( fork );
}
/**
* Set the jar name.
*/
public void setJar( final File jar )
{
m_exec.setJar( jar );
}
/**
* Set the command used to start the VM (only if fork==true).
*/
public void setJvm( final String jvm )
{
m_exec.setJvm( jvm );
}
/**
* -mx or -Xmx depending on VM version
*/
public void setMaxmemory( final String max )
{
m_exec.setMaxMemory( max );
}
/**
* Add a nested sysproperty element.
*/
public void addSysproperty( final EnvironmentVariable sysp )
{
m_exec.getSysProperties().addVariable( sysp );
}
/**
* Creates a nested arg element.
*/
public void addArg( final Argument argument )
{
m_exec.getArguments().addArgument( argument );
}
/**
* Creates a nested jvmarg element.
*/
public void addJvmarg( final Argument argument )
{
m_exec.getVmArguments().addArgument( argument );
}
public void execute()
throws TaskException
{
m_exec.execute( getContext() );
}
}
1.24 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLValidateTask.java 21 Mar 2002 06:38:12 -0000 1.23
+++ XMLValidateTask.java 21 Mar 2002 08:03:54 -0000 1.24
@@ -19,7 +19,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.FileSet;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
import org.apache.tools.todo.types.ScannerUtil;
import org.xml.sax.EntityResolver;
1.21 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XSLTProcess.java 18 Mar 2002 09:15:10 -0000 1.20
+++ XSLTProcess.java 21 Mar 2002 08:03:54 -0000 1.21
@@ -24,7 +24,7 @@
import org.apache.myrmidon.framework.AbstractMatchingTask;
import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.9 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java
Index: Execute.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Execute.java 19 Mar 2002 11:17:05 -0000 1.8
+++ Execute.java 21 Mar 2002 08:03:54 -0000 1.9
@@ -21,15 +21,15 @@
import org.apache.tools.todo.util.FileUtils;
/**
- * This is a utility class designed to make executing native
- * processes easier in the context of ant.
+ * This is a utility class designed to make executing native processes easier
+ * in the context of ant.
*
* <p>To execute a native process, configure an instance of this class,
* and then call its [EMAIL PROTECTED] #execute} method.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Haas</a>
- * @version $Revision: 1.8 $ $Date: 2002/03/19 11:17:05 $
+ * @version $Revision: 1.9 $ $Date: 2002/03/21 08:03:54 $
*/
public class Execute
{
1.11 +0 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Resources.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Resources.properties 18 Mar 2002 08:53:30 -0000 1.10
+++ Resources.properties 21 Mar 2002 08:03:54 -0000 1.11
@@ -26,4 +26,3 @@
execute.bad-resultcode.error=Command "{0}" returned unexpected exit code {1}.
execute.command.notice=Executing: {0}
execute.env-vars.notice=Using environment: {0}.
-
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ArrayFileList.java
Index: ArrayFileList.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.txt file.
*/
package org.apache.myrmidon.framework.file;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
/**
* A PathElement made up of an array of strings.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/03/21 08:03:54 $
*/
public class ArrayFileList
implements FileList
{
private final String[] m_parts;
public ArrayFileList( final String part )
{
m_parts = new String[] { part } ;
}
public ArrayFileList( final String[] parts )
{
m_parts = parts;
}
public String[] listFiles( final TaskContext context )
throws TaskException
{
return m_parts;
}
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java
Index: FileList.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.txt file.
*/
package org.apache.myrmidon.framework.file;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
/**
* A list of files.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/03/21 08:03:54 $
*/
public interface FileList
{
/**
* Returns the files in this list.
*
* @param context the context to use to evaluate the list.
* @return The names of the files in this list. All names are absolute
paths.
*/
public String[] listFiles( TaskContext context )
throws TaskException;
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java
Index: FileListToStringConverter.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.txt file.
*/
package org.apache.myrmidon.framework.file;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.file.FileList;
import org.apache.tools.todo.types.PathUtil;
/**
* Converters from FileList to String.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/03/21 08:03:54 $
*
* @ant:converter source="org.apache.myrmidon.framework.file.FileList"
destination="java.lang.String"
*/
public class FileListToStringConverter
extends AbstractConverter
{
public FileListToStringConverter()
{
super( FileList.class, String.class );
}
protected Object convert( final Object original, final Object context )
throws ConverterException
{
try
{
final TaskContext taskContext = (TaskContext)context;
final FileList fileList = (FileList)original;
final String[] files = fileList.listFiles( taskContext );
return PathUtil.formatPath( files );
}
catch( final TaskException e )
{
throw new ConverterException( e.getMessage(), e );
}
}
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ParsedPathElement.java
Index: ParsedPathElement.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.txt file.
*/
package org.apache.myrmidon.framework.file;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.file.FileList;
import org.apache.tools.todo.util.FileUtils;
/**
* A PathElement that is parsed from a string.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/03/21 08:03:54 $
*/
public class ParsedPathElement
implements FileList
{
private final String m_path;
public ParsedPathElement( final String path )
{
m_path = path;
}
public String[] listFiles( final TaskContext context )
throws TaskException
{
return FileUtils.translatePath( context.getBaseDirectory(), m_path );
}
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java
Index: Path.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.txt file.
*/
package org.apache.myrmidon.framework.file;
import java.io.File;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.DataType;
import org.apache.myrmidon.framework.file.ArrayFileList;
import org.apache.myrmidon.framework.file.FileList;
import org.apache.tools.todo.util.FileUtils;
import org.apache.tools.todo.types.FileSet;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.ScannerUtil;
/**
* This object represents a path as used by CLASSPATH or PATH environment
* variable. <p>
*
* <code>
* <sometask><br>
* <somepath><br>
* <pathelement location="/path/to/file.jar" />
* <br>
* <pathelement
* path="/path/to/file2.jar:/path/to/class2;/path/to/class3" /><br>
* <pathelement location="/path/to/file3.jar" />
* <br>
* <pathelement location="/path/to/file4.jar" />
* <br>
* </somepath><br>
* </sometask><br>
* </code> <p>
*
* The object implemention <code>sometask</code> must provide a method called
* <code>createSomepath</code> which returns an instance of <code>Path</code>.
* Nested path definitions are handled by the Path object and must be labeled
* <code>pathelement</code>.<p>
*
* The path element takes a parameter <code>path</code> which will be parsed
and
* split into single elements. It will usually be used to define a path from
an
* environment variable.
*
* @author [EMAIL PROTECTED]
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*
* @ant:data-type name="path"
*/
public class Path
implements DataType, FileList
{
private final ArrayList m_elements = new ArrayList();
public Path( final String path )
{
addPath( path );
}
public Path()
{
}
/**
* Adds a String to the ArrayList if it isn't already included.
*/
private void addUnlessPresent( final ArrayList list, final String entry )
{
if( !list.contains( entry ) )
{
list.add( entry );
}
}
/**
* Adds an element to the path.
*/
public void setLocation( final File location )
{
addLocation( location );
}
/**
* Adds a element definition to the path.
*
* @param location the location of the element to add (must not be
<code>null</code>
* nor empty.
*/
public void addLocation( final File location )
{
final FileList pathElement = new ArrayFileList(
location.getAbsolutePath() );
m_elements.add( pathElement );
}
/**
* Adds a nested <code><fileset></code> element.
*/
public void addFileset( final FileSet fileSet )
{
m_elements.add( fileSet );
}
/**
* Adds a path.
*/
public void setPath( final String path )
{
addPath( path );
}
/**
* Adds a path.
*/
public void addPath( final String path )
{
final FileList pathElement = new ParsedPathElement( path );
m_elements.add( pathElement );
}
/**
* Adds a path.
*/
public void addPath( final String[] path )
{
final FileList pathElement = new ArrayFileList( path );
m_elements.add( pathElement );
}
/**
* Creates a nested <code><path></code> element.
*/
public void addPath( final Path path )
{
m_elements.add( path );
}
/**
* Returns all path elements defined by this and nested path objects.
* The paths returned by this method are absolute.
*/
public String[] listFiles( final TaskContext context )
throws TaskException
{
ArrayList result = new ArrayList( 2 * m_elements.size() );
for( int i = 0; i < m_elements.size(); i++ )
{
Object o = m_elements.get( i );
if( o instanceof FileList )
{
final FileList element = (FileList)o;
final String[] parts = element.listFiles( context );
for( int j = 0; j < parts.length; j++ )
{
addUnlessPresent( result, parts[ j ] );
}
}
else if( o instanceof FileSet )
{
final FileSet fs = (FileSet)o;
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner(
fs );
final String[] s = ds.getIncludedFiles();
final File dir = fs.getDir();
for( int j = 0; j < s.length; j++ )
{
File f = new File( dir, s[ j ] );
String absolutePath = f.getAbsolutePath();
addUnlessPresent( result, FileUtils.translateFile(
absolutePath ) );
}
}
}
return (String[])result.toArray( new String[ result.size() ] );
}
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java
Index: StringToPathConverter.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.txt file.
*/
package org.apache.myrmidon.framework.file;
import org.apache.aut.converter.AbstractConverter;
import org.apache.aut.converter.ConverterException;
import org.apache.myrmidon.framework.file.Path;
/**
* A converter from String to Path.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Adam Murdoch</a>
* @version $Revision: 1.1 $ $Date: 2002/03/21 08:03:54 $
*
* @ant:converter source="java.lang.String"
destination="org.apache.myrmidon.framework.file.Path"
*/
public class StringToPathConverter
extends AbstractConverter
{
/**
* Constructors a converter.
*/
public StringToPathConverter()
{
super( String.class, Path.class );
}
/**
* Converts from String to Path
*
* @param original the original Object
* @param context the context in which to convert
* @return the converted object
*/
protected Object convert( final Object original, final Object context )
throws ConverterException
{
String path = (String)original;
Path retval = new Path( path );
return retval;
}
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java
Index: ExecuteJava.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.txt file.
*/
package org.apache.myrmidon.framework.java;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.EnvironmentData;
import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
import org.apache.tools.todo.types.SysProperties;
import org.apache.tools.todo.util.FileUtils;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
/**
* A utility class that takes care of executing a Java application. This
* class can execute Java apps in the current JVM, or a forked JVM.
*
* <p>To execute a Java application, create an instance of this class,
* configure it, and call one of the following methods:
* <ul>
* <li>[EMAIL PROTECTED] #execute}
* <li>[EMAIL PROTECTED] #executeForked}
* <li>[EMAIL PROTECTED] #executeNonForked}
* </ul>
*
* @author [EMAIL PROTECTED]
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*/
public class ExecuteJava
{
private final static Resources REZ
= ResourceManager.getPackageResources( ExecuteJava.class );
private final Path m_classPath = new Path();
private final EnvironmentData m_sysProperties = new EnvironmentData();
private final Commandline m_args = new Commandline();
private final Commandline m_vmArgs = new Commandline();
private boolean m_fork;
private File m_workingDirectory;
private File m_jar;
private String m_jvm;
private String m_className;
private String m_maxMemory;
private boolean m_ignoreReturnCode;
/**
* Sets the main class of the application.
*/
public void setClassName( final String className )
{
m_className = className;
}
/**
* Sets the executable jar file to use to execute the application.
* Can only be used in forked mode.
*/
public void setJar( final File jar )
{
m_jar = jar;
}
/**
* Enables forked mode.
*/
public void setFork( final boolean fork )
{
m_fork = fork;
}
/**
* Sets the max memory allocation pool size to use when running the
* application. Only used in forked mode.
*
* @param maxMemory the maximum memory pool size, or null for the default.
*/
public void setMaxMemory( final String maxMemory )
{
m_maxMemory = maxMemory;
}
/**
* Sets the working directory for the application. Only used in forked
mode.
*/
public void setWorkingDirectory( final File workingDirectory )
{
m_workingDirectory = workingDirectory;
}
/**
* Disables checking of the application's return code. Only used in
forked
* mode.
*
* @param ignore If true, the return code of the application is ignored.
* If false, an exception is thrown if the application does
* no exit with a 0 return code.
*/
public void setIgnoreReturnCode( boolean ignore )
{
m_ignoreReturnCode = ignore;
}
/**
* Sets the JVM executable to use to run the application in a forked JVM.
*
* @param jvm the path to the JVM executable, or null to use the default
* JVM executable.
*/
public void setJvm( final String jvm )
{
m_jvm = jvm;
}
/**
* Returns the classpath that will be used to execute the application.
*
* @return the application's classpath. This path can be modified.
*/
public Path getClassPath()
{
return m_classPath;
}
/**
* Returns the system properties that will be used for the application.
* Only used in forked mode.
*
* @return the application's system properties. Can be modified.
*/
public EnvironmentData getSysProperties()
{
return m_sysProperties;
}
/**
* Returns the arguments that will be used for the application.
*
* @return the application's arguments. Can be modified.
*/
public Commandline getArguments()
{
return m_args;
}
/**
* Returns the JVM arguments that will be used to execute the application.
* Only used in forked mode.
*
* @return the JVM aguments. Can be modified.
*/
public Commandline getVmArguments()
{
return m_vmArgs;
}
/**
* Executes the application.
*/
public void execute( final TaskContext context )
throws TaskException
{
if( m_fork )
{
executeForked( context );
}
else
{
executeNonForked( context );
}
}
/**
* Executes the application in this JVM.
*/
public void executeNonForked( final TaskContext context )
throws TaskException
{
if( m_className == null )
{
final String message = REZ.getString(
"executejava.no-classname.error" );
throw new TaskException( message );
}
if( m_jar != null )
{
final String message = REZ.getString(
"executejava.jar-no-fork.error" );
throw new TaskException( message );
}
if( m_vmArgs.size() > 0 )
{
final String message = REZ.getString(
"executejava.ignore-jvm-args.notice" );
context.warn( message );
}
if( m_workingDirectory != null )
{
final String message = REZ.getString(
"executejava.ignore-dir.notice" );
context.warn( message );
}
if( m_maxMemory != null )
{
final String message = REZ.getString(
"executejava.ignore-maxmem.notice" );
context.warn( message );
}
if( m_sysProperties.size() > 0 )
{
final String message = REZ.getString(
"executejava.ignore-sys-props.notice" );
context.warn( message );
}
final String[] args = m_args.getArguments();
// Log message
final String debugMessage
= REZ.getString( "executejava.exec-in-jvm.notice",
m_className,
FileUtils.formatCommandLine( args ) );
context.info( debugMessage );
// Locate the class
final Class target;
try
{
final URL[] urls = PathUtil.toURLs( m_classPath, context );
if( urls.length == 0 )
{
target = Class.forName( m_className );
}
else
{
final URLClassLoader classLoader = new URLClassLoader( urls );
target = classLoader.loadClass( m_className );
}
}
catch( final Exception e )
{
final String message = REZ.getString(
"executejava.find-class.error", m_className );
throw new TaskException( message, e );
}
// Call the main method
try
{
final Class[] params = { args.getClass() };
final Method main = target.getMethod( "main", params );
main.invoke( null, new Object[] { args } );
}
catch( final InvocationTargetException e )
{
final Throwable t = e.getTargetException();
final String message = REZ.getString(
"executejava.execute-app.error", m_className );
throw new TaskException( message, t );
}
catch( final Exception e )
{
final String message = REZ.getString(
"executejava.execute-app.error", m_className );
throw new TaskException( message, e );
}
}
/**
* Executes the application in a separate JVM.
*/
public int executeForked( final TaskContext context )
throws TaskException
{
// Validate
if( m_className != null && m_jar != null )
{
final String message = REZ.getString(
"executejava.class-and-jar.error" );
throw new TaskException( message );
}
if( m_className == null && m_jar == null )
{
final String message = REZ.getString(
"executejava.no-classname.error" );
throw new TaskException( message );
}
final Execute exe = new Execute();
exe.setWorkingDirectory( m_workingDirectory );
exe.setIgnoreReturnCode( m_ignoreReturnCode );
// Setup the command line
final Commandline command = exe.getCommandline();
// Executable name
if( m_jvm != null )
{
command.setExecutable( m_jvm );
}
else
{
command.setExecutable( getJavaExecutableName() );
}
// JVM arguments
command.addArguments( m_vmArgs );
// Max memory size
if( m_maxMemory != null )
{
command.addArgument( "-Xmx" + m_maxMemory );
}
// System properties
final String[] props = SysProperties.getJavaVariables(
m_sysProperties );
command.addArguments( props );
// Classpath
final String[] classpath = m_classPath.listFiles( context );
if( classpath.length > 0 )
{
command.addArgument( "-classpath" );
command.addArgument( PathUtil.formatPath( classpath ) );
}
// What to execute
if( m_jar != null )
{
command.addArgument( "-jar" );
command.addArgument( m_jar );
}
else
{
command.addArgument( m_className );
}
// Java app arguments
command.addArguments( m_args );
// Execute
return exe.execute( context );
}
/**
* Determines the executable name for the java command for this JVM.
*
* @todo Move this to somewhere in AUT.
*/
public static String getJavaExecutableName()
{
if( Os.isFamily( Os.OS_FAMILY_NETWARE ) )
{
// NetWare may have a "java" in the JRE directory, but 99% of
// the time, you don't want to execute it -- Jeff Tulley
// <[EMAIL PROTECTED]>
return "java";
}
// Figure out the basename
final String baseName;
if( Os.isFamily( Os.OS_FAMILY_WINDOWS) || Os.isFamily(
Os.OS_FAMILY_DOS ) )
{
baseName = "java.exe";
}
else
{
baseName = "java";
}
// Look for java in the ${java.home{/../bin directory. Unfortunately
// on Windows java.home doesn't always refer to the correct location,
// so we need to fall back to assuming java is somewhere on the
// PATH.
File javaExe =
new File( System.getProperty( "java.home" ) + "/../bin/" +
baseName );
if( javaExe.exists() )
{
return javaExe.getAbsolutePath();
}
else
{
return "java";
}
}
}
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/Resources.properties
Index: Resources.properties
===================================================================
executejava.exec-in-jvm.notice=Running in same VM: {0} {1}.
executejava.ignore-jvm-args.notice=JVM args are ignored when using non-forked
mode.
executejava.ignore-dir.notice=Working directory is ignored when using
non-forked mode.
executejava.ignore-maxmem.notice=Maximum memory pool size is ignored when
using non-forked mode.
executejava.ignore-sys-props.notice=System properties are ignored when using
non-forked mode.
executejava.no-classname.error=No class-name specified.
executejava.jar-no-fork.error=Cannot execute a jar in non-forked mode.
executejava.find-class.error=Could not find main class "{0}".
executejava.execute-app.error=Could not execute class "{0}".
executejava.class-and-jar.error=Cannot specify both a Jar file and a main
class.
1.9 +0 -9
jakarta-ant/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml
Index: ant1-ant-descriptor.xml
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ant1-ant-descriptor.xml 21 Mar 2002 06:38:12 -0000 1.8
+++ ant1-ant-descriptor.xml 21 Mar 2002 08:03:55 -0000 1.9
@@ -1,15 +1,6 @@
<ant-lib version="1.0">
<types>
- <task name="java" classname="org.apache.tools.todo.taskdefs.Java" />
- <data-type name="path" classname="org.apache.tools.todo.types.Path"
/>
- <task name="path"
classname="org.apache.myrmidon.framework.TypeInstanceTask" />
- <converter
classname="org.apache.tools.todo.types.converters.StringToPathConverter"
- source="java.lang.String"
- destination="org.apache.tools.todo.types.Path" />
- <converter
classname="org.apache.tools.todo.types.converters.FileListToStringConverter"
- source="org.apache.tools.todo.types.FileList"
- destination="java.lang.String" />
</types>
</ant-lib>
1.6 +2 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ANTLR.java 20 Mar 2002 08:19:42 -0000 1.5
+++ ANTLR.java 21 Mar 2002 08:03:55 -0000 1.6
@@ -13,8 +13,9 @@
import java.net.URL;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.types.Argument;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
/**
* ANTLR task.
1.6 +3 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java
Index: IContract.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IContract.java 21 Mar 2002 06:38:12 -0000 1.5
+++ IContract.java 21 Mar 2002 08:03:55 -0000 1.6
@@ -20,8 +20,9 @@
import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
import org.apache.tools.todo.taskdefs.javac.Javac;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
+import org.apache.antlib.java.JavaTask;
/**
* Instruments Java classes with <a
href="http://www.reliable-systems.com/tools/";>
@@ -737,7 +738,7 @@
iContractClasspath.addLocation( buildDir );
// Create a forked java process
- Java iContract = null;//(Java)getProject().createTask( "java" );
+ JavaTask iContract = null;//(Java)getProject().createTask(
"java" );
iContract.setFork( true );
iContract.setClassname( "com.reliablesystems.iContract.Tool" );
iContract.setClasspath( iContractClasspath );
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java
Index: Javah.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Javah.java 21 Mar 2002 06:38:12 -0000 1.3
+++ Javah.java 21 Mar 2002 08:03:55 -0000 1.4
@@ -15,7 +15,7 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PathConvert.java 21 Mar 2002 06:38:12 -0000 1.2
+++ PathConvert.java 21 Mar 2002 08:03:55 -0000 1.3
@@ -12,7 +12,7 @@
import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
/**
* This task converts path and classpath information to a specific target OS
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Property.java 21 Mar 2002 06:38:12 -0000 1.2
+++ Property.java 21 Mar 2002 08:03:55 -0000 1.3
@@ -16,7 +16,7 @@
import java.util.Properties;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SQLExec.java 21 Mar 2002 06:38:12 -0000 1.2
+++ SQLExec.java 21 Mar 2002 08:03:55 -0000 1.3
@@ -37,7 +37,7 @@
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.EnumeratedAttribute;
import org.apache.tools.todo.types.FileSet;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
import org.apache.tools.todo.types.ScannerUtil;
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultCompilerAdapter.java 21 Mar 2002 06:38:12 -0000 1.5
+++ DefaultCompilerAdapter.java 21 Mar 2002 08:03:55 -0000 1.6
@@ -17,7 +17,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java
Index: Gcj.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Gcj.java 21 Mar 2002 06:38:12 -0000 1.3
+++ Gcj.java 21 Mar 2002 08:03:55 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Javac.java 21 Mar 2002 06:38:12 -0000 1.2
+++ Javac.java 21 Mar 2002 08:03:55 -0000 1.3
@@ -15,7 +15,7 @@
import org.apache.myrmidon.framework.JavaVersion;
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.SourceFileScanner;
import org.apache.tools.todo.util.mappers.GlobPatternMapper;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jikes.java 21 Mar 2002 06:38:12 -0000 1.3
+++ Jikes.java 21 Mar 2002 08:03:55 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java
Index: Jvc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jvc.java 21 Mar 2002 06:38:12 -0000 1.3
+++ Jvc.java 21 Mar 2002 08:03:55 -0000 1.4
@@ -9,7 +9,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java
Index: Kjc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Kjc.java 21 Mar 2002 06:38:12 -0000 1.3
+++ Kjc.java 21 Mar 2002 08:03:55 -0000 1.4
@@ -10,7 +10,7 @@
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JJTree.java 20 Mar 2002 08:19:42 -0000 1.4
+++ JJTree.java 21 Mar 2002 08:03:55 -0000 1.5
@@ -12,8 +12,8 @@
import java.util.Hashtable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.java.ExecuteJava;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaCC.java 20 Mar 2002 08:19:42 -0000 1.4
+++ JavaCC.java 21 Mar 2002 08:03:55 -0000 1.5
@@ -12,8 +12,8 @@
import java.util.Hashtable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.java.ExecuteJava;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java
Index: DocletInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocletInfo.java 19 Mar 2002 02:44:37 -0000 1.2
+++ DocletInfo.java 21 Mar 2002 08:03:55 -0000 1.3
@@ -10,7 +10,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
public class DocletInfo
{
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Javadoc.java 21 Mar 2002 06:38:12 -0000 1.5
+++ Javadoc.java 21 Mar 2002 08:03:55 -0000 1.6
@@ -24,7 +24,7 @@
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.FileSet;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
import org.apache.tools.todo.types.ScannerUtil;
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JDependTask.java 21 Mar 2002 06:38:13 -0000 1.6
+++ JDependTask.java 21 Mar 2002 08:03:55 -0000 1.7
@@ -13,8 +13,8 @@
import java.io.PrintWriter;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.java.ExecuteJava;
+import org.apache.myrmidon.framework.file.Path;
/**
* Ant task to run JDepend tests. <p>
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspC.java 21 Mar 2002 06:38:13 -0000 1.3
+++ JspC.java 21 Mar 2002 08:03:56 -0000 1.4
@@ -15,7 +15,7 @@
import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapter;
import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapterFactory;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
/**
* Ant task to run the jsp compiler. <p>
@@ -56,7 +56,7 @@
* </a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">J D Glanville</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/21 06:38:13 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/21 08:03:56 $
*/
public class JspC extends MatchingTask
{
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java
Index: WLJspc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WLJspc.java 21 Mar 2002 06:38:13 -0000 1.6
+++ WLJspc.java 21 Mar 2002 08:03:56 -0000 1.7
@@ -12,10 +12,10 @@
import java.util.Date;
import java.util.StringTokenizer;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
+import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java
Index: JasperC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JasperC.java 17 Mar 2002 09:56:54 -0000 1.1
+++ JasperC.java 21 Mar 2002 08:03:56 -0000 1.2
@@ -9,7 +9,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.todo.taskdefs.Java;
+import org.apache.antlib.java.JavaTask;
import org.apache.tools.todo.taskdefs.jsp.JspC;
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.Commandline;
@@ -37,7 +37,7 @@
// Create an instance of the compiler, redirecting output to
// the project log
//FIXME
- Java java = null;//(Java)( getJspc().getProject() ).createTask(
"java" );
+ JavaTask java = null;//(Java)( getJspc().getProject()
).createTask( "java" );
if( getJspc().getClasspath() != null )
{
java.addClasspath( getJspc().getClasspath() );
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JUnitTask.java 21 Mar 2002 06:38:13 -0000 1.5
+++ JUnitTask.java 21 Mar 2002 08:03:56 -0000 1.6
@@ -19,13 +19,13 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
+import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.EnumeratedAttribute;
import org.apache.tools.todo.types.EnvironmentData;
import org.apache.tools.todo.types.EnvironmentVariable;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
import org.apache.tools.todo.types.SysProperties;
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMetamataTask.java 20 Mar 2002 08:19:43 -0000 1.5
+++ AbstractMetamataTask.java 21 Mar 2002 08:03:56 -0000 1.6
@@ -17,11 +17,11 @@
import java.util.Random;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
+import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.FileSet;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.ScannerUtil;
/**
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java
Index: MAudit.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MAudit.java 21 Mar 2002 06:38:13 -0000 1.4
+++ MAudit.java 21 Mar 2002 08:03:56 -0000 1.5
@@ -10,7 +10,7 @@
import java.io.File;
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java
Index: MMetrics.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MMetrics.java 21 Mar 2002 06:38:13 -0000 1.4
+++ MMetrics.java 21 Mar 2002 08:03:56 -0000 1.5
@@ -14,7 +14,7 @@
import java.util.ArrayList;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.taskdefs.exec.ExecuteStreamHandler;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MParse.java 21 Mar 2002 06:38:13 -0000 1.6
+++ MParse.java 21 Mar 2002 08:03:56 -0000 1.7
@@ -16,9 +16,9 @@
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.ExecuteJava;
+import org.apache.myrmidon.framework.java.ExecuteJava;
import org.apache.tools.todo.types.Argument;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java
Index: DefaultRmicAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultRmicAdapter.java 21 Mar 2002 06:38:13 -0000 1.3
+++ DefaultRmicAdapter.java 21 Mar 2002 08:03:56 -0000 1.4
@@ -14,7 +14,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.FileNameMapper;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Rmic.java 21 Mar 2002 06:38:13 -0000 1.2
+++ Rmic.java 21 Mar 2002 08:03:56 -0000 1.3
@@ -18,7 +18,7 @@
import org.apache.myrmidon.framework.FileNameMapper;
import org.apache.tools.todo.taskdefs.MatchingTask;
import org.apache.tools.todo.types.DirectoryScanner;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
import org.apache.tools.todo.types.SourceFileScanner;
1.2 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java
Index: RmicAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RmicAdapter.java 17 Mar 2002 09:42:23 -0000 1.1
+++ RmicAdapter.java 21 Mar 2002 08:03:56 -0000 1.2
@@ -10,7 +10,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.framework.FileNameMapper;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.taskdefs.rmic.Rmic;
/**
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java
Index: CovReport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CovReport.java 21 Mar 2002 06:38:13 -0000 1.4
+++ CovReport.java 21 Mar 2002 08:03:56 -0000 1.5
@@ -22,7 +22,7 @@
import org.apache.myrmidon.framework.Execute;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.EnumeratedAttribute;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.w3c.dom.Document;
/**
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Coverage.java 21 Mar 2002 06:38:13 -0000 1.6
+++ Coverage.java 21 Mar 2002 08:03:56 -0000 1.7
@@ -19,7 +19,7 @@
import org.apache.tools.todo.types.Argument;
import org.apache.tools.todo.types.Commandline;
import org.apache.tools.todo.types.FileSet;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.types.PathUtil;
/**
1.2 +2 -2
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java
Index: StyleBook.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StyleBook.java 17 Mar 2002 10:00:31 -0000 1.1
+++ StyleBook.java 21 Mar 2002 08:03:56 -0000 1.2
@@ -9,7 +9,7 @@
import java.io.File;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.todo.taskdefs.Java;
+import org.apache.antlib.java.JavaTask;
import org.apache.tools.todo.types.Argument;
/**
@@ -20,7 +20,7 @@
* Börger</a>
*/
public class StyleBook
- extends Java
+ extends JavaTask
{
private File m_book;
private String m_loaderConfig;
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSGET.java
Index: MSVSSGET.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSGET.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MSVSSGET.java 19 Mar 2002 02:44:37 -0000 1.3
+++ MSVSSGET.java 21 Mar 2002 08:03:56 -0000 1.4
@@ -10,7 +10,7 @@
import java.io.File;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.todo.types.Commandline;
-import org.apache.tools.todo.types.Path;
+import org.apache.myrmidon.framework.file.Path;
/**
* Task to perform GET commands to Microsoft Visual Source Safe. <p>
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java
Index: Argument.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Argument.java 21 Mar 2002 06:38:13 -0000 1.3
+++ Argument.java 21 Mar 2002 08:03:56 -0000 1.4
@@ -9,6 +9,7 @@
import java.io.File;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.file.Path;
import org.apache.tools.todo.util.FileUtils;
/**
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java
Index: EnvironmentVariable.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnvironmentVariable.java 21 Mar 2002 06:38:13 -0000 1.3
+++ EnvironmentVariable.java 21 Mar 2002 08:03:56 -0000 1.4
@@ -9,6 +9,7 @@
import java.io.File;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.file.Path;
public class EnvironmentVariable
{
1.4 +2 -1
jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java
Index: PathUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PathUtil.java 21 Mar 2002 06:38:13 -0000 1.3
+++ PathUtil.java 21 Mar 2002 08:03:56 -0000 1.4
@@ -13,12 +13,13 @@
import java.util.Locale;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.framework.file.Path;
/**
* Utilities for operating on Path objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/21 06:38:13 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/21 08:03:56 $
*/
public class PathUtil
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
