donaldp 01/12/15 20:43:51
Modified: proposal/myrmidon/src/main/org/apache/tools/ant
DefaultLogger.java IntrospectionHelper.java
TaskAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Tstamp.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
GenericDeploymentTool.java
Removed: proposal/myrmidon/src/main/org/apache/tools/ant
BuildException.java
Log:
Lets say tata to the BuildException.
Revision Changes Path
1.4 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
Index: DefaultLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultLogger.java 2001/12/16 04:12:39 1.3
+++ DefaultLogger.java 2001/12/16 04:43:51 1.4
@@ -9,6 +9,7 @@
import java.io.PrintStream;
import org.apache.tools.ant.util.StringUtils;
+import org.apache.myrmidon.api.TaskException;
/**
* Writes build event to a PrintStream. Currently, it only writes which
targets
@@ -118,13 +119,13 @@
message.append( StringUtils.LINE_SEP );
if( Project.MSG_VERBOSE <= msgOutputLevel ||
- !( error instanceof BuildException ) )
+ !( error instanceof TaskException ) )
{
message.append( StringUtils.getStackTrace( error ) );
}
else
{
- if( error instanceof BuildException )
+ if( error instanceof TaskException )
{
message.append( error.toString() ).append(
StringUtils.LINE_SEP );
}
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IntrospectionHelper.java 2001/12/16 01:01:19 1.3
+++ IntrospectionHelper.java 2001/12/16 04:43:51 1.4
@@ -287,7 +287,7 @@
*/
public void setAttribute( Project p, Object element, String
attributeName,
String value )
- throws BuildException
+ throws TaskException
{
AttributeSetter as = (AttributeSetter)attributeSetters.get(
attributeName );
if( as == null )
1.4 +5 -5
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TaskAdapter.java 2001/12/16 01:01:19 1.3
+++ TaskAdapter.java 2001/12/16 04:43:51 1.4
@@ -25,7 +25,7 @@
* Checks a class, whether it is suitable to be adapted by TaskAdapter.
* Checks conditions only, which are additionally required for a tasks
* adapted by TaskAdapter. Thus, this method should be called by [EMAIL
PROTECTED]
- * Project#checkTaskClass}. Throws a BuildException and logs as
+ * Project#checkTaskClass}. Throws a TaskException and logs as
* Project.MSG_ERR for conditions, that will cause the task execution to
* fail. Logs other suspicious conditions with Project.MSG_WARN.
*
@@ -76,10 +76,10 @@
/**
* Do the execution.
*
- * @exception BuildException Description of Exception
+ * @exception TaskException Description of Exception
*/
public void execute()
- throws BuildException
+ throws TaskException
{
Method setProjectM = null;
try
@@ -101,7 +101,7 @@
{
log( "Error setting project in " + proxy.getClass(),
Project.MSG_ERR );
- throw new BuildException( "Error", ex );
+ throw new TaskException( "Error", ex );
}
Method executeM = null;
@@ -120,7 +120,7 @@
catch( Exception ex )
{
log( "Error in " + proxy.getClass(), Project.MSG_ERR );
- throw new BuildException( "Error", ex );
+ throw new TaskException( "Error", ex );
}
}
1.6 +0 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tstamp.java 2001/12/16 03:10:44 1.5
+++ Tstamp.java 2001/12/16 04:43:51 1.6
@@ -18,7 +18,6 @@
import java.util.TimeZone;
import java.util.Vector;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Location;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
1.7 +0 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultCompilerAdapter.java 2001/12/16 03:10:44 1.6
+++ DefaultCompilerAdapter.java 2001/12/16 04:43:51 1.7
@@ -12,7 +12,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Location;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Execute;
import org.apache.tools.ant.taskdefs.Javac;
1.6 +0 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
Index: GenericDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenericDeploymentTool.java 2001/12/16 03:10:44 1.5
+++ GenericDeploymentTool.java 2001/12/16 04:43:51 1.6
@@ -28,7 +28,6 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Location;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
