← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ivy/trusty-proposed

« back to all changes in this revision

Viewing changes to src/java/org/apache/ivy/ant/IvyDeliver.java

  • Committer: Bazaar Package Importer
  • Author(s): Varun Hiremath
  • Date: 2009-04-30 20:15:32 UTC
  • mfrom: (1.1.1 upstream) (2.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090430201532-2fozwm738vb9kmo3
Tags: 2.1.0~rc1-1
http://bugs.debian.org/526326
* New upstream release
* Fix watch file
* Include .xsd and .ent files in ivy.jar (Closes: #526326)
* Copy settings files for backward compatibility with ivyconf naming    
* Copy antlib for backward compatibility with fr.jayasoft.ivy package

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/java/org/apache/ivy/ant/IvyDeliver.java
204
204
    private String conf;
205
205
 
206
206
    private String pubBranch;
 
207
    
 
208
    private boolean generateRevConstraint = true;
207
209
 
208
210
    public void setCache(File cache) {
209
211
        cacheAttributeNotSupported();
305
307
        conf = confs;
306
308
    }
307
309
 
 
310
    public boolean isGenerateRevConstraint() {
 
311
        return generateRevConstraint;
 
312
    }
 
313
 
 
314
    public void setGenerateRevConstraint(boolean generateRevConstraint) {
 
315
        this.generateRevConstraint = generateRevConstraint;
 
316
    }
 
317
 
308
318
    public void doExecute() throws BuildException {
309
319
        Ivy ivy = getIvyInstance();
310
320
        IvySettings settings = ivy.getSettings();
383
393
            DeliverOptions options = new DeliverOptions(status, pubdate, 
384
394
                drResolver, doValidate(settings), replacedynamicrev, splitConfs(conf))
385
395
                .setResolveId(resolveId)
 
396
                .setGenerateRevConstraint(generateRevConstraint)
386
397
                .setPubBranch(pubBranch);
387
398
            if (mrid == null) {
388
399
                ivy.deliver(pubRevision, deliverpattern, options);