You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/09/22 13:14:48 UTC
cvs commit: maven/xdocs changes.xml
brett 2004/09/22 04:14:47
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
xdocs Tag: MAVEN-1_0-BRANCH changes.xml
Log:
PR:MAVEN-1433
show error when Jelly cannot parse XML
Revision Changes Path
No revision
No revision
1.70.4.53 +25 -9 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.52
retrieving revision 1.70.4.53
diff -u -r1.70.4.52 -r1.70.4.53
--- PluginManager.java 7 Jul 2004 10:09:08 -0000 1.70.4.52
+++ PluginManager.java 22 Sep 2004 11:14:47 -0000 1.70.4.53
@@ -357,11 +357,19 @@
{
JellyScriptHousing jellyScriptHousing = new JellyScriptHousing();
- // Now lets compile the script once so we can use it repeatedly.
- Script script = JellyUtils.compileScript( jelly, project.getContext() );
+ try
+ {
+ // Now lets compile the script once so we can use it repeatedly.
+ Script script = JellyUtils.compileScript( jelly, project.getContext() );
- jellyScriptHousing.setProject( project );
- jellyScriptHousing.setScript( script );
+ jellyScriptHousing.setProject( project );
+ jellyScriptHousing.setScript( script );
+ }
+ catch ( Exception e )
+ {
+ // FIXME: exception? Yuck!
+ throw new MavenException( "Error parsing driver.jelly", e );
+ }
return jellyScriptHousing;
}
@@ -970,12 +978,20 @@
context.setRootURL( jellyScriptHousing.getSource().toURL() );
context.setCurrentURL( jellyScriptHousing.getSource().toURL() );
- Script script = JellyUtils.compileScript( jellyScriptHousing.getSource(), context );
+ try
+ {
+ Script script = JellyUtils.compileScript( jellyScriptHousing.getSource(), context );
- context.setRootURL( oldRoot );
- context.setCurrentURL( oldCurrent );
+ context.setRootURL( oldRoot );
+ context.setCurrentURL( oldCurrent );
- return script;
+ return script;
+ }
+ catch ( Exception e )
+ {
+ // FIXME: exception? Yuck!
+ throw new MavenException( "Error parsing: " + jellyScriptHousing.getSource(), e );
+ }
}
/**
No revision
No revision
1.14.4.35 +2 -1 maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/xdocs/changes.xml,v
retrieving revision 1.14.4.34
retrieving revision 1.14.4.35
diff -u -r1.14.4.34 -r1.14.4.35
--- changes.xml 20 Jul 2004 07:41:26 -0000 1.14.4.34
+++ changes.xml 22 Sep 2004 11:14:47 -0000 1.14.4.35
@@ -24,7 +24,8 @@
<author email="vmassol@apache.org">Vincent Massol</author>
</properties>
<body>
- <release version="1.0.1-SNAPSHOT" date="in CVS">
+ <release version="1.0.1-SNAPSHOT" date="in CVS MAVEN-1_0-BRANCH">
+ <action dev="brett" type="fix" issue="MAVEN-1433">Show filename in error when Jelly can't parse XML</action>
<action dev="dion" type="add" issue="MAVEN-1382">Add license report to web site</action>
</release>
<release version="1.0" date="2004-07-13">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org