Author: brett Date: Mon Dec 20 03:16:59 2004 New Revision: 122846 URL: http://svn.apache.org/viewcvs?view=rev&rev=122846 Log: all checkout goals now consistent
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties 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=122846&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=122845&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=122846 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Mon Dec 20 03:16:59 2004 @@ -57,7 +57,7 @@ </j:if> </j:if> </j:if> - <echo>Using connection: ${scmConnection}</echo> + <ant:echo>Using connection: ${scmConnection}</ant:echo> </goal> <goal name="scm:checkout" prereqs="scm:find-connection"> @@ -71,13 +71,50 @@ <scm:checkout url="${scmConnection}" workingDirectory="${maven.scm.checkout.dir}" tag="${maven.scm.tag}" /> </goal> - <!-- TODO: the below may be need to be ported or removed --> + <!-- + DEPRECATED METHODS + --> + + <goal name="scm:validate" prereqs="scm:parse-connection"> + <j:choose> + <j:when test="${scmMethod == 'cvs'}"> + <j:set var="cvsModule" value="${maven.scm.cvs.module}"/> + <j:if test="${empty(cvsModule)}"> + <ant:fail>You must specify maven.scm.cvs.module</ant:fail> + </j:if> + </j:when> + <j:when test="${scmMethod == 'svn'}"> + <j:set var="svnRoot" value="${maven.scm.svn.root}"/> + <j:if test="${empty(svnRoot)}"> + <ant:fail>You must specify maven.scm.svn.root</ant:fail> + </j:if> + <j:set var="svnModule" value="${maven.scm.svn.module}"/> + <j:if test="${empty(svnModule)}"> + <ant:fail>You must specify maven.scm.svn.module</ant:fail> + </j:if> + </j:when> + <j:otherwise> + <ant:fail>Unknown SCM method: '${maven.scm.method}'</ant:fail> + </j:otherwise> + </j:choose> + </goal> + + <goal name="scm:checkout-project" + prereqs="scm:validate" + description="Checkout a project"> + <ant:echo>DEPRECATED: please use scm:checkout</ant:echo> + <j:choose> + <j:when test="${scmMethod == 'cvs'}"> + <attainGoal name="scm:cvs-checkout-project"/> + </j:when> + <j:otherwise> + <ant:fail>Unsupported scm type: ${scmMethod}</ant:fail> + </j:otherwise> + </j:choose> + </goal> <j:set var="scmMethod" value="${maven.scm.method}"/> - <!--==================================================================--> - <!-- Goal to validate SCM properties --> - <!--==================================================================--> <goal name="scm:parse-connection" prereqs="scm:find-connection"> <j:if test="${scmConnection != null}"> <j:set var="delim" value=":"/> @@ -115,48 +152,30 @@ </j:if> </goal> - <goal name="scm:validate" prereqs="scm:parse-connection"> - <j:choose> - <j:when test="${scmMethod == 'cvs'}"> - <j:set var="cvsModule" value="${maven.scm.cvs.module}"/> - <j:if test="${empty(cvsModule)}"> - <ant:fail>You must specify maven.scm.cvs.module</ant:fail> - </j:if> - </j:when> - <j:when test="${scmMethod == 'svn'}"> - <j:set var="svnRoot" value="${maven.scm.svn.root}"/> - <j:if test="${empty(svnRoot)}"> - <ant:fail>You must specify maven.scm.svn.root</ant:fail> - </j:if> - <j:set var="svnModule" value="${maven.scm.svn.module}"/> - <j:if test="${empty(svnModule)}"> - <ant:fail>You must specify maven.scm.svn.module</ant:fail> - </j:if> - </j:when> - <j:otherwise> - <ant:fail>Unknown SCM method: '${maven.scm.method}'</ant:fail> - </j:otherwise> - </j:choose> + <goal name="scm:cvs-checkout-project"> + <j:set var="scmFlags" value="${maven.scm.cvs.checkout.flags}"/> + <j:if test="${!empty(scmFlags)}"> + <!-- TODO: should/can it be passed to maven SCM? --> + <ant:echo>DEPRECATED: maven.scm.cvs.checkout.flags no longer used - ignored</ant:echo> + </j:if> + <j:set var="scmRsh" value="${maven.scm.rsh}" /> + <j:if test="${!empty(scmRsh)}"> + <!-- TODO: should/can it be passed to maven SCM? --> + <ant:echo>DEPRECATED: maven.scm.cvs.rsh no longer used - ignored</ant:echo> + </j:if> + <j:set var="scmTag" value="${maven.scm.cvs.sticky.tag}"/> + <j:if test="${!empty(scmTag)}"> + <j:set var="scmTag" value="${maven.scm.tag}"/> + <j:if test="${empty(scmTag)}"> + <ant:echo>DEPRECATED: maven.scm.cvs.sticky.tag replaced by maven.scm.tag</ant:echo> + <j:set var="maven.scm.tag" value="${maven.scm.cvs.sticky.tag}" /> + </j:if> + </j:if> + + <attainGoal name="scm:checkout" /> </goal> - <!--==================================================================--> - <!-- Goal to checkout a project --> - <!--==================================================================--> - <goal name="scm:checkout-project" - prereqs="scm:validate" - description="Checkout a project"> - <j:choose> - <j:when test="${scmMethod == 'cvs'}"> - <attainGoal name="scm:cvs-checkout-project"/> - </j:when> - <j:when test="${scmMethod == 'svn'}"> - <attainGoal name="scm:svn-checkout-project"/> - </j:when> - <j:otherwise> - <ant:fail>Unsupported scm type: ${scmMethod}</ant:fail> - </j:otherwise> - </j:choose> - </goal> + <!-- TODO: the below may be need to be ported or removed --> <!--==================================================================--> <!-- Goal to bootstrap a project from SCM --> @@ -258,35 +277,6 @@ <attainGoal name="scm:bootstrap-project" /> </goal> - <!--==================================================================--> - <!-- Checkout - CVS --> - <!--==================================================================--> - <goal name="scm:cvs-checkout-project"> - <j:set var="msg" value="Checking out ${maven.scm.cvs.module}" /> - <j:set var="value" value="${maven.scm.cvs.root}"/> - <j:if test="${!empty(value)}"> - <j:set var="msg" value="${msg}; from CVSROOT: ${value}" /> - </j:if> - <j:set var="value" value="${maven.scm.cvs.sticky.tag}"/> - <j:if test="${!empty(value)}"> - <j:set var="msg" value="${msg}; using tag: ${value}" /> - </j:if> - <ant:echo>${msg}</ant:echo> - - <j:set var="maven.scm.bootstrap.pom.dir" value="${maven.scm.checkout.dir}/${maven.scm.cvs.module}"/> - <ant:delete dir="${maven.scm.bootstrap.pom.dir}"/> - <ant:mkdir dir="${maven.scm.bootstrap.pom.dir}"/> - <ant:cvs command="checkout ${maven.scm.cvs.checkout.flags}" - quiet="${maven.scm.cvs.quiet}" - cvsRsh="${maven.scm.cvs.rsh}" - cvsRoot="${maven.scm.cvs.root}" - dest="${maven.scm.checkout.dir}" - package="${maven.scm.cvs.module}" - tag="${maven.scm.cvs.sticky.tag}" - failonerror="true" - /> - </goal> - <!--==================================================================--> <!-- Update - CVS --> <!--==================================================================--> 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=122846&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r1=122845&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties&r2=122846 ============================================================================== --- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties (original) +++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.properties Mon Dec 20 03:16:59 2004 @@ -14,10 +14,13 @@ # limitations under the License. # ------------------------------------------------------------------- -# Available settings currently only CVS -maven.scm.method=cvs # Directory to checkout to maven.scm.checkout.dir=${maven.build.dir}/checkouts + + + +# TODO: remove/review +maven.scm.method=cvs # Set to true if you want to ignore the connection and developer connection parameters in the POM maven.scm.ignore.pom.connection=false # Set to true if you want to ignore the developer connection parameter only in the POM @@ -35,6 +38,8 @@ # CVS Properties #=============== +# TODO: remove + # Set to CVS RSH variable, or leave as is to use CVS_RSH from the environment maven.scm.cvs.rsh= # Set to CVS root, or leave as is to use CVSROOT from the environment @@ -43,10 +48,6 @@ maven.scm.cvs.module= # Flags after update. Default updates new directories and prunes empty ones maven.scm.cvs.update.flags=-Pd -# Flags after checkout. Default prunes empty directories -maven.scm.cvs.checkout.flags=-P -# Sticky tag/branch to use. Default is trunk. -maven.scm.cvs.sticky.tag= # Whether to use quiet mode maven.scm.cvs.quiet=true # The file name for the patch --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
