You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2007/07/25 23:31:05 UTC
svn commit: r559618 - in
/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage:
CopyRepositoryMojo.java DefaultRepositoryCopier.java RepositoryCopier.java
Author: dennisl
Date: Wed Jul 25 14:31:03 2007
New Revision: 559618
URL: http://svn.apache.org/viewvc?view=rev&rev=559618
Log:
o The plugin doesn't currently read username/password from settings.xml. If your local username is different than your Apache username, you can specify your Apache username with -Dstage.username=yourApacheUsername on the command line.
Modified:
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/RepositoryCopier.java
Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java?view=diff&rev=559618&r1=559617&r2=559618
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java Wed Jul 25 14:31:03 2007
@@ -19,12 +19,13 @@
* under the License.
*/
-import java.io.IOException;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.wagon.WagonException;
import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.IOException;
/**
* @author Jason van Zyl
@@ -44,6 +45,15 @@
private String repositoryId;
/**
+ * The plugin doesn't currently read username/password from settings.xml.
+ * If your local username is different than your Apache username, you can
+ * specify your Apache username with this parameter.
+ *
+ * @parameter expression="${stage.username}"
+ */
+ private String username;
+
+ /**
* @parameter expression="${version}"
* @required
*/
@@ -58,8 +68,15 @@
try
{
Repository targetRepository = new Repository( repositoryId, target );
-
- copier.copy( source, targetRepository, version );
+ getLog().debug( "username: " + username );
+ if ( StringUtils.isEmpty( username ) )
+ {
+ copier.copy( source, targetRepository, version );
+ }
+ else
+ {
+ copier.copy( source, targetRepository, version, username );
+ }
}
catch ( IOException e )
{
Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java?view=diff&rev=559618&r1=559617&r2=559618
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java Wed Jul 25 14:31:03 2007
@@ -31,6 +31,7 @@
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.WagonException;
import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.providers.ssh.jsch.ScpWagon;
import org.apache.maven.wagon.repository.Repository;
@@ -92,6 +93,12 @@
public void copy( String sourceRepositoryUrl, Repository targetRepository, String version )
throws WagonException, IOException
{
+ copy( sourceRepositoryUrl, targetRepository, version, null );
+ }
+
+ public void copy( String sourceRepositoryUrl, Repository targetRepository, String version, String username )
+ throws WagonException, IOException
+ {
String groupId = "staging-plugin";
String fileName = groupId + "-" + version + ".zip";
@@ -151,7 +158,10 @@
// TODO BUG for some reason it gets the wagon without authentication info
Wagon targetWagon = wagonManager.getWagon( targetRepository );
- targetWagon.connect( targetRepository );
+ // @todo Work around the bug above
+ AuthenticationInfo authenticationInfo = new AuthenticationInfo();
+ authenticationInfo.setUserName( username );
+ targetWagon.connect( targetRepository, authenticationInfo );
PrintWriter rw = new PrintWriter( new FileWriter( renameScript ) );
Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/RepositoryCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/RepositoryCopier.java?view=diff&rev=559618&r1=559617&r2=559618
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/RepositoryCopier.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/RepositoryCopier.java Wed Jul 25 14:31:03 2007
@@ -19,11 +19,11 @@
* under the License.
*/
-import java.io.IOException;
-
import org.apache.maven.wagon.WagonException;
import org.apache.maven.wagon.repository.Repository;
+import java.io.IOException;
+
/**
* @author Jason van Zyl
*/
@@ -46,5 +46,8 @@
throws WagonException, IOException;
public void copy( String sourceRepositoryUrl, Repository targetRepository, String version )
+ throws WagonException, IOException;
+
+ public void copy( String sourceRepositoryUrl, Repository targetRepository, String version, String username )
throws WagonException, IOException;
}