adammurdoch 2002/06/27 04:06:47
Modified: framework/src/java/org/apache/myrmidon/framework
Resources.properties ExecuteTarget.java
Log:
Fix error message for when using the default target fails.
Revision Changes Path
1.6 +2 -1
jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/Resources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Resources.properties 23 Jun 2002 10:40:27 -0000 1.5
+++ Resources.properties 27 Jun 2002 11:06:46 -0000 1.6
@@ -20,4 +20,5 @@
facade.missing-impl.error=Unable to determine the name of implementation for
facade task "{0}".
-execute-target.execute.error=Execution of target "{1}" in project "{0}"
failed.
\ No newline at end of file
+execute-target.execute.error=Execution of target "{1}" in project "{0}"
failed.
+execute-target.execute-default.error=Execution of default target in project
"{0}" failed.
\ No newline at end of file
1.24 +13 -5
jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java
Index: ExecuteTarget.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ExecuteTarget.java 23 Jun 2002 10:40:27 -0000 1.23
+++ ExecuteTarget.java 27 Jun 2002 11:06:46 -0000 1.24
@@ -87,10 +87,18 @@
}
catch( final Exception e )
{
- final String message =
- REZ.getString( "execute-target.execute.error",
- m_project.getUri(),
- m_target );
+ final String message;
+ if( m_target != null )
+ {
+ message = REZ.getString( "execute-target.execute.error",
+ m_project.getUri(),
+ m_target );
+ }
+ else
+ {
+ message = REZ.getString(
"execute-target.execute-default.error",
+ m_project.getUri() );
+ }
throw new TaskException( message, e );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
