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/07/30 01:31:22 UTC
svn commit: r680880 - in /maven/sandbox/trunk/mercury/src:
main/java/org/apache/maven/mercury/
main/java/org/apache/maven/mercury/artifact/
main/java/org/apache/maven/mercury/metadata/
main/java/org/apache/maven/mercury/metadata/sat/ main/java/org/apac...
Author: ogusakov
Date: Tue Jul 29 16:31:21 2008
New Revision: 680880
URL: http://svn.apache.org/viewvc?rev=680880&view=rev
Log:
moved artifact-related classes into artifact package - prep for split
Added:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/Artifact.java
- copied, changed from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
- copied, changed from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java (contents, props changed)
- copied, changed from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java (contents, props changed)
- copied, changed from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java
- copied, changed from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
Removed:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java
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/MetadataTreeArtifactFilter.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatHelper.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatVar.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataProcessor.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryOperationResult.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.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/sat/DefaultSatSolverTest.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/Artifact.java (from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/Artifact.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/Artifact.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java&r1=680879&r2=680880&rev=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/Artifact.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/Artifact.java Tue Jul 29 16:31:21 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury;
+package org.apache.maven.mercury.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -18,6 +18,7 @@
import java.io.File;
import java.util.regex.Pattern;
+
/*
* Description of an artifact.
*
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java (from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java&r1=680879&r2=680880&rev=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactBasicMetadata.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java Tue Jul 29 16:31:21 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury;
+package org.apache.maven.mercury.artifact;
import org.apache.maven.mercury.repository.api.RepositoryReader;
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java (from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java&r1=680879&r2=680880&rev=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactMetadata.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java Tue Jul 29 16:31:21 2008
@@ -1,14 +1,15 @@
-package org.apache.maven.mercury;
+package org.apache.maven.mercury.artifact;
import java.util.List;
+
/**
* Artifact Metadata that is resolved independent of Artifact itself. It's
* built on top of ArtifactBasicMetadata
*
* @author Oleg Gusakov
- * @version $Id$
+ * @version $Id: ArtifactMetadata.java 680879 2008-07-29 23:27:00Z ogusakov $
*/
public class ArtifactMetadata
extends ArtifactBasicMetadata
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java (from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java&r1=680879&r2=680880&rev=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java Tue Jul 29 16:31:21 2008
@@ -1,4 +1,5 @@
-package org.apache.maven.mercury;
+package org.apache.maven.mercury.artifact;
+
/**
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/ArtifactScopeEnum.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java (from r680879, maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java?p2=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java&p1=maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java&r1=680879&r2=680880&rev=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java Tue Jul 29 16:31:21 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury;
+package org.apache.maven.mercury.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClassicVersionComparator.java Tue Jul 29 16:31:21 2008
@@ -2,7 +2,7 @@
import java.util.Comparator;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.metadata.version.DefaultArtifactVersion;
/**
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/ClasspathContainer.java Tue Jul 29 16:31:21 2008
@@ -4,8 +4,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
/*
* classpath container that is aware of the classpath scope
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataRetrievalException.java Tue Jul 29 16:31:21 2008
@@ -1,6 +1,6 @@
package org.apache.maven.mercury.metadata;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
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=680880&r1=680879&r2=680880&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 Tue Jul 29 16:31:21 2008
@@ -6,9 +6,9 @@
import java.util.Map;
import java.util.Set;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.metadata.sat.DefaultSatSolver;
import org.apache.maven.mercury.metadata.sat.SatException;
import org.apache.maven.mercury.repository.api.Repository;
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilter.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilter.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilter.java Tue Jul 29 16:31:21 2008
@@ -1,6 +1,6 @@
package org.apache.maven.mercury.metadata;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
/**
* This is a member of a chain of filters that can stop an ArtifactMetadata
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java Tue Jul 29 16:31:21 2008
@@ -3,9 +3,9 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
/**
* metadata [dirty] Tree
*
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java Tue Jul 29 16:31:21 2008
@@ -9,9 +9,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
import org.apache.maven.mercury.metadata.MetadataTreeNodeGAComparator;
import org.apache.maven.mercury.metadata.MetadataTreeNodeGAVComparator;
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatContext.java Tue Jul 29 16:31:21 2008
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
/**
* This class hold all variables fed to the SAT solver. Because of the
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatHelper.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatHelper.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatHelper.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatHelper.java Tue Jul 29 16:31:21 2008
@@ -4,7 +4,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.sat4j.core.ReadOnlyVec;
import org.sat4j.core.ReadOnlyVecInt;
import org.sat4j.core.Vec;
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatSolver.java Tue Jul 29 16:31:21 2008
@@ -3,7 +3,7 @@
import java.util.Comparator;
import java.util.List;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
/**
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatVar.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatVar.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatVar.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/sat/SatVar.java Tue Jul 29 16:31:21 2008
@@ -1,6 +1,6 @@
package org.apache.maven.mercury.metadata.sat;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
/**
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java Tue Jul 29 16:31:21 2008
@@ -1,6 +1,6 @@
package org.apache.maven.mercury.repository.api;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
/**
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataProcessor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataProcessor.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataProcessor.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataProcessor.java Tue Jul 29 16:31:21 2008
@@ -2,7 +2,7 @@
import java.util.List;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
public interface MetadataProcessor
{
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/MetadataReader.java Tue Jul 29 16:31:21 2008
@@ -1,6 +1,6 @@
package org.apache.maven.mercury.repository.api;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
/**
* This interface implementation is supplied to MetadataProcessor to simplify it's access to remote repositories
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryOperationResult.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryOperationResult.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryOperationResult.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryOperationResult.java Tue Jul 29 16:31:21 2008
@@ -7,7 +7,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
/**
* generic repository operation result. Represents a List of <T extends ArtifactBasicMetadata>
* objects and a set of exceptions thrown in the process
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java Tue Jul 29 16:31:21 2008
@@ -3,9 +3,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.DefaultArtifact;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.DefaultArtifact;
/**
* Repository reader API to be implemented by any repo implementation that wishes
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/RepositoryWriter.java Tue Jul 29 16:31:21 2008
@@ -1,6 +1,6 @@
package org.apache.maven.mercury.repository.api;
-import org.apache.maven.mercury.Artifact;
+import org.apache.maven.mercury.artifact.Artifact;
/**
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/api/VirtualRepositoryReader.java Tue Jul 29 16:31:21 2008
@@ -5,8 +5,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
/**
* this helper class hides the necessity to talk to localRepo and a bunch of remoteRepos.
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java Tue Jul 29 16:31:21 2008
@@ -7,9 +7,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.DefaultArtifact;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.metadata.version.VersionException;
import org.apache.maven.mercury.metadata.version.VersionRange;
import org.apache.maven.mercury.repository.api.AbstracRepositoryReader;
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java Tue Jul 29 16:31:21 2008
@@ -8,9 +8,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.DefaultArtifact;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.DefaultArtifact;
import org.apache.maven.mercury.metadata.version.VersionException;
import org.apache.maven.mercury.metadata.version.VersionRange;
import org.apache.maven.mercury.repository.api.AbstracRepositoryReader;
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/AbstractSimpleTreeTest.java Tue Jul 29 16:31:21 2008
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.apache.maven.mercury.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
public abstract class AbstractSimpleTreeTest
extends TestCase
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=680880&r1=680879&r2=680880&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 Tue Jul 29 16:31:21 2008
@@ -8,8 +8,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.LogFactoryImpl;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.repository.MetadataProcessorMock;
import org.apache.maven.mercury.repository.api.MetadataProcessor;
import org.apache.maven.mercury.repository.api.Repository;
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java Tue Jul 29 16:31:21 2008
@@ -8,8 +8,8 @@
import junit.framework.TestCase;
-import org.apache.maven.mercury.ArtifactMetadata;
-import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.metadata.ClassicDepthComparator;
import org.apache.maven.mercury.metadata.ClassicVersionComparator;
import org.apache.maven.mercury.metadata.MetadataTreeNode;
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java?rev=680880&r1=680879&r2=680880&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/repository/MetadataProcessorMock.java Tue Jul 29 16:31:21 2008
@@ -6,7 +6,7 @@
import java.util.List;
import org.apache.commons.digester.Digester;
-import org.apache.maven.mercury.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.repository.api.MetadataProcessingException;
import org.apache.maven.mercury.repository.api.MetadataProcessor;
import org.apache.maven.mercury.repository.api.MetadataReader;