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 2009/11/10 23:18:35 UTC

svn commit: r834698 - /maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/

Author: bentmann
Date: Tue Nov 10 22:18:34 2009
New Revision: 834698

URL: http://svn.apache.org/viewvc?rev=834698&view=rev
Log:
o Moved local repo to context
o Added missing interface

Added:
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java   (with props)
Modified:
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java
    maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/CollectRequest.java Tue Nov 10 22:18:34 2009
@@ -33,14 +33,12 @@
     // 3. children-only, e.g. the (managed) dependencies of a project, don't resolve root but only its transitive
     // closure
 
-    Artifact getRoot();
+    Dependency getRoot();
 
     List<? extends Dependency> getDependencies();
 
     List<? extends Dependency> getManagedDependencies();
 
-    LocalRepository getLocalRepository();
-
     List<? extends RemoteRepository> getRemoteRepositories();
 
     RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DependencyRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@
 
     Artifact getArtifact();
 
-    LocalRepository getLocalRepository();
-
     List<? extends RemoteRepository> getRemoteRepositories();
 
     RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/DeployRequest.java Tue Nov 10 22:18:34 2009
@@ -30,8 +30,6 @@
 
     List<? extends Artifact> getArtifacts();
 
-    LocalRepository getLocalRepository();
-
     RemoteRepository getRemoteRepository();
 
     RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/RepositoryContext.java Tue Nov 10 22:18:34 2009
@@ -33,6 +33,10 @@
 
     String getUpdatePolicy();
 
+    LocalRepository getLocalRepository();
+
+    WorkspaceReader getWorkspaceReader();
+
     TransferListener getTransferListener();
 
     Properties getSystemProperties();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/ResolveRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@
 
     List<? extends Artifact> getArtifacts();
 
-    LocalRepository getLocalRepository();
-
     List<? extends RemoteRepository> getRemoteRepositories( Artifact artifact );
 
     RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRangeRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@
 
     Artifact getArtifact();
 
-    LocalRepository getLocalRepository();
-
     List<? extends RemoteRepository> getRemoteRepositories();
 
     RepositoryContext getContext();

Modified: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java?rev=834698&r1=834697&r2=834698&view=diff
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java (original)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/VersionRequest.java Tue Nov 10 22:18:34 2009
@@ -29,8 +29,6 @@
 
     Artifact getArtifact();
 
-    LocalRepository getLocalRepository();
-
     List<? extends RemoteRepository> getRemoteRepositories();
 
     RepositoryContext getContext();

Added: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java
URL: http://svn.apache.org/viewvc/maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java?rev=834698&view=auto
==============================================================================
--- maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java (added)
+++ maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java Tue Nov 10 22:18:34 2009
@@ -0,0 +1,35 @@
+package org.apache.maven.repository;
+
+/*
+ * 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.
+ */
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * @author Benjamin Bentmann
+ */
+public interface WorkspaceReader
+{
+
+    File findArtifact( Artifact artifact );
+
+    List<String> findVersions( Artifact artifact );
+
+}

Propchange: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-3/branches/MNG-4388/maven-dependency-tree-builder/src/main/java/org/apache/maven/repository/WorkspaceReader.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision