svn commit: r1495412 - /commons/sandbox/commons-staging-plugin/trunk/src/main/java/org/apache/commons/plugins/staging/CreateScriptMojo.java

[se...@apache.org]

Author: sebb
Date: Fri Jun 21 12:37:57 2013
New Revision: 1495412

URL: http://svn.apache.org/r1495412
Log:
Need to avoid using names that might be confused with Maven plugin fields

Modified:
    commons/sandbox/commons-staging-plugin/trunk/src/main/java/org/apache/commons/plugins/staging/CreateScriptMojo.java

Modified: commons/sandbox/commons-staging-plugin/trunk/src/main/java/org/apache/commons/plugins/staging/CreateScriptMojo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/commons-staging-plugin/trunk/src/main/java/org/apache/commons/plugins/staging/CreateScriptMojo.java?rev=1495412&r1=1495411&r2=1495412&view=diff
==============================================================================
--- commons/sandbox/commons-staging-plugin/trunk/src/main/java/org/apache/commons/plugins/staging/CreateScriptMojo.java (original)
+++ commons/sandbox/commons-staging-plugin/trunk/src/main/java/org/apache/commons/plugins/staging/CreateScriptMojo.java Fri Jun 21 12:37:57 2013
@@ -52,20 +52,20 @@ public class CreateScriptMojo extends Ab
     /**
      * The top-level project name (as used in ASF dist repository) for the packages
      */
-    @Parameter( property="staging.project", required=true)
-    private String project;
+    @Parameter( property="staging.asfProject", required=true)
+    private String asfProject;
 
     /**
      * The staging directory name within the project (e.g. commons-lang-1.2-RC3)
      */
-    @Parameter( property="staging.directory", required=true)
+    @Parameter( property="staging.stagingDirectory", required=true)
     private String stagingDirectory;
     
     /**
      * The component name within the project package (for release folder); may be empty
      */
-    @Parameter( property="staging.component", required=false)
-    private String component;
+    @Parameter( property="staging.asfComponent", required=false)
+    private String asfComponent;
     
     /**
      * Where to find the packages for upload.
@@ -103,10 +103,10 @@ public class CreateScriptMojo extends Ab
                     throw new MojoExecutionException("Could not find " + releaseNotes);
                 }
             }
-            final String stagingDir = "dev/" + project + "/" + stagingDirectory;
+            final String stagingDir = "dev/" + asfProject + "/" + stagingDirectory;
             log.info("staging directory: " + stagingDir);
             final String releaseDir = 
-                    "release/" + project + (component != null && component.length() > 0 ? "/" + component : "");
+                    "release/" + asfProject + (asfComponent != null && asfComponent.length() > 0 ? "/" + asfComponent : "");
             log.info("release directory: " + releaseDir);
             try {
                 final PrintWriter staging = new PrintWriter(new File(packageDirectory, SVMNUCC_UPLOAD), "UTF-8");