Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 05:55:44 +01:00
Code Issues Packages Projects Releases Activity

use proxy settings for maven aether, see #14

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-05-09 15:08:42 +02:00
parent 3f74473be5
commit d04c898fb8
2 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java
View File

@@ -57,7 +57,10 @@ import org.sonatype.aether.impl.VersionRangeResolver;
import org.sonatype.aether.impl.VersionResolver;
import org.sonatype.aether.impl.internal.DefaultServiceLocator;
import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.Proxy;
import org.sonatype.aether.repository.ProxySelector;
import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.resolution.DependencyRequest;
import org.sonatype.aether.spi.connector.RepositoryConnectorFactory;
import org.sonatype.aether.util.artifact.DefaultArtifact;
import org.sonatype.aether.util.graph.PreorderNodeListGenerator;
@@ -66,6 +69,7 @@ import sonia.scm.ConfigurationException;
import sonia.scm.SCMContextProvider;
import sonia.scm.boot.BootstrapListener;
import sonia.scm.boot.Classpath;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.util.IOUtil;
import sonia.scm.util.Util;
@@ -109,11 +113,14 @@ public class AetherPluginHandler
*
* @param pluginManager
* @param context
* @param configuration
*/
public AetherPluginHandler(PluginManager pluginManager,
SCMContextProvider context)
SCMContextProvider context,
ScmConfiguration configuration)
{
this.pluginManager = pluginManager;
this.configuration = configuration;
localRepositoryDirectory = new File(context.getBaseDirectory(),
BootstrapListener.PLUGIN_DIRECTORY);
@@ -208,8 +215,23 @@ public class AetherPluginHandler
for (PluginRepository repository : repositories)
{
remoteRepositories.add(new RemoteRepository(repository.getId(),
"default", repository.getUrl()));
RemoteRepository rr = new RemoteRepository(repository.getId(), "default",
repository.getUrl());
if (configuration.isEnableProxy())
{
Proxy proxy = createProxy();
if (logger.isDebugEnabled())
{
logger.debug("enable proxy {} for {}", repository.getUrl(),
proxy.getHost());
}
rr.setProxy(proxy);
}
remoteRepositories.add(rr);
}
}
@@ -236,8 +258,9 @@ public class AetherPluginHandler
{
DependencyNode node = repositorySystem.collectDependencies(session,
request).getRoot();
DependencyRequest dr = new DependencyRequest(node, FILTER);
repositorySystem.resolveDependencies(session, node, FILTER);
repositorySystem.resolveDependencies(session, dr);
synchronized (Classpath.class)
{
@@ -295,6 +318,18 @@ public class AetherPluginHandler
return classpathSet;
}
/**
* Method description
*
*
* @return
*/
private Proxy createProxy()
{
return new Proxy(Proxy.TYPE_HTTP, configuration.getProxyServer(),
configuration.getProxyPort(), null);
}
/**
* Method description
*
@@ -381,6 +416,9 @@ public class AetherPluginHandler
/** Field description */
private File classpathFile;
/** Field description */
private ScmConfiguration configuration;
/** Field description */
private JAXBContext jaxbContext;