Author: ogusakov
Date: Mon Dec 29 11:31:30 2008
New Revision: 729980
URL: http://svn.apache.org/viewvc?rev=729980&view=rev
Log:
[MERCURY-65] old-style authentication element inside repository works, updating
documentation
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
Modified: maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml?rev=729980&r1=729979&r2=729980&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant/mercury-ant-tasks/build.xml Mon Dec 29
11:31:30 2008
@@ -267,17 +267,38 @@
</target>
-
<target name="compile-old-syntax" depends="init">
- <remoteRepository id="remote.repository.old"
url="http://localhost:${repo.port}/maven2"; />
+ <remoteRepository id="remote.repository.old"
url="http://localhost:${repo.port}/maven2"; />
+
+ <localRepository path="${basedir}/target/path-old" layout="default"/>
+
+ <dependencies pathId="dependency.classpath">
+ <dependency groupId="asm" artifactId="asm" version="3.0"/>
+ </dependencies>
+
+ <javac srcdir="${src}"
+ destdir="${target}"
+ source="${compiler.version}"
+ target="${compiler.version}"
+ >
+ <classpath refid="dependency.classpath"/>
+ </javac>
+
+ </target>
+
+ <target name="compile-old-syntax-with-auth" depends="init">
+
+ <remoteRepository id="remote.repository.old"
url="http://localhost:${repo.port}/maven2";>
+ <authentication username="foo" password="bar"/>
+ </remoteRepository>
- <localRepository path="${basedir}/target/path-old" layout="default"/>
+ <localRepository path="${basedir}/target/path-old-auth" layout="default"/>
+
+ <dependencies pathId="dependency.classpath">
+ <dependency groupId="asm" artifactId="asm" version="3.0"/>
+ </dependencies>
- <dependencies pathId="dependency.classpath">
- <dependency groupId="asm" artifactId="asm" version="3.0"/>
- </dependencies>
-
<javac srcdir="${src}"
destdir="${target}"
source="${compiler.version}"
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java?rev=729980&r1=729979&r2=729980&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
Mon Dec 29 11:31:30 2008
@@ -33,15 +33,45 @@
this._name = name;
}
+ // compatibility with old syntax
+ public void setUsername( String name )
+ {
+ setName( name );
+ }
+
public void setPass( String pass )
{
this._pass = pass;
}
+ // compatibility with old syntax
+ public void setPassword( String pass )
+ {
+ setPass( pass );
+ }
+
+ // compatibility with old syntax
+ public void setPassphrase( String pass )
+ {
+ setPass( pass );
+ }
+
public void setCertfile( String certfile )
{
this._certfile = certfile;
}
+
+ // compatibility with old syntax
+ public void setPrivateKey( String certfile )
+ {
+ setCertfile( certfile );
+ }
+
+ // compatibility with old syntax + case independence
+ public void setPrivatekey( String certfile )
+ {
+ setCertfile( certfile );
+ }
protected static Auth findAuth( Project project, String authId )
{
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java?rev=729980&r1=729979&r2=729980&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
Mon Dec 29 11:31:30 2008
@@ -308,6 +308,11 @@
return _auth;
}
+ public Auth createAuthentication()
+ {
+ return createAuth();
+ }
+
public Auth createProxyauth()
{
_auth = new Auth();
@@ -315,6 +320,16 @@
return _auth;
}
+ public Auth createProxyauthentication()
+ {
+ return createProxyauth();
+ }
+
+ public Auth createProxyAuthentication()
+ {
+ return createProxyauth();
+ }
+
public class Verify
extends AbstractDataType
{
Modified:
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java?rev=729980&r1=729979&r2=729980&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
(original)
+++
maven/mercury/trunk/mercury-ant/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MecuryAntTest.java
Mon Dec 29 11:31:30 2008
@@ -386,6 +386,34 @@
assertTrue( asm.exists() );
}
+ // -----------------------------------
+ public void testCompileOldSyntaxWithAuth()
+ throws Exception
+ {
+ String title = "compile-old-syntax-with-auth";
+ System.out.println( "========> start " + title );
+ System.out.flush();
+
+ restart( _port, _remoteRepoDirFile, "/maven2", true );
+
+ File af = new File( _compileDirFile, "T.class" );
+
+ assertFalse( af.exists() );
+
+ File asm = new File( "target/path-old-auth/asm/asm/3.0/asm-3.0.jar" );
+
+ FileUtil.delete( asm );
+
+ asm.delete();
+
+ assertFalse( asm.exists() );
+
+ executeTarget( title );
+
+ assertTrue( af.exists() );
+
+ assertTrue( asm.exists() );
+ }
// -----------------------------------
public void testBadAuthRepo()
