svn commit: r1069075 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

2011-02-09 Thread bentmann 
Author: bentmann
Date: Wed Feb  9 20:40:02 2011
New Revision: 1069075

URL: http://svn.apache.org/viewvc?rev=1069075&view=rev
Log:
o Polished code

Modified:

maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

Modified: 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=1069075&r1=1069074&r2=1069075&view=diff
==
--- 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
 (original)
+++ 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
 Wed Feb  9 20:40:02 2011
@@ -150,7 +150,7 @@ public abstract class AbstractScmMojo
 private File basedir;
 
 /**
- * @parameter expression="${settings}"
+ * @parameter default-value="${settings}"
  * @required
  * @readonly
  */
@@ -379,22 +379,22 @@ public abstract class AbstractScmMojo
 {
 if ( username == null )
 {
-username = this.settings.getServer( host ).getUsername();
+username = server.getUsername();
 }
 
 if ( password == null )
 {
-password = this.settings.getServer( host ).getPassword();
+password = server.getPassword();
 }
 
 if ( privateKey == null )
 {
-privateKey = this.settings.getServer( host 
).getPrivateKey();
+privateKey = server.getPrivateKey();
 }
 
 if ( passphrase == null )
 {
-passphrase = this.settings.getServer( host 
).getPassphrase();
+passphrase = server.getPassphrase();
 }
 }
 }

svn commit: r1069164 - in /maven/scm/trunk/maven-scm-plugin: ./ src/main/java/org/apache/maven/scm/plugin/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/plexus/ src/site

2011-02-09 Thread bentmann 
Author: bentmann
Date: Wed Feb  9 23:00:06 2011
New Revision: 1069164

URL: http://svn.apache.org/viewvc?rev=1069164&view=rev
Log:
[SCM-495] Support for encrypted passwords in settings.xml

Added:

maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/SettingsDecrypter.java
   (with props)
maven/scm/trunk/maven-scm-plugin/src/main/resources/
maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/
maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/

maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
   (with props)

maven/scm/trunk/maven-scm-plugin/src/test/resources/mojos/checkout/checkoutEncryptedPasswordFromSettings.xml
   (with props)
maven/scm/trunk/maven-scm-plugin/src/test/resources/settings-security.xml   
(with props)
Modified:
maven/scm/trunk/maven-scm-plugin/pom.xml

maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java

maven/scm/trunk/maven-scm-plugin/src/site/apt/examples/bootstrapping-with-pom.apt.vm

maven/scm/trunk/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/CheckoutMojoTest.java

Modified: maven/scm/trunk/maven-scm-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1069164&r1=1069163&r2=1069164&view=diff
==
--- maven/scm/trunk/maven-scm-plugin/pom.xml (original)
+++ maven/scm/trunk/maven-scm-plugin/pom.xml Wed Feb  9 23:00:06 2011
@@ -118,7 +118,12 @@
   file-management
   1.2.1
 
-
+
+
+  org.sonatype.plexus
+  plexus-sec-dispatcher
+  1.3
+
 
 
 
@@ -142,7 +147,6 @@
   
 
   
-
 
   
 
@@ -168,8 +172,53 @@
 
scp://people.apache.org/www/maven.apache.org/scm/maven-scm-plugin-${project.version}
   
 
+
+  org.apache.maven.plugins
+  maven-surefire-plugin
+  
+
+  
+settings.security
+
${project.build.testOutputDirectory}/settings-security.xml
+  
+
+  
+
   
 
+
+  
+org.apache.maven.plugins
+maven-shade-plugin
+1.4
+
+  
+  
+package
+
+  shade
+
+
+  false
+  
+
+  org.sonatype.plexus:*
+
+  
+  
+
+  org.sonatype.plexus
+  
org.apache.maven.scm.org.sonatype.plexus
+
+  
+  
+
+  
+
+  
+
+  
+
   
 
   

Modified: 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=1069164&r1=1069163&r2=1069164&view=diff
==
--- 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
 (original)
+++ 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
 Wed Feb  9 23:00:06 2011
@@ -142,6 +142,11 @@ public abstract class AbstractScmMojo
 private ScmManager manager;
 
 /**
+ * @component
+ */
+private SettingsDecrypter decryptor;
+
+/**
  * The base directory.
  *
  * @parameter expression="${basedir}"
@@ -384,7 +389,7 @@ public abstract class AbstractScmMojo
 
 if ( password == null )
 {
-password = server.getPassword();
+password = decryptor.decrypt( server.getPassword(), host );
 }
 
 if ( privateKey == null )
@@ -394,7 +399,7 @@ public abstract class AbstractScmMojo
 
 if ( passphrase == null )
 {
-passphrase = server.getPassphrase();
+passphrase = decryptor.decrypt( server.getPassphrase(), 
host );
 }
 }
 }

Added: 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/SettingsDecrypter.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/SettingsDecrypter.java?rev=1069164&view=auto
==
--- 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/SettingsDecrypter.java
 (added)
+++ 
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/SettingsDecrypter.java
 Wed Feb  9 23:00:06 2011
@@ -0,0 +1,49 @@
+package org.apache.maven.scm.plugin;
+
+/*
+ * Licensed to the