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

o removal of xpp3 as a dependency 

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2004-10-25 14:22:51 +00:00
parent 3a09b73001
commit 0d2848002d
4 changed files with 16 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ public class MBoot
"plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
"surefire/jars/surefire-booter-1.2-SNAPSHOT.jar",
"surefire/jars/surefire-1.2-SNAPSHOT.jar",
"xpp3/jars/xpp3-1.1.3.3.jar",
"qdox/jars/qdox-1.2.jar"
};
@ -48,8 +47,7 @@ public class MBoot
"classworlds/jars/classworlds-1.1-SNAPSHOT.jar",
"plexus/jars/plexus-container-api-1.0-alpha-1-SNAPSHOT.jar",
"plexus/jars/plexus-container-default-1.0-alpha-1-SNAPSHOT.jar",
"plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar",
"xpp3/jars/xpp3-1.1.3.3.jar"
"plexus/jars/plexus-utils-1.0-alpha-1-SNAPSHOT.jar"
};
// ----------------------------------------------------------------------
@ -65,8 +63,7 @@ public class MBoot
"modello/jars/modello-core-1.0-SNAPSHOT.jar",
"modello/jars/modello-xdoc-plugin-1.0-SNAPSHOT.jar",
"modello/jars/modello-xml-plugin-1.0-SNAPSHOT.jar",
"modello/jars/modello-xpp3-plugin-1.0-SNAPSHOT.jar",
"xpp3/jars/xpp3-1.1.3.3.jar"
"modello/jars/modello-xpp3-plugin-1.0-SNAPSHOT.jar"
};
String[] builds = new String[]
@ -315,7 +312,7 @@ public void run( String[] args )
for ( int i = 0; i < plexusDeps.length; i++ )
{
if ( plexusDeps[i].startsWith( "classworlds") )
if ( plexusDeps[i].startsWith( "classworlds" ) )
{
FileUtils.copyFileToDirectory( repoLocal + "/" + plexusDeps[i], boot );
}
@ -338,10 +335,10 @@ public void run( String[] args )
Dependency d = (Dependency) i.next();
if ( d.getArtifactId().equals( "classworlds" ) ||
d.artifactId.equals( "plexus" ) ||
d.artifactId.equals( "xstream" ) ||
d.artifactId.equals( "xpp3" ) ||
d.artifactId.equals( "junit" ) )
d.artifactId.equals( "plexus-container-api" ) ||
d.artifactId.equals( "plexus-container-default" ) ||
d.artifactId.equals( "plexus-utils" ) ||
d.artifactId.equals( "junit" ) )
{
continue;
}
@ -581,8 +578,8 @@ private void createToolsClassLoader()
File f = new File( repoLocal, dependency );
if ( !f.exists() )
{
throw new FileNotFoundException( "Missing dependency: " + dependency +
( !online ? "; run again online" : "; there was a problem downloading it earlier" ) );
throw new FileNotFoundException( "Missing dependency: " + dependency +
( !online ? "; run again online" : "; there was a problem downloading it earlier" ) );
}
cl.addURL( f.toURL() );
@ -613,8 +610,8 @@ private void generateSources( String model, String mode, String dir, String mode
File f = new File( repoLocal, dependency );
if ( !f.exists() )
{
throw new FileNotFoundException( "Missing dependency: " + dependency +
( !online ? "; run again online" : "; there was a problem downloading it earlier" ) );
throw new FileNotFoundException( "Missing dependency: " + dependency +
( !online ? "; run again online" : "; there was a problem downloading it earlier" ) );
}
modelloClassLoader.addURL( f.toURL() );
@ -769,7 +766,7 @@ private void runTests( String basedir, String classes, String testClasses )
if ( !success )
{
throw new Exception ( "Tests error" );
throw new Exception( "Tests error" );
}
}
@ -1207,7 +1204,7 @@ else if ( rawName.equals( "repository" ) )
{
local.repository = getBodyText();
}
else
else
{
insideRepository = false;
}
@ -1522,8 +1519,8 @@ public String getRepository()
public void setRepository( String repository )
{
this.repository = repository;
}
}
public String getOnline()
{
return this.online;
@ -1532,6 +1529,6 @@ public String getOnline()
public void setOnline( String online )
{
this.online = online;
}
}
}
}

59
maven-mboot2/src/main/java/StreamPumper.java
View File

@ -1,59 +0,0 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.OutputStream;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
public class StreamPumper
extends Thread
{
private static final int BUFFER_SIZE = 512;
private BufferedInputStream stream;
private boolean endOfStream = false;
private int SLEEP_TIME = 5;
private OutputStream out;
public StreamPumper( BufferedInputStream is, OutputStream out )
{
this.stream = is;
this.out = out;
}
public void pumpStream() throws IOException
{
byte[] buf = new byte[BUFFER_SIZE];
if ( !endOfStream )
{
int bytesRead = stream.read( buf, 0, BUFFER_SIZE );
if ( bytesRead > 0 )
{
out.write( buf, 0, bytesRead );
}
else if ( bytesRead == -1 )
{
endOfStream = true;
}
}
}
public void run()
{
try
{
while ( !endOfStream )
{
pumpStream();
sleep( SLEEP_TIME );
}
}
catch ( Exception e )
{
// getLogger().warn("Jikes.run()", e);
}
}
}

BIN
mboot.jar
View File

Binary file not shown.

5
pom.xml
View File

@ -106,11 +106,6 @@
<artifactId>classworlds</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>