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 2009/02/25 21:09:58 UTC
svn commit: r747905 - in
/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository:
LegacyMavenRepositorySystem.java MavenRepositorySystem.java
MavenRepositoryWrapper.java
Author: jvanzyl
Date: Wed Feb 25 20:09:57 2009
New Revision: 747905
URL: http://svn.apache.org/viewvc?rev=747905&view=rev
Log:
o trying out some more decoupling in a separate module
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java (with props)
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747905&r1=747904&r2=747905&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Wed Feb 25 20:09:57 2009
@@ -52,8 +52,6 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.artifact.MavenMetadataSource;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
@@ -182,7 +180,7 @@
return artifactFactory.createPluginArtifact( groupId, artifactId, versionRange );
}
- public Set<Artifact> createArtifacts( List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenProject project )
+ public Set<Artifact> createArtifacts( List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper project )
throws InvalidDependencyVersionException
{
return MavenMetadataSource.createArtifacts( artifactFactory, dependencies, inheritedScope, dependencyFilter, project );
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=747905&r1=747904&r2=747905&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java Wed Feb 25 20:09:57 2009
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
@@ -26,20 +25,14 @@
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ResolutionGroup;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DeploymentRepository;
-import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.wagon.events.TransferListener;
@@ -69,7 +62,7 @@
Artifact createDependencyArtifact( String groupId, String artifactId, String version, String type, String classifier, String scope, String inheritedScope );
- Set<Artifact> createArtifacts( List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenProject project )
+ Set<Artifact> createArtifacts( List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenRepositoryWrapper reactor )
throws InvalidDependencyVersionException;
// Repository creation
Added: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java?rev=747905&view=auto
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java (added)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java Wed Feb 25 20:09:57 2009
@@ -0,0 +1,53 @@
+/*
+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.repository;
+
+import java.io.File;
+
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * small repository implementation used to find artifact in a local source
+ * instead of going out to the real repo. Used to search reactor for matches
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public interface MavenRepositoryWrapper
+{
+ /**
+ * finds supplied artifact, if any, in the wrapped source
+ *
+ * @param artifact
+ * @return
+ */
+ Artifact find( Artifact artifact );
+
+ /**
+ * @return
+ */
+ String getId();
+
+ /**
+ * @return
+ */
+ File getFile();
+}
Propchange: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositoryWrapper.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"