← 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/plugins/parser/xml/XmlModuleDescriptorUpdater.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/plugins/parser/xml/XmlModuleDescriptorUpdater.java
168
168
        private final Namespace ns;
169
169
 
170
170
        private final boolean replaceInclude;
 
171
        
 
172
        private final boolean generateRevConstraint;
171
173
 
172
174
        private boolean inHeader = true;
173
175
 
187
189
            this.pubdate = options.getPubdate();
188
190
            this.ns = options.getNamespace();
189
191
            this.replaceInclude = options.isReplaceInclude();
 
192
            this.generateRevConstraint = options.isGenerateRevConstraint();
190
193
            this.relativePathCtx = relativePathCtx;
191
194
            if (options.getConfsToExclude() != null) {
192
195
                this.confs = Arrays.asList(options.getConfsToExclude());
390
393
                                && branchConstraint != null) {
391
394
                            write(" branchConstraint=\"" + branchConstraint + "\"");
392
395
                        }
393
 
                        if (attributes.getIndex("revConstraint") == -1 
 
396
                        if (generateRevConstraint && attributes.getIndex("revConstraint") == -1
394
397
                                && !rev.equals(systemMrid.getRevision())) {
395
398
                            write(" revConstraint=\"" + systemMrid.getRevision() + "\"");
396
399
                        }