You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/03/24 14:26:24 UTC
svn commit: r927050 - in /maven/maven-3/trunk:
maven-artifact/src/main/java/org/apache/maven/artifact/repository/
maven-compat/src/main/java/org/apache/maven/artifact/repository/
maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/a...
Author: bentmann
Date: Wed Mar 24 13:26:24 2010
New Revision: 927050
URL: http://svn.apache.org/viewvc?rev=927050&view=rev
Log:
o Refactored code to be more general/clear
Modified:
maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java?rev=927050&r1=927049&r2=927050&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java (original)
+++ maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java Wed Mar 24 13:26:24 2010
@@ -75,6 +75,14 @@ public interface ArtifactRepository
*/
List<String> findVersions( Artifact artifact );
+ /**
+ * Indicates whether this repository is backed by actual projects. For instance, the build reactor or IDE workspace
+ * are examples of such repositories.
+ *
+ * @return {@code true} if the repository is backed by actual projects, {@code false} otherwise.
+ */
+ boolean isProjectAware();
+
void setAuthentication( Authentication authentication );
Authentication getAuthentication();
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java?rev=927050&r1=927049&r2=927050&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java Wed Mar 24 13:26:24 2010
@@ -216,6 +216,11 @@ public class DefaultArtifactRepository
return Collections.emptyList();
}
+ public boolean isProjectAware()
+ {
+ return false;
+ }
+
public Authentication getAuthentication()
{
return authentication;
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=927050&r1=927049&r2=927050&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java Wed Mar 24 13:26:24 2010
@@ -276,4 +276,11 @@ public class ReactorArtifactRepository
return eq( reactorProjects.keySet(), other.reactorProjects.keySet() );
}
+
+ @Override
+ public boolean isProjectAware()
+ {
+ return true;
+ }
+
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java?rev=927050&r1=927049&r2=927050&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java Wed Mar 24 13:26:24 2010
@@ -375,4 +375,9 @@ public class MavenArtifactRepository
return true;
}
+ public boolean isProjectAware()
+ {
+ return false;
+ }
+
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=927050&r1=927049&r2=927050&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Wed Mar 24 13:26:24 2010
@@ -238,7 +238,7 @@ public class DefaultProjectBuilder
"Error resolving project artifact: " + e.getMessage(), e );
}
- boolean localProject = artifact.getRepository() != null && "reactor".equals( artifact.getRepository().getId() );
+ boolean localProject = artifact.getRepository() != null && artifact.getRepository().isProjectAware();
File pomFile = artifact.getFile();