Author: brett
Date: Thu Jul 28 05:49:37 2011
New Revision: 1151737
URL: http://svn.apache.org/viewvc?rev=1151737&view=rev
Log:
add some comments about areas that can be improved when proxy sits behind the
repository API
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java?rev=1151737&r1=1151736&r2=1151737&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
Thu Jul 28 05:49:37 2011
@@ -180,6 +180,8 @@ public class DefaultDependencyTreeBuilde
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>();
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1151737&r1=1151736&r2=1151737&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
Thu Jul 28 05:49:37 2011
@@ -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>();
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1151737&r1=1151736&r2=1151737&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
Thu Jul 28 05:49:37 2011
@@ -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
+}