svn commit: r171239 - in /maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin: release/PrepareReleaseMojo.java scm/ScmBean.java

[jvanzyl]

Author: jvanzyl
Date: Sat May 21 12:08:10 2005
New Revision: 171239

URL: http://svn.apache.org/viewcvs?rev=171239&view=rev
Log:
o the getScm() call creates a new instance of the scm bean so I corrected some
  spots where it was being used because it was assuming the target/checkout
  directory for the prepare phase. this needs a touch of work but i left
  it pretty much as is to get it working. i have successfully prepared
  for the release and now i'm going to try and perform the release.
  

Modified:
    
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/release/PrepareReleaseMojo.java
    
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/scm/ScmBean.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=171239&r1=171238&r2=171239&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
 Sat May 21 12:08:10 2005
@@ -338,6 +338,8 @@
         {
             ScmBean scm = getScm();
 
+            scm.setWorkingDirectory( basedir );
+
             if ( scm.getTag() == null )
             {
                 getLog().info( "What tag name should be used? [ " + tag + " ]" 
);
@@ -354,7 +356,7 @@
                 scm.setTag( tag );
             }
 
-            getScm().tag();
+            scm.tag();
         }
         catch ( Exception e )
         {

Modified: 
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/scm/ScmBean.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/scm/ScmBean.java?rev=171239&r1=171238&r2=171239&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/scm/ScmBean.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugin/scm/ScmBean.java
 Sat May 21 12:08:10 2005
@@ -175,7 +175,8 @@
 
         CheckInScmResult result = getScmManager().checkIn( repository,
                                                            new ScmFileSet( new 
File( workingDirectory ), includes, excludes ),
-                                                           tag, message );
+                                                           tag,
+                                                           message );
         checkResult( result );
     }
 
@@ -217,6 +218,8 @@
 
     public void setWorkingDirectory( String workingDirectory )
     {
+        FileUtils.mkdir( workingDirectory );
+
         this.workingDirectory = workingDirectory;
     }
 



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