svn commit: r524917 - in /maven/release/trunk: ./ maven-release-manager/src/main/java/org/apache/maven/shared/release/ maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/main/java/org/apache/maven/share...

[evenisse]

Author: evenisse
Date: Mon Apr  2 13:50:39 2007
New Revision: 524917

URL: http://svn.apache.org/viewvc?view=rev&rev=524917
Log:
Little fix for latest Maven-SCM changes

Modified:
    maven/release/trunk/   (props changed)
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java

Propchange: maven/release/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr  2 13:50:39 2007
@@ -0,0 +1,3 @@
+*.ipr
+*.iml
+*.iws

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?view=diff&rev=524917&r1=524916&r2=524917
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
 Mon Apr  2 13:50:39 2007
@@ -21,6 +21,7 @@
 
 import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmTag;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.provider.ScmProvider;
@@ -244,7 +245,7 @@
 
         releaseDescriptor = loadReleaseDescriptor( releaseDescriptor, null );
 
-        for( Iterator phases = rollbackPhases.iterator(); phases.hasNext(); )
+        for ( Iterator phases = rollbackPhases.iterator(); phases.hasNext(); )
         {
             String name = (String) phases.next();
 
@@ -395,8 +396,8 @@
         CheckOutScmResult scmResult;
         try
         {
-            scmResult =
-                provider.checkOut( repository, new ScmFileSet( 
checkoutDirectory ), config.getScmReleaseLabel() );
+            scmResult = provider.checkOut( repository, new ScmFileSet( 
checkoutDirectory ),
+                                           new ScmTag( 
config.getScmReleaseLabel() ) );
         }
         catch ( ScmException e )
         {
@@ -449,7 +450,8 @@
         updateListener( listener, "perform", GOAL_END );
     }
 
-    private ReleaseDescriptor loadReleaseDescriptor( ReleaseDescriptor 
releaseDescriptor, ReleaseManagerListener listener )
+    private ReleaseDescriptor loadReleaseDescriptor( ReleaseDescriptor 
releaseDescriptor,
+                                                     ReleaseManagerListener 
listener )
         throws ReleaseExecutionException
     {
         try

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java?view=diff&rev=524917&r1=524916&r2=524917
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPhase.java
 Mon Apr  2 13:50:39 2007
@@ -94,7 +94,8 @@
         try
         {
             ScmFileSet fileSet = new ScmFileSet( new File( 
releaseDescriptor.getWorkingDirectory() ), files );
-            result = provider.checkIn( repository, fileSet, null, 
createMessage( releaseDescriptor ) );
+            //TODO: Use ScmVersion instead of String for the 
branch/tag/revision parameter
+            result = provider.checkIn( repository, fileSet, (String) null, 
createMessage( releaseDescriptor ) );
         }
         catch ( ScmException e )
         {

Modified: 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
URL: 
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java?view=diff&rev=524917&r1=524916&r2=524917
==============================================================================
--- 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
 (original)
+++ 
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
 Mon Apr  2 13:50:39 2007
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.maven.scm.ScmTag;
 import org.apache.maven.scm.provider.svn.SvnTagBranchUtils;
 
 /**
@@ -31,7 +32,7 @@
 {
     public String translateTagUrl( String url, String tag, String tagBase )
     {
-        return SvnTagBranchUtils.resolveUrl( url, tagBase, 
SvnTagBranchUtils.SVN_TAGS, tag );
+        return SvnTagBranchUtils.resolveUrl( url, tagBase, 
SvnTagBranchUtils.SVN_TAGS, new ScmTag( tag ) );
     }
 
     public String resolveTag( String tag )