Author: brett Date: Wed Jan 12 00:41:12 2005 New Revision: 124953 URL: http://svn.apache.org/viewcvs?view=rev&rev=124953 Log: remove need for getModule() fn Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml
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=124953&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=124952&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=124953 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Wed Jan 12 00:41:12 2005 @@ -107,13 +107,13 @@ </j:if> <ant:echo>${msg}</ant:echo> - <scm:checkout var="scmCheckoutBean" url="${scmConnection}" workingDirectory="${maven.scm.checkout.dir}" tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}" /> + <scm:checkout var="checkoutBean" 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> + <ant:echo>Bootstrapping from ${checkoutBean.checkoutDirectory}/project.xml with goals ${maven.scm.bootstrap.goals}</ant:echo> <j:set var="pomDir" value="${maven.scm.bootstrap.pom.dir}" /> - <j:set var="dir" value="${scmCheckoutBean.checkoutDirectory}" /> + <j:set var="dir" value="${checkoutBean.checkoutDirectory}" /> <j:if test="${!empty(pomDir)}"> <j:set var="dir" value="${dir}/${pomDir}" /> </j:if> @@ -132,7 +132,7 @@ </j:if> <ant:echo>${msg}</ant:echo> - <scm:update var="scmUpdateBean" url="${scmConnection}" workingDirectory="${basedir}" /> + <scm:update url="${scmConnection}" workingDirectory="${basedir}" /> </goal> <goal name="scm:tag" prereqs="scm:find-connection" description="Tag the project in the current directory in SCM"> @@ -146,7 +146,7 @@ <ant:echo>Tagging ${scmConnection} with ${maven.scm.tag}</ant:echo> - <scm:tag var="scmTagBean" url="${scmConnection}" workingDirectory="${basedir}" tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}" /> + <scm:tag url="${scmConnection}" workingDirectory="${basedir}" tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}" /> </goal> <!-- TODO: change prereqs to scm:find-connection only --> @@ -230,15 +230,15 @@ <ant:echo>Committing descriptors</ant:echo> <!-- No tag here - in this context it means the branch to commit to, and we want whatever this checkout current is on --> - <scm:checkin var="scmCheckinBean" url="${scmConnection}" workingDirectory="${basedir}" includes="project.xml,xdocs/changes.xml" message="[maven-scm-plugin] prepare release ${version_name}" /> + <scm:checkin url="${scmConnection}" workingDirectory="${basedir}" includes="project.xml,xdocs/changes.xml" message="[maven-scm-plugin] prepare release ${version_name}" /> <ant:echo>Tagging source tree</ant:echo> - <scm:tag var="scmTagBean" url="${scmConnection}" workingDirectory="${basedir}" tag="${tag_name}" tagBase="${maven.scm.svn.tag.base}" /> + <scm:tag url="${scmConnection}" workingDirectory="${basedir}" tag="${tag_name}" tagBase="${maven.scm.svn.tag.base}" /> </goal> <goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection"> <ant:mkdir dir="${maven.scm.patch.dir}"/> - <scm:diff var="scmDiffBean" url="${scmConnection}" workingDirectory="${basedir}" outputFile="${maven.scm.patch.dir}/${maven.scm.patch.file}" /> + <scm:diff url="${scmConnection}" workingDirectory="${basedir}" outputFile="${maven.scm.patch.dir}/${maven.scm.patch.file}" /> <ant:echo>Patch created in ${maven.scm.patch.dir}/${maven.scm.patch.file}</ant:echo> </goal> @@ -382,7 +382,7 @@ <j:if test="${checkTagged}"> <j:set var="tag" value="${maven.scm.cvs.sticky.tag}"/> <j:if test="${tag == 'HEAD'}"> - <maven:pom var="project" projectDescriptor="${maven.scm.checkout.dir}/${maven.scm.cvs.module}/project.xml"/> + <maven:pom var="project" projectDescriptor="${checkoutBean.checkoutDirectory}/${maven.scm.cvs.module}/project.xml"/> <ant:echo>WARNING: you are releasing HEAD. This will overwrite any previous release versioned '${project.currentVersion}'.</ant:echo> <i:ask question="Are you sure (y/n)?" Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties?view=diff&rev=124953&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r1=124952&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r2=124953 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties Wed Jan 12 00:41:12 2005 @@ -15,7 +15,7 @@ # ------------------------------------------------------------------- # Directory to checkout to -maven.scm.checkout.dir=${maven.build.dir}/checkouts +maven.scm.checkout.dir=${maven.build.dir}/checkout # Tag base for SVN if specified - should be a URL maven.scm.svn.tag.base= 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=124953&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r1=124952&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmBean.java&r2=124953 ============================================================================== --- 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 Wed Jan 12 00:41:12 2005 @@ -69,7 +69,6 @@ ScmManager scmManager = lookupScmManager(); ScmRepository repository = scmManager.makeScmRepository( url ); - String module = repository.getProviderRepository().getModule(); if ( repository.getProvider().equals( "svn" ) ) { @@ -80,15 +79,11 @@ } if ( tag != null ) { - module = tag; + checkoutDirectory = new File( checkoutDirectory, tag ); } } checkoutDirectory = new File( workingDirectory ); - if ( module.length() > 0 ) - { - checkoutDirectory = new File( checkoutDirectory, module ); - } if ( checkoutDirectory.exists() ) { // TODO: sanity check that it is not . or .. or lower Modified: maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml?view=diff&rev=124953&p1=maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml&r1=124952&p2=maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml&r2=124953 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml Wed Jan 12 00:41:12 2005 @@ -25,6 +25,7 @@ </properties> <body> <release version="1.5-beta-3-SNAPSHOT" date="in SVN"> + <action dev="brett" type="update">Check out into <code>maven.scm.checkout.dir</code> rather than a subdirectory of it</action> <action dev="brett" type="add" issue="MPSCM-33">Use maven.scm.bootstrap.pom.dir</action> <action dev="brett" type="add" issue="MPSCM-32">Add support for subversion</action> <action dev="brett" type="add">Rewritten to utilise the Maven SCM library</action> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
