Author: ogusakov
Date: Tue Feb 10 02:50:55 2009
New Revision: 742835
URL: http://svn.apache.org/viewvc?rev=742835&view=rev
Log:
[MERCURY-93] intermediate commit: multiple issues fixed, new tests
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar.sha1
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom
(with props)
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom.sha1
maven/mercury/trunk/mercury-maven/etc/
maven/mercury/trunk/mercury-maven/etc/maven/
maven/mercury/trunk/mercury-maven/etc/maven/private-repository/
maven/mercury/trunk/mercury-maven/list-plugins.txt (with props)
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/${basedir}/
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/${basedir}/etc/
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/${basedir}/etc/maven/
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/${basedir}/etc/maven/private-repository/
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/etc/
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/etc/maven/
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/etc/maven/private-repository/
maven/mercury/trunk/mercury-maven/results.html (with props)
Removed:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryTest.java
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-maven/list-.txt
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/c
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java
maven/mercury/trunk/mercury-maven/repositories.properties
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
(original)
+++
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
Tue Feb 10 02:50:55 2009
@@ -25,13 +25,16 @@
import java.util.HashSet;
import java.util.List;
+import org.apache.maven.mercury.MavenDependencyProcessor;
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.ArtifactExclusionList;
+import org.apache.maven.mercury.artifact.ArtifactInclusionList;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.artifact.DefaultArtifact;
+import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
import org.apache.maven.mercury.crypto.sha.SHA1VerifierFactory;
@@ -45,6 +48,7 @@
import org.apache.maven.mercury.util.FileUtil;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
*
@@ -100,7 +104,7 @@
throws Exception
{
super.setUp();
-
+
// prep. Artifact
File artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
FileUtil.writeRawData( getClass().getResourceAsStream(
"/maven-core-2.0.9.jar" ), artifactBinary );
@@ -134,8 +138,10 @@
localRepoDir = new File( "./target/local" );
FileUtil.delete( localRepoDir );
localRepoDir.mkdirs();
+//
+// localRepo = new LocalRepositoryM2( "testLocalRepo", localRepoDir,
pm.findDependencyProcessor() );
- localRepo = new LocalRepositoryM2( "testLocalRepo", localRepoDir,
pm.findDependencyProcessor() );
+ localRepo = pm.constructLocalRepositoryM2( "testLocal", localRepoDir,
null, null, null, null );
repos = new ArrayList<Repository>();
repos.add( localRepo );
@@ -174,9 +180,28 @@
return false;
}
//-------------------------------------------------------------------------------------
- public void testDummy()
+ public void testFindDepProcessorWithHint()
+ throws RepositoryException, ComponentLookupException
+ {
+ DependencyProcessor dp = null;
+
+ dp = pm.findDependencyProcessor("default");
+
+ assertNotNull( dp );
+
+ assertTrue( MavenDependencyProcessor.class.isAssignableFrom(
dp.getClass() ) );
+ }
+
//-------------------------------------------------------------------------------------
+ public void testFindDepProcessor() // should run after the previous one
+ throws RepositoryException, ComponentLookupException
{
- System.out.println("Have to disable plexus tests - need to fix
maven-mercury first");
+ DependencyProcessor dp = null;
+
+ dp = pm.findDependencyProcessor();
+
+ assertNotNull( dp );
+
+ assertTrue( MavenDependencyProcessor.class.isAssignableFrom(
dp.getClass() ) );
}
//-------------------------------------------------------------------------------------
public void testWrite()
@@ -189,6 +214,31 @@
assertTrue( af.exists() );
}
//-------------------------------------------------------------------------------------
+ public void testReadVersions()
+ throws RepositoryException
+ {
+ ArtifactMetadata bmd = new ArtifactMetadata(artifactCoord);
+
+ List<ArtifactBasicMetadata> res = pm.readVersions( repos, bmd );
+
+ assertNotNull( res );
+
+ assertFalse( res.isEmpty() );
+
+ ArtifactBasicMetadata a = res.get( 0 );
+
+ assertEquals( "1.0.0-alpha-2-20081104.001322-2", a.getVersion() );
+
+ List<Artifact> al = pm.read( repos, a );
+
+ assertNotNull( al );
+
+ assertFalse( al.isEmpty() );
+
+ assertEquals( 1, al.size() );
+
+ }
+
//-------------------------------------------------------------------------------------
public void testRead()
throws RepositoryException
{
@@ -272,13 +322,13 @@
}
//-------------------------------------------------------------------------------------
@SuppressWarnings("unchecked")
- public void ntestResolveWithExclusion()
+ public void testResolveWithExclusion()
throws Exception
{
- Server central = new Server( "central", new
URL("http://repo1.maven.org/maven2";) );
+// Server central = new Server( "central", new
URL("http://repo1.maven.org/maven2";) );
// Server central = new Server( "central", new
URL("http://repository.sonatype.org/content/groups/public";) );
- repos.add( new RemoteRepositoryM2(central, pm.findDependencyProcessor()) );
+// repos.add( new RemoteRepositoryM2(central, pm.findDependencyProcessor())
);
String artifactId = "asm:asm-xml:3.0";
@@ -299,5 +349,33 @@
assertFalse( assertHasArtifact( res, "asm:asm:3.0" ) );
}
//-------------------------------------------------------------------------------------
+ @SuppressWarnings("unchecked")
+ public void testResolveWithInclusion()
+ throws Exception
+ {
+// Server central = new Server( "central", new
URL("http://repo1.maven.org/maven2";) );
+// Server central = new Server( "central", new
URL("http://repository.sonatype.org/content/groups/public";) );
+
+// repos.add( new RemoteRepositoryM2(central, pm.findDependencyProcessor())
);
+
+ String artifactId = "asm:asm-xml:3.0";
+
+ List<ArtifactMetadata> res = pm.resolve( repos
+ , ArtifactScopeEnum.compile
+ , new ArtifactQueryList(artifactId)
+ , new
ArtifactInclusionList("asm:asm-xml:3.0","asm:asm-util:3.0")
+ , null
+ );
+
+ System.out.println("Resolved as "+res);
+
+ assertEquals( 2, res.size() );
+
+ assertTrue( assertHasArtifact( res, "asm:asm-xml:3.0" ) );
+ assertTrue( assertHasArtifact( res, "asm:asm-util:3.0" ) );
+ assertFalse( assertHasArtifact( res, "asm:asm-tree:3.0" ) );
+ assertFalse( assertHasArtifact( res, "asm:asm:3.0" ) );
+ }
+
//-------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------
}
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom
Tue Feb 10 02:50:55 2009
@@ -0,0 +1,91 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.0</version>
+ <packaging>pom</packaging>
+
+ <name>ASM</name>
+ <description>A very small and fast Java bytecode manipulation
framework</description>
+ <url>http://asm.objectweb.org/</url>
+
+ <organization>
+ <name>ObjectWeb</name>
+ <url>http://www.objectweb.org/</url>
+ </organization>
+ <inceptionYear>2000</inceptionYear>
+
+ <developers>
+ <developer>
+ <name>Eric Bruneton</name>
+ <id>ebruneton</id>
+ <email>[email protected]</email>
+ <roles>
+ <role>Creator</role>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Eugene Kuleshov</name>
+ <id>eu</id>
+ <email>[email protected]</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <scm>
+
<connection>scm:cvs:pserver:[email protected]:/cvsroot/asm:asm</connection>
+
<developerConnection>scm:cvs:ext:${[email protected]:/cvsroot/asm:asm</developerConnection>
+ <url>http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/asm/</url>
+ </scm>
+
+ <issueManagement>
+ <url>http://forge.objectweb.org/tracker/?group_id=23</url>
+ </issueManagement>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <artifactId>asm</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-tree</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-analysis</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-commons</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-util</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-xml</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-parent/3.0/asm-parent-3.0.pom.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+526bfebc865ac047ff3fa7d77924a4edff7ba468
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar?rev=742835&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.jar.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+6fff655717d1e1871decfe9f8e46a531e8df3a31
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom
Tue Feb 10 02:50:55 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>asm-tree</artifactId>
+ <name>ASM Tree</name>
+ <version>3.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-tree/3.0/asm-tree-3.0.pom.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+ab6cd3767b9d74674add377f571dc6fb28c867f9
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar?rev=742835&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.jar.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+948516ecc11fe78bc373aa68626d64bc51321a26
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom
Tue Feb 10 02:50:55 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>asm-util</artifactId>
+ <name>ASM Util</name>
+ <version>3.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-util/3.0/asm-util-3.0.pom.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+93889a96e9d131986748858c5530c36990f4efff
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar?rev=742835&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.jar.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+f37fac6e8563334d0d6960fec5c5cdaf65c69b6f
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom
Tue Feb 10 02:50:55 2009
@@ -0,0 +1,20 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>asm-xml</artifactId>
+ <name>ASM XML</name>
+ <version>3.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm-xml/3.0/asm-xml-3.0.pom.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+e4f53862352dcbeab566b761283dd94c30326943
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar?rev=742835&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.jar.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+d1616c03f056291a2314510dea75739b15b4d415
\ No newline at end of file
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom
Tue Feb 10 02:50:55 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0"?><project>
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>asm</artifactId>
+ <name>ASM Core</name>
+ <version>3.0</version>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+</project>
\ No newline at end of file
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom.sha1
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom.sha1?rev=742835&view=auto
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom.sha1
(added)
+++
maven/mercury/trunk/mercury-it/src/test/resources/remoteRepo/asm/asm/3.0/asm-3.0.pom.sha1
Tue Feb 10 02:50:55 2009
@@ -0,0 +1 @@
+b48a64347352256722f848007cfe92939ec04747
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-maven/list-.txt
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/list-.txt?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/list-.txt (original)
+++ maven/mercury/trunk/mercury-maven/list-.txt Tue Feb 10 02:50:55 2009
@@ -1,29 +1,8 @@
asm:asm-xml:3.0
org.apache.maven.plugins:maven-antrun-plugin:1.2
-org.apache.maven.plugins:maven-archetypeng-plugin:2.0
org.apache.maven.plugins:maven-assembly-plugin:2.1
org.apache.maven.plugins:maven-changelog-plugin:2.1
org.apache.maven.plugins:maven-checkstyle-plugin:2.1
org.apache.maven.plugins:maven-clean-plugin:2.2
org.apache.maven.plugins:maven-compiler-plugin:2.0.2
-org.apache.maven.plugins:maven-dependency-plugin:2.0
-org.apache.maven.plugins:maven-deploy-plugin:2.4
-org.apache.maven.plugins:maven-ear-plugin:2.3.1
-org.apache.maven.plugins:maven-eclipse-plugin:2.4
-org.apache.maven.plugins:maven-ejb-plugin:2.1
-org.apache.maven.plugins:maven-help-plugin:2.0.2
-org.apache.maven.plugins:maven-install-plugin:2.2
-org.apache.maven.plugins:maven-jar-plugin:2.2
-org.apache.maven.plugins:maven-javadoc-plugin:2.4
-org.apache.maven.plugins:maven-jxr-plugin:2.1
-org.apache.maven.plugins:maven-plugin-parent:2.0.1
-org.apache.maven.plugins:maven-plugin-plugin:2.4.3
-org.apache.maven.plugins:maven-pmd-plugin:2.4
-org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1
-org.apache.maven.plugins:maven-rar-plugin:2.2
-org.apache.maven.plugins:maven-remote-resources-plugin:1.0
-org.apache.maven.plugins:maven-resources-plugin:2.3
-org.apache.maven.plugins:maven-shade-plugin:1.1
-org.apache.maven.plugins:maven-source-plugin:2.0.4
-org.apache.maven.plugins:maven-surefire-plugin:2.4.3
org.apache.maven.plugins:maven-surefire-report-plugin:2.4.3
Added: maven/mercury/trunk/mercury-maven/list-plugins.txt
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/list-plugins.txt?rev=742835&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/list-plugins.txt (added)
+++ maven/mercury/trunk/mercury-maven/list-plugins.txt Tue Feb 10 02:50:55 2009
@@ -0,0 +1,29 @@
+asm:asm-xml:3.0
+org.apache.maven.plugins:maven-antrun-plugin:1.2
+org.apache.maven.plugins:maven-archetypeng-plugin:2.0
+org.apache.maven.plugins:maven-assembly-plugin:2.1
+org.apache.maven.plugins:maven-changelog-plugin:2.1
+org.apache.maven.plugins:maven-checkstyle-plugin:2.1
+org.apache.maven.plugins:maven-clean-plugin:2.2
+org.apache.maven.plugins:maven-compiler-plugin:2.0.2
+org.apache.maven.plugins:maven-dependency-plugin:2.0
+org.apache.maven.plugins:maven-deploy-plugin:2.4
+org.apache.maven.plugins:maven-ear-plugin:2.3.1
+org.apache.maven.plugins:maven-eclipse-plugin:2.4
+org.apache.maven.plugins:maven-ejb-plugin:2.1
+org.apache.maven.plugins:maven-help-plugin:2.0.2
+org.apache.maven.plugins:maven-install-plugin:2.2
+org.apache.maven.plugins:maven-jar-plugin:2.2
+org.apache.maven.plugins:maven-javadoc-plugin:2.4
+org.apache.maven.plugins:maven-jxr-plugin:2.1
+org.apache.maven.plugins:maven-plugin-parent:2.0.1
+org.apache.maven.plugins:maven-plugin-plugin:2.4.3
+org.apache.maven.plugins:maven-pmd-plugin:2.4
+org.apache.maven.plugins:maven-project-info-reports-plugin:2.0.1
+org.apache.maven.plugins:maven-rar-plugin:2.2
+org.apache.maven.plugins:maven-remote-resources-plugin:1.0
+org.apache.maven.plugins:maven-resources-plugin:2.3
+org.apache.maven.plugins:maven-shade-plugin:1.1
+org.apache.maven.plugins:maven-source-plugin:2.0.4
+org.apache.maven.plugins:maven-surefire-plugin:2.4.3
+org.apache.maven.plugins:maven-surefire-report-plugin:2.4.3
Propchange: maven/mercury/trunk/mercury-maven/list-plugins.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-maven/list-plugins.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/c Tue Feb 10
02:50:55 2009
@@ -1 +1,2 @@
-mvn -e -s s.xml
org.sonatype.maven.plugins:mercury-compare-maven-plugin:1.0:deps
-DtargetDir=../deps -DlistFile=../list.txt -DlocalRepo=../localRepoMaven
+mvn -e -s s.xml
org.sonatype.maven.plugins:mercury-compare-maven-plugin:1.0-alpha-5-SNAPSHOT:deps
-DtargetDir=../deps -DlistFile=../list.txt -DlocalRepo=../localRepoMaven
+#mvn -e -s s.xml
org.sonatype.maven.plugins:mercury-compare-maven-plugin:1.0-alpha-5-SNAPSHOT:deps
-DtargetDir=../deps -DlistFile=../list.txt -DlocalRepo=/app/maven.repo
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
(original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml Tue
Feb 10 02:50:55 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0-alpha-5-SNAPSHOT</version>
</parent>
<groupId>org.sonatype.maven.plugins</groupId>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml
(original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/s.xml Tue
Feb 10 02:50:55 2009
@@ -22,7 +22,12 @@
<settings>
+<!--
<localRepository>/app/src/asf/maven/mercury/trunk/mercury-maven/localRepoMaven</localRepository>
+ <localRepository>/app/maven.repo</localRepository>
+-->
+
<localRepository>/app/src/asf/maven/mercury/trunk/mercury-maven/localRepoMaven</localRepository>
+
<profiles>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml Tue Feb 10
02:50:55 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0-alpha-5-SNAPSHOT</version>
</parent>
<artifactId>mercury-compare-mdo</artifactId>
@@ -79,4 +79,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mercury/c
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/c?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mercury/c (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mercury/c Tue Feb 10
02:50:55 2009
@@ -1 +1 @@
-mvnDebug -X org.sonatype.maven.plugins:mercury-compare-plugin:1.0-test:compare
-DlocalFileDir=./target/repo
+mvnDebug -X
org.sonatype.maven.plugins:mercury-compare-plugin:1.0-alpha-5-SNAPSHOT:compare
-DlocalFileDir=./target/repo
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml Tue Feb
10 02:50:55 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0-alpha-5-SNAPSHOT</version>
</parent>
<groupId>org.sonatype.maven.plugins</groupId>
@@ -45,7 +45,7 @@
</developers>
<properties>
- <maven.version>3.0-alpha-1</maven.version>
+ <maven.version>3.0-SNAPSHOT</maven.version>
</properties>
<dependencies>
Modified:
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java
(original)
+++
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/src/main/java/org/sonatype/maven/plugins/mercury/compare/MercuryResolve.java
Tue Feb 10 02:50:55 2009
@@ -55,8 +55,8 @@
implements IDepResolver
{
static final String SYSTEM_PROPERTY_LOCAL_REPO = "localRepo";
- static final String localRepoDir = System.getProperty(
SYSTEM_PROPERTY_LOCAL_REPO, "../localRepoMercury" );
-// static final String localRepoDir = System.getProperty(
SYSTEM_PROPERTY_LOCAL_REPO, "../localRepoMaven" );
+// static final String localRepoDir = System.getProperty(
SYSTEM_PROPERTY_LOCAL_REPO, "../localRepoMercury" );
+ static final String localRepoDir = System.getProperty(
SYSTEM_PROPERTY_LOCAL_REPO, "/app/maven.repo" );
static final File localRepoDirFile = new File( localRepoDir );
static final String SYSTEM_PROPERTY_LIST_FILE = "list";
@@ -121,6 +121,7 @@
}
depBuilder = DependencyBuilderFactory.create(
DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos, null, null, null );
+// depBuilder.register( new DumbListener() );
DataBuilder.visitDeps( listFile, mc );
@@ -162,10 +163,18 @@
MetadataTreeNode.showNode( root, 0 );
long ll = System.currentTimeMillis();
- System.out.println("BuildTree: " + (ll - start) );
+ long interval = ll - start;
+ int count = root.countNodes();
+ long timePerNode = count == 0L ? 0 : interval / count;
+
+ System.out.println("BuildTree: " + (ll - start)+" ms, " + count + " nodes,
" + timePerNode+ " ms per node" );
List<ArtifactMetadata> dl = depBuilder.resolveConflicts( root );
- System.out.println("resolveDeps: " + (System.currentTimeMillis() - ll) );
+ interval = System.currentTimeMillis() - ll;
+ count = dl == null ? 0 : dl.size();
+ timePerNode = count == 0L ? 0 : interval / count;
+
+ System.out.println("resolveDeps: " + interval+ " ms, "+ count+" nodes, "+
timePerNode+" ms per node" );
File df = DataBuilder.getFile( targetDirFile, bmd.getGroupId(),
bmd.getArtifactId(), bmd.getVersion(), bmd.getType() );
@@ -176,7 +185,9 @@
if( df.exists() )
{
deps = DataBuilder.read( df );
+
List l = deps.getMercury();
+
if( !Util.isEmpty( l ) )
l.clear();
}
@@ -192,17 +203,18 @@
deps.setMercuryMillis( System.currentTimeMillis() - start );
- for( ArtifactMetadata am : dl )
- {
- Dependency dep = new Dependency();
- dep.setGroupId( am.getGroupId() );
- dep.setArtifactId( am.getArtifactId() );
- dep.setVersion( am.getVersion() );
- dep.setType( am.getType() );
- dep.setScope( am.getScope() );
-
- deps.addMercury( dep );
- }
+ if(dl != null)
+ for( ArtifactMetadata am : dl )
+ {
+ Dependency dep = new Dependency();
+ dep.setGroupId( am.getGroupId() );
+ dep.setArtifactId( am.getArtifactId() );
+ dep.setVersion( am.getVersion() );
+ dep.setType( am.getType() );
+ dep.setScope( am.getScope() );
+
+ deps.addMercury( dep );
+ }
DataBuilder.write( deps, df );
Modified: maven/mercury/trunk/mercury-maven/repositories.properties
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/repositories.properties?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/repositories.properties (original)
+++ maven/mercury/trunk/mercury-maven/repositories.properties Tue Feb 10
02:50:55 2009
@@ -16,8 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
-#sona.central=http://repository.sonatype.org/content/groups/public
-maven.central=http://repo1.maven.org/maven2
+sona.central=http://repository.sonatype.org/content/groups/public
+#maven.central=http://repo1.maven.org/maven2
#codehaus.snapshots=http://snapshots.repository.codehaus.org
#apache.snapshots=http://people.apache.org/repo/m2-snapshot-repository
#codehaus.releases=http://repository.codehaus.org
Added: maven/mercury/trunk/mercury-maven/results.html
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/results.html?rev=742835&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-maven/results.html (added)
+++ maven/mercury/trunk/mercury-maven/results.html Tue Feb 10 02:50:55 2009
@@ -0,0 +1,378 @@
+<html><body><table border='1'><tr><th
colspan='2'>vdoclet:vdoclet:20070127::jar</th></tr>
+
+<tr><th>Maven: 5 deps in 14201 millis</th><th>Mercury: 5 deps in 1371
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>magicGball:magicGball:0.01234-alpha0::jar</th></tr>
+
+<tr><th>Maven: 2 deps in 3943 millis</th><th>Mercury: 2 deps in 1429
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>asm:asm-util:2.2.1::jar</th></tr>
+
+<tr><th>Maven: 5 deps in 5537 millis</th><th>Mercury: 5 deps in 2740
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>asm:asm-tree:2.2.1::jar</th></tr>
+
+<tr><th>Maven: 2 deps in 1 millis</th><th>Mercury: 2 deps in 6
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>asm:asm-attrs:2.2.1::jar</th></tr>
+
+<tr><th>Maven: 2 deps in 8 millis</th><th>Mercury: 2 deps in 8
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>asm:asm-xml:2.2.1::jar</th></tr>
+
+<tr><th>Maven: 6 deps in 1799 millis</th><th>Mercury: 6 deps in 1119
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>asm:asm-commons:2.2.1::jar</th></tr>
+
+<tr><th>Maven: 2 deps in 1213 millis</th><th>Mercury: 2 deps in 184
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>asm:asm-analysis:2.2.1::jar</th></tr>
+
+<tr><th>Maven: 3 deps in 1 millis</th><th>Mercury: 3 deps in 13
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.0-20050713::jar</th></tr>
+
+<tr><th>Maven: 12 deps in 27569 millis</th><th>Mercury: 14 deps in 4776
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.2.3::jar</th></tr>
+
+<tr><th>Maven: 12 deps in 3450 millis</th><th>Mercury: 14 deps in 329
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.2::jar</th></tr>
+
+<tr><th>Maven: 12 deps in 7245 millis</th><th>Mercury: 14 deps in 700
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.0-M3::jar</th></tr>
+
+<tr><th>Maven: 12 deps in 6352 millis</th><th>Mercury: 14 deps in 1474
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.2.1::jar</th></tr>
+
+<tr><th>Maven: 12 deps in 4777 millis</th><th>Mercury: 14 deps in 229
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.2.2::jar</th></tr>
+
+<tr><th>Maven: 12 deps in 3192 millis</th><th>Mercury: 14 deps in 226
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th colspan='2'>tranql:tranql:1.0-M2::jar</th></tr>
+
+<tr><th>Maven: 11 deps in 5209 millis</th><th>Mercury: 13 deps in 402
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>tranql:tranql-connector:1.1::jar</th></tr>
+
+<tr><th>Maven: 11 deps in 3059 millis</th><th>Mercury: 13 deps in 666
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>tranql:tranql-connector:1.0::jar</th></tr>
+
+<tr><th>Maven: 11 deps in 2101 millis</th><th>Mercury: 13 deps in 397
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>tranql:tranql-connector:1.0-M3::jar</th></tr>
+
+<tr><th>Maven: 11 deps in 2972 millis</th><th>Mercury: 13 deps in 357
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>tranql:tranql-connector:1.0-20050716::jar</th></tr>
+
+<tr><th>Maven: 11 deps in 1973 millis</th><th>Mercury: 13 deps in 242
millis</th></tr><tr>
+
+<td>
+net.java.dev.javacc:javacc:3.2::jar:compile<br/>
+
+</td>
+
+<td>
+javacc:javacc:3.2::jar:compile<br/>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>jmimemagic:jmimemagic:0.0.4a::jar</th></tr>
+
+<tr><th>Maven: 5 deps in 12956 millis</th><th>Mercury: 5 deps in 164
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>jmimemagic:jmimemagic:0.1.1::jar</th></tr>
+
+<tr><th>Maven: 7 deps in 2476 millis</th><th>Mercury: 10 deps in 1458
millis</th></tr><tr>
+
+<td>
+xerces:xercesImpl:2.4.0::jar:runtime<br/>
+xml-apis:xml-apis:1.0.b2::jar:compile<br/>
+
+</td>
+
+<td>
+logkit:logkit:1.0.1::jar:compile<br/>
+avalon-framework:avalon-framework:4.1.3::jar:compile<br/>
+xerces:xerces:2.4.0::jar:compile<br/>
+xerces:xercesImpl:2.7.1::jar:compile<br/>
+xml-apis:xml-apis:2.0.2::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>jmimemagic:jmimemagic:0.1.2::jar</th></tr>
+
+<tr><th>Maven: 7 deps in 1734 millis</th><th>Mercury: 10 deps in 213
millis</th></tr><tr>
+
+<td>
+xerces:xercesImpl:2.4.0::jar:runtime<br/>
+xml-apis:xml-apis:1.0.b2::jar:compile<br/>
+
+</td>
+
+<td>
+logkit:logkit:1.0.1::jar:compile<br/>
+avalon-framework:avalon-framework:4.1.3::jar:compile<br/>
+xerces:xerces:2.4.0::jar:compile<br/>
+xerces:xercesImpl:2.7.1::jar:compile<br/>
+xml-apis:xml-apis:2.0.2::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>commons-validator:commons-validator:1.2.0::jar</th></tr>
+
+<tr><th>Maven: 7 deps in 77 millis</th><th>Mercury: 10 deps in 41
millis</th></tr><tr>
+
+<td>
+xml-apis:xml-apis:1.0.b2::jar:compile<br/>
+
+</td>
+
+<td>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+avalon-framework:avalon-framework:4.1.3::jar:compile<br/>
+xml-apis:xml-apis:2.0.2::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+<table border='1'><tr><th
colspan='2'>commons-httpclient:commons-httpclient:2.0.2::jar</th></tr>
+
+<tr><th>Maven: 2 deps in 1 millis</th><th>Mercury: 4 deps in 25
millis</th></tr><tr>
+
+<td>
+
+</td>
+
+<td>
+log4j:log4j:1.2.6::jar:compile<br/>
+logkit:logkit:1.0.1::jar:compile<br/>
+
+</td>
+
+</tr></table><br/><br/><br/><br/>
+</body></html>
\ No newline at end of file
Propchange: maven/mercury/trunk/mercury-maven/results.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/mercury/trunk/mercury-maven/results.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=742835&r1=742834&r2=742835&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
(original)
+++
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
Tue Feb 10 02:50:55 2009
@@ -185,6 +185,32 @@
// build all trees
for ( ArtifactBasicMetadata bmd : startMDs )
{
+ if( inclusions != null )
+ {
+ List<ArtifactBasicMetadata> inc = inclusions.getMetadataList();
+
+ if( ! inc.contains( bmd ) )
+ continue;
+
+ if( bmd.hasInclusions() )
+ bmd.getInclusions().addAll( inc );
+ else
+ bmd.setInclusions( inc );
+ }
+
+ if( exclusions != null )
+ {
+ List<ArtifactBasicMetadata> excl =
exclusions.getMetadataList();
+
+ if( excl.contains( bmd ) )
+ continue;
+
+ if( bmd.hasExclusions() )
+ bmd.getExclusions().addAll( excl );
+ else
+ bmd.setExclusions( excl );
+ }
+
MetadataTreeNode rooty = buildTree( bmd, scope );
deps.add( rooty );
@@ -206,7 +232,6 @@
return res;
}
-
// -----------------------------------------------------
private MetadataTreeNode createNode( ArtifactBasicMetadata nodeMD,
MetadataTreeNode parent
, ArtifactBasicMetadata nodeQuery,
ArtifactScopeEnum globalScope
