Author: ogusakov
Date: Thu Jan 8 18:16:54 2009
New Revision: 732910
URL: http://svn.apache.org/viewvc?rev=732910&view=rev
Log:
[MERCURY-72] fixing the consequences of the swallowed exception
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.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-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
Modified:
maven/mercury/trunk/mercury-ant/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/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=732910&r1=732909&r2=732910&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
Thu Jan 8 18:16:54 2009
@@ -10,6 +10,7 @@
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.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.builder.api.DependencyProcessor;
import org.apache.maven.mercury.logging.IMercuryLogger;
@@ -144,7 +145,7 @@
VirtualRepositoryReader vr = new VirtualRepositoryReader( repos );
- List<ArtifactMetadata> res = db.resolveConflicts( scope,
getDependencies(vr) );
+ List<ArtifactMetadata> res = db.resolveConflicts( scope, new
ArtifactQueryList( getDependencies(vr) ), null, null );
if ( Util.isEmpty( res ) )
return null;
Modified:
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?rev=732910&r1=732909&r2=732910&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
(original)
+++
maven/mercury/trunk/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
Thu Jan 8 18:16:54 2009
@@ -261,6 +261,11 @@
return artifactId + "-" + version + (classifier == null ? ""
:"-"+classifier);
}
+ 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);
Modified:
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java?rev=732910&r1=732909&r2=732910&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
(original)
+++
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyBuilder.java
Thu Jan 8 18:16:54 2009
@@ -21,7 +21,10 @@
import java.util.List;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactExclusionList;
+import org.apache.maven.mercury.artifact.ArtifactInclusionList;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.event.MercuryEventListener;
@@ -67,9 +70,13 @@
* @return list of resolved GAVs
* @throws MetadataTreeException
*/
- public abstract List<ArtifactMetadata> resolveConflicts( ArtifactScopeEnum
scope, ArtifactBasicMetadata... startMDs )
- throws MetadataTreeException;
- public abstract List<ArtifactMetadata> resolveConflicts( ArtifactScopeEnum
scope, List<ArtifactBasicMetadata> startMDs )
+ public abstract List<ArtifactMetadata> resolveConflicts(
+ ArtifactScopeEnum scope
+ , ArtifactQueryList artifacts
+ , ArtifactInclusionList inclusions
+ , ArtifactExclusionList exclusions
+ )
+
throws MetadataTreeException;
/**
Modified:
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=732910&r1=732909&r2=732910&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
(original)
+++
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
Thu Jan 8 18:16:54 2009
@@ -19,7 +19,6 @@
package org.apache.maven.mercury.metadata;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
@@ -27,7 +26,10 @@
import java.util.Map;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactExclusionList;
+import org.apache.maven.mercury.artifact.ArtifactInclusionList;
import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.artifact.ArtifactQueryList;
import org.apache.maven.mercury.artifact.ArtifactScopeEnum;
import org.apache.maven.mercury.artifact.api.ArtifactListProcessor;
import org.apache.maven.mercury.artifact.version.VersionException;
@@ -151,16 +153,20 @@
}
// ------------------------------------------------------------------------
- public List<ArtifactMetadata> resolveConflicts( ArtifactScopeEnum scope,
ArtifactBasicMetadata... startMDs )
- throws MetadataTreeException
- {
- return resolveConflicts( scope, Arrays.asList( startMDs ) );
- }
+ public List<ArtifactMetadata> resolveConflicts(
+ ArtifactScopeEnum scope
+ , ArtifactQueryList artifacts
+ , ArtifactInclusionList inclusions
+ , ArtifactExclusionList exclusions
+ )
- // ------------------------------------------------------------------------
- public List<ArtifactMetadata> resolveConflicts( ArtifactScopeEnum scope,
List<ArtifactBasicMetadata> startMDs )
- throws MetadataTreeException
+ throws MetadataTreeException
{
+ if ( artifacts == null )
+ throw new MetadataTreeException( _lang.getMessage(
"empty.md.collection" ) );
+
+ List<ArtifactBasicMetadata> startMDs = artifacts.getMetadataList();
+
if ( Util.isEmpty( startMDs ) )
throw new MetadataTreeException( _lang.getMessage(
"empty.md.collection" ) );
@@ -185,6 +191,8 @@
}
DUMMY_ROOT.setDependencies( startMDs );
+ DUMMY_ROOT.setInclusions( inclusions == null ? null :
inclusions.getMetadataList() );
+ DUMMY_ROOT.setExclusions( exclusions == null ? null :
exclusions.getMetadataList() );
// combine into one tree
MetadataTreeNode root = new MetadataTreeNode( DUMMY_ROOT, null, null );
@@ -200,8 +208,9 @@
}
// -----------------------------------------------------
- private MetadataTreeNode createNode( ArtifactBasicMetadata nodeMD,
MetadataTreeNode parent,
- ArtifactBasicMetadata nodeQuery,
ArtifactScopeEnum globalScope )
+ private MetadataTreeNode createNode( ArtifactBasicMetadata nodeMD,
MetadataTreeNode parent
+ , ArtifactBasicMetadata nodeQuery,
ArtifactScopeEnum globalScope
+ )
throws MetadataTreeException
{
GenericEvent nodeBuildEvent = null;
Modified:
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java?rev=732910&r1=732909&r2=732910&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
(original)
+++
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/DefaultPlexusMercury.java
Thu Jan 8 18:16:54 2009
@@ -207,7 +207,13 @@
}
//---------------------------------------------------------------
- public List<Artifact> read( List<Repository> repos, List<ArtifactMetadata>
artifacts )
+ public List<Artifact> read( List<Repository> repos, ArtifactBasicMetadata...
artifacts )
+ throws RepositoryException
+ {
+ return read( repos, Arrays.asList( artifacts ) );
+ }
+ //---------------------------------------------------------------
+ public List<Artifact> read( List<Repository> repos, List<? extends
ArtifactBasicMetadata> artifacts )
throws RepositoryException
{
if( Util.isEmpty( repos ) )
@@ -290,17 +296,19 @@
{
DependencyBuilder depBuilder = DependencyBuilderFactory.create(
DependencyBuilderFactory.JAVA_DEPENDENCY_MODEL, repos );
- ArtifactBasicMetadata a = artifacts.getMetadataList().get( 0 );
+// ArtifactBasicMetadata a = artifacts.getMetadataList().get( 0 );
+//
+// if( inclusions != null && ! inclusions.isEmpty() )
+// a.setInclusions( inclusions.getMetadataList() );
+//
+// if( exclusions != null && ! exclusions.isEmpty() )
+// a.setExclusions( exclusions.getMetadataList() );
+//
+// MetadataTreeNode root = depBuilder.buildTree( a, scope );
+//
+// List<ArtifactMetadata> res = depBuilder.resolveConflicts( root );
- if( inclusions != null && ! inclusions.isEmpty() )
- a.setInclusions( inclusions.getMetadataList() );
-
- if( exclusions != null && ! exclusions.isEmpty() )
- a.setExclusions( exclusions.getMetadataList() );
-
- MetadataTreeNode root = depBuilder.buildTree( a, scope );
-
- List<ArtifactMetadata> res = depBuilder.resolveConflicts( root );
+ List<ArtifactMetadata> res = depBuilder.resolveConflicts( scope,
artifacts, inclusions, exclusions );
return res;
}
Modified:
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java?rev=732910&r1=732909&r2=732910&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
(original)
+++
maven/mercury/trunk/mercury-plexus/src/main/java/org/apache/maven/mercury/plexus/PlexusMercury.java
Thu Jan 8 18:16:54 2009
@@ -26,6 +26,7 @@
import java.util.Set;
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;
@@ -175,9 +176,9 @@
* @return
* @throws PlexusMercuryException
*/
- public List<Artifact> read( List<Repository> repo, List<ArtifactMetadata>
artifacts )
+ public List<Artifact> read( List<Repository> repo, List<? extends
ArtifactBasicMetadata> artifacts )
throws RepositoryException;
- public List<Artifact> read( List<Repository> repo, ArtifactMetadata...
artifacts )
+ public List<Artifact> read( List<Repository> repo, ArtifactBasicMetadata...
artifacts )
throws RepositoryException;
/**
