svn commit: r178310 - /maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java

[evenisse]

Author: evenisse
Date: Tue May 24 15:52:55 2005
New Revision: 178310

URL: http://svn.apache.org/viewcvs?rev=178310&view=rev
Log:
Fix tag creation. We need to store in release.properties the tag choose by user

Modified:
    
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java?rev=178310&r1=178309&r2=178310&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
 Tue May 24 15:52:55 2005
@@ -65,6 +65,8 @@
 
     private Model model;
 
+    private String userTag;
+
     protected void executeTask()
         throws MojoExecutionException
     {
@@ -435,7 +437,7 @@
         }
     }
 
-    private String getTagLabel()
+    private String getDefaultTagLabel()
     {
         String tag = project.getArtifactId().toUpperCase() + "_" + 
projectVersion.toUpperCase();
 
@@ -446,6 +448,44 @@
         return tag;
     }
 
+    private String getTagLabel()
+        throws MojoExecutionException
+    {
+        if ( userTag == null )
+        {
+            userTag = getDefaultTagLabel();
+
+            try
+            {
+                ScmBean scm = getScm();
+
+                if ( scm.getTag() == null )
+                {
+                    getLog().info( "What tag name should be used? [ " + tag + 
" ]" );
+
+                    InputHandler handler = (InputHandler) 
getContainer().lookup( InputHandler.ROLE );
+
+                    String inputTag = handler.readLine();
+
+                    if ( !StringUtils.isEmpty( inputTag ) )
+                    {
+                        userTag = inputTag;
+                    }
+                }
+                else
+                {
+                    userTag = scm.getTag();
+                }
+            }
+            catch ( Exception e )
+            {
+                throw new MojoExecutionException( "An error is occurred in the 
tag process.", e );
+            }
+        }
+
+        return userTag;
+    }
+
     /**
      * Tag the release in preparation for performing the release.
      *
@@ -466,23 +506,7 @@
         {
             ScmBean scm = getScm();
 
-            scm.setWorkingDirectory( basedir );
-
-            if ( scm.getTag() == null )
-            {
-                getLog().info( "What tag name should be used? [ " + tag + " ]" 
);
-
-                InputHandler handler = (InputHandler) getContainer().lookup( 
InputHandler.ROLE );
-
-                String inputTag = handler.readLine();
-
-                if ( !StringUtils.isEmpty( inputTag ) )
-                {
-                    tag = inputTag;
-                }
-
-                scm.setTag( tag );
-            }
+            scm.setTag( tag );
 
             getLog().info( "Tagging release with the label " + tag + "." );
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]