Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

fix a bug with auth proxy servers

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-09-04 00:24:11 +02:00
parent 718285b07e
commit db467ea2c6
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ import org.sonatype.aether.impl.ArtifactDescriptorReader;
import org.sonatype.aether.impl.VersionRangeResolver; import org.sonatype.aether.impl.VersionRangeResolver;
import org.sonatype.aether.impl.VersionResolver; import org.sonatype.aether.impl.VersionResolver;
import org.sonatype.aether.impl.internal.DefaultServiceLocator; import org.sonatype.aether.impl.internal.DefaultServiceLocator;
import org.sonatype.aether.repository.Authentication;
import org.sonatype.aether.repository.LocalRepository; import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.Proxy; import org.sonatype.aether.repository.Proxy;
import org.sonatype.aether.repository.RemoteRepository; import org.sonatype.aether.repository.RemoteRepository;
@@ -325,8 +326,18 @@ public class AetherPluginHandler
*/ */
private Proxy createProxy() private Proxy createProxy()
{ {
Authentication authentication = null;
String username = configuration.getProxyUser();
String password = configuration.getProxyPassword();
if (Util.isNotEmpty(username) || Util.isNotEmpty(password))
{
authentication = new Authentication(Util.nonNull(username),
Util.nonNull(password));
}
return new Proxy(Proxy.TYPE_HTTP, configuration.getProxyServer(), return new Proxy(Proxy.TYPE_HTTP, configuration.getProxyServer(),
configuration.getProxyPort(), null); configuration.getProxyPort(), authentication);
} }
/** /**