You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/09/22 09:25:51 UTC
svn commit: r578386 - in
/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact:
./ resolver/metadata/
Author: jvanzyl
Date: Sat Sep 22 00:25:50 2007
New Revision: 578386
URL: http://svn.apache.org/viewvc?rev=578386&view=rev
Log: (empty)
Modified:
maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java?rev=578386&r1=578385&r2=578386&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java Sat Sep 22 00:25:50 2007
@@ -9,7 +9,8 @@
, system(5)
;
- private int id;
+ public static final ArtifactScopeEnum DEFAULT_SCOPE = compile;
+ private int id;
// Constructor
ArtifactScopeEnum( int id )
Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java?rev=578386&r1=578385&r2=578386&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java Sat Sep 22 00:25:50 2007
@@ -3,6 +3,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactScopeEnum;
+import sun.security.action.GetLongAction;
+
/** @author Oleg Gusakov */
public class ArtifactMetadata
{
@@ -12,6 +14,8 @@
protected String type;
protected ArtifactScopeEnum scope;
protected String classifier;
+
+ protected boolean resolved = false;
//------------------------------------------------------------------
public ArtifactMetadata( String groupId, String name, String version )
{
@@ -52,6 +56,8 @@
setType(af.getType());
setScope( af.getScope() );
setClassifier( af.getClassifier() );
+
+ this.resolved = af.isResolved();
}
//------------------------------------------------------------------
@Override
@@ -89,8 +95,10 @@
public void setType(String type) {
this.type = type;
}
- public ArtifactScopeEnum getScope() {
- return scope;
+
+ public ArtifactScopeEnum getScope()
+ {
+ return scope == null ? ArtifactScopeEnum.DEFAULT_SCOPE : scope;
}
public void setScope(ArtifactScopeEnum scope)
{
@@ -99,7 +107,7 @@
public void setScope(String scope)
{
this.scope = scope == null
- ? ArtifactScopeEnum.compile
+ ? ArtifactScopeEnum.DEFAULT_SCOPE
: ArtifactScopeEnum.valueOf(scope)
;
}
@@ -108,6 +116,14 @@
}
public void setClassifier(String classifier) {
this.classifier = classifier;
+ }
+ public boolean isResolved()
+ {
+ return resolved;
+ }
+ public void setResolved(boolean resolved)
+ {
+ this.resolved = resolved;
}
//------------------------------------------------------------------
//------------------------------------------------------------------
Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java?rev=578386&r1=578385&r2=578386&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java Sat Sep 22 00:25:50 2007
@@ -26,6 +26,7 @@
throws MetadataResolutionException
{
try {
+ getLogger().debug("Received request for: "+req.getQuery() );
MetadataResolutionResult res = new MetadataResolutionResult();
if( req.type == null ) {
throw new MetadataResolutionException("no type in the request");
@@ -69,15 +70,24 @@
+ "\n> remoteRepos: "+req.getRemoteRepositories()
+ "\n> localRepo : "+req.getLocalRepository()
);
- ar.resolve( pomArtifact
- , req.getRemoteRepositories()
- , req.getLocalRepository()
- );
+
+ try {
+ ar.resolve( pomArtifact
+ , req.getRemoteRepositories()
+ , req.getLocalRepository()
+ );
+ } catch ( ArtifactResolutionException are ) {
+ pomArtifact.setResolved(false);
+ } catch( ArtifactNotFoundException anfe ) {
+ pomArtifact.setResolved(false);
+ }
+
if( pomArtifact.isResolved() ) {
ResolutionGroup rg = ams.retrieve( pomArtifact, req.getLocalRepository(), req.getRemoteRepositories() );
- MetadataTreeNode node = new MetadataTreeNode( pomArtifact, parent, true );
+ MetadataTreeNode node = new MetadataTreeNode( pomArtifact, parent, true, query.getScope() );
Set<Artifact> dependencies = (Set<Artifact>)rg.getArtifacts();
- if( dependencies != null && dependencies.size() > 0 ) {
+ if( dependencies != null && dependencies.size() > 0 )
+ {
ArrayList<MetadataTreeNode> kids = new ArrayList<MetadataTreeNode>( dependencies.size() );
for( Artifact a : dependencies ) {
req.query.init( a );
@@ -89,7 +99,7 @@
return node;
}
else {
- return new MetadataTreeNode( pomArtifact, parent, false );
+ return new MetadataTreeNode( pomArtifact, parent, false, query.getScope() );
}
} catch( Exception anyEx ) {
anyEx.printStackTrace();
Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java?rev=578386&r1=578385&r2=578386&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java Sat Sep 22 00:25:50 2007
@@ -3,6 +3,7 @@
import java.util.List;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactScopeEnum;
public class MetadataTreeNode
{
@@ -17,16 +18,19 @@
{
}
//------------------------------------------------------------------------
- public MetadataTreeNode( ArtifactMetadata md, MetadataTreeNode parent, boolean resolved )
+ public MetadataTreeNode( ArtifactMetadata md, MetadataTreeNode parent, boolean resolved, ArtifactScopeEnum scope )
{
+ if( md != null )
+ md.setScope(scope);
+
this.md = md;
this.parent = parent;
this.resolved = resolved;
}
//------------------------------------------------------------------------
- public MetadataTreeNode( Artifact af, MetadataTreeNode parent, boolean resolved )
+ public MetadataTreeNode( Artifact af, MetadataTreeNode parent, boolean resolved, ArtifactScopeEnum scope )
{
- this( new ArtifactMetadata(af), parent, resolved );
+ this( new ArtifactMetadata(af), parent, resolved, scope );
}
//------------------------------------------------------------------------
public void addChildren( List<MetadataTreeNode> kidList )