Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mboot needed to be smarter about its parsing - was picking up <version> from anywhere 

removed unused "local" parsing


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163426 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-02-27 23:30:07 +00:00
parent bd54ac838b
commit 6aed331a91
1 changed files with 22 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
maven-mboot2/src/main/java/MBoot.java
View File

@ -943,6 +943,8 @@ public class MBoot
class ModelReader
extends DefaultHandler
{
int depth = 0;
String artifactId;
String version;
@ -963,8 +965,6 @@ public class MBoot
private UnitTests unitTests;
private Local local = new Local();
private List resources = new ArrayList();
private Dependency currentDependency;
@ -977,8 +977,6 @@ public class MBoot
private boolean insideDependency = false;
private boolean insideLocal = false;
private boolean insideUnitTest = false;
private boolean insideResource = false;
@ -1014,11 +1012,6 @@ public class MBoot
return resources;
}
public Local getLocal()
{
return local;
}
public boolean parse( File file )
{
this.file = file;
@ -1049,14 +1042,10 @@ public class MBoot
{
insideParent = true;
}
else if ( rawName.equals( "repository" ) && !insideLocal )
else if ( rawName.equals( "repository" ) )
{
insideRepository = true;
}
else if ( rawName.equals( "local" ) )
{
insideLocal = true;
}
else if ( rawName.equals( "unitTest" ) )
{
unitTests = new UnitTests();
@ -1075,6 +1064,7 @@ public class MBoot
insideResource = true;
}
depth ++;
}
public void characters( char buffer[], int start, int length )
@ -1127,10 +1117,6 @@ public class MBoot
insideParent = false;
}
else if ( rawName.equals( "local" ) )
{
insideLocal = false;
}
else if ( rawName.equals( "unitTest" ) )
{
insideUnitTest = false;
@ -1226,29 +1212,25 @@ public class MBoot
unitTests.addExclude( getBodyText() );
}
}
else if ( rawName.equals( "artifactId" ) )
else if ( depth == 2 )
{
artifactId = getBodyText();
}
else if ( rawName.equals( "version" ) )
{
version = getBodyText();
}
else if ( rawName.equals( "groupId" ) )
{
groupId = getBodyText();
}
else if ( rawName.equals( "type" ) )
{
type = getBodyText();
}
else if ( rawName.equals( "repository" ) )
{
if ( insideLocal )
if ( rawName.equals( "artifactId" ) )
{
local.repository = getBodyText();
artifactId = getBodyText();
}
else
else if ( rawName.equals( "version" ) )
{
version = getBodyText();
}
else if ( rawName.equals( "groupId" ) )
{
groupId = getBodyText();
}
else if ( rawName.equals( "type" ) )
{
type = getBodyText();
}
else if ( rawName.equals( "repository" ) )
{
insideRepository = false;
}
@ -1262,6 +1244,8 @@ public class MBoot
}
bodyText = new StringBuffer();
depth --;
}
public void warning( SAXParseException spe )
@ -1544,32 +1528,4 @@ public class MBoot
this.filtering = filtering;
}
}
public static class Local
implements Serializable
{
private String repository;
private String online;
public String getRepository()
{
return this.repository;
}
public void setRepository( String repository )
{
this.repository = repository;
}
public String getOnline()
{
return this.online;
}
public void setOnline( String online )
{
this.online = online;
}
}
}