donaldp 01/12/15 18:05:43
Modified: proposal/myrmidon/src/main/org/apache/tools/ant
ProjectComponent.java TaskContainer.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Chmod.java Ear.java Echo.java ExecuteOn.java
Exit.java Expand.java FixCRLF.java Javac.java
Javadoc.java Manifest.java Move.java Parallel.java
Patch.java PathConvert.java Property.java Rmic.java
SQLExec.java Tar.java Tstamp.java Untar.java
UpToDate.java War.java XSLTProcess.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition
Http.java Socket.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
Rpm.java XMLValidateTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
CCMCreateTask.java Continuus.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend
Depend.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java Ilasm.java NetCommand.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandGenerateClient.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink
JlinkTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java WLJspc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java MSVSSHISTORY.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic
DefaultRmicAdapter.java RmicAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/types
DataType.java
proposal/myrmidon/src/main/org/apache/tools/ant/util
FileNameMapper.java RegexpPatternMapper.java
Log:
BuildException -> TaskException
39 errors to go
39 errors to go
hey ho we're merry now for theres
39 errors to go
Revision Changes Path
1.4 +6 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java
Index: ProjectComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProjectComponent.java 2001/12/16 00:39:45 1.3
+++ ProjectComponent.java 2001/12/16 02:05:41 1.4
@@ -46,6 +46,12 @@
return project;
}
+ public void execute()
+ throws TaskException
+ {
+ //HACK: NOOP execute - should be deleted in the future!
+ }
+
protected File resolveFile( final String name )
throws TaskException
{
1.2 +4 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/TaskContainer.java
Index: TaskContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/TaskContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TaskContainer.java 2001/12/15 12:06:20 1.1
+++ TaskContainer.java 2001/12/16 02:05:41 1.2
@@ -7,6 +7,8 @@
*/
package org.apache.tools.ant;
+import org.apache.myrmidon.api.TaskException;
+
/**
* Interface for objects which can contain tasks <p>
*
@@ -23,6 +25,7 @@
*
* @param task the task to be added to this container
*/
- void addTask( Task task );
+ void addTask( Task task )
+ throws TaskException;
}
1.5 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
Index: Chmod.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Chmod.java 2001/12/16 01:31:37 1.4
+++ Chmod.java 2001/12/16 02:05:41 1.5
@@ -32,6 +32,7 @@
private boolean havePerm = false;
public Chmod()
+ throws TaskException
{
super.setExecutable( "chmod" );
super.setParallel( true );
1.5 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Ear.java
Index: Ear.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Ear.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Ear.java 2001/12/16 01:31:37 1.4
+++ Ear.java 2001/12/16 02:05:41 1.5
@@ -34,6 +34,7 @@
}
public void setAppxml( File descr )
+ throws TaskException
{
deploymentDescriptor = descr;
if( !deploymentDescriptor.exists() )
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
Index: Echo.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Echo.java 2001/12/16 00:38:01 1.3
+++ Echo.java 2001/12/16 02:05:41 1.4
@@ -106,6 +106,7 @@
* @param msg The feature to be added to the Text attribute
*/
public void addText( String msg )
+ throws TaskException
{
message += project.replaceProperties( msg );
}
1.6 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExecuteOn.java 2001/12/16 01:31:38 1.5
+++ ExecuteOn.java 2001/12/16 02:05:41 1.6
@@ -167,6 +167,7 @@
* @return The Commandline value
*/
protected String[] getCommandline( String[] srcFiles, File[] baseDirs )
+ throws TaskException
{
Vector targets = new Vector();
if( targetFilePos != null )
1.3 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Exit.java
Index: Exit.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Exit.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Exit.java 2001/12/16 00:38:01 1.2
+++ Exit.java 2001/12/16 02:05:41 1.3
@@ -41,6 +41,7 @@
* @param msg The feature to be added to the Text attribute
*/
public void addText( String msg )
+ throws TaskException
{
message += project.replaceProperties( msg );
}
1.4 +2 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Expand.java 2001/12/16 00:38:01 1.3
+++ Expand.java 2001/12/16 02:05:41 1.4
@@ -151,6 +151,7 @@
* This method is to be overridden by extending unarchival tasks.
*/
protected void expandFile( FileUtils fileUtils, File srcF, File dir )
+ throws TaskException
{
ZipInputStream zis = null;
try
@@ -192,7 +193,7 @@
InputStream compressedInputStream,
String entryName,
Date entryDate, boolean isDirectory )
- throws IOException
+ throws IOException, TaskException
{
if( patternsets != null && patternsets.size() > 0 )
1.4 +10 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
Index: FixCRLF.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FixCRLF.java 2001/12/16 00:38:01 1.3
+++ FixCRLF.java 2001/12/16 02:05:41 1.4
@@ -66,7 +66,7 @@
*
* @author Sam Ruby <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
- * @version $Revision: 1.3 $ $Name: $
+ * @version $Revision: 1.4 $ $Name: $
*/
public class FixCRLF extends MatchingTask
@@ -455,6 +455,7 @@
*/
private void notInConstant( OneLiner.BufferLine bufline, int end,
BufferedWriter outWriter )
+ throws TaskException
{
// N.B. both column and string index are zero-based
// Process a string not part of a constant;
@@ -922,7 +923,14 @@
}
BufferLine tmpLine =
new BufferLine( line.toString(), eolStr.toString() );
- nextLine();
+ try
+ {
+ nextLine();
+ }
+ catch( TaskException e )
+ {
+ throw new NoSuchElementException();
+ }
return tmpLine;
}
1.6 +0 -11
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Javac.java 2001/12/16 01:31:38 1.5
+++ Javac.java 2001/12/16 02:05:41 1.6
@@ -832,17 +832,6 @@
}
/**
- * Recreate src
- *
- * @return a nested src element.
- */
- protected Path recreateSrc()
- {
- src = null;
- return createSrc();
- }
-
- /**
* Clear the list of files to be compiled and copied..
*/
protected void resetFileLists()
1.4 +15 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Javadoc.java 2001/12/16 00:38:01 1.3
+++ Javadoc.java 2001/12/16 02:05:41 1.4
@@ -116,11 +116,13 @@
* @param r The new BootClasspathRef value
*/
public void setBootClasspathRef( Reference r )
+ throws TaskException
{
createBootclasspath().setRefid( r );
}
public void setBootclasspath( Path src )
+ throws TaskException
{
if( bootclasspath == null )
{
@@ -145,6 +147,7 @@
}
public void setClasspath( Path src )
+ throws TaskException
{
if( classpath == null )
{
@@ -162,6 +165,7 @@
* @param r The new ClasspathRef value
*/
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -209,6 +213,7 @@
}
public void setDocletPathRef( Reference r )
+ throws TaskException
{
if( doclet == null )
{
@@ -445,6 +450,7 @@
}
public void setSourcepath( Path src )
+ throws TaskException
{
if( sourcePath == null )
{
@@ -462,6 +468,7 @@
* @param r The new SourcepathRef value
*/
public void setSourcepathRef( Reference r )
+ throws TaskException
{
createSourcepath().setRefid( r );
}
@@ -557,11 +564,13 @@
}
public void addSource( SourceFile sf )
+ throws TaskException
{
sourceFiles.addElement( sf );
}
public Path createBootclasspath()
+ throws TaskException
{
if( bootclasspath == null )
{
@@ -571,6 +580,7 @@
}
public Path createClasspath()
+ throws TaskException
{
if( classpath == null )
{
@@ -600,6 +610,7 @@
}
public Path createSourcepath()
+ throws TaskException
{
if( sourcePath == null )
{
@@ -956,6 +967,7 @@
* @return Description of the Returned Value
*/
protected String expand( String content )
+ throws TaskException
{
return project.replaceProperties( content );
}
@@ -1242,6 +1254,7 @@
}
public void setPath( Path path )
+ throws TaskException
{
if( this.path == null )
{
@@ -1259,6 +1272,7 @@
* @param r The new PathRef value
*/
public void setPathRef( Reference r )
+ throws TaskException
{
createPath().setRefid( r );
}
@@ -1287,6 +1301,7 @@
}
public Path createPath()
+ throws TaskException
{
if( path == null )
{
1.6 +5 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
Index: Manifest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Manifest.java 2001/12/16 01:31:38 1.5
+++ Manifest.java 2001/12/16 02:05:41 1.6
@@ -109,7 +109,7 @@
* @throws IOException if the manifest cannot be read from the reader.
*/
public Manifest( Reader r )
- throws ManifestException, IOException
+ throws ManifestException, TaskException, IOException
{
BufferedReader reader = new BufferedReader( r );
// This should be the manifest version
@@ -239,7 +239,7 @@
}
public void addConfiguredAttribute( Attribute attribute )
- throws ManifestException
+ throws ManifestException, TaskException
{
mainSection.addConfiguredAttribute( attribute );
}
@@ -417,7 +417,7 @@
{
write( new PrintWriter( sw ) );
}
- catch( IOException e )
+ catch( Exception e )
{
return null;
}
@@ -431,7 +431,7 @@
* @throws IOException if the manifest cannot be written
*/
public void write( PrintWriter writer )
- throws IOException
+ throws IOException, TaskException
{
writer.println( ATTRIBUTE_MANIFEST_VERSION + ": " + manifestVersion
);
String signatureVersion = mainSection.getAttributeValue(
ATTRIBUTE_SIGNATURE_VERSION );
@@ -862,7 +862,7 @@
* @throws IOException if the section cannot be read from the reader.
*/
public String read( BufferedReader reader )
- throws ManifestException, IOException
+ throws ManifestException, IOException, TaskException
{
Attribute attribute = null;
while( true )
1.4 +2 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java
Index: Move.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Move.java 2001/12/16 00:38:01 1.3
+++ Move.java 2001/12/16 02:05:41 1.4
@@ -47,6 +47,7 @@
* @param d Description of Parameter
*/
protected void deleteDir( File d )
+ throws TaskException
{
String[] list = d.list();
if( list == null )
@@ -77,6 +78,7 @@
//************************************************************************
protected void doFileOperations()
+ throws TaskException
{
//Attempt complete directory renames, if any, first.
if( completeDirMap.size() > 0 )
1.4 +2 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Parallel.java
Index: Parallel.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Parallel.java 2001/12/16 00:38:01 1.3
+++ Parallel.java 2001/12/16 02:05:41 1.4
@@ -98,11 +98,13 @@
{
firstException = t;
}
+ /*
if( t instanceof TaskException &&
firstLocation == Location.UNKNOWN_LOCATION )
{
firstLocation = ( (TaskException)t ).getLocation();
}
+ */
exceptionMessage.append( lSep );
exceptionMessage.append( t.getMessage() );
}
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
Index: Patch.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Patch.java 2001/12/16 00:38:01 1.3
+++ Patch.java 2001/12/16 02:05:41 1.4
@@ -68,6 +68,7 @@
* @param file The new Patchfile value
*/
public void setPatchfile( File file )
+ throws TaskException
{
if( !file.exists() )
{
1.3 +5 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PathConvert.java 2001/12/16 00:38:01 1.2
+++ PathConvert.java 2001/12/16 02:05:41 1.3
@@ -77,6 +77,7 @@
* @param r The new Refid value
*/
public void setRefid( Reference r )
+ throws TaskException
{
if( path != null )
throw noChildrenAllowed();
@@ -90,8 +91,8 @@
* @param target The new Targetos value
*/
public void setTargetos( String target )
+ throws TaskException
{
-
targetOS = target.toLowerCase();
if( !targetOS.equals( "windows" ) && !target.equals( "unix" ) &&
@@ -139,8 +140,8 @@
* @return Description of the Returned Value
*/
public Path createPath()
+ throws TaskException
{
-
if( isReference() )
throw noChildrenAllowed();
@@ -159,7 +160,6 @@
public void execute()
throws TaskException
{
-
// If we are a reference, the create a Path from the reference
if( isReference() )
{
@@ -238,8 +238,8 @@
* @return String Updated element
*/
private String mapElement( String elem )
+ throws TaskException
{
-
int size = prefixMap.size();
if( size != 0 )
@@ -365,6 +365,7 @@
* @return String Updated path element after mapping
*/
public String apply( String elem )
+ throws TaskException
{
if( from == null || to == null )
{
1.6 +4 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Property.java 2001/12/16 01:01:19 1.5
+++ Property.java 2001/12/16 02:05:41 1.6
@@ -54,6 +54,7 @@
}
public void setClasspath( Path classpath )
+ throws TaskException
{
if( this.classpath == null )
{
@@ -66,6 +67,7 @@
}
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -136,6 +138,7 @@
}
public Path createClasspath()
+ throws TaskException
{
if( this.classpath == null )
{
@@ -192,6 +195,7 @@
}
protected void addProperties( Properties props )
+ throws TaskException
{
resolveAllProperties( props );
Enumeration e = props.keys();
1.6 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Rmic.java 2001/12/16 01:01:19 1.5
+++ Rmic.java 2001/12/16 02:05:41 1.6
@@ -682,7 +682,6 @@
{
String msg = "Failed to copy " + oldFile + " to " +
newFile + " due to " + ioe.getMessage();
- newFile + " due to " + ioe.getMessage();
throw new TaskException( msg, ioe );
}
}
1.5 +5 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SQLExec.java 2001/12/16 00:38:01 1.4
+++ SQLExec.java 2001/12/16 02:05:41 1.5
@@ -171,6 +171,7 @@
* @param classpath The new Classpath value
*/
public void setClasspath( Path classpath )
+ throws TaskException
{
if( this.classpath == null )
{
@@ -188,6 +189,7 @@
* @param r The new ClasspathRef value
*/
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -364,6 +366,7 @@
* @return Description of the Returned Value
*/
public Path createClasspath()
+ throws TaskException
{
if( this.classpath == null )
{
@@ -739,7 +742,7 @@
}
protected void runStatements( Reader reader, PrintStream out )
- throws SQLException, IOException
+ throws SQLException, IOException, TaskException
{
String sql = "";
String line = "";
@@ -845,7 +848,7 @@
}
private void runTransaction( PrintStream out )
- throws IOException, SQLException
+ throws IOException, SQLException, TaskException
{
if( tSqlCommand.length() != 0 )
{
1.5 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Tar.java 2001/12/16 01:01:19 1.4
+++ Tar.java 2001/12/16 02:05:41 1.5
@@ -222,7 +222,7 @@
protected void tarFile( File file, TarOutputStream tOut, String vPath,
TarFileSet tarFileSet )
- throws IOException
+ throws IOException, TaskException
{
FileInputStream fIn = null;
@@ -341,6 +341,7 @@
* for the project.
*/
public String[] getFiles( Project p )
+ throws TaskException
{
if( files == null )
{
@@ -380,7 +381,6 @@
*/
public static class TarLongFileMode extends EnumeratedAttribute
{
-
// permissable values for longfile attribute
public final static String WARN = "warn";
public final static String FAIL = "fail";
@@ -391,6 +391,7 @@
private final String[] validModes = {WARN, FAIL, TRUNCATE, GNU,
OMIT};
public TarLongFileMode()
+ throws TaskException
{
super();
setValue( WARN );
1.4 +2 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Tstamp.java 2001/12/16 00:38:01 1.3
+++ Tstamp.java 2001/12/16 02:05:41 1.4
@@ -153,6 +153,7 @@
}
public void setLocale( String locale )
+ throws TaskException
{
StringTokenizer st = new StringTokenizer( locale, " \t\n\r\f," );
try
@@ -207,6 +208,7 @@
}
public void execute( Project project, Date date, Location location )
+ throws TaskException
{
if( propertyName == null )
{
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Untar.java
Index: Untar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Untar.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Untar.java 2001/12/16 00:38:01 1.3
+++ Untar.java 2001/12/16 02:05:41 1.4
@@ -26,6 +26,7 @@
{
protected void expandFile( FileUtils fileUtils, File srcF, File dir )
+ throws TaskException
{
TarInputStream tis = null;
try
1.5 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
Index: UpToDate.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UpToDate.java 2001/12/16 01:01:19 1.4
+++ UpToDate.java 2001/12/16 02:05:41 1.5
@@ -107,6 +107,7 @@
* @return Description of the Returned Value
*/
public boolean eval()
+ throws TaskException
{
if( sourceFileSets.size() == 0 )
{
1.5 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/War.java
Index: War.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/War.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- War.java 2001/12/16 01:31:38 1.4
+++ War.java 2001/12/16 02:05:41 1.5
@@ -33,6 +33,7 @@
}
public void setWebxml( File descr )
+ throws TaskException
{
deploymentDescriptor = descr;
if( !deploymentDescriptor.exists() )
1.4 +4 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSLTProcess.java 2001/12/16 00:38:01 1.3
+++ XSLTProcess.java 2001/12/16 02:05:41 1.4
@@ -91,6 +91,7 @@
* @param classpath The new Classpath value
*/
public void setClasspath( Path classpath )
+ throws TaskException
{
createClasspath().append( classpath );
}
@@ -102,6 +103,7 @@
* @param r The new ClasspathRef value
*/
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}//-- setSourceDir
@@ -191,6 +193,7 @@
* @return Description of the Returned Value
*/
public Path createClasspath()
+ throws TaskException
{
if( classpath == null )
{
@@ -279,6 +282,7 @@
}
protected XSLTLiaison getLiaison()
+ throws TaskException
{
// if processor wasn't specified, see if TraX is available. If not,
// default it to xslp or xalan, depending on which is in the
classpath
1.5 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultCompilerAdapter.java 2001/12/16 01:31:38 1.4
+++ DefaultCompilerAdapter.java 2001/12/16 02:05:42 1.5
@@ -384,6 +384,7 @@
* @return Description of the Returned Value
*/
protected int executeExternalCompile( String[] args, int firstFileName )
+ throws TaskException
{
String[] commandArray = null;
File tmpFile = null;
1.3 +3 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
Index: Http.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Http.java 2001/12/16 00:38:31 1.2
+++ Http.java 2001/12/16 02:05:42 1.3
@@ -21,7 +21,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Denis Hennessy</a>
*/
-public class Http extends ProjectComponent implements Condition
+public class Http
+ extends ProjectComponent
+ implements Condition
{
String spec = null;
1.3 +3 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
Index: Socket.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Socket.java 2001/12/16 00:38:31 1.2
+++ Socket.java 2001/12/16 02:05:42 1.3
@@ -18,7 +18,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Denis Hennessy</a>
*/
-public class Socket extends ProjectComponent implements Condition
+public class Socket
+ extends ProjectComponent
+ implements Condition
{
String server = null;
int port = 0;
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
Index: Rpm.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Rpm.java 2001/12/16 00:33:54 1.3
+++ Rpm.java 2001/12/16 02:05:42 1.4
@@ -100,6 +100,7 @@
}
public void setSpecFile( String sf )
+ throws TaskException
{
if( ( sf == null ) || ( sf.trim().equals( "" ) ) )
{
1.3 +4 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
Index: XMLValidateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLValidateTask.java 2001/12/15 15:20:24 1.2
+++ XMLValidateTask.java 2001/12/16 02:05:42 1.3
@@ -109,8 +109,8 @@
* @param classpath The new Classpath value
*/
public void setClasspath( Path classpath )
+ throws TaskException
{
-
if( this.classpath == null )
{
this.classpath = classpath;
@@ -126,6 +126,7 @@
* @see #setClasspath
*/
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -202,6 +203,7 @@
* @see #setClasspath
*/
public Path createClasspath()
+ throws TaskException
{
if( this.classpath == null )
{
@@ -319,6 +321,7 @@
* parse the file
*/
private void doValidate( File afile )
+ throws TaskException
{
try
{
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
Index: CCMCreateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CCMCreateTask.java 2001/12/16 00:37:34 1.3
+++ CCMCreateTask.java 2001/12/16 02:05:42 1.4
@@ -119,7 +119,7 @@
* @exception IOException Description of Exception
*/
public void setProcessOutputStream( InputStream is )
- throws IOException
+ throws TaskException, IOException
{
String buffer = "";
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
Index: Continuus.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Continuus.java 2001/12/16 00:37:34 1.3
+++ Continuus.java 2001/12/16 02:05:42 1.4
@@ -107,6 +107,7 @@
}
protected int run( Commandline cmd, ExecuteStreamHandler handler )
+ throws TaskException
{
try
{
1.4 +3 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClearCase.java 2001/12/16 00:37:27 1.3
+++ ClearCase.java 2001/12/16 02:05:42 1.4
@@ -13,6 +13,7 @@
import org.apache.tools.ant.taskdefs.Execute;
import org.apache.tools.ant.taskdefs.LogStreamHandler;
import org.apache.tools.ant.types.Commandline;
+import java.io.IOException;
/**
* A base class for creating tasks for executing commands on ClearCase. <p>
@@ -103,6 +104,7 @@
}
protected int run( Commandline cmd )
+ throws TaskException
{
try
{
@@ -113,7 +115,7 @@
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
}
- catch( java.io.IOException e )
+ catch( IOException e )
{
throw new TaskException( "Error", e );
}
1.4 +4 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
Index: Depend.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Depend.java 2001/12/15 15:20:24 1.3
+++ Depend.java 2001/12/16 02:05:42 1.4
@@ -105,6 +105,7 @@
* @param classpath The new Classpath value
*/
public void setClasspath( Path classpath )
+ throws TaskException
{
if( dependClasspath == null )
{
@@ -122,6 +123,7 @@
* @param r The new ClasspathRef value
*/
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -178,6 +180,7 @@
* @return Description of the Returned Value
*/
public Path createClasspath()
+ throws TaskException
{
if( dependClasspath == null )
{
@@ -359,6 +362,7 @@
* @return a vector containing the classes to analyse.
*/
private Vector getClassFiles( Path classLocations )
+ throws TaskException
{
// break the classLocations into its components.
String[] classLocationsList = classLocations.list();
1.4 +2 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CSharp.java 2001/12/16 00:37:10 1.3
+++ CSharp.java 2001/12/16 02:05:42 1.4
@@ -280,6 +280,7 @@
*/
public CSharp()
+ throws TaskException
{
Clear();
setIncludes( csc_file_pattern );
@@ -417,6 +418,7 @@
* @param path another path to append
*/
public void setReferenceFiles( Path path )
+ throws TaskException
{
//demand create pathlist
if( _referenceFiles == null )
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
Index: Ilasm.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ilasm.java 2001/12/16 00:37:10 1.3
+++ Ilasm.java 2001/12/16 02:05:42 1.4
@@ -119,6 +119,7 @@
* constructor inits everything and set up the search pattern
*/
public Ilasm()
+ throws TaskException
{
Clear();
setIncludes( file_pattern );
1.4 +2 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
Index: NetCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetCommand.java 2001/12/16 00:37:10 1.3
+++ NetCommand.java 2001/12/16 02:05:42 1.4
@@ -76,6 +76,7 @@
*/
public NetCommand( Task owner, String title, String program )
+ throws TaskException
{
_owner = owner;
_title = title;
@@ -196,6 +197,7 @@
* set up the command sequence..
*/
protected void prepareExecutor()
+ throws TaskException
{
// default directory to the project's base directory
File dir = _owner.getProject().getBaseDir();
1.3 +3 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BorlandGenerateClient.java 2001/12/16 00:37:02 1.2
+++ BorlandGenerateClient.java 2001/12/16 02:05:42 1.3
@@ -55,6 +55,7 @@
Path classpath;
public void setClasspath( Path classpath )
+ throws TaskException
{
if( this.classpath == null )
{
@@ -67,6 +68,7 @@
}
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -92,6 +94,7 @@
}
public Path createClasspath()
+ throws TaskException
{
if( this.classpath == null )
{
1.4 +7 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
Index: JlinkTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JlinkTask.java 2001/12/16 00:36:15 1.3
+++ JlinkTask.java 2001/12/16 02:05:42 1.4
@@ -59,6 +59,7 @@
* @param addfiles The new Addfiles value
*/
public void setAddfiles( Path addfiles )
+ throws TaskException
{
if( this.addfiles == null )
{
@@ -86,6 +87,7 @@
* @param mergefiles The new Mergefiles value
*/
public void setMergefiles( Path mergefiles )
+ throws TaskException
{
if( this.mergefiles == null )
{
@@ -113,6 +115,7 @@
* @return Description of the Returned Value
*/
public Path createAddfiles()
+ throws TaskException
{
if( this.addfiles == null )
{
@@ -128,6 +131,7 @@
* @return Description of the Returned Value
*/
public Path createMergefiles()
+ throws TaskException
{
if( this.mergefiles == null )
{
@@ -179,11 +183,13 @@
}
private boolean haveAddFiles()
+ throws TaskException
{
return haveEntries( addfiles );
}
private boolean haveEntries( Path p )
+ throws TaskException
{
if( p == null )
{
@@ -197,9 +203,9 @@
}
private boolean haveMergeFiles()
+ throws TaskException
{
return haveEntries( mergefiles );
}
-
}
1.4 +5 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspC.java 2001/12/16 00:36:07 1.3
+++ JspC.java 2001/12/16 02:05:42 1.4
@@ -58,7 +58,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: 2001/12/16 00:36:07 $
+ * @version $Revision: 1.4 $ $Date: 2001/12/16 02:05:42 $
*/
public class JspC extends MatchingTask
{
@@ -101,6 +101,7 @@
* @param cp The new Classpath value
*/
public void setClasspath( Path cp )
+ throws TaskException
{
if( classpath == null )
classpath = cp;
@@ -114,6 +115,7 @@
* @param r The new ClasspathRef value
*/
public void setClasspathRef( Reference r )
+ throws TaskException
{
createClasspath().setRefid( r );
}
@@ -187,6 +189,7 @@
* @param srcDir The new Srcdir value
*/
public void setSrcdir( Path srcDir )
+ throws TaskException
{
if( src == null )
{
@@ -309,6 +312,7 @@
* @return Description of the Returned Value
*/
public Path createClasspath()
+ throws TaskException
{
if( classpath == null )
classpath = new Path( project );
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
Index: WLJspc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WLJspc.java 2001/12/16 00:36:07 1.3
+++ WLJspc.java 2001/12/16 02:05:42 1.4
@@ -74,6 +74,7 @@
* @param classpath The new Classpath value
*/
public void setClasspath( Path classpath )
+ throws TaskException
{
if( compileClasspath == null )
{
@@ -92,7 +93,6 @@
*/
public void setDest( File dirName )
{
-
destinationDirectory = dirName;
}
1.4 +2 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
Index: Pvcs.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Pvcs.java 2001/12/16 00:34:52 1.3
+++ Pvcs.java 2001/12/16 02:05:43 1.4
@@ -319,7 +319,7 @@
* build...
*/
public void execute()
- throws org.apache.tools.ant.TaskException
+ throws TaskException
{
Project aProj = getProject();
int result = 0;
@@ -446,6 +446,7 @@
}
protected int runCmd( Commandline cmd, ExecuteStreamHandler out )
+ throws TaskException
{
try
{
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MSVSS.java 2001/12/16 00:34:17 1.3
+++ MSVSS.java 2001/12/16 02:05:43 1.4
@@ -200,6 +200,7 @@
}
protected int run( Commandline cmd )
+ throws TaskException
{
try
{
1.4 +1 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
Index: MSVSSHISTORY.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MSVSSHISTORY.java 2001/12/16 00:34:17 1.3
+++ MSVSSHISTORY.java 2001/12/16 02:05:43 1.4
@@ -141,6 +141,7 @@
* @param attr The new Style value
*/
public void setStyle( BriefCodediffNofile attr )
+ throws TaskException
{
String option = attr.getValue();
if( option.equals( "brief" ) )
1.3 +5 -0
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
Index: DefaultRmicAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultRmicAdapter.java 2001/12/16 00:38:31 1.2
+++ DefaultRmicAdapter.java 2001/12/16 02:05:43 1.3
@@ -10,6 +10,7 @@
import java.io.File;
import java.util.Random;
import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Rmic;
import org.apache.tools.ant.types.Commandline;
@@ -51,6 +52,7 @@
* @return The Classpath value
*/
public Path getClasspath()
+ throws TaskException
{
return getCompileClasspath();
}
@@ -77,6 +79,7 @@
* @return Description of the Returned Value
*/
protected Commandline setupRmicCommand()
+ throws TaskException
{
return setupRmicCommand( null );
}
@@ -88,6 +91,7 @@
* @return Description of the Returned Value
*/
protected Commandline setupRmicCommand( String[] options )
+ throws TaskException
{
Commandline cmd = new Commandline();
@@ -178,6 +182,7 @@
* @return The CompileClasspath value
*/
protected Path getCompileClasspath()
+ throws TaskException
{
// add dest dir to classpath so that previously compiled and
// untouched classes are on classpath
1.3 +2 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
Index: RmicAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RmicAdapter.java 2001/12/16 00:38:31 1.2
+++ RmicAdapter.java 2001/12/16 02:05:43 1.3
@@ -57,5 +57,6 @@
*
* @return The Classpath value
*/
- Path getClasspath();
+ Path getClasspath()
+ throws TaskException;
}
1.4 +0 -6
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/DataType.java
Index: DataType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/DataType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DataType.java 2001/12/16 00:38:47 1.3
+++ DataType.java 2001/12/16 02:05:43 1.4
@@ -92,12 +92,6 @@
return ref != null;
}
- public void execute()
- throws TaskException
- {
- //HACK: NOOP execute - should be deleted in the future!
- }
-
/**
* Performs the check for circular references and returns the referenced
* object.
1.2 +4 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java
Index: FileNameMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileNameMapper.java 2001/12/15 12:06:32 1.1
+++ FileNameMapper.java 2001/12/16 02:05:43 1.2
@@ -7,6 +7,8 @@
*/
package org.apache.tools.ant.util;
+import org.apache.myrmidon.api.TaskException;
+
/**
* Interface to be used by SourceFileScanner. <p>
*
@@ -27,7 +29,8 @@
*
* @param from The new From value
*/
- void setFrom( String from );
+ void setFrom( String from )
+ throws TaskException;
/**
* Sets the to part of the transformation rule.
1.3 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
Index: RegexpPatternMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegexpPatternMapper.java 2001/12/16 00:39:05 1.2
+++ RegexpPatternMapper.java 2001/12/16 02:05:43 1.3
@@ -69,9 +69,9 @@
* @return Description of the Returned Value
*/
public String[] mapFileName( String sourceFileName )
+ throws TaskException
{
- if( reg == null || to == null
- || !reg.matches( sourceFileName ) )
+ if( reg == null || to == null || !reg.matches( sourceFileName ) )
{
return null;
}
@@ -86,6 +86,7 @@
* @return Description of the Returned Value
*/
protected String replaceReferences( String source )
+ throws TaskException
{
Vector v = reg.getGroups( source );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
