diff options
| author | Brett Porter <brett@apache.org> | 2011-07-28 05:49:37 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2011-07-28 05:49:37 +0000 |
| commit | 1e8ff1265f039b0c3dd9946848539023009b6c46 (patch) | |
| tree | 490950c1eb3f5617863861db47e0451ce4ae22f2 /archiva-modules/plugins/maven2-repository/src/main | |
| parent | 4e18b216a572527d6f2104bfc981dd2a4824bb39 (diff) | |
| download | archiva-1e8ff1265f039b0c3dd9946848539023009b6c46.tar.gz archiva-1e8ff1265f039b0c3dd9946848539023009b6c46.zip | |
add some comments about areas that can be improved when proxy sits behind the repository API
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1151737 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/plugins/maven2-repository/src/main')
3 files changed, 6 insertions, 2 deletions
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java index 61bfd5d93..5dea113e5 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java @@ -180,6 +180,8 @@ public class DefaultDependencyTreeBuilder try { // MRM-1411 + // TODO: this is a workaround for a lack of proxy capability in the resolvers - replace when it can all be + // handled there. It doesn't cache anything locally! List< RemoteRepositoryConfiguration > remoteRepositories = new ArrayList<RemoteRepositoryConfiguration>(); Map<String, ProxyInfo > networkProxies = new HashMap<String, ProxyInfo>(); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index d99f1644b..90aba6777 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -174,6 +174,8 @@ public class Maven2RepositoryStorage "The artifact's POM file '" + file.getAbsolutePath() + "' was missing" ); } + // TODO: this is a workaround until we can properly resolve using proxies as well - this doesn't cache + // anything locally! List<RemoteRepositoryConfiguration> remoteRepositories = new ArrayList<RemoteRepositoryConfiguration>(); Map<String, ProxyInfo> networkProxies = new HashMap<String, ProxyInfo>(); diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java index f0df57fef..45839b60e 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java @@ -139,7 +139,7 @@ public class RepositoryModelResolver return new RepositoryModelResolver( basedir, pathTranslator ); } - // TODO: we need to do some refactoring, we cannot re-use the proxy components of archiva-proxy in maven2-repository + // FIXME: we need to do some refactoring, we cannot re-use the proxy components of archiva-proxy in maven2-repository // because it's causing a cyclic dependency private boolean getModelFromProxy( RemoteRepositoryConfiguration remoteRepository, String groupId, String artifactId, String version, String filename ) @@ -398,4 +398,4 @@ public class RepositoryModelResolver } } } -}
\ No newline at end of file +} |