Return-Path: X-Original-To: apmail-ant-notifications-archive@minotaur.apache.org Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61590111B5 for ; Thu, 3 Jul 2014 18:26:29 +0000 (UTC) Received: (qmail 60551 invoked by uid 500); 3 Jul 2014 18:26:29 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 60507 invoked by uid 500); 3 Jul 2014 18:26:29 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 60498 invoked by uid 99); 3 Jul 2014 18:26:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 18:26:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D787C9993B4; Thu, 3 Jul 2014 18:26:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlboudart@apache.org To: notifications@ant.apache.org Message-Id: <275f4174fd5a4345b2cf699ccaabaf63@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: getModuleDescriptorParser now takes a file as argument. Currently ivy use XmlModuleDescriptorParser in DefaultResolutionCacheManager and DefaultRepositoryCacheManager by default like in previous versions Date: Thu, 3 Jul 2014 18:26:28 +0000 (UTC) Repository: ant-ivy Updated Branches: refs/heads/master 3076802a7 -> 5063d2562 getModuleDescriptorParser now takes a file as argument. Currently ivy use XmlModuleDescriptorParser in DefaultResolutionCacheManager and DefaultRepositoryCacheManager by default like in previous versions Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5063d256 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5063d256 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5063d256 Branch: refs/heads/master Commit: 5063d256221e7fe8a8c433401bea988d7ccb0a35 Parents: 3076802 Author: Jean-Louis Boudart Authored: Thu Jul 3 19:27:00 2014 +0200 Committer: Jean-Louis Boudart Committed: Thu Jul 3 19:27:00 2014 +0200 ---------------------------------------------------------------------- .../ivy/core/cache/DefaultRepositoryCacheManager.java | 11 +++++++++-- .../ivy/core/cache/DefaultResolutionCacheManager.java | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5063d256/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java index b9439a4..55f498d 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -722,7 +722,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv if (ivyFile.exists()) { // found in cache ! try { - ModuleDescriptorParser parser = getModuleDescriptorParser(); + ModuleDescriptorParser parser = getModuleDescriptorParser(ivyFile); ModuleDescriptor depMD = getMdFromCache(parser, options, ivyFile); String resolverName = getSavedResolverName(depMD); String artResolverName = getSavedArtResolverName(depMD); @@ -790,7 +790,14 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv return null; } - protected ModuleDescriptorParser getModuleDescriptorParser() { + /** + * Choose write module descriptor parser for a given moduleDescriptor + * + * @param moduleDescriptorFile + * a given module descriptor + * @return + */ + protected ModuleDescriptorParser getModuleDescriptorParser(File moduleDescriptorFile) { return XmlModuleDescriptorParser.getInstance(); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5063d256/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java index 5ad338c..2683702 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java @@ -155,10 +155,17 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv ParserSettings pSettings = new CacheParserSettings(settings, paths); URL ivyFileURL = ivyFile.toURI().toURL(); - return getModuleDescriptorParser().parseDescriptor(pSettings, ivyFileURL, false); + return getModuleDescriptorParser(ivyFile).parseDescriptor(pSettings, ivyFileURL, false); } - protected ModuleDescriptorParser getModuleDescriptorParser() { + /** + * Choose write module descriptor parser for a given moduleDescriptor + * + * @param moduleDescriptorFile + * a given module descriptor + * @return + */ + protected ModuleDescriptorParser getModuleDescriptorParser(File moduleDescriptorFile) { return XmlModuleDescriptorParser.getInstance(); }