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

[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();
                 }
             }
         }