werken 2002/06/27 19:34:44
Modified: . jars.list project-ng.xml project.xml
src/java/org/apache/maven/app Maven.java
Log:
Better error messages when references to an undefined goal occur.
Revision Changes Path
1.33 +1 -1 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jars.list 27 Jun 2002 21:13:20 -0000 1.32
+++ jars.list 28 Jun 2002 02:34:43 -0000 1.33
@@ -51,5 +51,5 @@
velocity-dvsl-0.43.jar
xercesImpl-2.0.0.jar
xmlParserAPIs-2.0.0.jar
-werkz-1.0-beta-2.jar
+werkz-1.0-beta-3.jar
1.12 +1 -1 jakarta-turbine-maven/project-ng.xml
Index: project-ng.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project-ng.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project-ng.xml 28 Jun 2002 01:59:35 -0000 1.11
+++ project-ng.xml 28 Jun 2002 02:34:43 -0000 1.12
@@ -355,7 +355,7 @@
<dependency>
<id>werkz</id>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
</dependency>
<!-- Runtime dependencies -->
1.131 +1 -1 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- project.xml 27 Jun 2002 21:13:20 -0000 1.130
+++ project.xml 28 Jun 2002 02:34:43 -0000 1.131
@@ -366,7 +366,7 @@
<dependency>
<id>werkz</id>
- <version>1.0-beta-2</version>
+ <version>1.0-beta-3</version>
</dependency>
<!-- Runtime dependencies -->
1.32 +13 -0 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Maven.java 27 Jun 2002 23:24:05 -0000 1.31
+++ Maven.java 28 Jun 2002 02:34:43 -0000 1.32
@@ -90,6 +90,7 @@
import com.werken.werkz.Goal;
import com.werken.werkz.Session;
import com.werken.werkz.UnattainableGoalException;
+import com.werken.werkz.NoActionDefinitionException;
import java.beans.IntrospectionException;
import java.io.File;
@@ -1264,6 +1265,14 @@
System.out.println( "" );
return;
}
+ catch (NoActionDefinitionException e)
+ {
+ failed = true;
+ System.err.println("INTERNAL ERROR");
+ System.err.println("Reference made to goal '" + e.getGoalName() + "'
which has no definition.");
+ System.out.println("");
+ return;
+ }
catch (UnattainableGoalException e)
{
failed = true;
@@ -1275,6 +1284,10 @@
if (rootCause != null)
{
+ if ( rootCause instanceof JellyException )
+ {
+ rootCause = ((JellyException)rootCause).getCause();
+ }
msg = rootCause.getLocalizedMessage();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
