Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-440 

add proxy support, both as a nested element or if not given there, as a settings.xml entry



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189490 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-06-08 01:56:01 +00:00
parent 223d37a7ad
commit f028275f61
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
View File

@ -65,14 +65,22 @@ protected ArtifactRepository createRemoteArtifactRepository( RemoteRepository re
ArtifactRepositoryLayout repositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE,
repository.getLayout() );
WagonManager manager = (WagonManager) lookup( WagonManager.ROLE );
Authentication authentication = repository.getAuthentication();
if ( authentication != null )
{
WagonManager manager = (WagonManager) lookup( WagonManager.ROLE );
manager.addAuthenticationInfo( "remote", authentication.getUserName(), authentication.getPassword(),
authentication.getPrivateKey(), authentication.getPassphrase() );
}
Proxy proxy = repository.getProxy();
if ( proxy != null )
{
manager.addProxy( proxy.getType(), proxy.getHost(), proxy.getPort(), proxy.getUserName(),
proxy.getPassword(), proxy.getNonProxyHosts() );
}
ArtifactRepository artifactRepository;
if ( repository.getSnapshotPolicy() != null )
{
@ -201,6 +209,13 @@ protected RemoteRepository createAntRemoteRepository( org.apache.maven.model.Rep
{
r.addAuthentication( new Authentication( server ) );
}
org.apache.maven.settings.Proxy proxy = getSettings().getActiveProxy();
if ( proxy != null )
{
r.addProxy( new Proxy( proxy ) );
}
return r;
}
}

12
maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
View File

@ -31,6 +31,8 @@ public class RemoteRepository
private String snapshotPolicy;
private Proxy proxy;
public String getUrl()
{
return ( (RemoteRepository) getInstance() ).url;
@ -60,4 +62,14 @@ public String getSnapshotPolicy()
{
return snapshotPolicy;
}
public void addProxy( Proxy proxy )
{
this.proxy = proxy;
}
public Proxy getProxy()
{
return proxy;
}
}

1
maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml
View File

@ -9,5 +9,6 @@
<typedef name="localRepository" classname="org.apache.maven.artifact.ant.LocalRepository"/>
<typedef name="remoteRepository" classname="org.apache.maven.artifact.ant.RemoteRepository"/>
<typedef name="authentication" classname="org.apache.maven.artifact.ant.Authentication"/>
<typedef name="proxy" classname="org.apache.maven.artifact.ant.Proxy"/>
<typedef name="pom" classname="org.apache.maven.artifact.ant.Pom"/>
</antlib>