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 2009/03/07 02:38:54 UTC

svn commit: r751167 [1/3] - in /maven/mercury/trunk: mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ mercury-artifact/src/main/ mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ mercury-artifact/src/main/java/org/apa...

Author: ogusakov
Date: Sat Mar  7 01:38:52 2009
New Revision: 751167

URL: http://svn.apache.org/viewvc?rev=751167&view=rev
Log:
removed ArtifactBasicMetadata

Added:
    maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java   (with props)
Removed:
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
Modified:
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
    maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java
    maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java
    maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
    maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
    maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AbstractTestCase.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AllTestCases.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ReadWriteTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryCachingReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryReaderM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2Test.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/THelper.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
    maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/WebDavServer.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilter.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeArtifactFilterMap.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/MetadataTreeNode.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolver.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
    maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/sat/DefaultSatSolverTest.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
    maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
    maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstracRepositoryReader.java
    maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/AbstractRepOpResult.java
    maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/ArtifactBasicResults.java
    maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/ArtifactResults.java
    maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryMetadataCache.java
    maven/mercury/trunk/mercury-repo/mercury-repo-api/src/main/java/org/apache/maven/mercury/repository/api/RepositoryReader.java
    maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/src/main/java/org/apache/maven/mercury/repository/cache/fs/MetadataCacheFs.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/main/java/org/apache/maven/mercury/repository/local/flat/ArtifactLocation.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocationtest.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryM2Test.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/DefaultStorage.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryReaderMap.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/main/java/org/apache/maven/mercury/repository/local/map/Storage.java
    maven/mercury/trunk/mercury-repo/mercury-repo-local-map/src/test/java/org/apache/maven/mercury/repository/local/map/LocalRepositoryMapTest.java
    maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryReaderM2.java
    maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/src/main/java/org/apache/maven/mercury/repository/remote/m2/RemoteRepositoryWriterM2.java
    maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
    maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/test/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReaderTest.java
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/HandshakeExchange.java
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/deploy/FilePutExchange.java
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/FileGetExchange.java
    maven/mercury/trunk/mercury-transport/mercury-transport-http/src/main/java/org/apache/maven/mercury/spi/http/client/retrieve/RetrievalTarget.java

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Sat Mar  7 01:38:52 2009
@@ -27,7 +27,6 @@
 
 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;
@@ -86,7 +85,7 @@
     
     List<String> _exclusions;
 
-    private List<ArtifactBasicMetadata> getDependencies( VirtualRepositoryReader vr )
+    private List<ArtifactMetadata> getDependencies( VirtualRepositoryReader vr )
         throws RepositoryException
     {
         if ( Util.isEmpty( _dependencies ) )
@@ -94,7 +93,7 @@
             return null;
         }
 
-        List<ArtifactBasicMetadata> res = new ArrayList<ArtifactBasicMetadata>( _dependencies.size() );
+        List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( _dependencies.size() );
 
         for ( Dependency d : _dependencies )
         {
@@ -135,7 +134,7 @@
 
                 if ( deps != null && !Util.isEmpty( deps.getDependencies() ) )
                 {
-                    for ( ArtifactBasicMetadata bmd : deps.getDependencies() )
+                    for ( ArtifactMetadata bmd : deps.getDependencies() )
                     {
                         res.add( bmd );
                     }
@@ -199,7 +198,7 @@
         
         _pomRepo.setMetadataReader( vr );
 
-        List<ArtifactBasicMetadata> depList = getDependencies( vr );
+        List<ArtifactMetadata> depList = getDependencies( vr );
         
         ArtifactQueryList aql = new ArtifactQueryList( depList );
         
@@ -236,10 +235,10 @@
             return null;
         }
 
-        Map<ArtifactBasicMetadata, List<Artifact>> resMap = aRes.getResults();
+        Map<ArtifactMetadata, List<Artifact>> resMap = aRes.getResults();
 
         int count = 0;
-        for ( ArtifactBasicMetadata key : resMap.keySet() )
+        for ( ArtifactMetadata key : resMap.keySet() )
         {
             List<Artifact> artifacts = resMap.get( key );
             if ( artifacts != null )
@@ -255,7 +254,7 @@
 
         _artifacts = new ArrayList<Artifact>( count );
 
-        for ( ArtifactBasicMetadata key : resMap.keySet() )
+        for ( ArtifactMetadata key : resMap.keySet() )
         {
             List<Artifact> artifacts = resMap.get( key );
 
@@ -291,14 +290,14 @@
      * @param depList
      * @return
      */
-    private List<ArtifactMetadata> toArtifactMetadataList( List<ArtifactBasicMetadata> depList )
+    private List<ArtifactMetadata> toArtifactMetadataList( List<ArtifactMetadata> depList )
     {
         if ( Util.isEmpty( depList ) )
             return null;
 
         List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( depList.size() );
 
-        for ( ArtifactBasicMetadata bmd : depList )
+        for ( ArtifactMetadata bmd : depList )
             res.add( new ArtifactMetadata( bmd ) );
 
         return res;

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java Sat Mar  7 01:38:52 2009
@@ -23,7 +23,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.util.Util;
 import org.codehaus.plexus.lang.DefaultLanguage;
 import org.codehaus.plexus.lang.Language;
@@ -37,7 +37,7 @@
 {
     private static final Language LANG = new DefaultLanguage( Dependency.class );
 
-    protected ArtifactBasicMetadata _amd;
+    protected ArtifactMetadata _amd;
 
     protected String _pom;
 
@@ -52,7 +52,7 @@
     
     private static long _count = 0L;
     
-    public ArtifactBasicMetadata getMetadata()
+    public ArtifactMetadata getMetadata()
     {
         _amd.setInclusions( getInclusions() );
         
@@ -61,28 +61,28 @@
         return _amd;
     }
     
-    private Collection<ArtifactBasicMetadata> getExclusions()
+    private Collection<ArtifactMetadata> getExclusions()
     {
         if( Util.isEmpty( _exclusions ))
             return null;
         
-        List<ArtifactBasicMetadata> res = new ArrayList<ArtifactBasicMetadata>( _exclusions.size() );
+        List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( _exclusions.size() );
         
         for( String name : _exclusions )
-            res.add( new ArtifactBasicMetadata(name) );
+            res.add( new ArtifactMetadata(name) );
         
         return res;
     }
 
-    private Collection<ArtifactBasicMetadata> getInclusions()
+    private Collection<ArtifactMetadata> getInclusions()
     {
         if( Util.isEmpty( _inclusions ))
             return null;
         
-        List<ArtifactBasicMetadata> res = new ArrayList<ArtifactBasicMetadata>( _inclusions.size() );
+        List<ArtifactMetadata> res = new ArrayList<ArtifactMetadata>( _inclusions.size() );
         
         for( String name : _inclusions )
-            res.add( new ArtifactBasicMetadata(name) );
+            res.add( new ArtifactMetadata(name) );
         
         return res;
     }
@@ -92,7 +92,7 @@
         if( _pom != null )
             throw new IllegalArgumentException( LANG.getMessage( "dependency.amd.pom.exists", _pom, name ) );
         
-        _amd = new ArtifactBasicMetadata( name );
+        _amd = new ArtifactMetadata( name );
 
         _amd.setOptional( _optional );
     }
@@ -141,7 +141,7 @@
     {
         if ( _amd == null )
         {
-            _amd = new ArtifactBasicMetadata();
+            _amd = new ArtifactMetadata();
         }
 
         _amd.setGroupId( groupId );
@@ -156,7 +156,7 @@
     {
         if ( _amd == null )
         {
-            _amd = new ArtifactBasicMetadata();
+            _amd = new ArtifactMetadata();
         }
 
         _amd.setArtifactId( artifactId );
@@ -171,7 +171,7 @@
     {
         if ( _amd == null )
         {
-            _amd = new ArtifactBasicMetadata();
+            _amd = new ArtifactMetadata();
         }
 
         _amd.setVersion( version );

Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java Sat Mar  7 01:38:52 2009
@@ -25,7 +25,7 @@
 import java.util.Hashtable;
 
 import org.apache.maven.mercury.artifact.Artifact;
-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.repository.api.Repository;
 import org.apache.maven.mercury.util.Util;
@@ -165,7 +165,7 @@
 
             if ( !Util.isEmpty( _name ) )
             {
-                a = new DefaultArtifact( new ArtifactBasicMetadata( _name ) );
+                a = new DefaultArtifact( new ArtifactMetadata( _name ) );
 
                 String pomStr =
                     "?xml version='1.0' encoding='UTF-8'?>\n"

Added: maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java?rev=751167&view=auto
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java (added)
+++ maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java Sat Mar  7 01:38:52 2009
@@ -0,0 +1,66 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.maven.mercury.artifact;
+
+import java.util.Map;
+
+/**
+ * Artifact Metadata that is resolved independent of Artifact itself. It's built on top of ArtifactBasicMetadata
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ */
+public class ArtifactMetadata
+    extends ArtifactBasicMetadata
+{
+    /**
+     * for testing - required for mock MetadataSource
+     */
+    public ArtifactMetadata()
+    {
+    }
+
+    // ------------------------------------------------------------------
+
+    public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
+                             String classifier, String artifactUri, String why, boolean resolved, String error,
+                             Map<String, String> attributes )
+    {
+        this.groupId = groupId;
+        this.artifactId = name;
+        setVersion( version );
+        this.type = type;
+        this.artifactScope = artifactScope;
+        this.classifier = classifier;
+        this.artifactUri = artifactUri;
+        this.attributes = attributes;
+    }
+
+    public ArtifactMetadata( ArtifactBasicMetadata bmd )
+    {
+        this( bmd.getGroupId(), bmd.getArtifactId(), bmd.getVersion(), bmd.getType(), null, bmd.getClassifier(), null,
+              null, true, null, bmd.getAttributes() );
+    }
+
+    public ArtifactMetadata( String gav )
+    {
+        this( new ArtifactBasicMetadata( gav ) );
+    }
+
+}

Propchange: maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/mercury/trunk/mercury-artifact/src/main/ArtifactMetadata.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactExclusionList.java Sat Mar  7 01:38:52 2009
@@ -31,7 +31,7 @@
     /**
      * @param md
      */
-    public ArtifactExclusionList( ArtifactBasicMetadata... md )
+    public ArtifactExclusionList( ArtifactMetadata... md )
     {
         super( md );
     }
@@ -39,7 +39,7 @@
     /**
      * @param md
      */
-    public ArtifactExclusionList( Collection<ArtifactBasicMetadata> md )
+    public ArtifactExclusionList( Collection<ArtifactMetadata> md )
     {
         super( md );
     }

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactInclusionList.java Sat Mar  7 01:38:52 2009
@@ -31,7 +31,7 @@
     /**
      * @param md
      */
-    public ArtifactInclusionList( ArtifactBasicMetadata... md )
+    public ArtifactInclusionList( ArtifactMetadata... md )
     {
         super( md );
     }
@@ -39,7 +39,7 @@
     /**
      * @param md
      */
-    public ArtifactInclusionList( Collection<ArtifactBasicMetadata> md )
+    public ArtifactInclusionList( Collection<ArtifactMetadata> md )
     {
         super( md );
     }

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadata.java Sat Mar  7 01:38:52 2009
@@ -18,68 +18,686 @@
  */
 package org.apache.maven.mercury.artifact;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
+import org.apache.maven.mercury.artifact.version.VersionException;
+import org.apache.maven.mercury.artifact.version.VersionRange;
+import org.apache.maven.mercury.artifact.version.VersionRangeFactory;
+import org.codehaus.plexus.lang.DefaultLanguage;
+import org.codehaus.plexus.lang.Language;
+
 /**
- * Artifact Metadata that is resolved independent of Artifact itself. It's built on top of ArtifactBasicMetadata
+ * this is the most primitive metadata there is, usually used to query repository for "real" metadata. It holds
+ * everything a project.dependencies.dependency element can have
  *
  * @author Oleg Gusakov
  * @version $Id$
  */
 public class ArtifactMetadata
-    extends ArtifactBasicMetadata
 {
+    public static final String DEFAULT_ARTIFACT_TYPE = "jar";
+
+    private static final Language LANG = new DefaultLanguage( ArtifactMetadata.class );
+
+
+    /**
+     * standard glorified artifact coordinates
+     */
+    protected String groupId;
+
+    protected String artifactId;
+
+    private String version;
+    
+    private transient VersionRange versionRange;
+
+    /**
+     * relocation chain after processing by ProjectBuilder
+     */
+    protected List<ArtifactCoordinates> relocations;
+
+    protected ArtifactCoordinates effectiveCoordinates;
+
+    // This is Maven specific. jvz/
+    protected String classifier;
+
+    protected String type = DEFAULT_ARTIFACT_TYPE;
+
+    protected ArtifactScopeEnum artifactScope;
+
+    protected String scope;
+
+    protected boolean optional;
+
+    protected Collection<ArtifactMetadata> inclusions;
+
+    protected Collection<ArtifactMetadata> exclusions;
+
+    protected Map<String, String> attributes;
+
+    /**
+     * transient helper objects, used by DependencyBuilder.
+     */
+    transient Object tracker;
+
+    transient Boolean local = false;
+
     /** dependencies of the artifact behind this metadata */
-    protected List<ArtifactBasicMetadata> dependencies;
+    protected List<ArtifactMetadata> dependencies;
 
     /** artifact URI */
     protected String artifactUri;
 
+    // ------------------------------------------------------------------
+    public ArtifactMetadata()
+    {
+    }
+
+    // ------------------------------------------------------------------
+    private void processAttributes( String as )
+    {
+        if ( as == null || as.length() < 1 )
+        {
+            return;
+        }
+
+        String attrString = as.trim();
+
+        if ( attrString == null || attrString.length() < 1 )
+        {
+            return;
+        }
+
+        int fromCh = attrString.indexOf( '{' );
+        int toCh = attrString.indexOf( '}' );
+
+        if ( fromCh != -1 && toCh != -1 )
+        {
+            attrString = attrString.substring( fromCh + 1, toCh );
+        }
+
+        String[] entries = attrString.split( "," );
+
+        if ( entries != null )
+        {
+            for ( int i = 0; i < entries.length; i++ )
+            {
+                String e = entries[i];
+
+                if ( e == null )
+                {
+                    continue;
+                }
+
+                int eq = e.indexOf( '=' );
+
+                if ( eq == -1 )
+                {
+                    continue;
+                }
+
+                if ( attributes == null )
+                {
+                    attributes = new LinkedHashMap<String, String>( entries.length );
+                }
+
+                String name = e.substring( 0, eq );
+
+                if ( name == null )
+                {
+                    continue;
+                }
+
+                name = name.trim();
+
+                String val = e.substring( eq + 1 );
+
+                if ( val != null )
+                {
+                    val = val.trim();
+                }
+
+                attributes.put( name, val );
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------
     /**
-     * for testing - required for mock MetadataSource
+     * create basic out of <b>group:artifact:version:classifier:type</b> string, use empty string to specify missing
+     * component - for instance query for common-1.3.zip can be specified as ":common:1.3::zip" - note missing groupId
+     * and classifier.
      */
-    public ArtifactMetadata()
+    public ArtifactMetadata( String gavQuery )
     {
+        if ( gavQuery == null )
+        {
+            return;
+        }
+
+        String[] tokens = gavQuery.split( ":" );
+
+        if ( tokens == null || tokens.length < 1 )
+        {
+            return;
+        }
+
+        int count = tokens.length;
+
+        this.groupId = nullify( tokens[0] );
+
+        if ( count > 1 )
+        {
+            this.artifactId = nullify( tokens[1] );
+        }
+
+        if ( count > 2 )
+        {
+            this.version = nullify( tokens[2] );
+        }
+
+        if ( count > 3 )
+        {
+            this.classifier = nullify( tokens[3] );
+        }
+
+        if ( count > 4 )
+        {
+            this.type = nullify( tokens[4] );
+        }
+
+        if ( this.type == null || this.type.length() < 1 )
+        {
+            this.type = DEFAULT_ARTIFACT_TYPE;
+        }
+
+        if ( count > 5 )
+        {
+            this.scope = nullify( tokens[5] );
+        }
+
+        if ( count > 6 )
+        {
+            processAttributes( nullify( tokens[6] ) );
+        }
+    }
+    
+    /**
+     * copy constructor
+     * 
+     * @param copyFrom
+     */
+    public ArtifactMetadata( ArtifactMetadata copyFrom )
+    {
+        if( copyFrom == null )
+            throw new IllegalArgumentException( LANG.getMessage( "null.copy.from.md") );
+
+       setGroupId( copyFrom.getGroupId() );
+       setArtifactId( copyFrom.getArtifactId() );
+       setVersion( copyFrom.getVersion() );
+       setClassifier( copyFrom.getClassifier() );
+       setType( copyFrom.getType() );
+       setScope( copyFrom.getScope() );
+       
+       Map<String, String> a = copyFrom.getAttributes(); 
+       if(  a != null && a.size() > 0 )
+       {
+           attributes = new HashMap<String, String>( a.size() );
+           
+           attributes.putAll( a );
+       }
+       
+       setTracker( copyFrom.getTracker() );
+       
     }
 
     // ------------------------------------------------------------------
+    /**
+     * create basic out of <b>group:artifact:version:classifier:type</b> string, use empty string to specify missing
+     * component - for instance query for common-1.3.zip can be specified as ":common:1.3::zip" - note missing groupId
+     * and classifier.
+     */
+    public static ArtifactMetadata create( String query )
+    {
+        ArtifactMetadata mdq = new ArtifactMetadata( query );
+
+        return mdq;
+    }
+
+    // ---------------------------------------------------------------------------
+    private static final String nullify( String s )
+    {
+        if ( s == null || s.length() < 1 )
+        {
+            return null;
+        }
+        return s;
+    }
+
+    // ---------------------------------------------------------------------
+    public boolean sameGAV( ArtifactMetadata md )
+    {
+        if ( md == null )
+        {
+            return false;
+        }
+
+        return sameGA( md ) && version != null && version.equals( md.getVersion() );
+    }
+
+    // ---------------------------------------------------------------------
+    public boolean sameGA( ArtifactMetadata md )
+    {
+        if ( md == null )
+        {
+            return false;
+        }
+
+        return groupId != null && artifactId != null && groupId.equals( md.getGroupId() )
+            && artifactId.equals( md.getArtifactId() );
+    }
+
+    public String getGA()
+    {
+        return toDomainString();
+    }
+
+    public String getGAV()
+    {
+        return toString();
+    }
+
+    private static final String nvl( String val, String dflt )
+    {
+        return val == null ? dflt : val;
+    }
+
+    private static final String nvl( String val )
+    {
+        return nvl( val, "" );
+    }
+
+    @Override
+    public String toString()
+    {
+        return nvl( groupId ) + ":" + nvl( artifactId ) + ":" + nvl( version ) + ":" + nvl( classifier ) + ":"
+            + nvl( type, DEFAULT_ARTIFACT_TYPE );
+    }
+
+    public String toScopedString()
+    {
+        return toString() + "-scope:" + getArtifactScope();
+    }
+
+    public String toDomainString()
+    {
+        return groupId + ":" + artifactId;
+    }
+
+    public String toManagementString()
+    {
+        return groupId + ":" + artifactId + ":" + type + ( classifier != null ? ":" + classifier : "" );
+    }
+
+    public String getBaseName()
+    {
+        return artifactId + "-" + version + ( classifier == null ? "" : "-" + classifier );
+    }
 
-    public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum artifactScope,
-                             String classifier, String artifactUri, String why, boolean resolved, String error,
-                             Map<String, String> attributes )
+    public String getFileName()
+    {
+        return getBaseName() + "." + ( type == null ? DEFAULT_ARTIFACT_TYPE : type );
+    }
+
+    public String getBaseName( String classifier )
+    {
+        return artifactId + "-" + version
+            + ( ( classifier == null || classifier.length() < 1 ) ? "" : "-" + classifier );
+    }
+
+    public String getCheckedType()
+    {
+        return type == null ? "jar" : type;
+    }
+
+    // ---------------------------------------------------------------------------
+    public String getGroupId()
+    {
+        return groupId;
+    }
+
+    public void setGroupId( String groupId )
     {
         this.groupId = groupId;
-        this.artifactId = name;
-        setVersion( version );
+    }
+
+    public String getArtifactId()
+    {
+        return artifactId;
+    }
+
+    public void setArtifactId( String artifactId )
+    {
+        this.artifactId = artifactId;
+    }
+
+    public String getVersion()
+    {
+        return version;
+    }
+
+    public boolean hasVersion()
+    {
+        return version != null && version.length() > 0;
+    }
+
+    public void setVersion( String version )
+    {
+        this.version = version;
+    }
+    
+    private void checkRangeExists()
+    {
+        if( versionRange == null )
+        {
+            if( version == null )
+                throw new IllegalArgumentException( LANG.getMessage( "artifact.metadata.no.version", toString() ) );
+            else
+            {
+                try
+                {
+                    versionRange = VersionRangeFactory.create( version );
+                }
+                catch ( VersionException e )
+                {
+                    throw new IllegalArgumentException( e.getMessage() );
+                }
+            }
+        }
+    }
+
+    public boolean isSingleton()
+    {
+        checkRangeExists();
+        
+        return versionRange.isSingleton();
+    }
+
+    public boolean isRange()
+    {
+        return !isSingleton();
+    }
+
+    public String getClassifier()
+    {
+        return classifier;
+    }
+
+    public void setClassifier( String classifier )
+    {
+        this.classifier = classifier;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+
+    public void setType( String type )
+    {
         this.type = type;
+    }
+
+    public Map<String, String> getAttributes()
+    {
+        return attributes;
+    }
+
+    public String getScope()
+    {
+        return getArtifactScope().getScope();
+    }
+
+    public ArtifactScopeEnum getScopeAsEnum()
+    {
+        return artifactScope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : artifactScope;
+    }
+
+    public ArtifactScopeEnum getArtifactScope()
+    {
+        return artifactScope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : artifactScope;
+    }
+
+    public void setArtifactScope( ArtifactScopeEnum artifactScope )
+    {
         this.artifactScope = artifactScope;
-        this.classifier = classifier;
-        this.artifactUri = artifactUri;
-        this.attributes = attributes;
     }
 
-    public ArtifactMetadata( ArtifactBasicMetadata bmd )
+    public void setScope( String scope )
+    {
+        this.artifactScope = scope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : ArtifactScopeEnum.valueOf( scope );
+    }
+
+    public boolean isOptional()
+    {
+        return optional;
+    }
+
+    public void setOptional( boolean optional )
+    {
+        this.optional = optional;
+    }
+
+    public void setOptional( String optional )
+    {
+        this.optional = "true".equals( optional );
+    }
+
+    public Object getTracker()
+    {
+        return tracker;
+    }
+
+    public void setTracker( Object tracker )
+    {
+        this.tracker = tracker;
+    }
+
+    public boolean hasClassifier()
+    {
+        return classifier != null && classifier.length() > 0;
+    }
+
+    public Boolean isLocal()
+    {
+        return local;
+    }
+
+    public void setLocal( Boolean local )
+    {
+        this.local = local;
+    }
+
+    public boolean isVirtual()
+    {
+        return DefaultArtifactVersion.isVirtual( version );
+    }
+
+    public ArtifactCoordinates getEffectiveCoordinates()
+    {
+        if ( relocations == null || relocations.isEmpty() )
+        {
+            return new ArtifactCoordinates( groupId, artifactId, version );
+        }
+
+        return relocations.get( relocations.size() - 1 );
+    }
+
+    public ArtifactMetadata addRelocation( ArtifactCoordinates coord )
+    {
+        if ( coord == null )
+        {
+            return this;
+        }
+
+        if ( relocations == null )
+        {
+            relocations = new ArrayList<ArtifactCoordinates>( 2 );
+        }
+
+        if ( coord.getGroupId() == null )
+        {
+            coord.setGroupId( groupId );
+        }
+
+        if ( coord.getArtifactId() == null )
+        {
+            coord.setArtifactId( artifactId );
+        }
+
+        if ( coord.getVersion() == null )
+        {
+            coord.setVersion( version );
+        }
+
+        relocations.add( coord );
+        effectiveCoordinates = coord;
+
+        return this;
+    }
+
+    public String getEffectiveGroupId()
+    {
+        return effectiveCoordinates == null ? groupId : effectiveCoordinates.getGroupId();
+    }
+
+    public String getEffectiveArtifactId()
+    {
+        return effectiveCoordinates == null ? artifactId : effectiveCoordinates.getArtifactId();
+    }
+
+    public String getEffectiveersion()
+    {
+        return effectiveCoordinates == null ? version : effectiveCoordinates.getVersion();
+    }
+
+    public boolean hasInclusions()
+    {
+        return inclusions == null ? false : !inclusions.isEmpty();
+    }
+
+    public Collection<ArtifactMetadata> getInclusions()
+    {
+        return inclusions;
+    }
+
+    public void setInclusions( Collection<ArtifactMetadata> inclusions )
+    {
+        this.inclusions = inclusions;
+    }
+
+    public boolean hasExclusions()
+    {
+        return exclusions == null ? false : !exclusions.isEmpty();
+    }
+
+    public Collection<ArtifactMetadata> getExclusions()
+    {
+        return exclusions;
+    }
+
+    public void setExclusions( Collection<ArtifactMetadata> exclusions )
+    {
+        this.exclusions = exclusions;
+    }
+
+    /**
+     * run dependency through inclusion/exclusion filters. Inclusion filter is always a "hole"-filter, which is then
+     * enhanced by exclusion "cork"-filter
+     *
+     * @param dep dependency to vet
+     * @return vet result
+     * @throws VersionException
+     */
+    public boolean allowDependency( ArtifactMetadata dep )
+        throws VersionException
+    {
+        boolean includeDependency = true;
+        if ( hasInclusions() )
+        {
+            includeDependency = !passesFilter( inclusions, dep );
+        }
+
+        if ( !includeDependency )
+        {
+            return false;
+        }
+
+        if ( !hasExclusions() )
+        {
+            return true;
+        }
+
+        if ( passesFilter( exclusions, dep ) )
+        {
+            return true;
+        }
+
+        return false;
+
+    }
+
+    private boolean passesFilter( Collection<ArtifactMetadata> filter, ArtifactMetadata dep )
+        throws VersionException
     {
-        this( bmd.getGroupId(), bmd.getArtifactId(), bmd.getVersion(), bmd.getType(), null, bmd.getClassifier(), null,
-              null, true, null, bmd.getAttributes() );
+        for ( ArtifactMetadata filterMd : filter )
+        {
+            if ( filterMd.sameGA( dep ) )
+            {
+                if ( !filterMd.hasVersion() )
+                {
+                    return false; // no version in the filter - catch by GA
+                }
+                VersionRange vr = VersionRangeFactory.create( filterMd.getVersion() );
+                if ( vr.includes( dep.getVersion() ) )
+                {
+                    return false; // catch by version query
+                }
+            }
+        }
+
+        return true;
     }
 
-    public ArtifactMetadata( Artifact af )
+    @Override
+    public boolean equals( Object obj )
     {
+        if ( obj == null || !( obj instanceof ArtifactMetadata ) )
+        {
+            return false;
+        }
+
+        return toString().equals( obj.toString() );
     }
 
-    public ArtifactMetadata( String gav )
+    @Override
+    public int hashCode()
     {
-        this( new ArtifactBasicMetadata( gav ) );
+        return toString().hashCode();
     }
 
-    public List<ArtifactBasicMetadata> getDependencies()
+    public List<ArtifactMetadata> getDependencies()
     {
         return dependencies;
     }
 
-    public void setDependencies( List<ArtifactBasicMetadata> dependencies )
+    public void setDependencies( List<ArtifactMetadata> dependencies )
     {
         this.dependencies = dependencies;
     }
@@ -94,4 +712,6 @@
         this.artifactUri = artifactUri;
     }
 
+    // ---------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------
 }

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactMetadataList.java Sat Mar  7 01:38:52 2009
@@ -28,15 +28,15 @@
  */
 public abstract class ArtifactMetadataList
 {
-    List<ArtifactBasicMetadata> _artifacts = new ArrayList<ArtifactBasicMetadata>( 8 );
+    List<ArtifactMetadata> _artifacts = new ArrayList<ArtifactMetadata>( 8 );
 
-    public ArtifactMetadataList( ArtifactBasicMetadata... md )
+    public ArtifactMetadataList( ArtifactMetadata... md )
     {
-        for ( ArtifactBasicMetadata m : md )
+        for ( ArtifactMetadata m : md )
             add( m );
     }
 
-    public ArtifactMetadataList( Collection<ArtifactBasicMetadata> md )
+    public ArtifactMetadataList( Collection<ArtifactMetadata> md )
     {
         add( md );
     }
@@ -44,33 +44,33 @@
     public ArtifactMetadataList( String... mds )
     {
         for ( String m : mds )
-            add( new ArtifactBasicMetadata( m ) );
+            add( new ArtifactMetadata( m ) );
     }
 
-    public void add( ArtifactBasicMetadata md )
+    public void add( ArtifactMetadata md )
     {
         _artifacts.add( md );
     }
 
-    public void add( Collection<ArtifactBasicMetadata> md )
+    public void add( Collection<ArtifactMetadata> md )
     {
         _artifacts.addAll( md );
     }
 
     public void addGav( String md )
     {
-        _artifacts.add( new ArtifactBasicMetadata( md ) );
+        _artifacts.add( new ArtifactMetadata( md ) );
     }
 
     public void addByGav( Collection<String> mds )
     {
         for ( String m : mds )
         {
-            _artifacts.add( new ArtifactBasicMetadata( m ) );
+            _artifacts.add( new ArtifactMetadata( m ) );
         }
     }
 
-    public List<ArtifactBasicMetadata> getMetadataList()
+    public List<ArtifactMetadata> getMetadataList()
     {
         return _artifacts;
     }

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactQueryList.java Sat Mar  7 01:38:52 2009
@@ -31,7 +31,7 @@
     /**
      * @param md
      */
-    public ArtifactQueryList( ArtifactBasicMetadata... md )
+    public ArtifactQueryList( ArtifactMetadata... md )
     {
         super( md );
     }
@@ -39,7 +39,7 @@
     /**
      * @param md
      */
-    public ArtifactQueryList( Collection<ArtifactBasicMetadata> md )
+    public ArtifactQueryList( Collection<ArtifactMetadata> md )
     {
         super( md );
     }

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/DefaultArtifact.java Sat Mar  7 01:38:52 2009
@@ -36,18 +36,7 @@
 
     private byte[] pomBlob;
 
-    public DefaultArtifact( String groupId, String artifactId, String version, String type, String classifier,
-                            boolean optional, String scope, String inheritedScope )
-    {
-        if ( version == null )
-        {
-            throw new IllegalArgumentException( "Version cannot be null." );
-        }
-
-        initialize( groupId, artifactId, version, type, classifier, optional, scope, inheritedScope );
-    }
-
-    public DefaultArtifact( ArtifactBasicMetadata bmd )
+    public DefaultArtifact( ArtifactMetadata bmd )
     {
         if ( bmd.getVersion() == null )
         {

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/Messages.properties Sat Mar  7 01:38:52 2009
@@ -18,3 +18,4 @@
 #
 
 artifact.metadata.no.version=no version in this metadata: {0}
+null.copy.from.md=cannot create a copy of a null metadata
\ No newline at end of file

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/api/ArtifactListProcessor.java Sat Mar  7 01:38:52 2009
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 
 /**
  * generic interface to be implemented by helper components
@@ -54,6 +54,6 @@
      *
      * @throws ArtifactListProcessorException
      */
-    public List<ArtifactBasicMetadata> process( List<ArtifactBasicMetadata> artifacts )
+    public List<ArtifactMetadata> process( List<ArtifactMetadata> artifacts )
         throws ArtifactListProcessorException;
 }

Modified: maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/MetadataVersionComparator.java Sat Mar  7 01:38:52 2009
@@ -20,7 +20,7 @@
 
 import java.util.Comparator;
 
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.codehaus.plexus.lang.DefaultLanguage;
 import org.codehaus.plexus.lang.Language;
 
@@ -31,11 +31,11 @@
  * @version $Id$
  */
 public class MetadataVersionComparator
-    implements Comparator<ArtifactBasicMetadata>
+    implements Comparator<ArtifactMetadata>
 {
     private static final Language _lang = new DefaultLanguage( MetadataVersionComparator.class );
 
-    public int compare( ArtifactBasicMetadata v1, ArtifactBasicMetadata v2 )
+    public int compare( ArtifactMetadata v1, ArtifactMetadata v2 )
     {
         if ( v1 == null || v2 == null )
         {

Modified: maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java (original)
+++ maven/mercury/trunk/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/DependencyFilterTest.java Sat Mar  7 01:38:52 2009
@@ -31,34 +31,34 @@
 public class DependencyFilterTest
     extends TestCase
 {
-    ArtifactBasicMetadata a1;
+    ArtifactMetadata a1;
 
-    ArtifactBasicMetadata a2;
+    ArtifactMetadata a2;
 
-    ArtifactBasicMetadata a3;
+    ArtifactMetadata a3;
 
-    ArtifactBasicMetadata a4;
+    ArtifactMetadata a4;
 
-    ArrayList<ArtifactBasicMetadata> inc;
+    ArrayList<ArtifactMetadata> inc;
 
-    ArrayList<ArtifactBasicMetadata> exc;
+    ArrayList<ArtifactMetadata> exc;
 
     @Override
     protected void setUp()
         throws Exception
     {
-        a1 = new ArtifactBasicMetadata( "a:a:1.1" );
-        a2 = new ArtifactBasicMetadata( "a:a:2.1" );
-        a3 = new ArtifactBasicMetadata( "a:a:3.1" );
-        a4 = new ArtifactBasicMetadata( "a:a:4.1" );
-
-        inc = new ArrayList<ArtifactBasicMetadata>();
-        inc.add( new ArtifactBasicMetadata( "a:a" ) );
-        inc.add( new ArtifactBasicMetadata( "b:b:2.0.0" ) );
-
-        exc = new ArrayList<ArtifactBasicMetadata>();
-        exc.add( new ArtifactBasicMetadata( "c:c" ) );
-        exc.add( new ArtifactBasicMetadata( "b:b:2.0.1" ) );
+        a1 = new ArtifactMetadata( "a:a:1.1" );
+        a2 = new ArtifactMetadata( "a:a:2.1" );
+        a3 = new ArtifactMetadata( "a:a:3.1" );
+        a4 = new ArtifactMetadata( "a:a:4.1" );
+
+        inc = new ArrayList<ArtifactMetadata>();
+        inc.add( new ArtifactMetadata( "a:a" ) );
+        inc.add( new ArtifactMetadata( "b:b:2.0.0" ) );
+
+        exc = new ArrayList<ArtifactMetadata>();
+        exc.add( new ArtifactMetadata( "c:c" ) );
+        exc.add( new ArtifactMetadata( "b:b:2.0.1" ) );
 
         a2.setInclusions( inc );
 
@@ -71,39 +71,39 @@
     public void testNoFilter()
         throws VersionException
     {
-        assertTrue( a1.allowDependency( new ArtifactBasicMetadata( "a:a:2.0.0" ) ) );
-        assertTrue( a1.allowDependency( new ArtifactBasicMetadata( "b:b:1.0.0" ) ) );
-        assertTrue( a1.allowDependency( new ArtifactBasicMetadata( "c:c:1.0.0" ) ) );
+        assertTrue( a1.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertTrue( a1.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertTrue( a1.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
     }
 
     public void testInclusionsFilter()
         throws VersionException
     {
-        assertTrue( a2.allowDependency( new ArtifactBasicMetadata( "a:a:2.0.0" ) ) );
-        assertFalse( a2.allowDependency( new ArtifactBasicMetadata( "b:b:1.0.0" ) ) );
-        assertTrue( a2.allowDependency( new ArtifactBasicMetadata( "b:b:2.0.0" ) ) );
-        assertFalse( a2.allowDependency( new ArtifactBasicMetadata( "b:b:2.0.1" ) ) );
-        assertFalse( a2.allowDependency( new ArtifactBasicMetadata( "c:c:1.0.0" ) ) );
+        assertTrue( a2.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertFalse( a2.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertTrue( a2.allowDependency( new ArtifactMetadata( "b:b:2.0.0" ) ) );
+        assertFalse( a2.allowDependency( new ArtifactMetadata( "b:b:2.0.1" ) ) );
+        assertFalse( a2.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
     }
 
     public void testExclusionsFilter()
         throws VersionException
     {
-        assertTrue( a3.allowDependency( new ArtifactBasicMetadata( "a:a:2.0.0" ) ) );
-        assertTrue( a3.allowDependency( new ArtifactBasicMetadata( "b:b:1.0.0" ) ) );
-        assertFalse( a3.allowDependency( new ArtifactBasicMetadata( "b:b:2.0.1" ) ) );
-        assertFalse( a3.allowDependency( new ArtifactBasicMetadata( "c:c:1.0.0" ) ) );
+        assertTrue( a3.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertTrue( a3.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertFalse( a3.allowDependency( new ArtifactMetadata( "b:b:2.0.1" ) ) );
+        assertFalse( a3.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
     }
 
     public void testInclusionsExclusionsFilter()
         throws VersionException
     {
-        assertTrue( a4.allowDependency( new ArtifactBasicMetadata( "a:a:2.0.0" ) ) );
-        assertFalse( a4.allowDependency( new ArtifactBasicMetadata( "b:b:1.0.0" ) ) );
-        assertTrue( a4.allowDependency( new ArtifactBasicMetadata( "b:b:2.0.0" ) ) );
-        assertFalse( a4.allowDependency( new ArtifactBasicMetadata( "b:b:2.0.1" ) ) );
-        assertFalse( a4.allowDependency( new ArtifactBasicMetadata( "b:b:3.0.1" ) ) );
-        assertFalse( a4.allowDependency( new ArtifactBasicMetadata( "c:c:1.0.0" ) ) );
+        assertTrue( a4.allowDependency( new ArtifactMetadata( "a:a:2.0.0" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "b:b:1.0.0" ) ) );
+        assertTrue( a4.allowDependency( new ArtifactMetadata( "b:b:2.0.0" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "b:b:2.0.1" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "b:b:3.0.1" ) ) );
+        assertFalse( a4.allowDependency( new ArtifactMetadata( "c:c:1.0.0" ) ) );
     }
 
 }

Modified: maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java (original)
+++ maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/DependencyProcessor.java Sat Mar  7 01:38:52 2009
@@ -21,14 +21,14 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 
 public interface DependencyProcessor
 {
 
     public static final DependencyProcessor NULL_PROCESSOR = new DependencyProcessor()
     {
-        public List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata bmd, MetadataReader mdReader,
+        public List<ArtifactMetadata> getDependencies( ArtifactMetadata bmd, MetadataReader mdReader,
                                                             Map<String, String> env, Map<?, ?> sysProps )
             throws MetadataReaderException, DependencyProcessorException
         {
@@ -37,7 +37,7 @@
     };
 
     // TODO: shouldn't sysProps be changed to Properties because of System.getProperties() API?
-    public List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata bmd, MetadataReader mdReader,
+    public List<ArtifactMetadata> getDependencies( ArtifactMetadata bmd, MetadataReader mdReader,
                                                         Map<String, String> env, Map<?, ?> sysProps )
         throws MetadataReaderException, DependencyProcessorException;
 }

Modified: maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java (original)
+++ maven/mercury/trunk/mercury-external/src/main/java/org/apache/maven/mercury/builder/api/MetadataReader.java Sat Mar  7 01:38:52 2009
@@ -18,7 +18,7 @@
  */
 package org.apache.maven.mercury.builder.api;
 
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 
 /**
  * This interface implementation is supplied to MetadataProcessor to simplify it's access to remote repositories
@@ -41,10 +41,10 @@
      * @throws MetadataReaderException
      * @throws RepositoryException
      */
-    public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type, boolean exempt )
+    public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type, boolean exempt )
         throws MetadataReaderException;
 
-    public byte[] readRawData( ArtifactBasicMetadata bmd, String classifier, String type )
+    public byte[] readRawData( ArtifactMetadata bmd, String classifier, String type )
         throws MetadataReaderException;
 
   /**
@@ -55,9 +55,9 @@
      * @return
      * @throws MetadataReaderException
      */
-    public byte[] readMetadata( ArtifactBasicMetadata bmd, boolean exempt )
+    public byte[] readMetadata( ArtifactMetadata bmd, boolean exempt )
         throws MetadataReaderException;
 
-    public byte[] readMetadata( ArtifactBasicMetadata bmd )
+    public byte[] readMetadata( ArtifactMetadata bmd )
         throws MetadataReaderException;
 }

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AbstractTestCase.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AbstractTestCase.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AbstractTestCase.java Sat Mar  7 01:38:52 2009
@@ -21,8 +21,6 @@
 
 import org.codehaus.plexus.PlexusTestCase;
 
-import junit.framework.TestCase;
-
 /**
  * Common tests code
  *

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AllTestCases.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AllTestCases.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AllTestCases.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/all/it/AllTestCases.java Sat Mar  7 01:38:52 2009
@@ -19,6 +19,9 @@
 
 package org.apache.maven.mercury.all.it;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.apache.maven.mercury.dependency.tests.DependencyTreeBuilderTest;
 import org.apache.maven.mercury.plexus.DefaultPlexusMercuryTest;
 import org.apache.maven.mercury.repository.tests.ComprehensiveRepositoryTest;
@@ -31,9 +34,6 @@
 import org.apache.maven.mercury.repository.tests.RemoteRepositoryWriterM2Test;
 import org.apache.maven.mercury.repository.tests.VirtualRepositoryReaderIntegratedTest;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * adopted from Maven ITs structure
  *

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java Sat Mar  7 01:38:52 2009
@@ -31,7 +31,6 @@
 
 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.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
 import org.apache.maven.mercury.event.DumbListener;
@@ -184,7 +183,7 @@
     
     List<Artifact> artifacts = new ArrayList<Artifact>();
     
-    for( ArtifactBasicMetadata abm : aRes.getResults().keySet() )
+    for( ArtifactMetadata abm : aRes.getResults().keySet() )
       artifacts.addAll(  aRes.getResults(abm) );
     
     localRepo.getWriter().writeArtifacts( artifacts );
@@ -265,7 +264,7 @@
 
     assertTrue( ar.hasResults() );
     
-    Map<ArtifactBasicMetadata, List<Artifact>> arts = ar.getResults();
+    Map<ArtifactMetadata, List<Artifact>> arts = ar.getResults();
     
     for( List<Artifact> al : arts.values() )
     {

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=751167&r1=751166&r2=751167&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 Sat Mar  7 01:38:52 2009
@@ -27,7 +27,6 @@
 
 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;
@@ -116,7 +115,7 @@
         File artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
         FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), artifactBinary );
 
-        a = new DefaultArtifact( new ArtifactBasicMetadata( "org.apache.maven.mercury:mercury-core:2.0.9" ) );
+        a = new DefaultArtifact( new ArtifactMetadata( "org.apache.maven.mercury:mercury-core:2.0.9" ) );
 
         a.setPomBlob( FileUtil.readRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) ) );
         a.setFile( artifactBinary );
@@ -182,7 +181,7 @@
     {
         ArtifactMetadata gavMd = new ArtifactMetadata( gav );
 
-        for ( ArtifactBasicMetadata md : res )
+        for ( ArtifactMetadata md : res )
             if ( md.sameGAV( gavMd ) )
                 return true;
 
@@ -233,13 +232,13 @@
     {
         ArtifactMetadata bmd = new ArtifactMetadata( artifactCoord );
 
-        List<ArtifactBasicMetadata> res = pm.readVersions( repos, bmd );
+        List<ArtifactMetadata> res = pm.readVersions( repos, bmd );
 
         assertNotNull( res );
 
         assertFalse( res.isEmpty() );
 
-        ArtifactBasicMetadata a = res.get( 0 );
+        ArtifactMetadata a = res.get( 0 );
 
         assertEquals( "1.0.0-alpha-2-20081104.001322-2", a.getVersion() );
 

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryReaderM2Test.java Sat Mar  7 01:38:52 2009
@@ -25,7 +25,7 @@
 import junit.framework.TestCase;
 
 import org.apache.maven.mercury.artifact.Artifact;
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.QualityRange;
 import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
@@ -53,9 +53,9 @@
   Repository repo;
   DependencyProcessor mdProcessor;
   RepositoryReader reader;
-  List<ArtifactBasicMetadata> query;
+  List<ArtifactMetadata> query;
   
-  ArtifactBasicMetadata bmd;
+  ArtifactMetadata bmd;
   
   private static final String publicKeyFile = "/pgp/pubring.gpg";
   private static final String secretKeyFile = "/pgp/secring.gpg";
@@ -88,7 +88,7 @@
   public void testReadReleaseVersion()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:[3,3]");
+    bmd = new ArtifactMetadata("a:a:[3,3]");
     query.add( bmd );
     
     ArtifactBasicResults res = reader.readVersions( query );
@@ -99,7 +99,7 @@
     
     assertEquals( 1, res.getResults().size() );
     
-    List<ArtifactBasicMetadata> ror = res.getResult( bmd );
+    List<ArtifactMetadata> ror = res.getResult( bmd );
     
     assertNotNull( ror );
     
@@ -116,7 +116,7 @@
   {
     repo.setRepositoryQualityRange( QualityRange.RELEASES_ONLY );
   
-    bmd = new ArtifactBasicMetadata("a:a:[3,)");
+    bmd = new ArtifactMetadata("a:a:[3,)");
     query.add( bmd );
     
     ArtifactBasicResults res = reader.readVersions( query );
@@ -131,12 +131,12 @@
     
     assertEquals( 1, res.getResults().size() );
     
-    List<ArtifactBasicMetadata> qr = res.getResult( bmd );
+    List<ArtifactMetadata> qr = res.getResult( bmd );
     
     assertNotNull( qr );
     assertTrue( qr.size() > 1 );
     
-    assertFalse( qr.contains( new ArtifactBasicMetadata("a:a:5-SNAPSHOT") ) );
+    assertFalse( qr.contains( new ArtifactMetadata("a:a:5-SNAPSHOT") ) );
     
     System.out.println("query "+bmd+"->"+qr);
     
@@ -146,25 +146,25 @@
     assertFalse( depRes.hasExceptions() );
     assertTrue( depRes.hasResults() );
     
-    ArtifactBasicMetadata a3 = new ArtifactBasicMetadata("a:a:3");
+    ArtifactMetadata a3 = new ArtifactMetadata("a:a:3");
     
     assertTrue( depRes.hasResults( a3 ) );
     
-    List<ArtifactBasicMetadata> deps = depRes.getResult( a3 );
+    List<ArtifactMetadata> deps = depRes.getResult( a3 );
     assertNotNull( deps );
     assertFalse( deps.isEmpty() );
 
     System.out.println(deps);
 
-    assertTrue( deps.contains( new ArtifactBasicMetadata("b:b:2") ) );
-    assertTrue( deps.contains( new ArtifactBasicMetadata("c:c:(1,)") ) );
+    assertTrue( deps.contains( new ArtifactMetadata("b:b:2") ) );
+    assertTrue( deps.contains( new ArtifactMetadata("c:c:(1,)") ) );
     
   }
   //------------------------------------------------------------------------------
   public void testReadArtifacts()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:3");
+    bmd = new ArtifactMetadata("a:a:3");
     query.add( bmd );
 
     ArtifactResults ror = reader.readArtifacts( query );
@@ -193,7 +193,7 @@
   public void testReadSnapshot()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:5-SNAPSHOT");
+    bmd = new ArtifactMetadata("a:a:5-SNAPSHOT");
     query.add( bmd );
 
     ArtifactResults ror = reader.readArtifacts( query );
@@ -223,7 +223,7 @@
   public void testReadSnapshotTS()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:5-20080807.234713-11");
+    bmd = new ArtifactMetadata("a:a:5-20080807.234713-11");
     query.add( bmd );
 
     ArtifactResults ror = reader.readArtifacts( query );
@@ -253,7 +253,7 @@
   public void testReadVersionsLatest()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:LATEST");
+    bmd = new ArtifactMetadata("a:a:LATEST");
     query.add( bmd );
 
     ArtifactBasicResults ror = reader.readVersions( query );
@@ -262,9 +262,9 @@
     
     if( ror.hasExceptions() )
     {
-      Map<ArtifactBasicMetadata, Exception> exs = ror.getExceptions();
+      Map<ArtifactMetadata, Exception> exs = ror.getExceptions();
       
-      for( ArtifactBasicMetadata bmd : exs.keySet() )
+      for( ArtifactMetadata bmd : exs.keySet() )
       {
         System.out.println( "\n==========> "+bmd.toString());
         exs.get( bmd ).printStackTrace();
@@ -274,18 +274,18 @@
     assertFalse( ror.hasExceptions() );
     assertTrue( ror.hasResults() );
     
-    List<ArtifactBasicMetadata> deps = ror.getResult(bmd);
+    List<ArtifactMetadata> deps = ror.getResult(bmd);
     
     assertNotNull( deps );
     assertEquals( 1, deps.size() );
-    assertTrue( deps.contains( new ArtifactBasicMetadata("a:a:5-SNAPSHOT") ) );
+    assertTrue( deps.contains( new ArtifactMetadata("a:a:5-SNAPSHOT") ) );
     
   }
   //------------------------------------------------------------------------------
   public void testReadVersionsRelease()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:RELEASE");
+    bmd = new ArtifactMetadata("a:a:RELEASE");
     query.add( bmd );
 
     ArtifactBasicResults ror = reader.readVersions( query );
@@ -298,18 +298,18 @@
     assertFalse( ror.hasExceptions() );
     assertTrue( ror.hasResults() );
     
-    List<ArtifactBasicMetadata> deps = ror.getResult(bmd);
+    List<ArtifactMetadata> deps = ror.getResult(bmd);
     
     assertNotNull( deps );
     assertEquals( 1, deps.size() );
-    assertTrue( deps.contains( new ArtifactBasicMetadata("a:a:4") ) );
+    assertTrue( deps.contains( new ArtifactMetadata("a:a:4") ) );
     
   }
   //------------------------------------------------------------------------------
   public void testReadLatest()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:LATEST");
+    bmd = new ArtifactMetadata("a:a:LATEST");
     query.add( bmd );
 
     ArtifactResults ror = reader.readArtifacts( query );
@@ -342,7 +342,7 @@
   public void testReadRelease()
   throws IllegalArgumentException, RepositoryException
   {
-    bmd = new ArtifactBasicMetadata("a:a:RELEASE");
+    bmd = new ArtifactMetadata("a:a:RELEASE");
     query.add( bmd );
 
     ArtifactResults ror = reader.readArtifacts( query );
@@ -387,7 +387,7 @@
     if( goodOs )
       server.setReaderStreamVerifierFactories(factories);
 
-    bmd = new ArtifactBasicMetadata("a:a:4");
+    bmd = new ArtifactMetadata("a:a:4");
     query.add( bmd );
 
     ArtifactResults ror = reader.readArtifacts( query );
@@ -432,7 +432,7 @@
     
     server.setReaderStreamVerifierFactories(factories);
 
-    bmd = new ArtifactBasicMetadata("a:a:3");
+    bmd = new ArtifactMetadata("a:a:3");
     query.add( bmd );
 
     ArtifactResults ror = null;
@@ -465,7 +465,7 @@
                   );
     server.setReaderStreamVerifierFactories(factories);
 
-    bmd = new ArtifactBasicMetadata("a:a:2");
+    bmd = new ArtifactMetadata("a:a:2");
     query.add( bmd );
 
     ArtifactResults ror = null;
@@ -502,7 +502,7 @@
       server.setReaderStreamVerifierFactories(factories);
     }
 
-    bmd = new ArtifactBasicMetadata("a:a:3");
+    bmd = new ArtifactMetadata("a:a:3");
     query.add( bmd );
 
     ArtifactResults ror = null;

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java Sat Mar  7 01:38:52 2009
@@ -25,15 +25,13 @@
 import java.util.Set;
 
 import org.apache.maven.mercury.artifact.Artifact;
-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.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
 import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
 import org.apache.maven.mercury.crypto.sha.SHA1VerifierFactory;
-import org.apache.maven.mercury.logging.IMercuryLogger;
-import org.apache.maven.mercury.logging.MercuryLoggerManager;
 import org.apache.maven.mercury.repository.api.Repository;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
 import org.apache.maven.mercury.repository.api.RepositoryWriter;
@@ -63,9 +61,9 @@
   RepositoryReader reader;
   RepositoryWriter writer;
 
-  List<ArtifactBasicMetadata> query;
+  List<ArtifactMetadata> query;
   
-  ArtifactBasicMetadata bmd;
+  ArtifactMetadata bmd;
   
   String pomBlob;
   
@@ -171,7 +169,7 @@
     assertFalse( new File( targetDirectory, "/org/apache/maven/maven-core/2.0.9/"+repo.getMetadataName()+".sha1").exists() );
 
     Set<Artifact> artifacts = new HashSet<Artifact>(3);
-    DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9") );
+    DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-core:2.0.9") );
     
     da.setPomBlob( pomBytes );
     da.setFile( artifactBinary );
@@ -218,7 +216,7 @@
     setSnapshots();
     
     Set<Artifact> artifacts = new HashSet<Artifact>(3);
-    DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-8") );
+    DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-8") );
     da.setPomBlob( pomBytes );
     da.setFile( artifactBinary );
     artifacts.add( da );
@@ -240,7 +238,7 @@
     setSnapshots();
     
     Set<Artifact> set = new HashSet<Artifact>(3);
-    DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-SNAPSHOT") );
+    DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-core:2.0.9-SNAPSHOT") );
     da.setPomBlob( pomBytes );
     da.setFile( artifactBinary );
     set.add( da );
@@ -262,7 +260,7 @@
     setSnapshots();
     
     Set<Artifact> set = new HashSet<Artifact>(3);
-    DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9:all") );
+    DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-core:2.0.9:all") );
     da.setFile( artifactBinary );
     set.add( da );
     
@@ -285,7 +283,7 @@
     {
       String si = ""+i;
       
-      DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-"+si) );
+      DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-"+si) );
       da.setPomBlob( pomBytes );
       File ab = File.createTempFile( "test-core-", "-bin" );
       FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), ab );
@@ -354,14 +352,14 @@
     {
       String si = ""+i;
       
-      DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0."+si+"-SNAPSHOT") );
+      DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-core:2.0."+si+"-SNAPSHOT") );
       da.setPomBlob( pomBytes );
       File ab = File.createTempFile( "test-core-", "-bin" );
       FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), ab );
       da.setFile( ab );
       set.add( da );
 
-      da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-mercury:2.0."+si+"-SNAPSHOT") );
+      da = new DefaultArtifact( new ArtifactMetadata("org.apache.maven:maven-mercury:2.0."+si+"-SNAPSHOT") );
       da.setPomBlob( pomBytes );
       ab = File.createTempFile( "test-mercury-", "-bin" );
       FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), ab );

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/ComprehensiveRepositoryTest.java Sat Mar  7 01:38:52 2009
@@ -27,7 +27,7 @@
 
 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.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.DefaultArtifact;
 import org.apache.maven.mercury.builder.api.DependencyProcessor;
 import org.apache.maven.mercury.repository.api.ArtifactBasicResults;
@@ -197,7 +197,7 @@
     public void writeArtifact( String name, File af, File ap, Repository repo, File expectedFile )
     throws Exception
     {
-        DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata(name) );
+        DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata(name) );
         
         da.setPomBlob( FileUtil.readRawData( ap ) );
         da.setFile( af );
@@ -222,9 +222,9 @@
     public List<Artifact> readArtifact( String name , List<Repository> repos )
     throws Exception
     {
-        ArtifactBasicMetadata bmd = new ArtifactBasicMetadata(name);
+        ArtifactMetadata bmd = new ArtifactMetadata(name);
         
-        List<ArtifactBasicMetadata> al = new ArrayList<ArtifactBasicMetadata>();
+        List<ArtifactMetadata> al = new ArrayList<ArtifactMetadata>();
         al.add( bmd );
         
         VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
@@ -241,12 +241,12 @@
         return res.getResults( bmd );
     }
     
-    public List<ArtifactBasicMetadata> readVersions( String name , List<Repository> repos )
+    public List<ArtifactMetadata> readVersions( String name , List<Repository> repos )
     throws Exception
     {
-        ArtifactBasicMetadata bmd = new ArtifactBasicMetadata(name);
+        ArtifactMetadata bmd = new ArtifactMetadata(name);
         
-        List<ArtifactBasicMetadata> al = new ArrayList<ArtifactBasicMetadata>();
+        List<ArtifactMetadata> al = new ArrayList<ArtifactMetadata>();
         al.add( bmd );
         
         VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
@@ -473,7 +473,7 @@
         writeArtifact( nameTS2, af, ap, _rr2, null );
         writeArtifact( nameSN, af, ap, _rr2, null );
         
-        List<ArtifactBasicMetadata> vl = readVersions( nameSN, _rrs );
+        List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
         
         System.out.println(vl);
         
@@ -514,7 +514,7 @@
         aJar = new File( _base1, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
         writeArtifact( nameTS2, af, ap, _rr1, aJar );
         
-        List<ArtifactBasicMetadata> vl = readVersions( nameSN, _rrs );
+        List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
         
         System.out.println(vl);
         
@@ -555,7 +555,7 @@
         aJar = new File( _base2, "org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20090204.232324-24.jar");
         writeArtifact( nameTS2, af, ap, _rr2, aJar );
         
-        List<ArtifactBasicMetadata> vl = readVersions( nameSN, _rrs );
+        List<ArtifactMetadata> vl = readVersions( nameSN, _rrs );
         
         System.out.println(vl);
         

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/DavServerTest.java Sat Mar  7 01:38:52 2009
@@ -26,7 +26,7 @@
 
 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.ArtifactMetadata;
 import org.apache.maven.mercury.artifact.DefaultArtifact;
 import org.apache.maven.mercury.repository.api.ArtifactResults;
 import org.apache.maven.mercury.repository.api.RepositoryReader;
@@ -153,7 +153,7 @@
         File pom = new File("./target/test.pom");
         FileUtil.writeRawData( pom, "test-pom" );
 
-        DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("a:test:1.0") );
+        DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("a:test:1.0") );
         da.setFile( jar );
         da.setPomBlob( FileUtil.readRawData( pom ) );
 
@@ -176,9 +176,9 @@
     {
         testDavWrite();
         
-        ArtifactBasicMetadata bmd = new ArtifactBasicMetadata("a:test:1.0");
+        ArtifactMetadata bmd = new ArtifactMetadata("a:test:1.0");
         
-        List<ArtifactBasicMetadata> query = new ArrayList<ArtifactBasicMetadata>( 1 );
+        List<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>( 1 );
 
         query.add( bmd );
         
@@ -218,7 +218,7 @@
         File pom = new File("./target/test.pom");
         FileUtil.writeRawData( pom, "test-pom" );
 
-        DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("a:test:1.0") );
+        DefaultArtifact da = new DefaultArtifact( new ArtifactMetadata("a:test:1.0") );
         da.setFile( jar );
         da.setPomBlob( FileUtil.readRawData( pom ) );
 
@@ -241,9 +241,9 @@
     {
         testDavWrite2();
         
-        ArtifactBasicMetadata bmd = new ArtifactBasicMetadata("a:test:1.0");
+        ArtifactMetadata bmd = new ArtifactMetadata("a:test:1.0");
         
-        List<ArtifactBasicMetadata> query = new ArrayList<ArtifactBasicMetadata>( 1 );
+        List<ArtifactMetadata> query = new ArrayList<ArtifactMetadata>( 1 );
 
         query.add( bmd );
         

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryReaderM2Test.java Sat Mar  7 01:38:52 2009
@@ -22,7 +22,7 @@
 import java.util.ArrayList;
 
 import org.apache.maven.mercury.MavenDependencyProcessor;
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.repository.local.m2.LocalRepositoryM2;
 import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
 import org.apache.maven.mercury.transport.api.Server;
@@ -44,7 +44,7 @@
   {
     mdProcessor = new MetadataProcessorMock();
 
-    query = new ArrayList<ArtifactBasicMetadata>();
+    query = new ArrayList<ArtifactMetadata>();
 
     server = new Server( "test", new File("./target/test-classes/repo").toURL() );
       

Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java?rev=751167&r1=751166&r2=751167&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/LocalRepositoryWriterM2Test.java Sat Mar  7 01:38:52 2009
@@ -24,7 +24,7 @@
 import java.util.HashSet;
 
 import org.apache.maven.mercury.MavenDependencyProcessor;
-import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
 import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
 import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
 import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
@@ -58,7 +58,7 @@
     FileUtil.copy( new File("./target/test-classes/repo"), targetDirectory, true );
     FileUtil.delete( new File(targetDirectory, "org") );
     
-    query = new ArrayList<ArtifactBasicMetadata>();
+    query = new ArrayList<ArtifactMetadata>();
     
     server = new Server( "test", targetDirectory.toURL() );
     // verifiers