jvanzyl 2004/04/20 12:02:15
Modified: maven-mboot/src/main Bootstrapper.java
Log:
o committing work from Trygve because he can't yet commit himself.
Revision Changes Path
1.21 +3 -4 maven-components/maven-mboot/src/main/Bootstrapper.java
Index: Bootstrapper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/main/Bootstrapper.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Bootstrapper.java 12 Apr 2004 14:40:35 -0000 1.20
+++ Bootstrapper.java 20 Apr 2004 19:02:15 -0000 1.21
@@ -1,4 +1,3 @@
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
@@ -493,12 +492,12 @@
public void endElement( String uri, String localName, String rawName )
throws SAXException
{
- if ( rawName.equals( "parent" ) )
+ // support both v3 <extend> and v4 <parent>
+ if ( rawName.equals( "extend" ) || rawName.equals( "parent" ) )
{
File f;
- // support both v3 <extend> and v4 <parent>
- if( getBodyText() == null )
+ if( rawName.equals( "extend" ) )
{
String extend = interpolate( getBodyText(), properties );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
