Author: bentmann
Date: Sat Aug 1 13:10:20 2009
New Revision: 799858
URL: http://svn.apache.org/viewvc?rev=799858&view=rev
Log:
o Removed authorative flag from repo, resolution just stops when the artifact's
resolved flag is true
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java?rev=799858&r1=799857&r2=799858&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
Sat Aug 1 13:10:20 2009
@@ -28,16 +28,6 @@
public static final String IDE_WORKSPACE = "ide-workspace";
public abstract Artifact find( Artifact artifact );
-
- /**
- * If an artifact is found in this repository and this method returns true
the search is over. This would
- * be the case if we look for artifacts in the reactor or a IDE workspace.
We don't want to search any
- * further.
- *
- * @return
- */
- // workspace or reactor
- public abstract boolean isAuthoritative();
-
+
public abstract boolean hasLocalMetadata();
}
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java?rev=799858&r1=799857&r2=799858&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/UserLocalArtifactRepository.java
Sat Aug 1 13:10:20 2009
@@ -65,12 +65,6 @@
{
return localRepository.pathOf( artifact );
}
-
- @Override
- public boolean isAuthoritative()
- {
- return false;
- }
@Override
public boolean hasLocalMetadata()
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=799858&r1=799857&r2=799858&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
Sat Aug 1 13:10:20 2009
@@ -95,12 +95,6 @@
}
@Override
- public boolean isAuthoritative()
- {
- return true;
- }
-
- @Override
public boolean hasLocalMetadata()
{
return false;
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java?rev=799858&r1=799857&r2=799858&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/ideworkspace/TestIdeWorkspaceRepository.java
Sat Aug 1 13:10:20 2009
@@ -37,10 +37,4 @@
return false;
}
- @Override
- public boolean isAuthoritative()
- {
- return true;
- }
-
}