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

*** empty log message *** 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163023 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Trygve Laugstol 2004-08-31 23:53:25 +00:00
parent 4d1ac08117
commit bd9e37321c
3 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-repository-tools/src/main/java/org/apache/maven/converter/Maven1Repository.java
View File

@ -23,7 +23,7 @@ public class Maven1Repository
public Iterator getArtifactsByType( String type ) public Iterator getArtifactsByType( String type )
throws Exception throws Exception
{ {
List files = FileUtils.getFiles( getRepository(), "tambora*/" + type + "s/*." + type, "" ); List files = FileUtils.getFiles( getRepository(), "*/" + type + "s/*." + type, "" );
Collections.sort( files ); Collections.sort( files );

44
maven-repository-tools/src/main/java/org/apache/maven/converter/PomV3ToV4Converter.java
View File

@ -23,6 +23,7 @@ package org.apache.maven.converter;
*/ */
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
@ -55,6 +56,10 @@ import org.apache.maven.model.v300.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
/** /**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a> * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
* @version $Id$ * @version $Id$
@ -182,7 +187,14 @@ public class PomV3ToV4Converter
// Group id // Group id
String groupId = v3Model.getGroupId(); String groupId = v3Model.getGroupId();
if( isEmpty( groupId ) && isEmpty( v3ParentModel.getGroupId() ) ) String parentGroupId = null;
if ( v3ParentModel != null )
{
parentGroupId = v3ParentModel.getGroupId();
}
if( isEmpty( groupId ) && isEmpty( parentGroupId ) )
{ {
throw new Exception( "Missing 'groupId' from both pom and the extended pom." ); throw new Exception( "Missing 'groupId' from both pom and the extended pom." );
} }
@ -194,15 +206,18 @@ public class PomV3ToV4Converter
if ( isEmpty( artifactId ) ) if ( isEmpty( artifactId ) )
{ {
throw new Exception( "Missing element 'artifactId'." ); // throw new Exception( "Missing element 'artifactId'." );
v4Model.setArtifactId( groupId );
} }
else
{
v4Model.setArtifactId( artifactId ); v4Model.setArtifactId( artifactId );
}
// Version // Version
String version = v3Model.getCurrentVersion(); String version = v3Model.getCurrentVersion();
if( isEmpty( version ) && isEmpty( v3ParentModel.getCurrentVersion() ) ) if( isEmpty( version ) && (v3ParentModel == null || isEmpty( v3ParentModel.getCurrentVersion() ) ) )
{ {
throw new Exception( "Missing 'currentVersion' from both pom and the extended pom." ); throw new Exception( "Missing 'currentVersion' from both pom and the extended pom." );
} }
@ -301,7 +316,7 @@ public class PomV3ToV4Converter
if ( !extendFile.isFile() ) if ( !extendFile.isFile() )
{ {
throw new Exception( "Could not find the file the pom extends: '" + extendFile.getAbsolutePath() + "' is not a file." ); throw new FileNotFoundException( "Could not find the file the pom extends: '" + extendFile.getAbsolutePath() + "' is not a file." );
} }
// try to find the parent pom. // try to find the parent pom.
@ -797,8 +812,21 @@ public class PomV3ToV4Converter
model = v3Reader.read( new FileReader( inputFile ) ); model = v3Reader.read( new FileReader( inputFile ) );
/* SAXReader r = new SAXReader();
String id = model.getId();
Document d = r.read( new FileReader( inputFile ) );
Element root = d.getRootElement();
Element idElement = root.element( "id" );
String id = null;
if ( idElement != null )
{
id = idElement.getText();
}
// String id = model.getId();
String groupId = model.getGroupId(); String groupId = model.getGroupId();
@ -843,7 +871,7 @@ public class PomV3ToV4Converter
model.setArtifactId( artifactId ); model.setArtifactId( artifactId );
} }
} }
*/ /**/
return model; return model;
} }

14
maven-repository-tools/src/main/java/org/apache/maven/converter/RepoReaper.java
View File

@ -17,12 +17,15 @@ package org.apache.maven.converter;
*/ */
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.util.Iterator; import java.util.Iterator;
import org.apache.maven.model.Model; import org.apache.maven.model.Model;
import org.codehaus.plexus.embed.ArtifactEnabledEmbedder; import org.codehaus.plexus.embed.ArtifactEnabledEmbedder;
import org.xmlpull.v1.XmlPullParserException;
/** /**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l </a> * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l </a>
* @version $Id$ * @version $Id$
@ -110,6 +113,14 @@ public class RepoReaper
{ {
warning( "Could not parse: '" + pomPath + "'."); warning( "Could not parse: '" + pomPath + "'.");
if ( ex instanceof XmlPullParserException ||
ex instanceof FileNotFoundException )
{
warning( " " + ex.getMessage() );
}
else
{
/*
Throwable t = ex; Throwable t = ex;
while ( t != null ) while ( t != null )
@ -118,6 +129,9 @@ public class RepoReaper
t = t.getCause(); t = t.getCause();
} }
*/
ex.printStackTrace( System.err );
}
continue; continue;
} }