sanders     02/02/01 17:37:33

  Modified:    proposal/vindico/src/java/org/apache/alexandria/om Cvs.java
  Log:
  Moved cvs tasking to the Cvs object.
  If the project is already checked out,
  an update is performed instead of a checkout.
  
  Revision  Changes    Path
  1.3       +58 -4     
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java
  
  Index: Cvs.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Cvs.java  31 Jan 2002 16:56:22 -0000      1.2
  +++ Cvs.java  2 Feb 2002 01:37:33 -0000       1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java,v
 1.2 2002/01/31 16:56:22 sanders Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/01/31 16:56:22 $
  + * $Header: 
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java,v
 1.3 2002/02/02 01:37:33 sanders Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/02/02 01:37:33 $
    *
    * ====================================================================
    *
  @@ -68,7 +68,7 @@
    * Cvs provides ...
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
  - * @version $Revision: 1.2 $ $Date: 2002/01/31 16:56:22 $
  + * @version $Revision: 1.3 $ $Date: 2002/02/02 01:37:33 $
    */
   public class Cvs {
   
  @@ -129,5 +129,59 @@
           helper.attribute("tag", tag);
           helper.attribute("repo", repo.getName());
           helper.element("cvs", true);
  +    }
  +
  +    public void build(XMLHelper helper) {
  +        Repository repo = getRepo();
  +
  +        helper.attribute("name", "cvs-" + parentProject.getName());
  +        helper.element("target");
  +
  +        helper.attribute("message", "Calling cvs for " + parentProject.getName());
  +        helper.element("echo", true);
  +
  +        if (repo.getPassword() != null) {
  +            helper.attribute("cvsRoot", repo.getCvsRoot());
  +            helper.attribute("password", repo.getPassword());
  +            helper.element("cvspass", true);
  +        }
  +
  +        helper.attribute("property", "cvs.already.checked.out");
  +        helper.attribute("file", "${project.cvs.dir}/CVS/Root");
  +        helper.element("available", true);
  +
  +        helper.attribute("target", "do-not-call-cvs-update");
  +        helper.element("antcall", true);
  +        helper.attribute("target", "do-not-call-cvs-checkout");
  +        helper.element("antcall", true);
  +
  +        helper.popElement();
  +
  +        helper.attribute("name", "do-not-call-cvs-update");
  +        helper.attribute("if", "cvs.already.checked.out");
  +        helper.element("target");
  +
  +        helper.attribute("command", "update");
  +        helper.attribute("cvsRoot", repo.getCvsRoot());
  +        helper.attribute("dest", "${project.cvs.dir}");
  +        helper.attribute("package", getModule());
  +        if (tag != null) {
  +            helper.attribute("tag", tag);
  +        }
  +        helper.element("cvs", true);
  +        helper.popElement();
  +
  +        helper.attribute("name", "do-not-call-cvs-checkout");
  +        helper.attribute("unless", "cvs.already.checked.out");
  +        helper.element("target");
  +        helper.attribute("command", "checkout");
  +        helper.attribute("cvsRoot", repo.getCvsRoot());
  +        helper.attribute("dest", "${project.cvs.dir}");
  +        helper.attribute("package", getModule());
  +        if (tag != null) {
  +            helper.attribute("tag", tag);
  +        }
  +        helper.element("cvs", true);
  +        helper.popElement();
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to