You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2012/10/15 21:59:51 UTC
svn commit: r1398486 - in /ant/ivy/core/branches/2.3.x: ./
src/java/org/apache/ivy/core/cache/ src/java/org/apache/ivy/core/deliver/
src/java/org/apache/ivy/core/publish/ src/java/org/apache/ivy/core/retrieve/
Author: maartenc
Date: Mon Oct 15 19:59:51 2012
New Revision: 1398486
URL: http://svn.apache.org/viewvc?rev=1398486&view=rev
Log:
Fixed typo in ResolutionCacheManager#getResolvedModuleDescriptor() (thanks to Mitch Gitman) (merged from trunk)
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/ResolutionCacheManager.java
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/publish/PublishEngine.java
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1398479
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java?rev=1398486&r1=1398485&r2=1398486&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java Mon Oct 15 19:59:51 2012
@@ -139,7 +139,7 @@ public class DefaultResolutionCacheManag
});
}
- public ModuleDescriptor getResolveModuleDescriptor(ModuleRevisionId mrid)
+ public ModuleDescriptor getResolvedModuleDescriptor(ModuleRevisionId mrid)
throws ParseException, IOException {
File ivyFile = getResolvedIvyFileInCache(mrid);
if (!ivyFile.exists()) {
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/ResolutionCacheManager.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/ResolutionCacheManager.java?rev=1398486&r1=1398485&r2=1398486&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/ResolutionCacheManager.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/cache/ResolutionCacheManager.java Mon Oct 15 19:59:51 2012
@@ -36,7 +36,7 @@ public interface ResolutionCacheManager
File[] getConfigurationResolveReportsInCache(final String resolveId);
- ModuleDescriptor getResolveModuleDescriptor(ModuleRevisionId mrid) throws ParseException, IOException;
+ ModuleDescriptor getResolvedModuleDescriptor(ModuleRevisionId mrid) throws ParseException, IOException;
void saveResolvedModuleDescriptor(ModuleDescriptor md) throws ParseException, IOException;
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/deliver/DeliverEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/deliver/DeliverEngine.java?rev=1398486&r1=1398485&r2=1398486&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/deliver/DeliverEngine.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/deliver/DeliverEngine.java Mon Oct 15 19:59:51 2012
@@ -108,7 +108,7 @@ public class DeliverEngine {
destIvyPattern = settings.substitute(destIvyPattern);
// 1) find the resolved module descriptor in cache
- ModuleDescriptor md = getCache().getResolveModuleDescriptor(mrid);
+ ModuleDescriptor md = getCache().getResolvedModuleDescriptor(mrid);
md.setResolvedModuleRevisionId(ModuleRevisionId.newInstance(md.getModuleRevisionId(),
options.getPubBranch() == null ? mrid.getBranch() : options.getPubBranch(),
revision));
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/publish/PublishEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/publish/PublishEngine.java?rev=1398486&r1=1398485&r2=1398486&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/publish/PublishEngine.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/publish/PublishEngine.java Mon Oct 15 19:59:51 2012
@@ -150,7 +150,7 @@ public class PublishEngine {
} else {
ResolutionCacheManager cacheManager = settings.getResolutionCacheManager();
try {
- md = cacheManager.getResolveModuleDescriptor(mrid);
+ md = cacheManager.getResolvedModuleDescriptor(mrid);
} catch (ParseException e) {
throw new IllegalStateException("bad ivy file in cache for " + mrid + ": " + e);
}
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java?rev=1398486&r1=1398485&r2=1398486&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java Mon Oct 15 19:59:51 2012
@@ -216,7 +216,7 @@ public class RetrieveEngine {
String[] confs = options.getConfs();
if (confs == null || (confs.length == 1 && "*".equals(confs[0]))) {
try {
- ModuleDescriptor md = getCache().getResolveModuleDescriptor(mrid);
+ ModuleDescriptor md = getCache().getResolvedModuleDescriptor(mrid);
Message.verbose("no explicit confs given for retrieve, using ivy file: " + md.getResource().getName());
confs = md.getConfigurationsNames();
options.setConfs(confs);