maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy ProxyInfo.java
Date Wed, 09 Feb 2005 09:54:23 GMT
brett       2005/02/09 01:54:23

  Modified:    wagon-providers/wagon-http pom.xml
               wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy
                        ProxyInfo.java
  Log:
  add NTLM settings and reformat
  
  Revision  Changes    Path
  1.7       +64 -65    maven-wagon/wagon-providers/wagon-http/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-http/pom.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pom.xml	14 Dec 2004 20:11:31 -0000	1.6
  +++ pom.xml	9 Feb 2005 09:54:23 -0000	1.7
  @@ -1,74 +1,73 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  -    <modelVersion>4.0.0</modelVersion>
  -    <parent>
  -        <groupId>maven</groupId>
  -        <artifactId>wagon-providers</artifactId>
  -        <version>1.0-alpha-2-SNAPSHOT</version>
  -    </parent>
  +  <modelVersion>4.0.0</modelVersion>
  +  <parent>
       <groupId>maven</groupId>
  -    <artifactId>wagon-http</artifactId>
  -    <name>Wagon HTTP Provider</name>
  +    <artifactId>wagon-providers</artifactId>
       <version>1.0-alpha-2-SNAPSHOT</version>
  -    <shortDescription>Wagon Provider for HTTP/HTTPS protocols based on jakarta-commons-httpclient</shortDescription>
  -    <package>org.apache.maven.wagon.providers.http</package>
  -    <inceptionYear>2003</inceptionYear>
  -    <url>http://maven.apache.org/wagon/wagon-providers/wagon-http</url>
  -    <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10319</issueTrackingUrl>
  -    <siteDirectory>/www/maven.apache.org/wagon/wagon-providers/wagon-http</siteDirectory>
  +  </parent>
  +  <groupId>maven</groupId>
  +  <artifactId>wagon-http</artifactId>
  +  <name>Wagon HTTP Provider</name>
  +  <version>1.0-alpha-2-SNAPSHOT</version>
  +  <shortDescription>Wagon Provider for HTTP/HTTPS protocols based on jakarta-commons-httpclient</shortDescription>
  +  <package>org.apache.maven.wagon.providers.http</package>
  +  <inceptionYear>2003</inceptionYear>
  +  <url>http://maven.apache.org/wagon/wagon-providers/wagon-http</url>
  +  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10319</issueTrackingUrl>
  +  <siteDirectory>/www/maven.apache.org/wagon/wagon-providers/wagon-http</siteDirectory>
   
  -    <developers>
  -        <developer>
  -            <name>Michal Maczka</name>
  -            <id>michal</id>
  -            <email>michal.maczka@dimatics.com</email>
  -            <organization>Dimatics</organization>
  -            <roles>
  -                <role>Creator</role>
  -                <role>Developer</role>
  -                <role>Release Manager</role>
  -            </roles>
  -        </developer>
  -    </developers>
  +  <developers>
  +    <developer>
  +      <name>Michal Maczka</name>
  +      <id>michal</id>
  +      <email>michal.maczka@dimatics.com</email>
  +      <organization>Dimatics</organization>
  +      <roles>
  +        <role>Creator</role>
  +        <role>Developer</role>
  +        <role>Release Manager</role>
  +      </roles>
  +    </developer>
  +  </developers>
   
  -    <dependencies>
  -        <dependency>
  -            <groupId>commons-httpclient</groupId>
  -            <artifactId>commons-httpclient</artifactId>
  -            <version>2.0</version>
  -            <type>jar</type>
  -        </dependency>
  -        <dependency>
  -            <groupId>commons-logging</groupId>
  -            <artifactId>commons-logging</artifactId>
  -            <version>1.0.3</version>
  -            <type>jar</type>
  -        </dependency>
  -        <dependency>
  -            <groupId>commons-lang</groupId>
  -            <artifactId>commons-lang</artifactId>
  -            <version>1.0.1</version>
  -            <type>jar</type>
  -        </dependency>
  +  <dependencies>
  +    <!-- Require v3.0+ for cross-host redirects to work -->
  +    <dependency>
  +      <groupId>commons-httpclient</groupId>
  +      <artifactId>commons-httpclient</artifactId>
  +      <version>3.0-rc1</version>
  +      <type>jar</type>
  +    </dependency>
  +    <dependency>
  +      <groupId>commons-logging</groupId>
  +      <artifactId>commons-logging</artifactId>
  +      <version>1.0.3</version>
  +      <type>jar</type>
  +    </dependency>
  +    <dependency>
  +      <groupId>commons-lang</groupId>
  +      <artifactId>commons-lang</artifactId>
  +      <version>1.0.1</version>
  +      <type>jar</type>
  +    </dependency>
   
  -
  -
  -        <!-- Testing -->
  -        <dependency>
  -            <groupId>plexus</groupId>
  -            <artifactId>plexus-jetty-httpd</artifactId>
  -            <version>1.0-SNAPSHOT</version>
  -        </dependency>
  -        <dependency>
  -            <groupId>jetty</groupId>
  -            <artifactId>jetty</artifactId>
  -            <version>4.2.10</version>
  -        </dependency>
  -        <dependency>
  -            <groupId>servletapi</groupId>
  -            <artifactId>servletapi</artifactId>
  -            <version>2.3</version>
  -        </dependency>
  -    </dependencies>
  +    <!-- Testing -->
  +    <dependency>
  +      <groupId>plexus</groupId>
  +      <artifactId>plexus-jetty-httpd</artifactId>
  +      <version>1.0-SNAPSHOT</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>jetty</groupId>
  +      <artifactId>jetty</artifactId>
  +      <version>4.2.10</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>servletapi</groupId>
  +      <artifactId>servletapi</artifactId>
  +      <version>2.3</version>
  +    </dependency>
  +  </dependencies>
   </project>
  
  
  
  1.4       +86 -50    maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyInfo.java
  
  Index: ProxyInfo.java
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProxyInfo.java	3 Feb 2005 11:39:14 -0000	1.3
  +++ ProxyInfo.java	9 Feb 2005 09:54:23 -0000	1.4
  @@ -31,121 +31,137 @@
    * which can be shared between wagon api and providers
    */
   public class ProxyInfo
  -implements Serializable
  +    implements Serializable
   {
       public final static String PROXY_SOCKS5 = "SOCKS_5";
       public final static String PROXY_SOCKS4 = "SOCKS4";
       public final static String PROXY_HTTP = "HTTP";
  +
       /**
  -         * Proxy server host
  -         */
  +     * Proxy server host
  +     */
       private String host = null;
  +
       /**
  -         * Username used to access the proxy server
  -         */
  +     * Username used to access the proxy server
  +     */
       private String userName = null;
  +
       /**
  -         * Password associated with the proxy server
  -         */
  +     * Password associated with the proxy server
  +     */
       private String password = null;
  +
       /**
  -         * Proxy server port
  -         */
  +     * Proxy server port
  +     */
       private int port = WagonConstants.UNKNOWN_PORT;
  +
       /**
  -         * Type of the proxy
  -         */
  +     * Type of the proxy
  +     */
       private String type = null;
  +
       /**
  -         * The non-proxy hosts. Follows Java system property format: <code>*.foo.com|localhost</code>.
  -         */
  +     * The non-proxy hosts. Follows Java system property format: <code>*.foo.com|localhost</code>.
  +     */
       private String nonProxyHosts;
   
       /**
  -         * Return proxy server host name.
  -         *
  -         * @return proxy server host name
  -         */
  +     * For NTLM proxies, specifies the NTLM host.
  +     */
  +    private String ntlmHost;
  +
  +    /**
  +     * For NTLM proxies, specifies the NTLM domain.
  +     */
  +    private String ntlmDomain;
  +
  +    /**
  +     * Return proxy server host name.
  +     *
  +     * @return proxy server host name
  +     */
       public String getHost()
       {
           return host;
       }
   
       /**
  -         * Set proxy host name.
  -         *
  -         * @param host proxy server host name
  -         */
  +     * Set proxy host name.
  +     *
  +     * @param host proxy server host name
  +     */
       public void setHost( final String host )
       {
           this.host = host;
       }
   
       /**
  -         * Get user's password used to login to proxy server.
  -         *
  -         * @return user's password at proxy host
  -         */
  +     * Get user's password used to login to proxy server.
  +     *
  +     * @return user's password at proxy host
  +     */
       public String getPassword()
       {
           return password;
       }
   
       /**
  -         * Set the user's password for the proxy server.
  -         *
  -         * @param password password to use to login to a proxy server
  -         */
  +     * Set the user's password for the proxy server.
  +     *
  +     * @param password password to use to login to a proxy server
  +     */
       public void setPassword( final String password )
       {
           this.password = password;
       }
   
       /**
  -         * Get the proxy port.
  -         *
  -         * @return proxy server port
  -         */
  +     * Get the proxy port.
  +     *
  +     * @return proxy server port
  +     */
       public int getPort()
       {
           return port;
       }
   
       /**
  -         * Set the proxy port.
  -         *
  -         * @param port proxy server port
  -         */
  +     * Set the proxy port.
  +     *
  +     * @param port proxy server port
  +     */
       public void setPort( final int port )
       {
           this.port = port;
       }
   
       /**
  -         * Get the proxy username.
  -         *
  -         * @return username for the proxy server
  -         */
  +     * Get the proxy username.
  +     *
  +     * @return username for the proxy server
  +     */
       public String getUserName()
       {
           return userName;
       }
   
       /**
  -         * Set the proxy username.
  -         *
  -         * @param userName username for the proxy server
  -         */
  +     * Set the proxy username.
  +     *
  +     * @param userName username for the proxy server
  +     */
       public void setUserName( final String userName )
       {
           this.userName = userName;
       }
   
       /**
  -         * Get the type of the proxy server.
  -         *
  -         * @return the type of the proxy server
  -         */
  +     * Get the type of the proxy server.
  +     *
  +     * @return the type of the proxy server
  +     */
       public String getType()
       {
           return type;
  @@ -168,4 +184,24 @@
       {
           this.nonProxyHosts = nonProxyHosts;
       }
  +
  +    public String getNtlmHost()
  +    {
  +        return ntlmHost;
  +    }
  +
  +    public void setNtlmHost( String ntlmHost )
  +    {
  +        this.ntlmHost = ntlmHost;
  +    }
  +
  +    public void setNtlmDomain( String ntlmDomain )
  +    {
  +        this.ntlmDomain = ntlmDomain;
  +    }
  +
  +    public String getNtlmDomain()
  +    {
  +        return ntlmDomain;
  +    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org


Mime
View raw message