You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/09 23:56:50 UTC
cvs commit: maven-components/maven-project/src/main/resources/org/apache/maven/project pom.xml super-model.xml
jvanzyl 2004/06/09 14:56:50
Modified: maven-project/src/main/java/org/apache/maven/artifact
AbstractMavenArtifact.java
maven-project/src/main/java/org/apache/maven/artifact/collector
ArtifactCollectionResult.java
maven-project/src/main/java/org/apache/maven/artifact/downloader
DefaultArtifactDownloader.java
maven-project/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
Added: maven-project/src/main/resources/org/apache/maven/project
pom.xml
Removed: maven-project/src/main/resources/org/apache/maven/project
super-model.xml
Log:
Revision Changes Path
1.8 +0 -9 maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java
Index: AbstractMavenArtifact.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractMavenArtifact.java 17 May 2004 21:11:34 -0000 1.7
+++ AbstractMavenArtifact.java 9 Jun 2004 21:56:50 -0000 1.8
@@ -71,7 +71,6 @@
return getPath() + ".md5";
}
-
public String generatePath()
{
@@ -106,8 +105,6 @@
{
return getUrlPath() + ".snapshot-version";
}
-
-
public String getArtifactDirectory( Dependency d )
{
@@ -150,7 +147,6 @@
return new File( getPath() );
}
-
public File getChecksumFile()
{
return new File( getChecksumPath() );
@@ -160,19 +156,14 @@
{
return new File( getSnapshotVersionPath() );
}
-
-
public String getExtension()
{
return dependency.getType();
}
-
-
public boolean equals( Object obj )
{
-
MavenArtifact other = ( MavenArtifact ) obj;
Dependency otherDependency = other.getDependency();
1.6 +1 -9 maven-components/maven-project/src/main/java/org/apache/maven/artifact/collector/ArtifactCollectionResult.java
Index: ArtifactCollectionResult.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/collector/ArtifactCollectionResult.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ArtifactCollectionResult.java 18 May 2004 19:39:46 -0000 1.5
+++ ArtifactCollectionResult.java 9 Jun 2004 21:56:50 -0000 1.6
@@ -9,19 +9,11 @@
*/
public class ArtifactCollectionResult
{
- /** Map<String,MavenArtifact> */
private Map artifacts;
-
- /**
- * Map<String, List<MavenArtifact>>
- *
- */
private Map conflicts;
- /** Map<String,MavenArtifact> */
private Map artifactsWithoutPoms;
-
public ArtifactCollectionResult()
{
1.10 +55 -77 maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloader.java
Index: DefaultArtifactDownloader.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultArtifactDownloader.java 8 Jun 2004 17:13:13 -0000 1.9
+++ DefaultArtifactDownloader.java 9 Jun 2004 21:56:50 -0000 1.10
@@ -24,66 +24,59 @@
* @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
*/
-public class DefaultArtifactDownloader extends AbstractLogEnabled implements ArtifactDownloader
+public class DefaultArtifactDownloader
+ extends AbstractLogEnabled
+ implements ArtifactDownloader
{
-
private WagonManager wagonManager;
-
- /**
- *
- */
+
private MavenArtifactFactory artifactFactory;
-
+ public boolean getRemoteArtifact( MavenArtifact artifact, List repositories )
+ {
+ boolean downloaded = false;
+
+ for ( Iterator iter = repositories.iterator(); iter.hasNext(); )
+ {
+ try
+ {
+ Repository repository = (Repository) iter.next();
+
+ downloaded = getRemoteArtifact( artifact, repository );
+
+ if ( downloaded )
+ {
+ break;
+ }
+ }
+ catch ( Exception e )
+ {
+ continue;
+ }
+ }
- public boolean getRemoteArtifact( MavenArtifact artifact, List repositories )
- {
- boolean downloaded = false;
-
- for ( Iterator iter = repositories.iterator(); iter.hasNext(); )
- {
- try
- {
- Repository repository = ( Repository ) iter.next( );
-
- downloaded = getRemoteArtifact( artifact, repository );
-
- if ( downloaded )
- {
- break;
- }
- }
- catch ( Exception e )
- {
- continue;
- }
- }
-
- return downloaded;
- }
-
+ return downloaded;
+ }
- public boolean getRemoteArtifact( MavenArtifact artifact, Repository repository )
+ public boolean getRemoteArtifact( MavenArtifact artifact, Repository repository )
{
Wagon wagon = null;
-
+
try
{
org.apache.maven.wagon.repository.Repository wagonRepository = RepositoryUtils.mavenRepositoryToWagonRepository( repository );
wagon = wagonManager.getWagon( wagonRepository.getProtocol() );
-
- wagon.connect( wagonRepository );
-
+
+ wagon.connect( wagonRepository );
+
return getRemoteArtifact( artifact, wagon );
-
}
catch ( Exception e )
{
-
//@todo improve error handling and reporting
getLogger().info( "Failed to download: " + artifact.getUrlPath() + " from " + repository.getUrl() );
-
+
return false;
}
finally
@@ -92,28 +85,23 @@
{
try
{
- wagonManager.releaseWagon( wagon );
+ wagonManager.releaseWagon( wagon );
}
- catch( Exception e )
+ catch ( Exception e )
{
- getLogger().error( "Failed to release wagon", e );
+ getLogger().error( "Failed to release wagon", e );
}
}
}
}
- /**
- * @param wagon
- * @param artifact
- */
- public boolean getRemoteArtifact( MavenArtifact artifact, Wagon wagon )
+ public boolean getRemoteArtifact( MavenArtifact artifact, Wagon wagon )
{
-
getLogger().info( "Trying to download: " + artifact.getUrlPath() + " from " + wagon.getRepository().getUrl() );
-
+
String source = artifact.getUrlPath();
-
- File file = artifact.getFile( );
+
+ File file = artifact.getFile();
// V A L I D A T I O N
// Thats just a sketch of things we can do with wagon api
@@ -129,9 +117,9 @@
// of this operation will be hidden.
//
ChecksumObserver md5SumObserver = new ChecksumObserver();
-
- wagon.addTransferListener( md5SumObserver );
-
+
+ wagon.addTransferListener( md5SumObserver );
+
try
{
wagon.get( source, file );
@@ -139,42 +127,32 @@
catch ( TransferFailedException e )
{
getLogger().info( "IO error occred while transfering " + artifact.getUrlPath() + " from " + wagon.getRepository().getUrl() );
-
+
return false;
}
catch ( ResourceDoesNotExistException e )
{
-
getLogger().info( artifact.getUrlPath() + " was not found in " + wagon.getRepository().getUrl() );
-
- return false;
-
+
+ return false;
}
catch ( AuthorizationException e )
{
getLogger().info( "Np permission for dowloading: " + artifact.getUrlPath() + " from " + wagon.getRepository().getUrl() );
-
+
return false;
- }
+ }
finally
{
- wagon.removeTransferListener( md5SumObserver );
+ wagon.removeTransferListener( md5SumObserver );
}
-
+
getLogger().info( "Actual md5 : " + md5SumObserver.getActualChecksum() );
-
+
getLogger().info( "Expected md5: " + md5SumObserver.getExpectedChecksum() );
-
+
getLogger().info( "md5 is valid: " + md5SumObserver.cheksumIsValid() );
-
+
return true;
-
}
-
-
-
-
-
-
-
}
1.21 +26 -26 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultMavenProjectBuilder.java 8 Jun 2004 21:38:44 -0000 1.20
+++ DefaultMavenProjectBuilder.java 9 Jun 2004 21:56:50 -0000 1.21
@@ -16,18 +16,9 @@
* limitations under the License.
*/
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.maven.artifact.MavenArtifact;
-import org.apache.maven.artifact.collector.ArtifactCollector;
import org.apache.maven.artifact.collector.ArtifactCollectionResult;
+import org.apache.maven.artifact.collector.ArtifactCollector;
import org.apache.maven.artifact.factory.MavenArtifactFactory;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
@@ -35,7 +26,6 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.wagon.manager.WagonManager;
-
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.CollectionUtils;
@@ -44,11 +34,25 @@
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
public class DefaultMavenProjectBuilder
extends AbstractLogEnabled
implements MavenProjectBuilder, Initializable
{
- // configuration
private MavenXpp3Writer modelWriter;
private MavenXpp3Reader modelReader;
@@ -71,7 +75,7 @@
modelReader = new MavenXpp3Reader();
- superModel = modelReader.read( new InputStreamReader( DefaultMavenProjectBuilder.class.getResourceAsStream( "super-model.xml" ) ) );
+ superModel = modelReader.read( new InputStreamReader( DefaultMavenProjectBuilder.class.getResourceAsStream( "pom.xml" ) ) );
}
public MavenProject build( File projectDescriptor )
@@ -85,7 +89,7 @@
{
// michal: I set it to false as this is backward compatible.
// I think that this method should be revoved and version with 3 params should be used exclusivly
- boolean followTransitiveDeps = true;
+ boolean followTransitiveDeps = true;
return build( projectDescriptor, useParentPom, followTransitiveDeps );
}
@@ -114,12 +118,11 @@
if ( followTransitiveDeps )
{
- ArtifactCollectionResult result = artifactCollector.collect( project, this );
+ ArtifactCollectionResult result = artifactCollector.collect( project, this );
project.getArtifacts().addAll( result.getArtifacts().values() );
-
}
-
+
project.initialize();
return project;
@@ -168,17 +171,17 @@
}
else if ( parentModel != null && useParentPom )
{
- if( isEmpty( parentModel.getArtifactId() ) )
+ if ( isEmpty( parentModel.getArtifactId() ) )
{
throw new ProjectBuildingException( "Missing artifact id element from parent element" );
}
- if( isEmpty( parentModel.getGroupId() ) )
+ if ( isEmpty( parentModel.getGroupId() ) )
{
throw new ProjectBuildingException( "Missing group id element from parent element" );
}
- if( isEmpty( parentModel.getVersion() ) )
+ if ( isEmpty( parentModel.getVersion() ) )
{
throw new ProjectBuildingException( "Missing version element from parent element" );
}
@@ -199,10 +202,9 @@
/**
* @todo throw something more specific then java.lang.Exception
- *
*/
private Model readModel( File projectDescriptor )
- throws Exception
+ throws Exception
{
Reader reader = null;
@@ -220,17 +222,15 @@
{
if ( reader != null )
{
-
try
{
reader.close();
}
- catch (IOException e)
+ catch ( IOException e )
{
- // ignore
+ // ignore
}
}
-
}
}
1.1 maven-components/maven-project/src/main/resources/org/apache/maven/project/pom.xml
Index: pom.xml
===================================================================
<project>
<modelVersion>3</modelVersion>
<repositories>
<repository>
<id>central</id>
<name>Maven Central Repository at ibiblio</name>
<url>http://www.ibiblio.org/maven</url>
</repository>
</repositories>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/*Abstract*.java</exclude>
</excludes>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
</resources>
</unitTest>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>