Author: brett Date: Fri Jan 7 03:50:58 2005 New Revision: 124481 URL: http://svn.apache.org/viewcvs?view=rev&rev=124481 Log: correct perform-release
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly?view=diff&rev=124481&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=124480&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=124481 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Fri Jan 7 03:50:58 2005 @@ -102,10 +102,11 @@ </j:if> <ant:echo>${msg}</ant:echo> - <scm:checkout var="scmCheckoutBean" url="${scmConnection}" workingDirectory="${maven.scm.checkout.dir}" tag="${maven.scm.tag}" /> + <scm:checkout var="scmCheckoutBean" url="${scmConnection}" workingDirectory="${maven.scm.checkout.dir}" tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}" /> </goal> <goal name="scm:bootstrap" prereqs="scm:checkout" description="Boostrap a project from the SCM"> + <ant:echo>Bootstrapping from ${scmCheckoutBean.checkoutDirectory}/project.xml with goals ${maven.scm.bootstrap.goals}</ant:echo> <maven:maven descriptor="${scmCheckoutBean.checkoutDirectory}/project.xml" goals="${maven.scm.bootstrap.goals}" Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java?view=diff&rev=124481&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r1=124480&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r2=124481 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java Fri Jan 7 03:50:58 2005 @@ -71,6 +71,19 @@ ScmRepository repository = scmManager.makeScmRepository( url ); String module = repository.getProviderRepository().getModule(); + if ( repository.getProvider().equals( "svn" ) ) + { + if ( tagBase != null && tagBase.length() > 0 ) + { + SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository(); + svnRepo.setTagBase( tagBase ); + } + if ( tag != null ) + { + module = tag; + } + } + checkoutDirectory = new File( workingDirectory ); if ( module.length() > 0 ) { @@ -83,7 +96,6 @@ } checkoutDirectory.mkdirs(); - // TODO: svn tag base, unless is HEAD, BASE, COMMITTED, PREV, rev#, {DATE} CheckOutScmResult result = scmManager.checkOut( repository, new ScmFileSet( checkoutDirectory ), tag ); checkResult( result ); @@ -118,7 +130,17 @@ ScmRepository repository = scmManager.makeScmRepository( url ); - // TODO: svn tag base, unless is HEAD, BASE, COMMITTED, PREV, rev#, {DATE} + if ( repository.getProvider().equals( "svn" ) ) + { + if ( tagBase != null && tagBase.length() > 0 ) + { + SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository(); + svnRepo.setTagBase( tagBase ); + } + } + + checkoutDirectory = new File( workingDirectory ); + // TODO: want includes/excludes? UpdateScmResult result = scmManager.update( repository, new ScmFileSet( new File( workingDirectory ) ), tag ); @@ -132,13 +154,15 @@ ScmRepository repository = scmManager.makeScmRepository( url ); - if ( tagBase != null && tagBase.length() > 0 ) + if ( repository.getProvider().equals( "svn" ) ) { - SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository(); - svnRepo.setTagBase( tagBase ); + if ( tagBase != null && tagBase.length() > 0 ) + { + SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) repository.getProviderRepository(); + svnRepo.setTagBase( tagBase ); + } } - // TODO: svn tag base, unless is HEAD, BASE, COMMITTED, PREV, rev#, {DATE} // TODO: want includes/excludes? TagScmResult result = scmManager.tag( repository, new ScmFileSet( new File( workingDirectory ) ), tag ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
