You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/06/27 07:25:08 UTC
svn commit: r672116 - in /maven/sandbox/trunk/mercury/src:
main/java/org/apache/maven/mercury/metadata/
main/java/org/apache/maven/mercury/metadata/version/
test/java/org/apache/maven/mercury/metadata/
test/java/org/apache/maven/mercury/metadata/versio...
Author: ogusakov
Date: Thu Jun 26 22:25:07 2008
New Revision: 672116
URL: http://svn.apache.org/viewvc?rev=672116&view=rev
Log:
Conflict resolution ut's work on a tree with ranges, built by the dependency builder
Added:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeCircularDependencyException.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactSorter.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeException.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionQuery.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionRange.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MockMetadataSource.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/version/VersionRangeTest.java
maven/sandbox/trunk/mercury/src/test/resources/controlledRepo/a/a/2/a-2.pom
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTree.java Thu Jun 26 22:25:07 2008
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Set;
+import org.apache.maven.mercury.metadata.sat.DefaultSatSolver;
+import org.apache.maven.mercury.metadata.sat.SatException;
import org.apache.maven.mercury.repository.LocalRepository;
import org.apache.maven.mercury.repository.RemoteRepository;
@@ -12,6 +14,7 @@
* It implements 3-phase
*
* @author Oleg Gusakov
+ * @version $Id$
*/
public class MetadataTree
{
@@ -114,14 +117,14 @@
}
//-----------------------------------------------------
private void checkForCircularDependency( ArtifactMetadata md, MetadataTreeNode parent )
- throws MetadataTreeException
+ throws MetadataTreeCircularDependencyException
{
MetadataTreeNode p = parent;
int count = 0;
while( p != null )
{
count++;
-System.out.println("circ "+md+" vs "+p.md);
+//System.out.println("circ "+md+" vs "+p.md);
if( md.sameGA(p.md) )
{
p = parent;
@@ -133,7 +136,7 @@
if( md.sameGA(p.md) )
{
- throw new MetadataTreeException("circular dependency "+count + " levels up. "
+ throw new MetadataTreeCircularDependencyException("circular dependency "+count + " levels up. "
+ sb.toString() + " <= "+(p.parent == null ? "no parent" : p.parent.md) );
}
p = p.parent;
@@ -153,10 +156,24 @@
}
//-----------------------------------------------------
// TODO
- public MetadataTreeNode resolveConflicts( MetadataTreeNode root )
+ public List<ArtifactMetadata> resolveConflicts( MetadataTreeNode root )
throws MetadataTreeException
{
- return null;
+ if( root == null )
+ throw new MetadataTreeException("null tree");
+
+ try
+ {
+ DefaultSatSolver solver = new DefaultSatSolver( root );
+ List<ArtifactMetadata> res = solver.solve();
+
+ return res;
+ }
+ catch (SatException e)
+ {
+ throw new MetadataTreeException(e);
+ }
+
}
//-----------------------------------------------------
//-----------------------------------------------------
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactSorter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactSorter.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactSorter.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactSorter.java Thu Jun 26 22:25:07 2008
@@ -5,6 +5,7 @@
* phase of the resolution process - conflict resolution
*
* @author Oleg Gusakov
+ * @version $Id$
*/
public interface MetadataTreeArtifactSorter
{
Added: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeCircularDependencyException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeCircularDependencyException.java?rev=672116&view=auto
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeCircularDependencyException.java (added)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeCircularDependencyException.java Thu Jun 26 22:25:07 2008
@@ -0,0 +1,31 @@
+package org.apache.maven.mercury.metadata;
+
+/**
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class MetadataTreeCircularDependencyException
+extends MetadataTreeException
+{
+
+ public MetadataTreeCircularDependencyException()
+ {
+ }
+
+ public MetadataTreeCircularDependencyException(String message)
+ {
+ super(message);
+ }
+
+ public MetadataTreeCircularDependencyException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public MetadataTreeCircularDependencyException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+}
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeException.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeException.java Thu Jun 26 22:25:07 2008
@@ -3,6 +3,7 @@
/**
*
* @author Oleg Gusakov
+ * @version $Id$
*/
public class MetadataTreeException
extends Exception
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionQuery.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionQuery.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionQuery.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionQuery.java Thu Jun 26 22:25:07 2008
@@ -3,7 +3,7 @@
import java.util.StringTokenizer;
/**
- * Implementation will check particular version against a range
+ * multiple ranges. Not sure if we need need it - will delete later ..
*
* @author Oleg Gusakov
* @version $Id$
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionRange.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionRange.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionRange.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/version/VersionRange.java Thu Jun 26 22:25:07 2008
@@ -110,7 +110,7 @@
}
}
- public boolean isInRange( String version )
+ public boolean includes( String version )
{
DefaultArtifactVersion ver = new DefaultArtifactVersion( version );
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataTreeTest.java Thu Jun 26 22:25:07 2008
@@ -1,6 +1,7 @@
package org.apache.maven.mercury.metadata;
import java.io.File;
+import java.util.List;
import junit.framework.TestCase;
@@ -8,15 +9,23 @@
import org.apache.commons.logging.impl.LogFactoryImpl;
import org.apache.maven.mercury.repository.DefaultLocalRepository;
+
+/**
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
public class MetadataTreeTest
extends TestCase
{
private static final Log log = LogFactoryImpl.getLog( MetadataTreeTest.class );
- ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
- File repo = new File("./target/test-classes/localRepo");
-// ArtifactMetadata md = new ArtifactMetadata( "a:a:1" );
-// File repo = new File("./target/test-classes/controlledRepo");
+// ArtifactMetadata md = new ArtifactMetadata( "pmd:pmd:3.9" );
+// File repo = new File("./target/test-classes/localRepo");
+
+ ArtifactMetadata a1 = new ArtifactMetadata( "a:a:1" );
+ ArtifactMetadata md = new ArtifactMetadata( "a:a:2" );
+ File repo = new File("./target/test-classes/controlledRepo");
MetadataTree mt;
MockMetadataSource mms = new MockMetadataSource();
@@ -43,6 +52,21 @@
super.tearDown();
}
+ public void testCircularDependency()
+ {
+
+ try
+ {
+ mt.buildTree( a1 );
+ }
+ catch (MetadataTreeException e)
+ {
+ assert e instanceof MetadataTreeCircularDependencyException : "expected circular dependency exception, but got "+e.getClass().getName();
+ return;
+ }
+ fail("circular dependency was not detected");
+ }
+
public void testBuildTree()
throws MetadataTreeException
{
@@ -50,5 +74,14 @@
System.out.println( "got tree of "+root.countNodes() );
}
+
+ public void testResolveConflicts()
+ throws MetadataTreeException
+ {
+ MetadataTreeNode root = mt.buildTree( md );
+ List<ArtifactMetadata> res = mt.resolveConflicts(root);
+
+ System.out.println( "No Conflict: " + res );
+ }
}
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MockMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MockMetadataSource.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MockMetadataSource.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MockMetadataSource.java Thu Jun 26 22:25:07 2008
@@ -8,6 +8,8 @@
import java.util.Set;
import org.apache.commons.digester.Digester;
+import org.apache.maven.mercury.metadata.version.VersionException;
+import org.apache.maven.mercury.metadata.version.VersionRange;
import org.apache.maven.mercury.repository.DefaultLocalRepository;
import org.apache.maven.mercury.repository.LocalRepository;
import org.apache.maven.mercury.repository.RemoteRepository;
@@ -15,6 +17,12 @@
import org.mortbay.log.Log;
import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
public class MockMetadataSource
implements MetadataSource
{
@@ -39,17 +47,30 @@
return null;
ArrayList<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( files.length );
+
+ VersionRange range;
+ try
+ {
+ range = new VersionRange( mdq.getVersion() );
+ }
+ catch (VersionException e)
+ {
+ throw new MetadataRetrievalException(e);
+ }
+
for( File f : files )
{
if( !f.isDirectory() )
continue;
+
File pom = new File( f, mdq.artifactId+"-"+f.getName()+".pom" );
if( pom.exists() )
{
ArtifactMetadata md = getMD(pom);
// TODO abstract into a range matcher
- if( md.sameGAV(mdq) )
+// if( md.sameGAV(mdq) )
+ if( range.includes( md.getVersion() ) )
res.add(md);
}
}
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/version/VersionRangeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/version/VersionRangeTest.java?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/version/VersionRangeTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/version/VersionRangeTest.java Thu Jun 26 22:25:07 2008
@@ -28,22 +28,22 @@
public void testSimple()
{
- assert range.isInRange( "1.2.4" ) : "1.2.4 did not match the range "+rangeS;
- assert range.isInRange( "1.3.1" ) : "1.3.1 did not match the range "+rangeS;
- assert range.isInRange( "1.2.3" ) : "1.2.3 did not match the range "+rangeS;
- assert ! range.isInRange( "1.2.2" ) : "1.2.2 did matches the range "+rangeS;
- assert ! range.isInRange( "2.0.0" ) : "2.0.0 did matches the range "+rangeS;
- assert ! range.isInRange( "3.1.0" ) : "3.1.0 did matches the range "+rangeS;
+ assert range.includes( "1.2.4" ) : "1.2.4 did not match the range "+rangeS;
+ assert range.includes( "1.3.1" ) : "1.3.1 did not match the range "+rangeS;
+ assert range.includes( "1.2.3" ) : "1.2.3 did not match the range "+rangeS;
+ assert ! range.includes( "1.2.2" ) : "1.2.2 did matches the range "+rangeS;
+ assert ! range.includes( "2.0.0" ) : "2.0.0 did matches the range "+rangeS;
+ assert ! range.includes( "3.1.0" ) : "3.1.0 did matches the range "+rangeS;
}
public void testEternity()
{
- assert rangeE.isInRange( "1.2.4" ) : "1.2.4 did not match the range "+rangeS;
- assert rangeE.isInRange( "1.3.1" ) : "1.3.1 did not match the range "+rangeS;
- assert rangeE.isInRange( "1.2.3" ) : "1.2.3 did not match the range "+rangeS;
- assert ! rangeE.isInRange( "1.2.2" ) : "1.2.2 did matches the range "+rangeS;
- assert rangeE.isInRange( "2.0.0" ) : "2.0.0 did matches the range "+rangeS;
- assert rangeE.isInRange( "3.1.0" ) : "3.1.0 did matches the range "+rangeS;
+ assert rangeE.includes( "1.2.4" ) : "1.2.4 did not match the range "+rangeS;
+ assert rangeE.includes( "1.3.1" ) : "1.3.1 did not match the range "+rangeS;
+ assert rangeE.includes( "1.2.3" ) : "1.2.3 did not match the range "+rangeS;
+ assert ! rangeE.includes( "1.2.2" ) : "1.2.2 did matches the range "+rangeS;
+ assert rangeE.includes( "2.0.0" ) : "2.0.0 did matches the range "+rangeS;
+ assert rangeE.includes( "3.1.0" ) : "3.1.0 did matches the range "+rangeS;
}
}
Modified: maven/sandbox/trunk/mercury/src/test/resources/controlledRepo/a/a/2/a-2.pom
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/resources/controlledRepo/a/a/2/a-2.pom?rev=672116&r1=672115&r2=672116&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/resources/controlledRepo/a/a/2/a-2.pom (original)
+++ maven/sandbox/trunk/mercury/src/test/resources/controlledRepo/a/a/2/a-2.pom Thu Jun 26 22:25:07 2008
@@ -3,4 +3,21 @@
<groupId>a</groupId>
<artifactId>a</artifactId>
<version>2</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>b</groupId>
+ <artifactId>b</artifactId>
+ <version>[1,)</version>
+ </dependency>
+
+ <dependency>
+ <groupId>c</groupId>
+ <artifactId>c</artifactId>
+ <version>2</version>
+ </dependency>
+ </dependencies>
+
+
</project>
\ No newline at end of file