werken 2002/07/22 20:13:50
Modified: src/java/org/apache/maven/jelly/tags/project MavenTag.java
Log:
<maven> doesn't choke now when invoked project contains non-wellformed XML.
Revision Changes Path
1.2 +17 -17
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java
Index: MavenTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenTag.java 22 Jul 2002 22:21:52 -0000 1.1
+++ MavenTag.java 23 Jul 2002 03:13:50 -0000 1.2
@@ -92,30 +92,30 @@
Maven parent = (Maven) getContext().getVariable( "maven.obj" );
- Maven maven = new Maven( parent.getMavenHome() );
+ try
+ {
+ Maven maven = new Maven( parent.getMavenHome() );
- maven.setDir( getDir() );
- maven.setProjectFile( getDescriptor() );
- maven.setXMLOutput( output,
- parent.isDebug() );
- maven.loadProperties();
+ maven.setDir( getDir() );
+ maven.setProjectFile( getDescriptor() );
+ maven.setXMLOutput( output,
+ parent.isDebug() );
+ maven.loadProperties();
- if ( this.goals != null )
- {
- StringTokenizer tokens = new StringTokenizer( this.goals,
- "," );
-
- while ( tokens.hasMoreTokens() )
+ if ( this.goals != null )
{
- maven.addGoalName( tokens.nextToken().trim() );
+ StringTokenizer tokens = new StringTokenizer( this.goals,
+ "," );
+
+ while ( tokens.hasMoreTokens() )
+ {
+ maven.addGoalName( tokens.nextToken().trim() );
+ }
}
- }
- maven.runtimeInitialization();
+ maven.runtimeInitialization();
- try
- {
maven.attainGoals();
}
catch (Exception e)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
