brett 2005/04/03 22:23:01
Modified: maven-mboot2/src/main/java/download ArtifactDownloader.java
maven-mboot2/src/main/java/model Dependency.java
ModelReader.java Repository.java
maven-mboot2/src/main/java/util AbstractReader.java
maven-mboot2/src/main/java MBoot.java
maven-mboot2 pom.xml
Log:
fix issues found with a clean repo
Revision Changes Path
1.6 +5 -3
maven-components/maven-mboot2/src/main/java/download/ArtifactDownloader.java
Index: ArtifactDownloader.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/download/ArtifactDownloader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArtifactDownloader.java 4 Apr 2005 05:08:45 -0000 1.5
+++ ArtifactDownloader.java 4 Apr 2005 05:23:01 -0000 1.6
@@ -107,8 +107,10 @@
if ( repositories.isEmpty() )
{
- // TODO: configure layout
- remoteRepos.add( new Repository( "http://repo1.maven.org";,
Repository.LAYOUT_LEGACY ) );
+ // TODO: use super POM?
+ Repository repository = new Repository();
+ repository.setBasedir( "http://repo1.maven.org"; );
+ remoteRepos.add( repository );
}
}
@@ -122,7 +124,7 @@
// The username and password parameters are not being
// used here. Those are the "" parameters you see below.
- String url = remoteRepo.getArtifactPath( dep );
+ String url = remoteRepo.getBasedir() + "/" +
remoteRepo.getArtifactPath( dep );
if ( !url.startsWith( "file" ) )
{
1.6 +6 -1
maven-components/maven-mboot2/src/main/java/model/Dependency.java
Index: Dependency.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/model/Dependency.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Dependency.java 4 Apr 2005 05:08:45 -0000 1.5
+++ Dependency.java 4 Apr 2005 05:23:01 -0000 1.6
@@ -194,4 +194,9 @@
return false;
}
+
+ public String toString()
+ {
+ return getId() + ":" + getVersion() + ":" + getType();
+ }
}
1.4 +13 -3
maven-components/maven-mboot2/src/main/java/model/ModelReader.java
Index: ModelReader.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/model/ModelReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModelReader.java 4 Apr 2005 05:08:45 -0000 1.3
+++ ModelReader.java 4 Apr 2005 05:23:01 -0000 1.4
@@ -20,6 +20,8 @@
import org.xml.sax.SAXException;
import util.AbstractReader;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -169,9 +171,17 @@
ModelReader p = new ModelReader( localRepository );
- if ( !p.parse( localRepository.getArtifactFile( parentGroupId,
parentArtifactId, parentVersion, "pom" ) ) )
+ try
{
- throw new SAXException( "Could not parse parent pom.xml" );
+ p.parse( localRepository.getArtifactFile( parentGroupId,
parentArtifactId, parentVersion, "pom" ) );
+ }
+ catch ( ParserConfigurationException e )
+ {
+ throw new SAXException( "Error getting parent POM", e );
+ }
+ catch ( IOException e )
+ {
+ throw new SAXException( "Error getting parent POM", e );
}
dependencies.addAll( p.getDependencies() );
1.2 +19 -5
maven-components/maven-mboot2/src/main/java/model/Repository.java
Index: Repository.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/model/Repository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Repository.java 4 Apr 2005 05:08:45 -0000 1.1
+++ Repository.java 4 Apr 2005 05:23:01 -0000 1.2
@@ -26,10 +26,12 @@
*/
public class Repository
{
- private String basedir;
-
public static final String LAYOUT_LEGACY = "legacy";
+ public static final String LAYOUT_DEFAULT = "default";
+
+ private String basedir;
+
private String layout = LAYOUT_LEGACY;
public Repository()
@@ -65,6 +67,12 @@
repositoryPath = dependency.getArtifactDirectory() + "/" +
dependency.getType() + "s/" +
dependency.getArtifact();
}
+ else if ( LAYOUT_DEFAULT.equals( layout ) )
+ {
+ String pathGroup = dependency.getGroupId().replace( '.', '/' );
+ repositoryPath = pathGroup + "/" + dependency.getArtifactId() +
"/" + dependency.getVersion();
+ repositoryPath = repositoryPath + "/" + dependency.getArtifact();
+ }
else
{
throw new IllegalStateException( "Unknown layout: " + layout );
@@ -74,12 +82,18 @@
public File getMetadataFile( String groupId, String artifactId, String
version, String type, String filename )
{
- Dependency d = new Dependency( groupId, artifactId, version, type );
+ Dependency dependency = new Dependency( groupId, artifactId,
version, type );
String repositoryPath;
if ( LAYOUT_LEGACY.equals( layout ) )
{
- repositoryPath = d.getArtifactDirectory() + "/poms/" + filename;
+ repositoryPath = dependency.getArtifactDirectory() + "/poms/" +
filename;
+ }
+ else if ( LAYOUT_DEFAULT.equals( layout ) )
+ {
+ String pathGroup = dependency.getGroupId().replace( '.', '/' );
+ repositoryPath = pathGroup + "/" + dependency.getArtifactId() +
"/" + dependency.getVersion();
+ repositoryPath = repositoryPath + "/" + filename;
}
else
{
1.2 +10 -17
maven-components/maven-mboot2/src/main/java/util/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-mboot2/src/main/java/util/AbstractReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractReader.java 4 Apr 2005 01:36:58 -0000 1.1
+++ AbstractReader.java 4 Apr 2005 05:23:01 -0000 1.2
@@ -17,13 +17,16 @@
*/
import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import java.io.File;
import java.io.FileInputStream;
+import java.io.IOException;
/**
* Parse an XML file.
@@ -35,26 +38,16 @@
{
private SAXParserFactory saxFactory;
- public boolean parse( File file )
+ public void parse( File file )
+ throws ParserConfigurationException, SAXException, IOException
{
- try
- {
- saxFactory = SAXParserFactory.newInstance();
+ saxFactory = SAXParserFactory.newInstance();
- SAXParser parser = saxFactory.newSAXParser();
+ SAXParser parser = saxFactory.newSAXParser();
- InputSource is = new InputSource( new FileInputStream( file ) );
+ InputSource is = new InputSource( new FileInputStream( file ) );
- parser.parse( is, this );
-
- return true;
- }
- catch ( Exception e )
- {
- e.printStackTrace();
-
- return false;
- }
+ parser.parse( is, this );
}
public void warning( SAXParseException spe )
1.87 +15 -25 maven-components/maven-mboot2/src/main/java/MBoot.java
Index: MBoot.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- MBoot.java 4 Apr 2005 05:08:45 -0000 1.86
+++ MBoot.java 4 Apr 2005 05:23:01 -0000 1.87
@@ -254,21 +254,8 @@
}
}
- reader = new ModelReader( localRepository );
-
String basedir = System.getProperty( "user.dir" );
- reader.parse( new File( basedir, "maven-mboot2/pom.xml" ) );
-
- ClassLoader bootstrapClassLoader =
createClassloaderFromDependencies( reader.getDependencies(), null,
-
localRepository );
-
- reader = new ModelReader( localRepository );
- reader.parse( new File( basedir,
"maven-plugins/maven-surefire-plugin/pom.xml" ) );
- List surefireDependencies = reader.getDependencies();
-
- reader = new ModelReader( localRepository );
-
// Install maven-components POM
installPomFile( localRepository, new File( basedir, "pom.xml" ) );
@@ -284,6 +271,19 @@
// Install it-support POM
installPomFile( localRepository, new File( basedir,
"maven-core-it-support/pom.xml" ) );
+ reader = new ModelReader( localRepository );
+
+ reader.parse( new File( basedir, "maven-mboot2/pom.xml" ) );
+
+ ClassLoader bootstrapClassLoader =
createClassloaderFromDependencies( reader.getDependencies(), null,
+
localRepository );
+
+ reader = new ModelReader( localRepository );
+ reader.parse( new File( basedir,
"maven-plugins/maven-surefire-plugin/pom.xml" ) );
+ List surefireDependencies = reader.getDependencies();
+
+ reader = new ModelReader( localRepository );
+
List coreDeps = null;
Dependency corePom = null;
@@ -452,12 +452,7 @@
ModelReader reader = new ModelReader( localRepository );
- if ( !reader.parse( new File( basedir, "pom.xml" ) ) )
- {
- System.err.println( "Could not parse pom.xml" );
-
- System.exit( 1 );
- }
+ reader.parse( new File( basedir, "pom.xml" ) );
String sources = new File( basedir, SOURCES ).getAbsolutePath();
@@ -711,12 +706,7 @@
{
ModelReader reader = new ModelReader( localRepository );
- if ( !reader.parse( pomIn ) )
- {
- System.err.println( "Could not parse pom.xml" );
-
- System.exit( 1 );
- }
+ reader.parse( pomIn );
installPomFile( reader, localRepository, pomIn );
}
1.8 +8 -8 maven-components/maven-mboot2/pom.xml
Index: pom.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot2/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pom.xml 4 Apr 2005 02:57:27 -0000 1.7
+++ pom.xml 4 Apr 2005 05:23:01 -0000 1.8
@@ -13,26 +13,26 @@
<dependencies>
<dependency>
<groupId>org.codehaus.modello</groupId>
- <artifactId>modello</artifactId>
- <version>core-1.0-alpha-1</version>
+ <artifactId>modello-core</artifactId>
+ <version>1.0-alpha-1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.modello</groupId>
- <artifactId>modello</artifactId>
- <version>xdoc-plugin-1.0-alpha-1</version>
+ <artifactId>modello-xdoc-plugin</artifactId>
+ <version>1.0-alpha-1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.modello</groupId>
- <artifactId>modello</artifactId>
- <version>xml-plugin-1.0-alpha-1</version>
+ <artifactId>modello-xml-plugin</artifactId>
+ <version>1.0-alpha-1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.modello</groupId>
- <artifactId>modello</artifactId>
- <version>xpp3-plugin-1.0-alpha-1</version>
+ <artifactId>modello-xpp3-plugin</artifactId>
+ <version>1.0-alpha-1</version>
<scope>runtime</scope>
</dependency>
