Re: svn commit: r533717 - /maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/

[Emmanuel Venisse]

Jason van Zyl a écrit :

On 30 Apr 07, at 8:12 AM 30 Apr 07, [EMAIL PROTECTED] wrote:

Author: evenisse
Date: Mon Apr 30 05:12:41 2007
New Revision: 533717

URL: http://svn.apache.org/viewvc?view=rev&rev=533717
Log:
[SCM-303] Allow to define system properties in plugin configuration

Why not simple execution properties? System properties are terrible for embedding. I would suggest doing the exact same thing we are doing in 2.1 where System Properties are banned and you pass in a Properties object in the request. This way it's thread safe.

I'm agree, but this system property is used actually by the scm manager. I must 
change it before 1.0 final.

Emmanuel

Jason.

Modified:

maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.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?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- 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 Mon Apr 30 05:12:41 2007

@@ -41,6 +41,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.Properties;

 /**
  * @author <a href="[EMAIL PROTECTED]">Emmanuel Venisse</a>
@@ -149,6 +150,33 @@
      * @readonly
      */
     private Settings settings;
+
+    /**
+     * List of System properties to pass to the JUnit tests.
+     *
+     * @parameter
+     */
+    private Properties systemProperties;
+
+
+    public void execute()
+        throws MojoExecutionException
+    {
+        if ( systemProperties != null )
+        {
+            // Add all system properties configured by the user
+            Iterator iter = systemProperties.keySet().iterator();
+
+            while ( iter.hasNext() )
+            {
+                String key = (String) iter.next();
+
+                String value = systemProperties.getProperty( key );
+
+                System.setProperty( key, value );
+            }
+        }
+    }

     protected void setConnectionType( String connectionType )
     {

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java Mon Apr 30 05:12:41 2007

@@ -38,6 +38,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java Mon Apr 30 05:12:41 2007

@@ -67,6 +67,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         CheckOutScmResult result = checkout();

         runGoals( result.getRelativePathProjectDirectory() );

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java Mon Apr 30 05:12:41 2007

@@ -55,6 +55,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java Mon Apr 30 05:12:41 2007

@@ -92,6 +92,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+

SimpleDateFormat localFormat = new SimpleDateFormat( userDateFormat );

         try

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java Mon Apr 30 05:12:41 2007

@@ -68,6 +68,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         setConnectionType( connectionType );

         try

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java Mon Apr 30 05:12:41 2007

@@ -72,6 +72,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+

//skip checkout if checkout directory is already created. See SCM-201 if ( !getCheckoutDirectory().isDirectory() || !this.skipCheckoutIfExists )

         {

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java Mon Apr 30 05:12:41 2007

@@ -78,6 +78,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java Mon Apr 30 05:12:41 2007

@@ -40,6 +40,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java Mon Apr 30 05:12:41 2007

@@ -82,6 +82,8 @@
     protected void export()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java Mon Apr 30 05:12:41 2007

@@ -64,8 +64,10 @@
     private boolean recursive = true;

     public void execute()
-        throws MojoExecutionException, MojoFailureException
+        throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java Mon Apr 30 05:12:41 2007

@@ -44,6 +44,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java Mon Apr 30 05:12:41 2007

@@ -87,6 +87,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             SimpleDateFormat dateFormat = null;

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java Mon Apr 30 05:12:41 2007

@@ -40,6 +40,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java Mon Apr 30 05:12:41 2007

@@ -80,6 +80,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java Mon Apr 30 05:12:41 2007

@@ -68,6 +68,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         try
         {
             ScmRepository repository = getScmRepository();

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java?view=diff&rev=533717&r1=533716&r2=533717 ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java Mon Apr 30 05:12:41 2007

@@ -53,6 +53,8 @@
     public void execute()
         throws MojoExecutionException
     {
+        super.execute();
+
         //check connectionUrl provided with cli
         try
         {