[jira] Commented: (MPSCM-22) scm:bootstrap goal cannot use the maven.scm.bootstrap.pom.dir

[ji...@codehaus.org]

The following comment has been added to this issue:

     Author: Martin Jaeger
    Created: Wed, 1 Sep 2004 1:53 AM
       Body:
Hi there

I was wrong that the given patch works perfectly.
It does not work when no maven.scm.bootstrap.pom.dir is given. So I added a check to set it when it is not yet set.

Regards,
Martin


Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/scm/plugin.jelly,v
retrieving revision 1.15
diff -u -r1.15 plugin.jelly
--- plugin.jelly	9 Aug 2004 01:25:46 -0000	1.15
+++ plugin.jelly	1 Sep 2004 05:41:48 -0000
@@ -231,18 +231,21 @@
     </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"
-      />
+   <j:set var="pomDirDefined" value="${maven.scm.bootstrap.pom.dir}"/>
+   <j:if test="${empty(pomDirDefined)}">
+     <j:set var="maven.scm.bootstrap.pom.dir" value="${maven.scm.checkout.dir}/${maven.scm.cvs.module}"/>
+   </j:if>
+   <ant:delete dir="${maven.scm.checkout.dir}"/>
+   <ant:mkdir dir="${maven.scm.checkout.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>
 
   <!--==================================================================-->
---------------------------------------------------------------------
View this comment:
  http://jira.codehaus.org/browse/MPSCM-22?page=comments#action_23649

---------------------------------------------------------------------
View the issue:
  http://jira.codehaus.org/browse/MPSCM-22

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: MPSCM-22
    Summary: scm:bootstrap goal cannot use the maven.scm.bootstrap.pom.dir
       Type: Bug

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: maven-scm-plugin
   Versions:
             1.4

   Assignee: Brett Porter
   Reporter: Neil Imms

    Created: Wed, 4 Aug 2004 9:24 AM
    Updated: Wed, 1 Sep 2004 1:53 AM
Environment: Unix, Windows

Description:
I have been trying to use the scm:botstrap-project goal, and was confused when the project tried to bootstrap from my 'maven.scm.checkout.dir' rather than the 'maven.scm.bootstrap.pom.dir' that I had specified.

Inspection of the plugin.jelly showed that  'maven.scm.bootstrap.pom.dir' was set to 'maven.scm.checkout.dir'  in the scm:checkout-project goal, a prerequisite of scm:botstrap-project goal.

I cannot see a reason why this is done, as the two properties are defined as separate options. I altered the checkout-project goal, see below, and the bootstrap worked correctly.

  <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>

    <ant:delete dir="${maven.scm.checkout.dir}"/>
    <ant:mkdir dir="${maven.scm.checkout.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>



---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.codehaus.org/secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org