werken 2002/07/05 19:02:36
Modified: . build-bootstrap.xml maven.xml project.xml
src/bin driver.jelly
src/java/org/apache/maven/app Maven.java
src/plugins/ant plugin.jelly
src/plugins/core plugin.jelly
src/plugins/test plugin.jelly
Log:
-- Better exception handling
-- Re-prefixing of core and test plugin goals.
-- updated jelly version in project.xml to match that in jars.list.
Revision Changes Path
1.115 +2 -2 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- build-bootstrap.xml 5 Jul 2002 18:45:28 -0000 1.114
+++ build-bootstrap.xml 6 Jul 2002 02:02:36 -0000 1.115
@@ -139,8 +139,8 @@
</condition>
<exec executable="${maven.home}/bin/${maven.script}"
failonerror="true">
- <arg line="clean"/>
- <arg line="jar"/>
+ <arg line="core:clean"/>
+ <arg line="core:jar"/>
</exec>
</target>
1.7 +5 -5 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 5 Jul 2002 22:56:12 -0000 1.6
+++ maven.xml 6 Jul 2002 02:02:36 -0000 1.7
@@ -1,15 +1,15 @@
-<project default="maven:jar">
+<project default="core:jar">
<!--
- <preGoal name="maven:compile">
+ <preGoal name="core:compile">
<echo>
- This is a callback before maven:compile
+ This is a callback before core:compile
</echo>
</preGoal>
- <postGoal name="maven:compile">
+ <postGoal name="core:compile">
<echo>
- This is a callback after maven:compile
+ This is a callback after core:compile
</echo>
</postGoal>
-->
1.137 +1 -1 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- project.xml 5 Jul 2002 01:35:43 -0000 1.136
+++ project.xml 6 Jul 2002 02:02:36 -0000 1.137
@@ -319,7 +319,7 @@
<dependency>
<id>commons-jelly</id>
- <version>1.0-dev.20020628.033340</version>
+ <version>1.0-dev-4</version>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
</dependency>
1.7 +0 -6 jakarta-turbine-maven/src/bin/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/driver.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- driver.jelly 5 Jul 2002 15:02:25 -0000 1.6
+++ driver.jelly 6 Jul 2002 02:02:36 -0000 1.7
@@ -7,11 +7,5 @@
-->
- <echo>
-
- I am a driver.jelly file executing.
-
- </echo>
-
</project>
1.49 +62 -37 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Maven.java 5 Jul 2002 23:46:27 -0000 1.48
+++ Maven.java 6 Jul 2002 02:02:36 -0000 1.49
@@ -595,6 +595,7 @@
private void runtimeInitialization() throws Exception
{
initializeDriver();
+
initializePlugins();
loadProjectBuildFile();
}
@@ -854,16 +855,7 @@
if (eachGoal == null)
{
- if (!eachGoalName.startsWith("maven:"))
- {
- eachGoalName = "maven:" + eachGoalName;
- eachGoal = werkzProject.getGoal(eachGoalName);
- }
-
- if (eachGoal == null)
- {
- throw new UnknownGoalException(eachGoalName);
- }
+ throw new UnknownGoalException(eachGoalName);
}
}
@@ -1302,62 +1294,95 @@
catch (UnattainableGoalException e)
{
failed = true;
+
System.out.println("");
System.err.println("BUILD FAILED");
String msg = null;
- e.printStackTrace();
+ String fileName = null;
+ String elementName = null;
+
+ int lineNumber = -1;
+ int column = -1;
Throwable rootCause = e.getRootCause();
if (rootCause != null)
{
-
- rootCause.printStackTrace();
-
if (rootCause instanceof JellyException)
{
- rootCause = ((JellyException)rootCause).getCause();
+ JellyException jellyEx = (JellyException) rootCause;
+
+ fileName = jellyEx.getFileName();
+ elementName = jellyEx.getElementName();
+
+ lineNumber = jellyEx.getLineNumber();
+ column = jellyEx.getColumnNumber();
- rootCause.printStackTrace();
+ rootCause = jellyEx.getCause();
+
+ if ( rootCause == null )
+ {
+ msg = jellyEx.getLocalizedMessage();
+ }
+ else
+ {
+ msg = rootCause.getLocalizedMessage();
+
+ if ( msg == null )
+ {
+ msg = rootCause.getClass().getName();
+ }
+ }
}
+ else
+ {
+ msg = rootCause.getLocalizedMessage();
- msg = rootCause.getLocalizedMessage();
+ if ( msg == null )
+ {
+ msg = rootCause.getClass().getName();
+ }
+ }
}
-
- if (msg == null)
+ else
{
msg = e.getLocalizedMessage();
}
- if ( msg != null )
+ if ( fileName != null)
{
- System.err.println(msg);
+ System.err.println( "File...... " + fileName );
+ System.err.println( "Element... " + elementName );
+ System.err.println( "Line...... " + lineNumber );
+ System.err.println( "Column.... " + column );
}
- else
+
+ System.err.println( msg );
+
+ if ( getCli().hasOption( 'X' ) )
{
e.printStackTrace();
-
- if (rootCause != null)
- {
- rootCause.printStackTrace();
- }
}
+
}
catch (JellyException e)
{
- failed = true;
- Throwable rootCause = e.getCause();
+ String fileName = e.getFileName();
+ String elementName = e.getElementName();
+
+ int lineNumber = e.getLineNumber();
+ int column = e.getColumnNumber();
- if (rootCause != null)
- {
- System.err.println(rootCause.getLocalizedMessage());
- }
- else
- {
- System.err.println(e.getLocalizedMessage());
- }
+ String msg = e.getLocalizedMessage();
+
+ System.err.println( "File...... " + fileName );
+ System.err.println( "Element... " + elementName );
+ System.err.println( "Line...... " + lineNumber );
+ System.err.println( "Column.... " + column );
+
+ System.err.println( msg );
}
catch (Exception e)
{
1.5 +2 -2 jakarta-turbine-maven/src/plugins/ant/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/ant/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 5 Jul 2002 00:37:28 -0000 1.4
+++ plugin.jelly 6 Jul 2002 02:02:36 -0000 1.5
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:jj="jelly:jeez" xmlns="dummy">
+<jj:project xmlns:j="jelly:core" xmlns:jj="jelly:jeez" xmlns="dummy">
<!-- ================================================================== -->
<!-- A N T B U I L D G E N E R A T O R -->
@@ -68,4 +68,4 @@
</jj:goal>
-</project>
+</jj:project>
1.15 +7 -7 jakarta-turbine-maven/src/plugins/core/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/core/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 5 Jul 2002 21:48:19 -0000 1.14
+++ plugin.jelly 6 Jul 2002 02:02:36 -0000 1.15
@@ -61,7 +61,7 @@
<!-- prepare-filesystem -->
<!-- ================================================================== -->
- <goal name="maven:prepare-filesystem">
+ <goal name="core:prepare-filesystem">
<mkdir dir="${maven.build.dest}"/>
</goal>
@@ -69,8 +69,8 @@
<!-- compile -->
<!-- ================================================================== -->
- <goal name="maven:compile"
- prereqs="maven:prepare-filesystem">
+ <goal name="core:compile"
+ prereqs="core:prepare-filesystem">
<property name="cp" refid="maven.dependency.classpath"/>
@@ -94,7 +94,7 @@
<!-- jar resources -->
<!-- ================================================================== -->
- <goal name="maven:jar-resources">
+ <goal name="core:jar-resources">
<j:if test="${maven.has.jar.resource.patterns}">
@@ -115,9 +115,9 @@
<!-- jar -->
<!-- ================================================================== -->
- <goal name="maven:jar"
+ <goal name="core:jar"
description="Create the deliverable jar file."
- prereqs="maven:test,maven:jar-resources">
+ prereqs="test:test,core:jar-resources">
<jar
jarfile="${maven.build.dir}/${maven.final.name}.jar"
@@ -146,7 +146,7 @@
<!-- clean -->
<!-- ================================================================== -->
- <goal name="maven:clean">
+ <goal name="core:clean">
<delete dir="${maven.build.dir}"/>
<delete dir="${maven.test.reportsDirectory}"/>
</goal>
1.5 +7 -5 jakarta-turbine-maven/src/plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/test/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 5 Jul 2002 13:28:44 -0000 1.4
+++ plugin.jelly 6 Jul 2002 02:02:36 -0000 1.5
@@ -1,13 +1,15 @@
<project xmlns:j="jelly:core">
- <goal name="maven:test.prepare-filesystem">
+ <goal name="test" prereqs="test:test"/>
+
+ <goal name="test:prepare-filesystem">
<mkdir dir="${maven.test.dest}"/>
<mkdir dir="${maven.test.reportsDirectory}"/>
</goal>
- <goal name="maven:compile-test"
- prereqs="maven:compile,maven:jar-resources,maven:test.prepare-filesystem">
+ <goal name="test:compile"
+ prereqs="core:compile,core:jar-resources,test:prepare-filesystem">
<javac
destdir="${maven.test.dest}"
@@ -26,8 +28,8 @@
</goal>
- <goal name="maven:test"
- prereqs="maven:compile-test">
+ <goal name="test:test"
+ prereqs="test:compile">
<junit printSummary="yes"
failureProperty="maven.test.failure"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
