Author: brett
Date: Tue Jun 7 18:56:01 2005
New Revision: 189490
URL: http://svn.apache.org/viewcvs?rev=189490&view=rev
Log:
PR: MNG-440
add proxy support, both as a nested element or if not given there, as a
settings.xml entry
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
maven/components/trunk/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=189490&r1=189489&r2=189490&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Tue Jun 7 18:56:01 2005
@@ -65,14 +65,22 @@
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 @@
{
r.addAuthentication( new Authentication( server ) );
}
+
+ org.apache.maven.settings.Proxy proxy = getSettings().getActiveProxy();
+ if ( proxy != null )
+ {
+ r.addProxy( new Proxy( proxy ) );
+ }
+
return r;
}
}
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java?rev=189490&r1=189489&r2=189490&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
Tue Jun 7 18:56:01 2005
@@ -31,6 +31,8 @@
private String snapshotPolicy;
+ private Proxy proxy;
+
public String getUrl()
{
return ( (RemoteRepository) getInstance() ).url;
@@ -59,5 +61,15 @@
public String getSnapshotPolicy()
{
return snapshotPolicy;
+ }
+
+ public void addProxy( Proxy proxy )
+ {
+ this.proxy = proxy;
+ }
+
+ public Proxy getProxy()
+ {
+ return proxy;
}
}
Modified:
maven/components/trunk/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml?rev=189490&r1=189489&r2=189490&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml
(original)
+++
maven/components/trunk/maven-artifact-ant/src/main/resources/org/apache/maven/artifact/ant/antlib.xml
Tue Jun 7 18:56:01 2005
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
