← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/java/org/apache/ivy/core/resolve/IvyNode.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/core/resolve/IvyNode.java
216
216
                            if (!settings.getVersionMatcher().isDynamic(getId())) {
217
217
                                log += " (forced)";
218
218
                            }
219
 
                            if (settings.logResolvedRevision()) {
 
219
                            if (settings.logResolvedRevision()
 
220
                                    && LogOptions.LOG_DEFAULT.equals(getData().getOptions().getLog())) {
220
221
                                Message.info(log);
221
222
                            } else {
222
223
                                Message.verbose(log);
278
279
        
279
280
        data.replaceNode(getId(), resolved, rootModuleConf); // this actually discards the node
280
281
 
281
 
        if (settings.logResolvedRevision()) {
 
282
        if (settings.logResolvedRevision()
 
283
                && LogOptions.LOG_DEFAULT.equals(getData().getOptions().getLog())) {
282
284
            Message.info("\t[" + module.getId().getRevision() + "] " + getId());
283
285
        } else {
284
286
            Message.verbose("\t[" + module.getId().getRevision() + "] " + getId());
291
293
                    "impossible to get dependencies when data has not been loaded");
292
294
        }
293
295
        if (Arrays.asList(confs).contains("*")) {
294
 
            confs = md.getConfigurationsNames();
 
296
            if (isRoot()) {
 
297
                confs = md.getConfigurationsNames();
 
298
            } else {
 
299
                confs = md.getPublicConfigurationsNames();
 
300
            }
295
301
        }
296
302
        Collection deps = new HashSet();
297
303
        for (int i = 0; i < confs.length; i++) {
384
390
                if (c == null) {
385
391
                    confsToFetch.remove(conf);
386
392
                    if (isConfRequiredByMergedUsageOnly(rootModuleConf, conf)) {
387
 
                        Message.info(
 
393
                        Message.verbose(
388
394
                            "configuration required by evicted revision is not available in "
389
395
                            + "selected revision. skipping " + conf + " in " + this);
390
396
                    } else if (!conf.equals(confs[i])) {
401
407
                        && c.getVisibility() != Configuration.Visibility.PUBLIC) {
402
408
                    confsToFetch.remove(conf);
403
409
                    if (isConfRequiredByMergedUsageOnly(rootModuleConf, conf)) {
404
 
                        Message.info(
 
410
                        Message.verbose(
405
411
                            "configuration required by evicted revision is not visible in "
406
412
                            + "selected revision. skipping " + conf + " in " + this);
407
413
                    } else {