diff --git a/.classpath.default b/.classpath.default index 24d26f59..d60d9a68 100644 --- a/.classpath.default +++ b/.classpath.default @@ -1,45 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NOTICE b/NOTICE index 14eef168..88d0339d 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Ivy (TM) -Copyright 2007-2014 The Apache Software Foundation +Copyright 2007-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/build-release.xml b/build-release.xml index 65c13c59..af396763 100644 --- a/build-release.xml +++ b/build-release.xml @@ -17,102 +17,102 @@ under the License. --> - - - - - - - - - Running @{antfile} @{target} > @{output} - + xmlns:openpgp="antlib:org.apache.commons.openpgp.ant"> + + + + + + + + + Running @{antfile} @{target} > @{output} + - - - - [ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator} - - - - - - - - - + + + + [ivy@apache:${antfile.dir}]$ ant -f ${antfile.name} @{target}${line.separator} + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - + + - + - + - + - - + + @@ -128,26 +128,26 @@ ${myrepository.content.deps} - + - $ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/advanced -type f -print${line.separator} + $ find ${tutorial.src.dir}/build-a-ivy-repository/myrepository/advanced -type f -print${line.separator} ${myrepository.content.namespace} - - + + - - - - - + + + + + @@ -158,29 +158,22 @@ - + - - - - - + + + + - + - @@ -188,165 +181,165 @@ - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - Setting version to ${build.version} - - - - - - - - Setting status to ${status} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Setting version to ${build.version} + + + + + + + + Setting status to ${status} + + + @@ -368,54 +361,54 @@ module="bcprov-jdk16" revision="1.45" inline="true" pathid="bouncycastle.bcprov.classpath"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -443,8 +436,8 @@ - - + + @@ -455,7 +448,7 @@ - + @@ -481,11 +474,11 @@ - - - + + + diff --git a/build.xml b/build.xml index a9b4c123..d6f50b50 100644 --- a/build.xml +++ b/build.xml @@ -14,27 +14,27 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations - under the License. + under the License. --> - + - + - + - + @@ -45,18 +45,18 @@ - + - - + + + description="build Ivy and install it in Ant home lib"> @@ -95,8 +95,8 @@ - - + + @@ -104,20 +104,20 @@ - + - + - + - + @@ -127,49 +127,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -187,7 +187,7 @@ - + @@ -218,11 +218,11 @@ tofile="${core.classes.build.dir}/org/apache/ivy/core/settings/ivyconf.xml" /> - + - - + + - + - - + - - - - - - - - + + + + + + + + @@ -325,24 +325,24 @@ - - + + - - @@ -365,23 +365,23 @@ - + - + - + - - + + @@ -403,14 +403,14 @@ - - + - + - + - + @@ -441,10 +441,10 @@ - + - - - - - - - + + + + + - + - + + + + + + + + + + + - + @@ -496,7 +506,7 @@ - + @@ -511,19 +521,19 @@ - - - - + + + + - + - + @@ -533,21 +543,21 @@ - - + + - - - - - @@ -556,20 +566,20 @@ - + + inline="true" conf="default" pathid="checkstyle.classpath" transitive="true" + log="download-only"/> - - - - + + + + @@ -578,11 +588,11 @@ - - + + - + @@ -596,37 +606,40 @@ - + - - - - - + - - - - @@ -635,15 +648,15 @@ - + - - + + - + - + + - + - - + diff --git a/doap_Ivy.rdf b/doap_Ivy.rdf index 97e13ffb..1db78dce 100644 --- a/doap_Ivy.rdf +++ b/doap_Ivy.rdf @@ -34,13 +34,41 @@ Java + + + Apache Ivy 2.4.0 + 2014-12-26 + 2.4.0 + + Apache Ivy 2.3.0 - 2013-01-20 + 2013-01-24 2.3.0 + + + Apache Ivy 2.2.0 + 2010-10-07 + 2.2.0 + + + + + Apache Ivy 2.1.0 + 2009-10-13 + 2.1.0 + + + + + Apache Ivy 2.0.0 + 2009-01-22 + 2.0.0 + + diff --git a/doc/concept.html b/doc/concept.html index 76029f28..74463c32 100644 --- a/doc/concept.html +++ b/doc/concept.html @@ -200,20 +200,27 @@ If you don't want to use xml namespaces, it's possible but you will need to disa since 1.4 Ivy allows the use of checksums, also known as digests, to verify the correctness of a downloaded file. -For the moment Ivy supports the md5 and sha1 algorithms. - -The configuration of using md5 and/or sha1 can be done globally or by dependency resolver. -Globally, use the ivy.checksums variable to list the check to be done (only md5 and sha1 are supported). +The configuration of using the algorithm can be done globally or by dependency resolver. +Globally, use the ivy.checksums variable to list the check to be done. On each resolver you can use the checksums attribute to override the global setting. The setting is a comma separated list of checksum algorithms to use. -During checking (at download time), the first checksum found is checked, and that's all. This means that if you have a "sha1, md5" setting, then if ivy finds a sha1 file, it will compare the downloaded file sha1 against this sha1, and if the comparison is ok, it will assume the file is ok. If no sha1 file is found, it will look for an md5 file. If none is found no checking is done. +During checking (at download time), the first checksum found is checked, and that's all. This means that if you have a "SHA-256, sha1, md5" setting, then if ivy finds a SHA-256 file, it will compare the downloaded file SHA-256 against this SHA-256, and if the comparison is ok, it will assume the file is ok. If no SHA-256 file is found, it will look for an sha1 file. If that isn't found, then it checks for md5 and so on. If none is found no checking is done. During publish, all listed checksum algorithms are computed and uploaded. By default checksum algorithms are "sha1, md5". If you want to change this default, you can set the variable ivy.checksums. Hence, to disable checksum validation you just have to set ivy.checksums to "". +

Supported algorithms

+since 1.4 +
    +
  • md5
    • +
  • sha1
    • +
+since 2.5 +Starting 2.5 version, in addition to md5 and sha1, Ivy supports SHA-256, SHA-512 and SHA-384 algorithms, if the Java runtime in which Ivy is running, supports those. For example, Java 6 runtime supports SHA-256 and SHA-512 as standard algorithms. If Ivy 2.5 and later versions are run under Java 6 or higher runtimes, these algorithms are supported by Ivy too. +

Events and Triggers

since 1.4 When Ivy performs the dependency resolution and some other tasks, it fires events before and after the most important steps. You can listen to these events using Ivy API, or you can even register a trigger to perform a particular action when a particular event occur. diff --git a/doc/ivyfile/dependencies.html b/doc/ivyfile/dependencies.html index c7e519c0..6e284101 100644 --- a/doc/ivyfile/dependencies.html +++ b/doc/ivyfile/dependencies.html @@ -51,6 +51,9 @@ In Ivy 2.1.0 and earlier, if both defaultconf and defaultconfmapping are defined

Child elements

+ +Note: as specified by the ivy.xsd, the children elements are ordered; must come first the dependency elements, then the exclude elements, then the override elements, and then the conflict elements. + diff --git a/doc/printTemplate.html b/doc/printTemplate.html index d9efe86d..fd29b367 100644 --- a/doc/printTemplate.html +++ b/doc/printTemplate.html @@ -47,7 +47,7 @@ diff --git a/doc/release-notes.html b/doc/release-notes.html index 8009de9d..60936705 100644 --- a/doc/release-notes.html +++ b/doc/release-notes.html @@ -36,6 +36,7 @@ reporting) project dependencies, characterized by flexibility, configurability, and tight integration with Apache Ant. Key features of this 2.5.0 release are +* Ivy nows uses BoucyCastle 1.52. Due to the non backward compatibility of that library, earlier versions are not supported. * TODO * TODO * TODO @@ -57,7 +58,27 @@ http://issues.apache.org/jira/browse/ivy List of changes since Ivy 2.4.0: +- FIX: Made the maven 'test' configuration public so we can use the test-jar as dependency (IVY-1444) +- FIX: NullPointerException in dependencytree with no dependencies (IVY-1539) +- FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task (IVY-1549) - FIX: ArrayIndexOutOfBoundsException when using a p2 repository for dependencies (IVY-1504) +- FIX: fixdeps remove transitive 'kept' dependencies +- FIX: PomModuleDescriptorParser should parse licenses from parent POM (IVY-1526) (Thanks to Jaikiran Pai) +- FIX: dynamic revisions are not cached per resolver (IVY-1430) (Thanks to Stephen Haberman) +- FIX: Dependencies failed using branch attribute (and extra attributes) (IVY-1141) (Thanks to Stephen Haberman) +- FIX: useCacheOnly should allow lookup of changing dependencies in cache (IVY-1515) (Thanks to Ilya) +- FIX: Translation of POM to Ivy XML with * exclusion is removing main artifact (IVY-1531) (Thanks to Jaikiran Pai) +- FIX: Have makepom task take description from ivy-module > info > description element (IVY-1520) +- FIX: Fix RetrieveEngine to take into account the correct extension while dealing with unpacked artifacts (IVY-1478) (Thanks to Jaikiran Pai) +- FIX: ParseException "Unsupported repository, resources names are not uris" for ivy.xml with parent on Windows (IVY-1448) (Thanks to Riccardo Foschia and Jaikiran Pai) + +- IMPROVEMENT: Throw an IllegalStateException when retrieving the resolutionCacheRoot on the DefaultResolutionCacheManager if the basedir (or IvySettings) is not set (IVY-1482) +- IMPROVEMENT: Optimization: limit the revision numbers scanned if revision prefix is specified (Thanks to Ernestas Vaiciukevičius) +- IMPROVEMENT: Update bouncycastle to 1.52 (IVY-1521) (Thanks to Michal Srb) + +- NEW: Lets ssh-based resolvers use an ~/.ssh/config file to find username/hostname/keyfile options (Thanks to Colin Stanfill) +- NEW: Add ivy.maven.lookup.sources and ivy.maven.lookup.javadoc variables to control the lookup of the additional artifacts. Defaults to true, for backward compatibility (IVY-1529) +- NEW: Add (conditional) support for SHA-256 SHA-512 and SHA-384 checksum algorithms (IVY-1554) (Thanks to Jaikiran Pai) - - - - + + + + + - - - - - + + + + + - - - + + + diff --git a/src/java/org/apache/ivy/Ivy.java b/src/java/org/apache/ivy/Ivy.java index c3799e92..fc190edb 100644 --- a/src/java/org/apache/ivy/Ivy.java +++ b/src/java/org/apache/ivy/Ivy.java @@ -24,7 +24,6 @@ import java.net.URL; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -38,6 +37,7 @@ import org.apache.ivy.core.deliver.DeliverOptions; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.install.InstallEngine; import org.apache.ivy.core.install.InstallOptions; +import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.core.module.id.ModuleRevisionId; @@ -45,6 +45,7 @@ import org.apache.ivy.core.publish.PublishEngine; import org.apache.ivy.core.publish.PublishOptions; import org.apache.ivy.core.report.ResolveReport; import org.apache.ivy.core.repository.RepositoryManagementEngine; +import org.apache.ivy.core.resolve.IvyNode; import org.apache.ivy.core.resolve.ResolveData; import org.apache.ivy.core.resolve.ResolveEngine; import org.apache.ivy.core.resolve.ResolveOptions; @@ -614,8 +615,9 @@ public class Ivy { // PUBLISH // /////////////////////////////////////////////////////////////////////// - public Collection publish(ModuleRevisionId mrid, Collection srcArtifactPattern, - String resolverName, PublishOptions options) throws IOException { + public Collection publish(ModuleRevisionId mrid, + Collection srcArtifactPattern, String resolverName, PublishOptions options) + throws IOException { pushContext(); try { return publishEngine.publish(mrid, srcArtifactPattern, resolverName, options); @@ -631,7 +633,7 @@ public class Ivy { /** * Sorts the collection of IvyNode from the less dependent to the more dependent */ - public List sortNodes(Collection nodes, SortOptions options) { + public List sortNodes(Collection nodes, SortOptions options) { pushContext(); try { return getSortEngine().sortNodes(nodes, options); @@ -654,7 +656,8 @@ public class Ivy { * if a circular dependency exists and circular dependency strategy decide to throw * an exception */ - public List sortModuleDescriptors(Collection moduleDescriptors, SortOptions options) { + public List sortModuleDescriptors( + Collection moduleDescriptors, SortOptions options) { pushContext(); try { return getSortEngine().sortModuleDescriptors(moduleDescriptors, options); @@ -750,7 +753,7 @@ public class Ivy { } } - public String[] listTokenValues(String token, Map otherTokenValues) { + public String[] listTokenValues(String token, Map otherTokenValues) { pushContext(); try { return searchEngine.listTokenValues(token, otherTokenValues); @@ -833,14 +836,12 @@ public class Ivy { } private void postConfigure() { - Collection triggers = settings.getTriggers(); - for (Iterator iter = triggers.iterator(); iter.hasNext();) { - Trigger trigger = (Trigger) iter.next(); + List triggers = settings.getTriggers(); + for (Trigger trigger : triggers) { eventManager.addIvyListener(trigger, trigger.getEventFilter()); } - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : settings.getResolvers()) { if (resolver instanceof BasicResolver) { ((BasicResolver) resolver).setEventManager(eventManager); } diff --git a/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java new file mode 100644 index 00000000..14fd0b14 --- /dev/null +++ b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java @@ -0,0 +1,236 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.ivy.ant; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.DefaultArtifact; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.report.ArtifactDownloadReport; +import org.apache.ivy.core.report.DownloadReport; +import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.resolve.DownloadOptions; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry; +import org.apache.ivy.plugins.resolver.AbstractWorkspaceResolver; +import org.apache.ivy.util.Message; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.types.DataType; +import org.apache.tools.ant.types.ResourceCollection; +import org.apache.tools.ant.types.resources.FileResource; + +public class AntWorkspaceResolver extends DataType { + + public static final class WorkspaceArtifact { + + private String name; + + private String type; + + private String ext; + + private String path; + + public void setName(String name) { + this.name = name; + } + + public void setType(String type) { + this.type = type; + } + + public void setExt(String ext) { + this.ext = ext; + } + + public void setPath(String path) { + this.path = path; + } + } + + private List allResources = new ArrayList(); + + private boolean haltOnError = true; + + private Resolver resolver; + + private String name; + + private List artifacts = new ArrayList(); + + public void setName(String name) { + this.name = name; + } + + public void setHaltonerror(boolean haltOnError) { + this.haltOnError = haltOnError; + } + + public void addConfigured(ResourceCollection resources) { + if (!resources.isFilesystemOnly()) { + throw new BuildException("Only filesystem resource collection is supported"); + } + allResources.add(resources); + } + + public WorkspaceArtifact createArtifact() { + WorkspaceArtifact a = new WorkspaceArtifact(); + artifacts.add(a); + return a; + } + + public Resolver getResolver() { + if (resolver == null) { + if (name == null) { + throw new BuildException("A name is required"); + } + resolver = new Resolver(); + resolver.setName(name); + } + return resolver; + } + + private String getProjectName(File ivyFile) { + return ivyFile.getParentFile().getName(); + } + + private class Resolver extends AbstractWorkspaceResolver { + + private Map md2IvyFile; + + private synchronized Map getModuleDescriptors() { + if (md2IvyFile == null) { + md2IvyFile = new HashMap(); + for (ResourceCollection resources : allResources) { + for (Iterator it = resources.iterator(); it.hasNext();) { + File ivyFile = ((FileResource) it.next()).getFile(); + try { + ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance() + .parseDescriptor(getParserSettings(), ivyFile.toURI().toURL(), + isValidate()); + md2IvyFile.put(md, ivyFile); + Message.debug("Add " + md.getModuleRevisionId().getModuleId()); + } catch (Exception ex) { + if (haltOnError) { + throw new BuildException("impossible to parse ivy file " + ivyFile + + " exception=" + ex, ex); + } else { + Message.warn("impossible to parse ivy file " + ivyFile + + " exception=" + ex.getMessage()); + } + } + } + } + } + return md2IvyFile; + } + + public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data) + throws ParseException { + Map mds = getModuleDescriptors(); + for (Entry md : mds.entrySet()) { + ResolvedModuleRevision rmr = checkCandidate(dd, md.getKey(), + getProjectName(md.getValue())); + if (rmr != null) { + return rmr; + } + } + return null; + } + + @Override + protected List createWorkspaceArtifacts(ModuleDescriptor md) { + List res = new ArrayList(); + + for (WorkspaceArtifact wa : artifacts) { + String name = wa.name; + String type = wa.type; + String ext = wa.ext; + String path = wa.path; + if (name == null) { + name = md.getModuleRevisionId().getName(); + } + if (type == null) { + type = "jar"; + } + if (ext == null) { + ext = "jar"; + } + if (path == null) { + path = "target" + File.separator + "dist" + File.separator + type + "s" + + File.separator + name + "." + ext; + } + + URL url; + File ivyFile = md2IvyFile.get(md); + File artifactFile = new File(ivyFile.getParentFile(), path); + try { + url = artifactFile.toURI().toURL(); + } catch (MalformedURLException e) { + throw new RuntimeException("Unsupported file path : " + artifactFile, e); + } + + res.add(new DefaultArtifact(md.getModuleRevisionId(), new Date(), name, type, ext, + url, null)); + } + + return res; + } + + public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { + // Not much to do here - downloads are not required for workspace projects. + DownloadReport dr = new DownloadReport(); + for (int i = 0; i < artifacts.length; i++) { + ArtifactDownloadReport adr = new ArtifactDownloadReport(artifacts[i]); + dr.addArtifactReport(adr); + URL url = artifacts[i].getUrl(); + if (url == null || !url.getProtocol().equals("file")) { + // this is not an artifact managed by this resolver + adr.setDownloadStatus(DownloadStatus.FAILED); + return dr; + } + File f; + try { + f = new File(url.toURI()); + } catch (URISyntaxException e) { + f = new File(url.getPath()); + } + adr.setLocalFile(f); + adr.setDownloadStatus(DownloadStatus.NO); + adr.setSize(0); + Message.verbose("\t[IN WORKSPACE] " + artifacts[i]); + } + return dr; + } + } + +} diff --git a/src/java/org/apache/ivy/ant/FixDepsTask.java b/src/java/org/apache/ivy/ant/FixDepsTask.java index 1be9222d..8695cb87 100644 --- a/src/java/org/apache/ivy/ant/FixDepsTask.java +++ b/src/java/org/apache/ivy/ant/FixDepsTask.java @@ -32,7 +32,7 @@ public class FixDepsTask extends IvyPostResolveTask { private File dest; - private List/* */keeps = new ArrayList(); + private List keeps = new ArrayList(); public void setToFile(File dest) { this.dest = dest; @@ -59,6 +59,7 @@ public class FixDepsTask extends IvyPostResolveTask { return k; } + @Override public void doExecute() throws BuildException { prepareAndCheck(); @@ -72,10 +73,9 @@ public class FixDepsTask extends IvyPostResolveTask { ResolveReport report = getResolvedReport(); - List/* */midToKeep = new ArrayList(); - for (int i = 0; i < keeps.size(); i++) { - midToKeep.add(ModuleId.newInstance(((Keep) keeps.get(i)).org, - ((Keep) keeps.get(i)).module)); + List midToKeep = new ArrayList(); + for (Keep keep : keeps) { + midToKeep.add(ModuleId.newInstance(keep.org, keep.module)); } ModuleDescriptor md = report.toFixedModuleDescriptor(getSettings(), midToKeep); diff --git a/src/java/org/apache/ivy/ant/IvyAntSettings.java b/src/java/org/apache/ivy/ant/IvyAntSettings.java index 660ebbe9..bb67ba7a 100644 --- a/src/java/org/apache/ivy/ant/IvyAntSettings.java +++ b/src/java/org/apache/ivy/ant/IvyAntSettings.java @@ -102,6 +102,8 @@ public class IvyAntSettings extends DataType { private boolean autoRegistered = false; + private AntWorkspaceResolver antWorkspaceResolver; + /** * Returns the default ivy settings of this classloader. If it doesn't exist yet, a new one is * created using the given project to back the VariableContainer. @@ -275,6 +277,10 @@ public class IvyAntSettings extends DataType { defineDefaultSettingFile(ivyAntVariableContainer, task); } + if (antWorkspaceResolver != null) { + settings.addConfigured(antWorkspaceResolver.getResolver()); + } + Ivy ivy = Ivy.newInstance(settings); try { ivy.pushContext(); @@ -388,4 +394,7 @@ public class IvyAntSettings extends DataType { URLHandlerRegistry.setDefault(dispatcher); } + public void addConfiguredWorkspaceResolver(AntWorkspaceResolver antWorkspaceResolver) { + this.antWorkspaceResolver = antWorkspaceResolver; + } } diff --git a/src/java/org/apache/ivy/ant/IvyBuildList.java b/src/java/org/apache/ivy/ant/IvyBuildList.java index 0620b49e..ba4b1a37 100644 --- a/src/java/org/apache/ivy/ant/IvyBuildList.java +++ b/src/java/org/apache/ivy/ant/IvyBuildList.java @@ -23,7 +23,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.ListIterator; @@ -66,7 +65,7 @@ public class IvyBuildList extends IvyTask { public static final String DESCRIPTOR_REQUIRED = "required"; - private List buildFileSets = new ArrayList(); // List (FileSet) + private List buildFileSets = new ArrayList(); private String reference; @@ -152,6 +151,7 @@ public class IvyBuildList extends IvyTask { this.onlydirectdep = onlydirectdep; } + @Override public void doExecute() throws BuildException { if (reference == null) { throw new BuildException("reference should be provided in ivy build list"); @@ -168,12 +168,12 @@ public class IvyBuildList extends IvyTask { Path path = new Path(getProject()); - Map buildFiles = new HashMap(); // Map (ModuleDescriptor -> File buildFile) - List independent = new ArrayList(); - List noDescriptor = new ArrayList(); - Collection mds = new ArrayList(); + Map buildFiles = new HashMap(); + List independent = new ArrayList(); + List noDescriptor = new ArrayList(); + Collection mds = new ArrayList(); - Set rootModuleNames = new LinkedHashSet(); + Set rootModuleNames = new LinkedHashSet(); if (!"*".equals(root)) { StringTokenizer st = new StringTokenizer(root, delimiter); while (st.hasMoreTokens()) { @@ -181,7 +181,7 @@ public class IvyBuildList extends IvyTask { } } - Set leafModuleNames = new LinkedHashSet(); + Set leafModuleNames = new LinkedHashSet(); if (!"*".equals(leaf)) { StringTokenizer st = new StringTokenizer(leaf, delimiter); while (st.hasMoreTokens()) { @@ -189,15 +189,14 @@ public class IvyBuildList extends IvyTask { } } - Set restartFromModuleNames = new LinkedHashSet(); + Set restartFromModuleNames = new LinkedHashSet(); if (!"*".equals(restartFrom)) { StringTokenizer st = new StringTokenizer(restartFrom, delimiter); // Only accept one (first) module restartFromModuleNames.add(st.nextToken()); } - for (ListIterator iter = buildFileSets.listIterator(); iter.hasNext();) { - FileSet fs = (FileSet) iter.next(); + for (FileSet fs : buildFileSets) { DirectoryScanner ds = fs.getDirectoryScanner(getProject()); String[] builds = ds.getIncludedFiles(); for (int i = 0; i < builds.length; i++) { @@ -228,12 +227,12 @@ public class IvyBuildList extends IvyTask { } } - List leafModuleDescriptors = convertModuleNamesToModuleDescriptors(mds, leafModuleNames, - "leaf"); - List rootModuleDescriptors = convertModuleNamesToModuleDescriptors(mds, rootModuleNames, - "root"); - List restartFromModuleDescriptors = convertModuleNamesToModuleDescriptors(mds, - restartFromModuleNames, "restartFrom"); + List leafModuleDescriptors = convertModuleNamesToModuleDescriptors(mds, + leafModuleNames, "leaf"); + List rootModuleDescriptors = convertModuleNamesToModuleDescriptors(mds, + rootModuleNames, "root"); + List restartFromModuleDescriptors = convertModuleNamesToModuleDescriptors( + mds, restartFromModuleNames, "restartFrom"); if (!rootModuleDescriptors.isEmpty()) { Message.info("Filtering modules based on roots " + rootModuleNames); @@ -244,16 +243,14 @@ public class IvyBuildList extends IvyTask { mds = filterModulesFromLeaf(mds, leafModuleDescriptors); } - List sortedModules = ivy.sortModuleDescriptors(mds, SortOptions.DEFAULT); + List sortedModules = ivy.sortModuleDescriptors(mds, SortOptions.DEFAULT); if (!OnMissingDescriptor.TAIL.equals(onMissingDescriptor)) { - for (ListIterator iter = noDescriptor.listIterator(); iter.hasNext();) { - File buildFile = (File) iter.next(); + for (File buildFile : noDescriptor) { addBuildFile(path, buildFile); } } - for (ListIterator iter = independent.listIterator(); iter.hasNext();) { - File buildFile = (File) iter.next(); + for (File buildFile : independent) { addBuildFile(path, buildFile); } if (isReverse()) { @@ -264,11 +261,9 @@ public class IvyBuildList extends IvyTask { // so they are not removed from build path. if (!restartFromModuleDescriptors.isEmpty()) { boolean foundRestartFrom = false; - List keptModules = new ArrayList(); - ModuleDescriptor restartFromModuleDescriptor = (ModuleDescriptor) restartFromModuleDescriptors - .get(0); - for (ListIterator iter = sortedModules.listIterator(); iter.hasNext();) { - ModuleDescriptor md = (ModuleDescriptor) iter.next(); + List keptModules = new ArrayList(); + ModuleDescriptor restartFromModuleDescriptor = restartFromModuleDescriptors.get(0); + for (ModuleDescriptor md : sortedModules) { if (md.equals(restartFromModuleDescriptor)) { foundRestartFrom = true; } @@ -279,18 +274,17 @@ public class IvyBuildList extends IvyTask { sortedModules = keptModules; } StringBuffer order = new StringBuffer(); - for (ListIterator iter = sortedModules.listIterator(); iter.hasNext();) { - ModuleDescriptor md = (ModuleDescriptor) iter.next(); + for (ListIterator iter = sortedModules.listIterator(); iter.hasNext();) { + ModuleDescriptor md = iter.next(); order.append(md.getModuleRevisionId().getModuleId()); if (iter.hasNext()) { order.append(", "); } - File buildFile = (File) buildFiles.get(md); + File buildFile = buildFiles.get(md); addBuildFile(path, buildFile); } if (OnMissingDescriptor.TAIL.equals(onMissingDescriptor)) { - for (ListIterator iter = noDescriptor.listIterator(); iter.hasNext();) { - File buildFile = (File) iter.next(); + for (File buildFile : noDescriptor) { addBuildFile(path, buildFile); } } @@ -299,7 +293,7 @@ public class IvyBuildList extends IvyTask { getProject().setProperty("ivy.sorted.modules", order.toString()); } - private void onMissingDescriptor(File buildFile, File ivyFile, List noDescriptor) { + private void onMissingDescriptor(File buildFile, File ivyFile, List noDescriptor) { if (OnMissingDescriptor.SKIP.equals(onMissingDescriptor)) { Message.debug("skipping " + buildFile + ": descriptor " + ivyFile + " doesn't exist"); } else if (OnMissingDescriptor.FAIL.equals(onMissingDescriptor)) { @@ -323,12 +317,12 @@ public class IvyBuildList extends IvyTask { } } - private List convertModuleNamesToModuleDescriptors(Collection mds, Set moduleNames, String kind) { - List result = new ArrayList(); - Set foundModuleNames = new HashSet(); + private List convertModuleNamesToModuleDescriptors( + Collection mds, Set moduleNames, String kind) { + List result = new ArrayList(); + Set foundModuleNames = new HashSet(); - for (Iterator it = mds.iterator(); it.hasNext();) { - ModuleDescriptor md = (ModuleDescriptor) it.next(); + for (ModuleDescriptor md : mds) { String name = md.getModuleRevisionId().getModuleId().getName(); if (moduleNames.contains(name)) { foundModuleNames.add(name); @@ -337,14 +331,14 @@ public class IvyBuildList extends IvyTask { } if (foundModuleNames.size() < moduleNames.size()) { - Set missingModules = new HashSet(moduleNames); + Set missingModules = new HashSet(moduleNames); missingModules.removeAll(foundModuleNames); StringBuffer missingNames = new StringBuffer(); String sep = ""; - for (Iterator it = missingModules.iterator(); it.hasNext();) { + for (String name : missingModules) { missingNames.append(sep); - missingNames.append(it.next()); + missingNames.append(name); sep = ", "; } @@ -365,20 +359,17 @@ public class IvyBuildList extends IvyTask { * root module * @return filtered list of modules */ - private Collection filterModulesFromRoot(Collection mds, List rootmds) { - // Make a map of ModuleId objects -> ModuleDescriptors - Map moduleIdMap = new HashMap(); - for (Iterator iter = mds.iterator(); iter.hasNext();) { - ModuleDescriptor md = ((ModuleDescriptor) iter.next()); + private Collection filterModulesFromRoot(Collection mds, + List rootmds) { + Map moduleIdMap = new HashMap(); + for (ModuleDescriptor md : mds) { moduleIdMap.put(md.getModuleRevisionId().getModuleId(), md); } // recursively process the nodes - Set toKeep = new LinkedHashSet(); + Set toKeep = new LinkedHashSet(); - Iterator it = rootmds.iterator(); - while (it.hasNext()) { - ModuleDescriptor rootmd = (ModuleDescriptor) it.next(); + for (ModuleDescriptor rootmd : rootmds) { processFilterNodeFromRoot(rootmd, toKeep, moduleIdMap); // With the excluderoot attribute set to true, take the rootmd out of the toKeep set. if (excludeRoot) { @@ -391,8 +382,7 @@ public class IvyBuildList extends IvyTask { } // just for logging - for (Iterator iter = toKeep.iterator(); iter.hasNext();) { - ModuleDescriptor md = ((ModuleDescriptor) iter.next()); + for (ModuleDescriptor md : toKeep) { Message.verbose("Kept module " + md.getModuleRevisionId().getModuleId().getName()); } @@ -411,13 +401,14 @@ public class IvyBuildList extends IvyTask { * @param moduleIdMap * reference mapping of moduleId to ModuleDescriptor that are part of the BuildList */ - private void processFilterNodeFromRoot(ModuleDescriptor node, Set toKeep, Map moduleIdMap) { + private void processFilterNodeFromRoot(ModuleDescriptor node, Set toKeep, + Map moduleIdMap) { // toKeep.add(node); DependencyDescriptor[] deps = node.getDependencies(); for (int i = 0; i < deps.length; i++) { ModuleId id = deps[i].getDependencyId(); - ModuleDescriptor md = (ModuleDescriptor) moduleIdMap.get(id); + ModuleDescriptor md = moduleIdMap.get(id); // we test if this module id has a module descriptor, and if it isn't already in the // toKeep Set, in which there's probably a circular dependency if (md != null && !toKeep.contains(md)) { @@ -439,19 +430,16 @@ public class IvyBuildList extends IvyTask { * leaf module * @return filtered list of modules */ - private Collection filterModulesFromLeaf(Collection mds, List leafmds) { - // Make a map of ModuleId objects -> ModuleDescriptors - Map moduleIdMap = new HashMap(); - for (Iterator iter = mds.iterator(); iter.hasNext();) { - ModuleDescriptor md = ((ModuleDescriptor) iter.next()); + private Collection filterModulesFromLeaf(Collection mds, + List leafmds) { + Map moduleIdMap = new HashMap(); + for (ModuleDescriptor md : mds) { moduleIdMap.put(md.getModuleRevisionId().getModuleId(), md); } // recursively process the nodes - Set toKeep = new LinkedHashSet(); - Iterator it = leafmds.iterator(); - while (it.hasNext()) { - ModuleDescriptor leafmd = (ModuleDescriptor) it.next(); + Set toKeep = new LinkedHashSet(); + for (ModuleDescriptor leafmd : leafmds) { // With the excludeleaf attribute set to true, take the rootmd out of the toKeep set. if (excludeLeaf) { Message.verbose("Excluded module " @@ -463,8 +451,7 @@ public class IvyBuildList extends IvyTask { } // just for logging - for (Iterator iter = toKeep.iterator(); iter.hasNext();) { - ModuleDescriptor md = ((ModuleDescriptor) iter.next()); + for (ModuleDescriptor md : toKeep) { Message.verbose("Kept module " + md.getModuleRevisionId().getModuleId().getName()); } @@ -482,9 +469,9 @@ public class IvyBuildList extends IvyTask { * @param moduleIdMap * reference mapping of moduleId to ModuleDescriptor that are part of the BuildList */ - private void processFilterNodeFromLeaf(ModuleDescriptor node, Set toKeep, Map moduleIdMap) { - for (Iterator iter = moduleIdMap.values().iterator(); iter.hasNext();) { - ModuleDescriptor md = (ModuleDescriptor) iter.next(); + private void processFilterNodeFromLeaf(ModuleDescriptor node, Set toKeep, + Map moduleIdMap) { + for (ModuleDescriptor md : moduleIdMap.values()) { DependencyDescriptor[] deps = md.getDependencies(); for (int i = 0; i < deps.length; i++) { ModuleId id = deps[i].getDependencyId(); diff --git a/src/java/org/apache/ivy/ant/IvyBuildNumber.java b/src/java/org/apache/ivy/ant/IvyBuildNumber.java index 7f7ce7d1..86344727 100644 --- a/src/java/org/apache/ivy/ant/IvyBuildNumber.java +++ b/src/java/org/apache/ivy/ant/IvyBuildNumber.java @@ -19,6 +19,7 @@ package org.apache.ivy.ant; import java.util.List; import java.util.ListIterator; +import java.util.regex.Pattern; import org.apache.ivy.Ivy; import org.apache.ivy.core.module.id.ModuleId; @@ -169,25 +170,32 @@ public class IvyBuildNumber extends IvyTask { if (expression.equals(organisation) || expression.equals(module) || expression.equals(branch)) { return exact.getMatcher(expression); + } else { + return regexp.getMatcher(expression); } - return regexp.getMatcher(expression); } public String getName() { return "buildnumber-matcher"; } }; + + String revisionPattern = ".*"; + if (revision.endsWith("+")) { + revisionPattern = Pattern.quote(revision.substring(0, revision.length() - 1)) + ".*"; + } + + ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation, module, branch, + revisionPattern); ModuleRevisionId[] revisions; if (resolver == null) { - revisions = searcher.listModules( - ModuleRevisionId.newInstance(organisation, module, branch, ".*"), patternMatcher); + revisions = searcher.listModules(mrid, patternMatcher); } else { DependencyResolver depResolver = settings.getResolver(resolver); if (depResolver == null) { throw new BuildException("Unknown resolver: " + resolver); } - revisions = searcher.listModules(depResolver, - ModuleRevisionId.newInstance(organisation, module, branch, ".*"), patternMatcher); + revisions = searcher.listModules(depResolver, mrid, patternMatcher); } ArtifactInfo[] infos = new ArtifactInfo[revisions.length]; diff --git a/src/java/org/apache/ivy/ant/IvyConfigure.java b/src/java/org/apache/ivy/ant/IvyConfigure.java index 5e05adcb..6926d025 100644 --- a/src/java/org/apache/ivy/ant/IvyConfigure.java +++ b/src/java/org/apache/ivy/ant/IvyConfigure.java @@ -130,6 +130,11 @@ public class IvyConfigure extends Task { settings.setPasswd(passwd); } + public void addConfiguredWorkspaceResolver(AntWorkspaceResolver resolver) { + settings.addConfiguredWorkspaceResolver(resolver); + } + + @Override public void execute() throws BuildException { String settingsId = settings.getId(); Object otherRef = getProject().getReference(settingsId); diff --git a/src/java/org/apache/ivy/ant/IvyDependency.java b/src/java/org/apache/ivy/ant/IvyDependency.java index dbc8f215..051a55ad 100644 --- a/src/java/org/apache/ivy/ant/IvyDependency.java +++ b/src/java/org/apache/ivy/ant/IvyDependency.java @@ -18,7 +18,6 @@ package org.apache.ivy.ant; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; @@ -32,13 +31,13 @@ import org.apache.tools.ant.BuildException; public class IvyDependency { - private List/* */confs = new ArrayList(); + private List confs = new ArrayList(); - private List/* */artifacts = new ArrayList(); + private List artifacts = new ArrayList(); - private List/* */excludes = new ArrayList(); + private List excludes = new ArrayList(); - private List/* */includes = new ArrayList(); + private List includes = new ArrayList(); private String org; @@ -161,28 +160,20 @@ public class IvyDependency { dd.addDependencyConfiguration(masterConf, "*"); } - Iterator itConfs = confs.iterator(); - while (itConfs.hasNext()) { - IvyDependencyConf c = (IvyDependencyConf) itConfs.next(); + for (IvyDependencyConf c : confs) { c.addConf(dd, masterConf); } - Iterator itArtifacts = artifacts.iterator(); - while (itArtifacts.hasNext()) { - IvyDependencyArtifact artifact = (IvyDependencyArtifact) itArtifacts.next(); + for (IvyDependencyArtifact artifact : artifacts) { artifact.addArtifact(dd, masterConf); } - Iterator itExcludes = excludes.iterator(); - while (itExcludes.hasNext()) { - IvyDependencyExclude exclude = (IvyDependencyExclude) itExcludes.next(); + for (IvyDependencyExclude exclude : excludes) { DefaultExcludeRule rule = exclude.asRule(settings); dd.addExcludeRule(masterConf, rule); } - Iterator itIncludes = includes.iterator(); - while (itIncludes.hasNext()) { - IvyDependencyInclude include = (IvyDependencyInclude) itIncludes.next(); + for (IvyDependencyInclude include : includes) { DefaultIncludeRule rule = include.asRule(settings); dd.addIncludeRule(masterConf, rule); } diff --git a/src/java/org/apache/ivy/ant/IvyDependencyTree.java b/src/java/org/apache/ivy/ant/IvyDependencyTree.java index f7c9feed..bb7c2797 100644 --- a/src/java/org/apache/ivy/ant/IvyDependencyTree.java +++ b/src/java/org/apache/ivy/ant/IvyDependencyTree.java @@ -49,7 +49,10 @@ public class IvyDependencyTree extends IvyPostResolveTask { IvyNode dependency = (IvyNode) iterator.next(); populateDependencyTree(dependency, mrid, report); } - printDependencies((List) dependencies.get(mrid), 0); + List dependencyList = (List) dependencies.get(mrid); + if (dependencyList != null) { + printDependencies(dependencyList, 0); + } } private void printDependencies(List/* */dependencyList, int indent) { diff --git a/src/java/org/apache/ivy/ant/IvyDependencyUpdateChecker.java b/src/java/org/apache/ivy/ant/IvyDependencyUpdateChecker.java index d416e570..4a71664e 100644 --- a/src/java/org/apache/ivy/ant/IvyDependencyUpdateChecker.java +++ b/src/java/org/apache/ivy/ant/IvyDependencyUpdateChecker.java @@ -211,4 +211,11 @@ public class IvyDependencyUpdateChecker extends IvyPostResolveTask { this.showTransitive = showTransitive; } + public boolean isCheckIfChanged() { + return checkIfChanged; + } + + public void setCheckIfChanged(boolean checkIfChanged) { + this.checkIfChanged = checkIfChanged; + } } diff --git a/src/java/org/apache/ivy/ant/IvyMakePom.java b/src/java/org/apache/ivy/ant/IvyMakePom.java index 406b1553..395a4ad6 100644 --- a/src/java/org/apache/ivy/ant/IvyMakePom.java +++ b/src/java/org/apache/ivy/ant/IvyMakePom.java @@ -22,15 +22,14 @@ import java.io.IOException; import java.net.MalformedURLException; import java.text.ParseException; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorWriter; import org.apache.ivy.plugins.parser.m2.PomWriterOptions; +import org.apache.ivy.plugins.parser.m2.PomWriterOptions.ExtraDependency; import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser; import org.apache.ivy.util.FileUtil; import org.apache.tools.ant.BuildException; @@ -152,9 +151,9 @@ public class IvyMakePom extends IvyTask { private String description; - private Collection mappings = new ArrayList(); + private List mappings = new ArrayList(); - private Collection dependencies = new ArrayList(); + private List dependencies = new ArrayList(); public File getPomFile() { return pomFile; @@ -240,6 +239,7 @@ public class IvyMakePom extends IvyTask { return dependency; } + @Override public void doExecute() throws BuildException { try { if (ivyFile == null) { @@ -281,10 +281,9 @@ public class IvyMakePom extends IvyTask { return options; } - private Map getMappingsMap() { - Map mappingsMap = new HashMap(); - for (Iterator iter = mappings.iterator(); iter.hasNext();) { - Mapping mapping = (Mapping) iter.next(); + private Map getMappingsMap() { + Map mappingsMap = new LinkedHashMap(); + for (Mapping mapping : mappings) { String[] mappingConfs = splitConfs(mapping.getConf()); for (int i = 0; i < mappingConfs.length; i++) { if (!mappingsMap.containsKey(mappingConfs[i])) { @@ -295,13 +294,12 @@ public class IvyMakePom extends IvyTask { return mappingsMap; } - private List getDependencies() { - List result = new ArrayList(); - for (Iterator iter = dependencies.iterator(); iter.hasNext();) { - Dependency dependency = (Dependency) iter.next(); - result.add(new PomWriterOptions.ExtraDependency(dependency.getGroup(), dependency - .getArtifact(), dependency.getVersion(), dependency.getScope(), dependency - .getType(), dependency.getClassifier(), dependency.getOptional())); + private List getDependencies() { + List result = new ArrayList(); + for (Dependency dependency : dependencies) { + result.add(new ExtraDependency(dependency.getGroup(), dependency.getArtifact(), + dependency.getVersion(), dependency.getScope(), dependency.getType(), + dependency.getClassifier(), dependency.getOptional())); } return result; } diff --git a/src/java/org/apache/ivy/ant/IvyPublish.java b/src/java/org/apache/ivy/ant/IvyPublish.java index d46b701f..04df76eb 100644 --- a/src/java/org/apache/ivy/ant/IvyPublish.java +++ b/src/java/org/apache/ivy/ant/IvyPublish.java @@ -61,7 +61,7 @@ public class IvyPublish extends IvyTask { private String publishResolverName = null; - private List artifactspattern = new ArrayList(); + private List artifactspattern = new ArrayList(); private File deliveryList; @@ -81,7 +81,7 @@ public class IvyPublish extends IvyTask { private boolean forcedeliver; - private Collection artifacts = new ArrayList(); + private Collection artifacts = new ArrayList(); private String pubBranch; @@ -190,7 +190,7 @@ public class IvyPublish extends IvyTask { } public String getArtifactspattern() { - return (String) (artifactspattern.isEmpty() ? null : artifactspattern.get(0)); + return artifactspattern.isEmpty() ? null : artifactspattern.get(0); } public void setArtifactspattern(String artifactsPattern) { @@ -222,6 +222,7 @@ public class IvyPublish extends IvyTask { this.merge = merge; } + @Override public void doExecute() throws BuildException { Ivy ivy = getIvyInstance(); IvySettings settings = ivy.getSettings(); @@ -312,14 +313,10 @@ public class IvyPublish extends IvyTask { mrid, artifactspattern, publishResolverName, - new PublishOptions() - .setPubrevision(getPubrevision()) - .setPubbranch(getPubbranch()) - .setSrcIvyPattern(publishivy ? srcivypattern : null) - .setStatus(getStatus()) + new PublishOptions().setPubrevision(getPubrevision()).setPubbranch(getPubbranch()) + .setSrcIvyPattern(publishivy ? srcivypattern : null).setStatus(getStatus()) .setPubdate(pubdate) - .setExtraArtifacts( - (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()])) + .setExtraArtifacts(artifacts.toArray(new Artifact[artifacts.size()])) .setValidate(doValidate(settings)).setOverwrite(overwrite) .setUpdate(update).setMerge(merge).setWarnOnMissing(warnonmissing) .setHaltOnMissing(haltonmissing).setConfs(splitConfs(conf))); @@ -392,7 +389,7 @@ public class IvyPublish extends IvyTask { private String type; - private Map extra = new HashMap(); + private Map extra = new HashMap(); public String[] getConfigurations() { return null; @@ -439,22 +436,22 @@ public class IvyPublish extends IvyTask { } public String getAttribute(String attName) { - return (String) extra.get(attName); + return extra.get(attName); } - public Map getAttributes() { + public Map getAttributes() { return extra; } public String getExtraAttribute(String attName) { - return (String) extra.get(attName); + return extra.get(attName); } - public Map getExtraAttributes() { + public Map getExtraAttributes() { return extra; } - public Map getQualifiedExtraAttributes() { + public Map getQualifiedExtraAttributes() { return extra; } diff --git a/src/java/org/apache/ivy/ant/IvyResolve.java b/src/java/org/apache/ivy/ant/IvyResolve.java index 5dd77577..c700421b 100644 --- a/src/java/org/apache/ivy/ant/IvyResolve.java +++ b/src/java/org/apache/ivy/ant/IvyResolve.java @@ -23,7 +23,6 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import java.util.List; import org.apache.ivy.Ivy; @@ -91,11 +90,11 @@ public class IvyResolve extends IvyTask { private boolean checkIfChanged = true; // for backward compatibility - private List/* */dependencies = new ArrayList(); + private List dependencies = new ArrayList(); - private List/* */excludes = new ArrayList(); + private List excludes = new ArrayList(); - private List/* */conflicts = new ArrayList(); + private List conflicts = new ArrayList(); public boolean isUseOrigin() { return useOrigin; @@ -229,11 +228,13 @@ public class IvyResolve extends IvyTask { return c; } + @Override protected void prepareTask() { super.prepareTask(); Message.setShowProgress(showProgress); } + @Override public void doExecute() throws BuildException { Ivy ivy = getIvyInstance(); IvySettings settings = ivy.getSettings(); @@ -267,24 +268,18 @@ public class IvyResolve extends IvyTask { Ivy.getWorkingRevision()); DefaultModuleDescriptor md = DefaultModuleDescriptor.newBasicInstance(mrid, null); - Iterator itDeps = dependencies.iterator(); - while (itDeps.hasNext()) { - IvyDependency dep = (IvyDependency) itDeps.next(); + for (IvyDependency dep : dependencies) { DependencyDescriptor dd = dep.asDependencyDescriptor(md, "default", settings); md.addDependency(dd); } - Iterator itExcludes = excludes.iterator(); - while (itExcludes.hasNext()) { - IvyExclude exclude = (IvyExclude) itExcludes.next(); + for (IvyExclude exclude : excludes) { DefaultExcludeRule rule = exclude.asRule(settings); rule.addConfiguration("default"); md.addExcludeRule(rule); } - Iterator itConflicts = conflicts.iterator(); - while (itConflicts.hasNext()) { - IvyConflict conflict = (IvyConflict) itConflicts.next(); + for (IvyConflict conflict : conflicts) { conflict.addConflict(md, settings); } @@ -426,9 +421,9 @@ public class IvyResolve extends IvyTask { } } - protected Collection/* */getAllowedLogOptions() { - return Arrays.asList(new String[] {LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY, - LogOptions.LOG_QUIET}); + protected Collection getAllowedLogOptions() { + return Arrays.asList(LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY, + LogOptions.LOG_QUIET); } private ResolveOptions getResolveOptions(Ivy ivy, String[] confs, IvySettings settings) { diff --git a/src/java/org/apache/ivy/ant/IvyTask.java b/src/java/org/apache/ivy/ant/IvyTask.java index 3533480b..6d65c34a 100644 --- a/src/java/org/apache/ivy/ant/IvyTask.java +++ b/src/java/org/apache/ivy/ant/IvyTask.java @@ -265,6 +265,7 @@ public abstract class IvyTask extends Task { /** * Ant task execute. Calls prepareTask, doExecute, finalzeTask */ + @Override public final void execute() throws BuildException { try { prepareTask(); @@ -282,6 +283,7 @@ public abstract class IvyTask extends Task { */ public abstract void doExecute() throws BuildException; + @Override public String toString() { return getClass().getName() + ":" + getTaskName(); } diff --git a/src/java/org/apache/ivy/ant/antlib.xml b/src/java/org/apache/ivy/ant/antlib.xml index ac327408..0111f781 100644 --- a/src/java/org/apache/ivy/ant/antlib.xml +++ b/src/java/org/apache/ivy/ant/antlib.xml @@ -49,4 +49,5 @@ + diff --git a/src/java/org/apache/ivy/core/cache/CacheMetadataOptions.java b/src/java/org/apache/ivy/core/cache/CacheMetadataOptions.java index a1c77b48..8f827c49 100644 --- a/src/java/org/apache/ivy/core/cache/CacheMetadataOptions.java +++ b/src/java/org/apache/ivy/core/cache/CacheMetadataOptions.java @@ -32,6 +32,8 @@ public class CacheMetadataOptions extends CacheDownloadOptions { private boolean checkTTL = true; + private boolean useCacheOnly = false; + public Namespace getNamespace() { return namespace; } @@ -85,4 +87,13 @@ public class CacheMetadataOptions extends CacheDownloadOptions { public boolean isCheckTTL() { return checkTTL; } + + public CacheMetadataOptions setUseCacheOnly(boolean useCacheOnly) { + this.useCacheOnly = useCacheOnly; + return this; + } + + public boolean isUseCacheOnly() { + return useCacheOnly; + } } diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java index 55f498d2..86b4a8b1 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -26,7 +26,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.ParseException; import java.util.Date; -import java.util.Iterator; import java.util.Map; import java.util.regex.Pattern; @@ -114,7 +113,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv private Boolean useOrigin; - private ModuleRules/* */ttlRules = new ModuleRules(); + private ModuleRules ttlRules = new ModuleRules(); private Long defaultTTL = null; @@ -188,17 +187,17 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv public long getDefaultTTL() { if (defaultTTL == null) { - defaultTTL = new Long(parseDuration(settings.getVariable("ivy.cache.ttl.default"))); + defaultTTL = Long.valueOf(parseDuration(settings.getVariable("ivy.cache.ttl.default"))); } return defaultTTL.longValue(); } public void setDefaultTTL(long defaultTTL) { - this.defaultTTL = new Long(defaultTTL); + this.defaultTTL = Long.valueOf(defaultTTL); } public void setDefaultTTL(String defaultTTL) { - this.defaultTTL = new Long(parseDuration(defaultTTL)); + this.defaultTTL = Long.valueOf(parseDuration(defaultTTL)); } public String getDataFilePattern() { @@ -239,16 +238,16 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv this.changingPattern = changingPattern; } - public void addTTL(Map attributes, PatternMatcher matcher, long duration) { + public void addTTL(Map attributes, PatternMatcher matcher, long duration) { ttlRules.defineRule(new MapMatcher(attributes, matcher), new Long(duration)); } - public void addConfiguredTtl(Map/* */attributes) { - String duration = (String) attributes.remove("duration"); + public void addConfiguredTtl(Map attributes) { + String duration = attributes.remove("duration"); if (duration == null) { throw new IllegalArgumentException("'duration' attribute is mandatory for ttl"); } - String matcher = (String) attributes.remove("matcher"); + String matcher = attributes.remove("matcher"); addTTL(attributes, matcher == null ? ExactPatternMatcher.INSTANCE : settings.getMatcher(matcher), parseDuration(duration)); @@ -295,10 +294,9 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv return days * MILLIS_IN_DAY + hours * MILLIS_IN_HOUR + minutes * MILLIS_IN_MINUTES + seconds * MILLIS_IN_SECONDS + millis; - } else { - throw new IllegalArgumentException("invalid duration '" + duration - + "': it must match " + DURATION_PATTERN.pattern() + " or 'eternal'"); } + throw new IllegalArgumentException("invalid duration '" + duration + + "': it must match " + DURATION_PATTERN.pattern() + " or 'eternal'"); } private int getGroupIntValue(java.util.regex.Matcher m, int groupNumber) { @@ -309,19 +307,14 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv /** * True if this cache should check lastmodified date to know if ivy files are up to date. * - * @return + * @return boolean */ public boolean isCheckmodified() { if (checkmodified == null) { - if (getSettings() != null) { - String check = getSettings().getVariable("ivy.resolver.default.check.modified"); - return check != null ? Boolean.valueOf(check).booleanValue() : false; - } else { - return false; - } - } else { - return checkmodified.booleanValue(); + return getSettings() != null && Boolean + .parseBoolean(getSettings().getVariable("ivy.resolver.default.check.modified")); } + return checkmodified.booleanValue(); } public void setCheckmodified(boolean check) { @@ -334,14 +327,9 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv */ public boolean isUseOrigin() { if (useOrigin == null) { - if (getSettings() != null) { - return getSettings().isDefaultUseOrigin(); - } else { - return false; - } - } else { - return useOrigin.booleanValue(); + return getSettings() != null && getSettings().isDefaultUseOrigin(); } + return useOrigin.booleanValue(); } public void setUseOrigin(boolean b) { @@ -384,9 +372,8 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv private File getArchiveFileInCache(Artifact artifact, ArtifactOrigin origin, boolean useOrigin) { if (useOrigin && !ArtifactOrigin.isUnknown(origin) && origin.isLocal()) { return Checks.checkAbsolute(origin.getLocation(), artifact + " origin location"); - } else { - return new File(getRepositoryCacheRoot(), getArchivePathInCache(artifact, origin)); } + return new File(getRepositoryCacheRoot(), getArchivePathInCache(artifact, origin)); } public String getArchivePathInCache(Artifact artifact) { @@ -396,9 +383,8 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv public String getArchivePathInCache(Artifact artifact, ArtifactOrigin origin) { if (isOriginalMetadataArtifact(artifact)) { return IvyPatternHelper.substitute(getIvyPattern() + ".original", artifact, origin); - } else { - return IvyPatternHelper.substitute(getArtifactPattern(), artifact, origin); } + return IvyPatternHelper.substitute(getArtifactPattern(), artifact, origin); } /** @@ -423,7 +409,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * * @param md * the module descriptor resolved - * @param name + * @param artifactResolverName * artifact resolver name */ public void saveResolvers(ModuleDescriptor md, String metadataResolverName, @@ -531,10 +517,8 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv // try to find other cached artifact info with same location. This must be the // origin. We must parse the key as we do not know for sure what the original // artifact is named. - Iterator it = cdf.entrySet().iterator(); String ownLocationKey = getLocationKey(artifact); - while (it.hasNext()) { - Map.Entry entry = (Map.Entry) it.next(); + for (Map.Entry entry : cdf.entrySet()) { if (entry.getValue().equals(location) && !ownLocationKey.equals(entry.getKey())) { // found a match, key is @@ -576,7 +560,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv origin.setLastChecked(Long.valueOf(lastChecked)); } if (exists != null) { - origin.setExist(Boolean.valueOf(exists).booleanValue()); + origin.setExist(Boolean.parseBoolean(exists)); } return origin; @@ -669,6 +653,17 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv getDataFilePattern(), mRevId)), "ivy cached data file for " + mRevId); } + /** + * A resolver-specific ivydata file, only used for caching dynamic revisions, e.g. + * integration-repo. + */ + private PropertiesFile getCachedDataFile(String resolverName, ModuleRevisionId mRevId) { + // we append ".${resolverName} onto the end of the regular ivydata location + return new PropertiesFile(new File(getRepositoryCacheRoot(), + IvyPatternHelper.substitute(getDataFilePattern(), mRevId) + "." + resolverName), + "ivy cached data file for " + mRevId); + } + public ResolvedModuleRevision findModuleInCache(DependencyDescriptor dd, ModuleRevisionId requestedRevisionId, CacheMetadataOptions options, String expectedResolver) { @@ -677,7 +672,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv Message.verbose("don't use cache for " + mrid + ": checkModified=true"); return null; } - if (isChanging(dd, requestedRevisionId, options)) { + if (!options.isUseCacheOnly() && isChanging(dd, requestedRevisionId, options)) { Message.verbose("don't use cache for " + mrid + ": changing=true"); return null; } @@ -695,25 +690,24 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv try { if (settings.getVersionMatcher().isDynamic(mrid)) { - String resolvedRevision = getResolvedRevision(mrid, options); - if (resolvedRevision != null) { - Message.verbose("found resolved revision in cache: " + mrid + " => " - + resolvedRevision); + String resolvedRevision = getResolvedRevision(expectedResolver, mrid, options); + if (resolvedRevision == null) { + return null; + } + Message.verbose("found resolved revision in cache: " + mrid + " => " + + resolvedRevision); - // we have found another module in the cache, make sure we unlock - // the original module - unlockMetadataArtifact(mrid); - mrid = ModuleRevisionId.newInstance(mrid, resolvedRevision); + // we have found another module in the cache, make sure we unlock + // the original module + unlockMetadataArtifact(mrid); + mrid = ModuleRevisionId.newInstance(mrid, resolvedRevision); - // don't forget to request a lock on the new module! - if (!lockMetadataArtifact(mrid)) { - Message.error("impossible to acquire lock for " + mrid); + // don't forget to request a lock on the new module! + if (!lockMetadataArtifact(mrid)) { + Message.error("impossible to acquire lock for " + mrid); - // we couldn't lock the new module, so no need to unlock it - unlock = false; - return null; - } - } else { + // we couldn't lock the new module, so no need to unlock it + unlock = false; return null; } } @@ -766,11 +760,10 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv } } return new ResolvedModuleRevision(resolver, artResolver, depMD, madr); - } else { - Message.debug("found module in cache but with a different resolver: " - + "discarding: " + mrid + "; expected resolver=" - + expectedResolver + "; resolver=" + resolver.getName()); } + Message.debug("found module in cache but with a different resolver: " + + "discarding: " + mrid + "; expected resolver=" + + expectedResolver + "; resolver=" + resolver.getName()); } else { Message.debug("\tresolver not found: " + resolverName + " => cannot use cached ivy file for " + mrid); @@ -834,19 +827,28 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv return cache.getStale(ivyFile, settings, options.isValidate(), mdProvider); } - private String getResolvedRevision(ModuleRevisionId mrid, CacheMetadataOptions options) { + /** + * Called by doFindModuleInCache to lookup the dynamic {@code mrid} in the ivycache's ivydata + * file. + */ + private String getResolvedRevision(String expectedResolver, ModuleRevisionId mrid, CacheMetadataOptions options) { if (!lockMetadataArtifact(mrid)) { Message.error("impossible to acquire lock for " + mrid); return null; } try { - String resolvedRevision = null; if (options.isForce()) { Message.verbose("refresh mode: no check for cached resolved revision for " + mrid); return null; } - PropertiesFile cachedResolvedRevision = getCachedDataFile(mrid); - resolvedRevision = cachedResolvedRevision.getProperty("resolved.revision"); + // If a resolver is asking for its specific dynamic revision, avoid looking at a different one + PropertiesFile cachedResolvedRevision; + if (expectedResolver != null) { + cachedResolvedRevision = getCachedDataFile(expectedResolver, mrid); + } else { + cachedResolvedRevision = getCachedDataFile(mrid); + } + String resolvedRevision = cachedResolvedRevision.getProperty("resolved.revision"); if (resolvedRevision == null) { Message.verbose(getName() + ": no cached resolved revision for " + mrid); return null; @@ -875,15 +877,27 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv } public void saveResolvedRevision(ModuleRevisionId mrid, String revision) { + saveResolvedRevision(null, mrid, revision); + } + + public void saveResolvedRevision(String resolverName, ModuleRevisionId mrid, String revision) { if (!lockMetadataArtifact(mrid)) { Message.error("impossible to acquire lock for " + mrid); return; } try { - PropertiesFile cachedResolvedRevision = getCachedDataFile(mrid); + PropertiesFile cachedResolvedRevision; + if (resolverName == null) { + cachedResolvedRevision = getCachedDataFile(mrid); + } else { + cachedResolvedRevision = getCachedDataFile(resolverName, mrid); + } cachedResolvedRevision.setProperty("resolved.time", String.valueOf(System.currentTimeMillis())); cachedResolvedRevision.setProperty("resolved.revision", revision); + if (resolverName != null) { + cachedResolvedRevision.setProperty("resolver", resolverName); + } cachedResolvedRevision.save(); } finally { unlockMetadataArtifact(mrid); @@ -891,10 +905,11 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv } public long getTTL(ModuleRevisionId mrid) { - Long ttl = (Long) ttlRules.getRule(mrid); + Long ttl = ttlRules.getRule(mrid); return ttl == null ? getDefaultTTL() : ttl.longValue(); } + @Override public String toString() { return name; } @@ -1028,11 +1043,13 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv File archiveFile = getArchiveFileInCache(unpacked, null, false); if (archiveFile.exists() && !options.isForce()) { adr.setUnpackedLocalFile(archiveFile); + adr.setUnpackedArtifact(unpacked); } else { Message.info("\tUnpacking " + artifact.getId()); try { - packagingManager.unpackArtifact(artifact, adr.getLocalFile(), archiveFile); + final Artifact unpackedArtifact = packagingManager.unpackArtifact(artifact, adr.getLocalFile(), archiveFile); adr.setUnpackedLocalFile(archiveFile); + adr.setUnpackedArtifact(unpackedArtifact); } catch (Exception e) { Message.debug(e); adr.setDownloadStatus(DownloadStatus.FAILED); @@ -1141,13 +1158,12 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the hash */ private String computeResourceNameHash(Resource resource) { - byte[] shaDigest; try { - shaDigest = SHA_DIGEST.digest(resource.getName().getBytes("UTF-8")); + byte[] shaDigest = SHA_DIGEST.digest(resource.getName().getBytes("UTF-8")); + return HexEncoder.encode(shaDigest); } catch (UnsupportedEncodingException e) { throw new RuntimeException("UTF-8 not supported", e); } - return HexEncoder.encode(shaDigest); } /** @@ -1171,18 +1187,13 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv if (savedOrigin.getLastChecked() != null && (time - savedOrigin.getLastChecked().longValue()) < ttl) { // still in the ttl period, no need to check, trust the cache - if (!archiveFile.exists()) { - // but if the local archive doesn't exist, trust the cache only if the cached origin - // says that the remote resource doesn't exist either - return !savedOrigin.isExists(); - } - return true; + return archiveFile.exists() || !savedOrigin.isExists(); } if (!archiveFile.exists()) { // the the file doesn't exist in the cache, obviously not up to date return false; } - origin.setLastChecked(new Long(time)); + origin.setLastChecked(Long.valueOf(time)); // check if the local resource is up to date regarding the remote one return archiveFile.lastModified() >= resource.getLastModified(); } @@ -1285,16 +1296,15 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv + mrid); rmr.getReport().setSearched(true); return rmr; - } else { - Message.verbose("\t" + getName() - + ": revision in cache is not up to date: " + mrid); - if (isChanging(dd, mrid, options)) { - // ivy file has been updated, we should see if it has a new publication - // date to see if a new download is required (in case the dependency is - // a changing one) - cachedPublicationDate = rmr.getDescriptor() - .getResolvedPublicationDate(); - } + } + Message.verbose("\t" + getName() + + ": revision in cache is not up to date: " + mrid); + if (isChanging(dd, mrid, options)) { + // ivy file has been updated, we should see if it has a new publication + // date to see if a new download is required (in case the dependency is + // a changing one) + cachedPublicationDate = rmr.getDescriptor() + .getResolvedPublicationDate(); } } } @@ -1327,9 +1337,8 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv parserSettings); if (md == null) { throw new IllegalStateException( - "module descriptor parser returned a null module descriptor, " - + "which is not allowed. " + "parser=" + parser - + "; parser class=" + parser.getClass().getName() + "module descriptor parser returned a null module descriptor, which is not allowed. parser=" + + parser + "; parser class=" + parser.getClass().getName() + "; module descriptor resource=" + mdRef.getResource()); } Message.debug("\t" + getName() + ": parsed downloaded md file for " + mrid @@ -1344,11 +1353,9 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv deleteOldArtifacts = true; } if (deleteOldArtifacts) { - String[] confs = md.getConfigurationsNames(); - for (int i = 0; i < confs.length; i++) { - Artifact[] arts = md.getArtifacts(confs[i]); - for (int j = 0; j < arts.length; j++) { - Artifact transformedArtifact = NameSpaceHelper.transform(arts[j], + for (String conf : md.getConfigurationsNames()) { + for (Artifact art : md.getArtifacts(conf)) { + Artifact transformedArtifact = NameSpaceHelper.transform(art, options.getNamespace().getToSystemTransformer()); ArtifactOrigin origin = getSavedArtifactOrigin(transformedArtifact); File artFile = getArchiveFileInCache(transformedArtifact, origin, false); @@ -1430,7 +1437,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv return new DefaultArtifact(mrid, new Date(), "metadata", "metadata", "ivy", true); } - // not used any more, but maybe useful for finer grain locking when downloading artifacts + // not used any more, but may be useful for finer grained locking when downloading artifacts // private boolean lockArtifact(Artifact artifact) { // try { // return getLockStrategy().lockArtifact(artifact, diff --git a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java index 26837021..9c421441 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultResolutionCacheManager.java @@ -74,6 +74,12 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv } public File getResolutionCacheRoot() { + if (basedir == null) { + if (settings == null) { + throw new IllegalStateException("The 'basedir' or 'IvySettings' has not been set on the ResolutionCacheManager"); + } + basedir = settings.getDefaultResolutionCacheBasedir(); + } return basedir; } @@ -213,7 +219,7 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv } public void clean() { - FileUtil.forceDelete(getBasedir()); + FileUtil.forceDelete(getResolutionCacheRoot()); } private static class CacheParserSettings implements ParserSettings { @@ -274,6 +280,10 @@ public class DefaultResolutionCacheManager implements ResolutionCacheManager, Iv public Namespace getContextNamespace() { return delegate.getContextNamespace(); } + + public String getVariable(String value) { + return delegate.getVariable(value); + } } private static class MapURLResolver extends RelativeUrlResolver { diff --git a/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java b/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java index 58c7f311..35da0bd4 100644 --- a/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java +++ b/src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java @@ -150,5 +150,9 @@ class ParserSettingsMonitor { } return r; } + + public String getVariable(String value) { + return delegatedSettings.getVariable(value); + } }; } diff --git a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java index f6c5c24b..a5effa15 100644 --- a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java @@ -188,7 +188,22 @@ public interface RepositoryCacheManager { * the dynamic module revision id * @param revision * the resolved revision + * @deprecated See {@link #saveResolvedRevision(String, ModuleRevisionId, String)} which + * prevents cache + * thrashing when multiple resolvers store the same dynamicMrid */ public void saveResolvedRevision(ModuleRevisionId dynamicMrid, String revision); + /** + * Caches a dynamic revision constraint resolution for a specific resolver. + * + * @param resolverName + * the resolver in which this dynamic revision was resolved + * @param dynamicMrid + * the dynamic module revision id + * @param revision + * the resolved revision + */ + public void saveResolvedRevision(String resolverName, ModuleRevisionId dynamicMrid, + String revision); + } diff --git a/src/java/org/apache/ivy/core/module/descriptor/Configuration.java b/src/java/org/apache/ivy/core/module/descriptor/Configuration.java index 30d111b3..de439121 100644 --- a/src/java/org/apache/ivy/core/module/descriptor/Configuration.java +++ b/src/java/org/apache/ivy/core/module/descriptor/Configuration.java @@ -52,14 +52,15 @@ public class Configuration extends DefaultExtendableItem implements InheritableI this.name = name; } + @Override public String toString() { return name; } } - public static Collection/* */findConfigurationExtending(String conf, + public static Collection findConfigurationExtending(String conf, Configuration[] confs) { - Collection extendingConfs = new ArrayList(); + Collection extendingConfs = new ArrayList(); for (int i = 0; i < confs.length; i++) { if (confs[i] != null && Arrays.asList(confs[i].getExtends()).contains(conf)) { extendingConfs.add(confs[i]); @@ -120,9 +121,9 @@ public class Configuration extends DefaultExtendableItem implements InheritableI this(null, null, name, visibility, description, ext, transitive, deprecated, null); } - private Configuration(Map attributes, Map extraAttributes, String name, Visibility visibility, - String description, String[] ext, boolean transitive, String deprecated, - ModuleRevisionId sourceModule) { + private Configuration(Map attributes, Map extraAttributes, + String name, Visibility visibility, String description, String[] ext, + boolean transitive, String deprecated, ModuleRevisionId sourceModule) { super(attributes, extraAttributes); if (name == null) { @@ -195,10 +196,12 @@ public class Configuration extends DefaultExtendableItem implements InheritableI return sourceModule; } + @Override public String toString() { return name; } + @Override public boolean equals(Object obj) { if (!(obj instanceof Configuration)) { return false; @@ -206,6 +209,7 @@ public class Configuration extends DefaultExtendableItem implements InheritableI return ((Configuration) obj).getName().equals(getName()); } + @Override public int hashCode() { return getName().hashCode(); } @@ -218,7 +222,7 @@ public class Configuration extends DefaultExtendableItem implements InheritableI Configuration[] configs = md.getConfigurations(); - Set newExtends = new LinkedHashSet(); + Set newExtends = new LinkedHashSet(); for (int j = 0; j < extendsFrom.length; j++) { if ("*".equals(extendsFrom[j])) { addOther(configs, null, newExtends); @@ -231,10 +235,10 @@ public class Configuration extends DefaultExtendableItem implements InheritableI } } - this.extendsFrom = (String[]) newExtends.toArray(new String[newExtends.size()]); + this.extendsFrom = newExtends.toArray(new String[newExtends.size()]); } - private void addOther(Configuration[] allConfigs, Visibility visibility, Set configs) { + private void addOther(Configuration[] allConfigs, Visibility visibility, Set configs) { for (int i = 0; i < allConfigs.length; i++) { String currentName = allConfigs[i].getName(); if (!name.equals(currentName) diff --git a/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java b/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java index 2c544c5b..39256d29 100644 --- a/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java +++ b/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -210,13 +209,13 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { private Date resolvedPublicationDate; - private List dependencies = new ArrayList(); // List (DependencyDescriptor) + private List dependencies = new ArrayList(); - private Map configurations = new LinkedHashMap(); // Map(String conf -> Configuration) + private Map configurations = new LinkedHashMap(); - private Map artifactsByConf = new HashMap(); // Map (String conf -> Collection(Artifact)) + private Map> artifactsByConf = new HashMap>(); - private Collection artifacts = new LinkedHashSet(); // Collection(Artifact) + private Collection artifacts = new LinkedHashSet(); // all artifacts could also be found in the artifactsByConf map, but here we can // preserve the order @@ -227,7 +226,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { private ModuleRules dependencyDescriptorMediators = new ModuleRules(); - private List licenses = new ArrayList(); // List(License) + private List licenses = new ArrayList(); private String homePage; @@ -247,13 +246,13 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { private Resource resource; - private List excludeRules = new ArrayList(); // List(ExcludeRule) + private List excludeRules = new ArrayList(); private Artifact metadataArtifact; - private List inheritedDescriptors = new ArrayList(); // List(ExtendsDescriptor) + private List inheritedDescriptors = new ArrayList(); - private Map/* */extraAttributesNamespaces = new LinkedHashMap(); + private Map extraAttributesNamespaces = new LinkedHashMap(); private List extraInfos = new ArrayList(); @@ -381,9 +380,9 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { addArtifact(members[i], artifact); } } else { - Collection artifacts = (Collection) artifactsByConf.get(conf); + Collection artifacts = artifactsByConf.get(conf); if (artifacts == null) { - artifacts = new ArrayList(); + artifacts = new ArrayList(); artifactsByConf.put(conf, artifacts); } artifacts.add(artifact); @@ -404,28 +403,25 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } public ExtendsDescriptor[] getInheritedDescriptors() { - return (ExtendsDescriptor[]) inheritedDescriptors - .toArray(new ExtendsDescriptor[inheritedDescriptors.size()]); + return inheritedDescriptors.toArray(new ExtendsDescriptor[inheritedDescriptors.size()]); } public Configuration[] getConfigurations() { - return (Configuration[]) configurations.values().toArray( - new Configuration[configurations.size()]); + return configurations.values().toArray(new Configuration[configurations.size()]); } public String[] getConfigurationsNames() { - return (String[]) configurations.keySet().toArray(new String[configurations.size()]); + return configurations.keySet().toArray(new String[configurations.size()]); } public String[] getPublicConfigurationsNames() { - List ret = new ArrayList(); - for (Iterator iter = configurations.values().iterator(); iter.hasNext();) { - Configuration conf = (Configuration) iter.next(); + List ret = new ArrayList(); + for (Configuration conf : configurations.values()) { if (conf.getVisibility() == Configuration.Visibility.PUBLIC) { ret.add(conf.getName()); } } - return (String[]) ret.toArray(new String[ret.size()]); + return ret.toArray(new String[ret.size()]); } /** @@ -433,7 +429,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { * if not found. */ public Configuration getConfiguration(String confName) { - Configuration configuration = (Configuration) configurations.get(confName); + Configuration configuration = configurations.get(confName); if (configuration == null && confName != null) { // let's first check if the configuration is a conf group Matcher m = Pattern.compile("\\*\\[([^=]+)\\=([^\\]]+)\\]").matcher(confName); @@ -442,9 +438,8 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { String attValue = m.group(2); // this is a conf group, let's search for its members - Map /* */members = new LinkedHashMap(); - for (Iterator it = configurations.values().iterator(); it.hasNext();) { - Configuration conf = (Configuration) it.next(); + Map members = new LinkedHashMap(); + for (Configuration conf : configurations.values()) { if (attValue.equals(conf.getAttribute(attName))) { members.put(conf.getName(), conf); } @@ -457,9 +452,9 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { if (confs.length <= 1) { return null; } - Map /* */intersectedConfs = new LinkedHashMap(); + Map intersectedConfs = new LinkedHashMap(); for (int i = 0; i < confs.length; i++) { - Configuration c = (Configuration) configurations.get(confs[i]); + Configuration c = configurations.get(confs[i]); if (c == null) { Message.verbose("missing configuration '" + confs[i] + "' from intersection " + confName + " in " + this); @@ -477,13 +472,13 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { if (c == null) { return new Artifact[0]; } - Collection artifacts = (Collection) artifactsByConf.get(conf); + Collection artifacts = artifactsByConf.get(conf); if (c instanceof ConfigurationIntersection) { ConfigurationIntersection intersection = (ConfigurationIntersection) c; String[] intersected = intersection.getIntersectedConfigurationNames(); - Set/* */intersectedArtifacts = new LinkedHashSet(); + Set intersectedArtifacts = new LinkedHashSet(); for (int j = 0; j < intersected.length; j++) { - Collection arts = getArtifactsIncludingExtending(intersected[j]); + Collection arts = getArtifactsIncludingExtending(intersected[j]); if (intersectedArtifacts.isEmpty()) { intersectedArtifacts.addAll(arts); } else { @@ -493,39 +488,37 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { if (artifacts != null) { intersectedArtifacts.addAll(artifacts); } - return (Artifact[]) intersectedArtifacts.toArray(new Artifact[intersectedArtifacts - .size()]); + return intersectedArtifacts.toArray(new Artifact[intersectedArtifacts.size()]); } else if (c instanceof ConfigurationGroup) { ConfigurationGroup group = (ConfigurationGroup) c; String[] members = group.getMembersConfigurationNames(); - Set/* */groupArtifacts = new LinkedHashSet(); + Set groupArtifacts = new LinkedHashSet(); for (int i = 0; i < members.length; i++) { groupArtifacts.addAll(getArtifactsIncludingExtending(members[i])); } if (artifacts != null) { groupArtifacts.addAll(artifacts); } - return (Artifact[]) groupArtifacts.toArray(new Artifact[groupArtifacts.size()]); + return groupArtifacts.toArray(new Artifact[groupArtifacts.size()]); } else { if (artifacts == null) { return new Artifact[0]; } else { - return (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]); + return artifacts.toArray(new Artifact[artifacts.size()]); } } } - private Collection/* */getArtifactsIncludingExtending(String conf) { - Collection extendingConfs = Configuration.findConfigurationExtending(conf, + private Collection getArtifactsIncludingExtending(String conf) { + Collection extendingConfs = Configuration.findConfigurationExtending(conf, getConfigurations()); - Set/* */artifacts = new LinkedHashSet(); - Collection arts = (Collection) artifactsByConf.get(conf); + Set artifacts = new LinkedHashSet(); + Collection arts = artifactsByConf.get(conf); if (arts != null) { artifacts.addAll(arts); } - for (Iterator it = extendingConfs.iterator(); it.hasNext();) { - Configuration extendingConf = (Configuration) it.next(); - arts = (Collection) artifactsByConf.get(extendingConf.getName()); + for (Configuration extendingConf : extendingConfs) { + arts = artifactsByConf.get(extendingConf.getName()); if (arts != null) { artifacts.addAll(arts); } @@ -534,17 +527,15 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } public Artifact[] getAllArtifacts() { - return (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]); + return artifacts.toArray(new Artifact[artifacts.size()]); } public DependencyDescriptor[] getDependencies() { - return (DependencyDescriptor[]) dependencies.toArray(new DependencyDescriptor[dependencies - .size()]); + return dependencies.toArray(new DependencyDescriptor[dependencies.size()]); } public boolean dependsOn(VersionMatcher matcher, ModuleDescriptor md) { - for (Iterator iter = dependencies.iterator(); iter.hasNext();) { - DependencyDescriptor dd = (DependencyDescriptor) iter.next(); + for (DependencyDescriptor dd : dependencies) { if (dd.getDependencyId().equals(md.getModuleRevisionId().getModuleId())) { if (md.getResolvedModuleRevisionId().getRevision() == null) { return true; @@ -564,6 +555,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -571,6 +563,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { return result; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -592,6 +585,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { return true; } + @Override public String toString() { return "module: " + revId + " status=" + status + " publication=" + publicationDate + " configurations=" + configurations + " artifacts=" + artifactsByConf @@ -633,7 +627,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { return dd; } - public ModuleRules/* */getAllDependencyDescriptorMediators() { + public ModuleRules getAllDependencyDescriptorMediators() { return (ModuleRules) dependencyDescriptorMediators.clone(); } @@ -642,7 +636,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } public License[] getLicenses() { - return (License[]) licenses.toArray(new License[licenses.size()]); + return licenses.toArray(new License[licenses.size()]); } public String getHomePage() { @@ -674,8 +668,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } public boolean isNamespaceUseful() { - for (Iterator iter = dependencies.iterator(); iter.hasNext();) { - DependencyDescriptor dd = (DependencyDescriptor) iter.next(); + for (DependencyDescriptor dd : dependencies) { if (dd.getAllExcludeRules().length > 0) { return true; } @@ -692,9 +685,8 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { * configurations existence and cycles are checked */ public void check() { - Stack confs = new Stack(); - for (Iterator iter = configurations.values().iterator(); iter.hasNext();) { - Configuration conf = (Configuration) iter.next(); + Stack confs = new Stack(); + for (Configuration conf : configurations.values()) { String[] ext = conf.getExtends(); for (int i = 0; i < ext.length; i++) { confs.push(conf.getName()); @@ -704,7 +696,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } } - private void checkConf(Stack confs, String confName) { + private void checkConf(Stack confs, String confName) { int index = confs.indexOf(confName); if (index != -1) { StringBuffer cycle = new StringBuffer(); @@ -756,7 +748,7 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { return resolvedRevId.getAttribute(attName); } - public Map getAttributes() { + public Map getAttributes() { return resolvedRevId.getAttributes(); } @@ -764,11 +756,11 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { return resolvedRevId.getExtraAttribute(attName); } - public Map getExtraAttributes() { + public Map getExtraAttributes() { return resolvedRevId.getExtraAttributes(); } - public Map getQualifiedExtraAttributes() { + public Map getQualifiedExtraAttributes() { return resolvedRevId.getQualifiedExtraAttributes(); } @@ -807,26 +799,25 @@ public class DefaultModuleDescriptor implements ModuleDescriptor { } public ExcludeRule[] getAllExcludeRules() { - return (ExcludeRule[]) excludeRules.toArray(new ExcludeRule[excludeRules.size()]); + return excludeRules.toArray(new ExcludeRule[excludeRules.size()]); } public ExcludeRule[] getExcludeRules(String[] moduleConfigurations) { - Set rules = new LinkedHashSet(); - for (Iterator iter = excludeRules.iterator(); iter.hasNext();) { - ExcludeRule rule = (ExcludeRule) iter.next(); + Set rules = new LinkedHashSet(); + for (ExcludeRule rule : excludeRules) { String[] ruleConfs = rule.getConfigurations(); if (containsAny(ruleConfs, moduleConfigurations)) { rules.add(rule); } } - return (ExcludeRule[]) rules.toArray(new ExcludeRule[rules.size()]); + return rules.toArray(new ExcludeRule[rules.size()]); } private boolean containsAny(String[] arr1, String[] arr2) { - return new ArrayList(Arrays.asList(arr1)).removeAll(Arrays.asList(arr2)); + return new ArrayList(Arrays.asList(arr1)).removeAll(Arrays.asList(arr2)); } - public Map getExtraAttributesNamespaces() { + public Map getExtraAttributesNamespaces() { return extraAttributesNamespaces; } diff --git a/src/java/org/apache/ivy/core/module/descriptor/DefaultWorkspaceModuleDescriptor.java b/src/java/org/apache/ivy/core/module/descriptor/DefaultWorkspaceModuleDescriptor.java new file mode 100644 index 00000000..1c86f56e --- /dev/null +++ b/src/java/org/apache/ivy/core/module/descriptor/DefaultWorkspaceModuleDescriptor.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.ivy.core.module.descriptor; + +import java.util.Date; + +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.plugins.parser.ModuleDescriptorParser; +import org.apache.ivy.plugins.repository.Resource; + +public class DefaultWorkspaceModuleDescriptor extends DefaultModuleDescriptor implements + WorkspaceModuleDescriptor { + + public DefaultWorkspaceModuleDescriptor(ModuleDescriptorParser parser, Resource res) { + super(parser, res); + } + + public DefaultWorkspaceModuleDescriptor(ModuleRevisionId id, String status, Date pubDate) { + super(id, status, pubDate); + } + + public DefaultWorkspaceModuleDescriptor(ModuleRevisionId id, String status, Date pubDate, + boolean isDefault) { + super(id, status, pubDate, isDefault); + } + +} diff --git a/test/java/org/apache/ivy/ant/AntTestHelper.java b/src/java/org/apache/ivy/core/module/descriptor/WorkspaceModuleDescriptor.java similarity index 59% rename from test/java/org/apache/ivy/ant/AntTestHelper.java rename to src/java/org/apache/ivy/core/module/descriptor/WorkspaceModuleDescriptor.java index 38cbe0df..44035262 100644 --- a/test/java/org/apache/ivy/ant/AntTestHelper.java +++ b/src/java/org/apache/ivy/core/module/descriptor/WorkspaceModuleDescriptor.java @@ -15,20 +15,12 @@ * limitations under the License. * */ -package org.apache.ivy.ant; +package org.apache.ivy.core.module.descriptor; -import org.apache.tools.ant.DefaultLogger; -import org.apache.tools.ant.Project; +/** + * Marker interface for module descriptor of a module in a workspace, then having special semantics, + * like artifacts declared by the resolver rather than the descriptor + */ +public interface WorkspaceModuleDescriptor extends ModuleDescriptor { -public class AntTestHelper { - // this is probably already available in some Ant class or helper... - public static Project newProject() { - Project project = new Project(); - DefaultLogger logger = new DefaultLogger(); - logger.setMessageOutputLevel(Project.MSG_INFO); - logger.setOutputPrintStream(System.out); - logger.setErrorPrintStream(System.out); - project.addBuildListener(logger); - return project; - } } diff --git a/src/java/org/apache/ivy/core/module/id/MatcherLookup.java b/src/java/org/apache/ivy/core/module/id/MatcherLookup.java index 76a44fc8..e4650de1 100644 --- a/src/java/org/apache/ivy/core/module/id/MatcherLookup.java +++ b/src/java/org/apache/ivy/core/module/id/MatcherLookup.java @@ -19,7 +19,6 @@ package org.apache.ivy.core.module.id; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -56,13 +55,13 @@ import org.apache.ivy.plugins.matcher.PatternMatcher; */ public class MatcherLookup { - //private static final String FORMAT = "{org:%s, module:%s}"; + // private static final String FORMAT = "{org:%s, module:%s}"; private static final String DEFAULT = "{org:" + "default" + ", module:" + "default" + "}"; - private Map/* > */lookup = new HashMap(); + private Map> lookup = new HashMap>(); - private List/* */non_exact_matchers = new ArrayList(); + private List non_exact_matchers = new ArrayList(); /** * Add matcher. @@ -79,10 +78,10 @@ public class MatcherLookup { non_exact_matchers.add(matcher); return; } - Object key = key(matcher.getAttributes()); - List exact_matchers = (List) lookup.get(key); + String key = key(matcher.getAttributes()); + List exact_matchers = lookup.get(key); if (exact_matchers == null) { - exact_matchers = new ArrayList(); + exact_matchers = new ArrayList(); lookup.put(key, exact_matchers); } exact_matchers.add(matcher); @@ -96,23 +95,21 @@ public class MatcherLookup { * * @return list A list of candidate matchers that matches specified attributes */ - public List get(Map attrs) { - List matchers = new ArrayList(); + public List get(Map attrs) { + List matchers = new ArrayList(); // Step 1: find matchers from non_exact_matchers list if (!non_exact_matchers.isEmpty()) { - for (Iterator iter = non_exact_matchers.iterator(); iter.hasNext();) { - MapMatcher matcher = (MapMatcher) iter.next(); + for (MapMatcher matcher : non_exact_matchers) { if (matcher.matches(attrs)) { matchers.add(matcher); } } } // Step 2: find matchers from exact_matchers list of key - Object key = key(attrs); - List exact_matchers = (List) lookup.get(key); + String key = key(attrs); + List exact_matchers = lookup.get(key); if (exact_matchers != null) { - for (Iterator iter = exact_matchers.iterator(); iter.hasNext();) { - MapMatcher matcher = (MapMatcher) iter.next(); + for (MapMatcher matcher : exact_matchers) { if (matcher.matches(attrs)) { matchers.add(matcher); } @@ -120,10 +117,9 @@ public class MatcherLookup { } // Step 3: (iff key != DEFAULT) find matchers from exact_matchers of DEFAULT if (key != DEFAULT) { - List default_exact_matchers = (List) lookup.get(DEFAULT); + List default_exact_matchers = lookup.get(DEFAULT); if (default_exact_matchers != null) { - for (Iterator iter = default_exact_matchers.iterator(); iter.hasNext();) { - MapMatcher matcher = (MapMatcher) iter.next(); + for (MapMatcher matcher : default_exact_matchers) { if (matcher.matches(attrs)) { matchers.add(matcher); } @@ -140,9 +136,9 @@ public class MatcherLookup { * A map of attributes * @return key object */ - private Object key(Map attrs) { - Object org = attrs.get(IvyPatternHelper.ORGANISATION_KEY); - Object module = attrs.get(IvyPatternHelper.MODULE_KEY); + private String key(Map attrs) { + String org = attrs.get(IvyPatternHelper.ORGANISATION_KEY); + String module = attrs.get(IvyPatternHelper.MODULE_KEY); if (org == null || PatternMatcher.ANY_EXPRESSION.equals(org) || module == null || PatternMatcher.ANY_EXPRESSION.equals(module)) { return DEFAULT; diff --git a/src/java/org/apache/ivy/core/module/id/ModuleId.java b/src/java/org/apache/ivy/core/module/id/ModuleId.java index 44928273..8d2a85df 100644 --- a/src/java/org/apache/ivy/core/module/id/ModuleId.java +++ b/src/java/org/apache/ivy/core/module/id/ModuleId.java @@ -31,10 +31,11 @@ import org.apache.ivy.core.IvyPatternHelper; * * @see org.apache.ivy.core.module.id */ -public class ModuleId implements Comparable { +public class ModuleId implements Comparable { + static final String ENCODE_SEPARATOR = ":#@#:"; - private static final Map/* > */CACHE = new WeakHashMap(); + private static final Map> CACHE = new WeakHashMap>(); /** * Returns a ModuleId for the given organization and module name. @@ -65,13 +66,13 @@ public class ModuleId implements Comparable { ModuleId r = null; synchronized (CACHE) { - WeakReference ref = (WeakReference) CACHE.get(moduleId); + WeakReference ref = CACHE.get(moduleId); if (ref != null) { - r = (ModuleId) ref.get(); + r = ref.get(); } if (r == null) { r = moduleId; - CACHE.put(r, new WeakReference(r)); + CACHE.put(r, new WeakReference(r)); } } @@ -84,7 +85,7 @@ public class ModuleId implements Comparable { private int hash; - private Map/* */attributes = new HashMap(); + private Map attributes = new HashMap(); /** * Constructor. @@ -122,7 +123,7 @@ public class ModuleId implements Comparable { return organisation; } - /** {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (!(obj instanceof ModuleId)) { return false; @@ -135,7 +136,7 @@ public class ModuleId implements Comparable { } } - /** {@inheritDoc} */ + @Override public int hashCode() { if (hash == 0) { // CheckStyle:MagicNumber| OFF @@ -147,14 +148,12 @@ public class ModuleId implements Comparable { return hash; } - /** {@inheritDoc} */ + @Override public String toString() { return organisation + "#" + name; } - /** {@inheritDoc} */ - public int compareTo(Object obj) { - ModuleId that = (ModuleId) obj; + public int compareTo(ModuleId that) { int result = organisation.compareTo(that.organisation); if (result == 0) { result = name.compareTo(that.name); @@ -177,7 +176,7 @@ public class ModuleId implements Comparable { * * @return A Map instance containing all the attributes and their values. */ - public Map getAttributes() { + public Map getAttributes() { return attributes; } diff --git a/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java b/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java index 6c36f5ca..38de003d 100644 --- a/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java +++ b/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java @@ -19,8 +19,8 @@ package org.apache.ivy.core.module.id; import java.lang.ref.WeakReference; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.WeakHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -36,6 +36,7 @@ import org.apache.ivy.util.extendable.UnmodifiableExtendableItem; * @see org.apache.ivy.core.module.id */ public class ModuleRevisionId extends UnmodifiableExtendableItem { + private static final String ENCODE_SEPARATOR = ModuleId.ENCODE_SEPARATOR; private static final String ENCODE_PREFIX = "+"; @@ -46,7 +47,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { private static final String REV_STRICT_CHARS_PATTERN = "[a-zA-Z0-9\\-/\\._+=,\\[\\]\\{\\}\\(\\):@]"; - private static final Map/* */CACHE = new WeakHashMap(); + private static final Map> CACHE = new WeakHashMap>(); /** * Pattern to use to matched mrid text representation. @@ -97,7 +98,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { } public static ModuleRevisionId newInstance(String organisation, String name, String revision, - Map extraAttributes) { + Map extraAttributes) { return intern(new ModuleRevisionId(ModuleId.newInstance(organisation, name), revision, extraAttributes)); } @@ -109,13 +110,14 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { } public static ModuleRevisionId newInstance(String organisation, String name, String branch, - String revision, Map extraAttributes) { + String revision, Map extraAttributes) { return intern(new ModuleRevisionId(ModuleId.newInstance(organisation, name), branch, revision, extraAttributes)); } public static ModuleRevisionId newInstance(String organisation, String name, String branch, - String revision, Map extraAttributes, boolean replaceNullBranchWithDefault) { + String revision, Map extraAttributes, + boolean replaceNullBranchWithDefault) { return intern(new ModuleRevisionId(ModuleId.newInstance(organisation, name), branch, revision, extraAttributes, replaceNullBranchWithDefault)); } @@ -149,13 +151,13 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { ModuleRevisionId r = null; synchronized (CACHE) { - WeakReference ref = (WeakReference) CACHE.get(moduleRevisionId); + WeakReference ref = CACHE.get(moduleRevisionId); if (ref != null) { - r = (ModuleRevisionId) ref.get(); + r = ref.get(); } if (r == null) { r = moduleRevisionId; - CACHE.put(r, new WeakReference(r)); + CACHE.put(r, new WeakReference(r)); } } @@ -180,16 +182,17 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { this(moduleId, branch, revision, null); } - private ModuleRevisionId(ModuleId moduleId, String revision, Map extraAttributes) { + private ModuleRevisionId(ModuleId moduleId, String revision, Map extraAttributes) { this(moduleId, null, revision, extraAttributes); } - private ModuleRevisionId(ModuleId moduleId, String branch, String revision, Map extraAttributes) { + private ModuleRevisionId(ModuleId moduleId, String branch, String revision, + Map extraAttributes) { this(moduleId, branch, revision, extraAttributes, true); } private ModuleRevisionId(ModuleId moduleId, String branch, String revision, - Map extraAttributes, boolean replaceNullBranchWithDefault) { + Map extraAttributes, boolean replaceNullBranchWithDefault) { super(null, extraAttributes); this.moduleId = moduleId; IvyContext context = IvyContext.getContext(); @@ -221,6 +224,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { return revision; } + @Override public boolean equals(Object obj) { if (!(obj instanceof ModuleRevisionId)) { return false; @@ -240,6 +244,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { } } + @Override public int hashCode() { if (hash == 0) { // CheckStyle:MagicNumber| OFF @@ -253,6 +258,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { return hash; } + @Override public String toString() { return moduleId + (branch == null || branch.length() == 0 ? "" : "#" + branch) + ";" + (revision == null ? "NONE" : revision); @@ -260,13 +266,13 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { public String encodeToString() { StringBuffer buf = new StringBuffer(); - Map attributes = new HashMap(getAttributes()); + Map attributes = new HashMap(getAttributes()); attributes.keySet().removeAll(getExtraAttributes().keySet()); attributes.putAll(getQualifiedExtraAttributes()); - for (Iterator iter = attributes.keySet().iterator(); iter.hasNext();) { - String attName = (String) iter.next(); - String value = (String) attributes.get(attName); + for (Entry att : attributes.entrySet()) { + String attName = att.getKey(); + String value = att.getValue(); value = value == null ? NULL_ENCODE : value; buf.append(ENCODE_PREFIX).append(attName).append(ENCODE_SEPARATOR) .append(ENCODE_PREFIX).append(value).append(ENCODE_SEPARATOR); @@ -280,7 +286,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { throw new IllegalArgumentException("badly encoded module revision id: '" + encoded + "'"); } - Map attributes = new HashMap(); + Map attributes = new HashMap(); for (int i = 0; i < parts.length; i += 2) { String attName = parts[i]; if (!attName.startsWith(ENCODE_PREFIX)) { @@ -301,10 +307,10 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { } attributes.put(attName, attValue); } - String org = (String) attributes.remove(IvyPatternHelper.ORGANISATION_KEY); - String mod = (String) attributes.remove(IvyPatternHelper.MODULE_KEY); - String rev = (String) attributes.remove(IvyPatternHelper.REVISION_KEY); - String branch = (String) attributes.remove(IvyPatternHelper.BRANCH_KEY); + String org = attributes.remove(IvyPatternHelper.ORGANISATION_KEY); + String mod = attributes.remove(IvyPatternHelper.MODULE_KEY); + String rev = attributes.remove(IvyPatternHelper.REVISION_KEY); + String branch = attributes.remove(IvyPatternHelper.BRANCH_KEY); if (org == null) { throw new IllegalArgumentException("badly encoded module revision id: '" + encoded + "': no organisation"); diff --git a/src/java/org/apache/ivy/core/module/id/ModuleRules.java b/src/java/org/apache/ivy/core/module/id/ModuleRules.java index f16981d5..5c4948c5 100644 --- a/src/java/org/apache/ivy/core/module/id/ModuleRules.java +++ b/src/java/org/apache/ivy/core/module/id/ModuleRules.java @@ -19,10 +19,10 @@ package org.apache.ivy.core.module.id; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.apache.ivy.plugins.matcher.MapMatcher; import org.apache.ivy.util.Checks; @@ -49,8 +49,9 @@ import org.apache.ivy.util.filter.NoFilter; * which resolver to use, which TTL in cache, ...) *

*/ -public class ModuleRules { - private Map/* */rules = new LinkedHashMap(); +public class ModuleRules { + + private Map rules = new LinkedHashMap(); private MatcherLookup matcher_lookup = new MatcherLookup(); @@ -60,10 +61,10 @@ public class ModuleRules { public ModuleRules() { } - private ModuleRules(Map/* */rules) { - this.rules = new LinkedHashMap(rules); - for (Iterator iter = rules.keySet().iterator(); iter.hasNext();) { - matcher_lookup.add((MapMatcher) iter.next()); + private ModuleRules(Map rules) { + this.rules = new LinkedHashMap(rules); + for (MapMatcher matcher : rules.keySet()) { + matcher_lookup.add(matcher); } } @@ -75,7 +76,7 @@ public class ModuleRules { * @param rule * the rule to apply. Must not be null. */ - public void defineRule(MapMatcher condition, Object rule) { + public void defineRule(MapMatcher condition, T rule) { Checks.checkNotNull(condition, "condition"); Checks.checkNotNull(rule, "rule"); @@ -93,8 +94,8 @@ public class ModuleRules { * applies. * @see #getRule(ModuleId, Filter) */ - public Object getRule(ModuleId mid) { - return getRule(mid, NoFilter.INSTANCE); + public T getRule(ModuleId mid) { + return getRule(mid, NoFilter. instance()); } /** @@ -105,8 +106,8 @@ public class ModuleRules { * the {@link ModuleId} to search the rule for. Must not be null. * @return an array of rule objects matching the given {@link ModuleId}. */ - public Object[] getRules(ModuleId mid) { - return getRules(mid.getAttributes(), NoFilter.INSTANCE); + public T[] getRules(ModuleId mid) { + return getRules(mid.getAttributes(), NoFilter. instance()); } /** @@ -120,8 +121,8 @@ public class ModuleRules { * no rule applies. * @see #getRule(ModuleRevisionId, Filter) */ - public Object getRule(ModuleRevisionId mrid) { - return getRule(mrid, NoFilter.INSTANCE); + public T getRule(ModuleRevisionId mrid) { + return getRule(mrid, NoFilter. instance()); } /** @@ -140,7 +141,7 @@ public class ModuleRules { * applies. * @see #getRule(ModuleRevisionId, Filter) */ - public Object getRule(ModuleId mid, Filter filter) { + public T getRule(ModuleId mid, Filter filter) { Checks.checkNotNull(mid, "mid"); return getRule(mid.getAttributes(), filter); } @@ -161,18 +162,17 @@ public class ModuleRules { * no rule applies. * @see #getRule(ModuleRevisionId) */ - public Object getRule(ModuleRevisionId mrid, Filter filter) { + public T getRule(ModuleRevisionId mrid, Filter filter) { Checks.checkNotNull(mrid, "mrid"); Checks.checkNotNull(filter, "filter"); - Map moduleAttributes = mrid.getAttributes(); + Map moduleAttributes = mrid.getAttributes(); return getRule(moduleAttributes, filter); } - private Object getRule(Map moduleAttributes, Filter filter) { - List matchers = matcher_lookup.get(moduleAttributes); - for (Iterator iter = matchers.iterator(); iter.hasNext();) { - MapMatcher midm = (MapMatcher) iter.next(); - Object rule = rules.get(midm); + private T getRule(Map moduleAttributes, Filter filter) { + List matchers = matcher_lookup.get(moduleAttributes); + for (MapMatcher midm : matchers) { + T rule = rules.get(midm); if (filter.accept(rule)) { return rule; } @@ -193,24 +193,23 @@ public class ModuleRules { * {@link ModuleRevisionId}. Must not be null. * @return an array of rule objects matching the given {@link ModuleRevisionId}. */ - public Object[] getRules(ModuleRevisionId mrid, Filter filter) { + public T[] getRules(ModuleRevisionId mrid, Filter filter) { Checks.checkNotNull(mrid, "mrid"); Checks.checkNotNull(filter, "filter"); - Map moduleAttributes = mrid.getAttributes(); + Map moduleAttributes = mrid.getAttributes(); return getRules(moduleAttributes, filter); } - private Object[] getRules(Map moduleAttributes, Filter filter) { - List matchers = matcher_lookup.get(moduleAttributes); - List matchingRules = new ArrayList(); - for (Iterator iter = matchers.iterator(); iter.hasNext();) { - MapMatcher midm = (MapMatcher) iter.next(); - Object rule = rules.get(midm); + private T[] getRules(Map moduleAttributes, Filter filter) { + List matchers = matcher_lookup.get(moduleAttributes); + List matchingRules = new ArrayList(); + for (MapMatcher midm : matchers) { + T rule = rules.get(midm); if (filter.accept(rule)) { matchingRules.add(rule); } } - return matchingRules.toArray(); + return matchingRules.toArray((T[]) new Object[0]); } /** @@ -223,9 +222,9 @@ public class ModuleRules { if (rules.isEmpty()) { Message.debug(prefix + "NONE"); } else { - for (Iterator iter = rules.keySet().iterator(); iter.hasNext();) { - MapMatcher midm = (MapMatcher) iter.next(); - Object rule = rules.get(midm); + for (Entry entry : rules.entrySet()) { + MapMatcher midm = entry.getKey(); + T rule = entry.getValue(); Message.debug(prefix + midm + " -> " + rule); } } @@ -240,11 +239,12 @@ public class ModuleRules { * * @return an unmodifiable view of all the rules defined on this ModuleRules. */ - public Map/* */getAllRules() { + public Map getAllRules() { return Collections.unmodifiableMap(rules); } + @Override public Object clone() { - return new ModuleRules(rules); + return new ModuleRules(rules); } } diff --git a/src/java/org/apache/ivy/core/module/status/StatusManager.java b/src/java/org/apache/ivy/core/module/status/StatusManager.java index cb45b7f5..53fc3823 100644 --- a/src/java/org/apache/ivy/core/module/status/StatusManager.java +++ b/src/java/org/apache/ivy/core/module/status/StatusManager.java @@ -42,14 +42,14 @@ public class StatusManager { return IvyContext.getContext().getSettings().getStatusManager(); } - private List status = new ArrayList(); + private List status = new ArrayList(); private String defaultStatus; // for easier querying only - private Map statusPriorityMap; + private Map statusPriorityMap; - private Map statusIntegrationMap; + private Map statusIntegrationMap; private String deliveryStatusListString; @@ -71,7 +71,7 @@ public class StatusManager { this.defaultStatus = defaultStatus; } - public List getStatuses() { + public List getStatuses() { return status; } @@ -79,14 +79,14 @@ public class StatusManager { if (status.isEmpty()) { throw new IllegalStateException("badly configured statuses: no status found"); } - statusPriorityMap = new HashMap(); - for (ListIterator iter = status.listIterator(); iter.hasNext();) { - Status status = (Status) iter.next(); + statusPriorityMap = new HashMap(); + for (ListIterator iter = status.listIterator(); iter.hasNext();) { + Status status = iter.next(); statusPriorityMap.put(status.getName(), new Integer(iter.previousIndex())); } - statusIntegrationMap = new HashMap(); - for (Iterator iter = status.iterator(); iter.hasNext();) { - Status status = (Status) iter.next(); + statusIntegrationMap = new HashMap(); + for (Iterator iter = status.iterator(); iter.hasNext();) { + Status status = iter.next(); statusIntegrationMap.put(status.getName(), Boolean.valueOf(status.isIntegration())); } } @@ -125,8 +125,7 @@ public class StatusManager { public String getDeliveryStatusListString() { if (deliveryStatusListString == null) { StringBuffer ret = new StringBuffer(); - for (Iterator iter = status.iterator(); iter.hasNext();) { - Status status = (Status) iter.next(); + for (Status status : this.status) { if (!status.isIntegration()) { ret.append(status.getName()).append(","); } diff --git a/src/java/org/apache/ivy/core/pack/PackagingManager.java b/src/java/org/apache/ivy/core/pack/PackagingManager.java index 6b3caf04..2eba4523 100644 --- a/src/java/org/apache/ivy/core/pack/PackagingManager.java +++ b/src/java/org/apache/ivy/core/pack/PackagingManager.java @@ -71,14 +71,14 @@ public class PackagingManager implements IvySettingsAware { return unpacked; } - public void unpackArtifact(Artifact artifact, File localFile, File archiveFile) + public Artifact unpackArtifact(Artifact artifact, File localFile, File archiveFile) throws IOException { String packaging = artifact.getExtraAttribute("packaging"); if (packaging == null) { // not declared as packed, nothing to do - return; + return null; } - + String ext = artifact.getExt(); String[] packings = packaging.split(","); InputStream in = null; try { @@ -94,6 +94,7 @@ public class PackagingManager implements IvySettingsAware { + packings[i] + "' in the streamed chain: " + packaging); } in = ((StreamPacking) packing).unpack(in); + ext = packing.getUnpackedExtension(ext); } ArchivePacking packing = settings.getPackingRegistry().get(packings[0]); if (packing == null) { @@ -101,6 +102,7 @@ public class PackagingManager implements IvySettingsAware { + "' in the packing chain: " + packaging); } packing.unpack(in, archiveFile); + ext = packing.getUnpackedExtension(ext); } finally { if (in != null) { try { @@ -110,6 +112,12 @@ public class PackagingManager implements IvySettingsAware { } } } + final DefaultArtifact unpacked = new DefaultArtifact(artifact.getModuleRevisionId(), + artifact.getPublicationDate(), artifact.getName(), + artifact.getType() + "_unpacked", ext); + + return unpacked; + } } diff --git a/src/java/org/apache/ivy/core/publish/PublishEngine.java b/src/java/org/apache/ivy/core/publish/PublishEngine.java index 4fa43a2f..6b42a35a 100644 --- a/src/java/org/apache/ivy/core/publish/PublishEngine.java +++ b/src/java/org/apache/ivy/core/publish/PublishEngine.java @@ -26,7 +26,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -75,8 +74,9 @@ public class PublishEngine { * the name, type, ext url and extra attributes of the artifacts are really used. Other methods * can return null safely. */ - public Collection publish(ModuleRevisionId mrid, Collection srcArtifactPattern, - String resolverName, PublishOptions options) throws IOException { + public Collection publish(ModuleRevisionId mrid, + Collection srcArtifactPattern, String resolverName, PublishOptions options) + throws IOException { Message.info(":: publishing :: " + mrid.getModuleId()); Message.verbose("\tvalidate = " + options.isValidate()); long start = System.currentTimeMillis(); @@ -111,7 +111,8 @@ public class PublishEngine { tmp.deleteOnExit(); String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md); - Set confsToRemove = new HashSet(Arrays.asList(md.getConfigurationsNames())); + Set confsToRemove = new HashSet(Arrays.asList(md + .getConfigurationsNames())); confsToRemove.removeAll(Arrays.asList(confs)); try { @@ -131,8 +132,7 @@ public class PublishEngine { .setMerge(options.isMerge()) .setMergedDescriptor(md) .setConfsToExclude( - (String[]) confsToRemove.toArray(new String[confsToRemove - .size()]))); + confsToRemove.toArray(new String[confsToRemove.size()]))); ivyFile = tmp; // we parse the new file to get updated module descriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(settings, @@ -169,15 +169,15 @@ public class PublishEngine { } // collect all declared artifacts of this module - Collection missing = publish(md, srcArtifactPattern, resolver, options); + Collection missing = publish(md, srcArtifactPattern, resolver, options); Message.verbose("\tpublish done (" + (System.currentTimeMillis() - start) + "ms)"); return missing; } - public Collection publish(ModuleDescriptor md, Collection srcArtifactPattern, + public Collection publish(ModuleDescriptor md, Collection srcArtifactPattern, DependencyResolver resolver, PublishOptions options) throws IOException { - Collection missing = new ArrayList(); - Set artifactsSet = new LinkedHashSet(); + Collection missing = new ArrayList(); + Set artifactsSet = new LinkedHashSet(); String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md); for (int i = 0; i < confs.length; i++) { @@ -195,11 +195,9 @@ public class PublishEngine { } } // now collects artifacts files - Map/* */artifactsFiles = new LinkedHashMap(); - for (Iterator iter = artifactsSet.iterator(); iter.hasNext();) { - Artifact artifact = (Artifact) iter.next(); - for (Iterator iterator = srcArtifactPattern.iterator(); iterator.hasNext();) { - String pattern = (String) iterator.next(); + Map artifactsFiles = new LinkedHashMap(); + for (Artifact artifact : artifactsSet) { + for (String pattern : srcArtifactPattern) { File artifactFile = settings.resolveFile(IvyPatternHelper.substitute( settings.substitute(pattern), artifact)); if (artifactFile.exists()) { @@ -210,8 +208,7 @@ public class PublishEngine { if (!artifactsFiles.containsKey(artifact)) { StringBuffer sb = new StringBuffer(); sb.append("missing artifact " + artifact + ":\n"); - for (Iterator iterator = srcArtifactPattern.iterator(); iterator.hasNext();) { - String pattern = (String) iterator.next(); + for (String pattern : srcArtifactPattern) { sb.append("\t" + settings.resolveFile(IvyPatternHelper.substitute(pattern, artifact)) + " file does not exist\n"); @@ -253,10 +250,9 @@ public class PublishEngine { try { resolver.beginPublishTransaction(md.getModuleRevisionId(), options.isOverwrite()); // for each declared published artifact in this descriptor, do: - for (Iterator iter = artifactsFiles.entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Entry) iter.next(); - Artifact artifact = (Artifact) entry.getKey(); - File artifactFile = (File) entry.getValue(); + for (Entry entry : artifactsFiles.entrySet()) { + Artifact artifact = entry.getKey(); + File artifactFile = entry.getValue(); publish(artifact, artifactFile, resolver, options.isOverwrite()); } resolver.commitPublishTransaction(); diff --git a/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java b/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java index 76547f79..f4a75536 100644 --- a/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java +++ b/src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java @@ -57,6 +57,8 @@ public class ArtifactDownloadReport { private File unpackedLocalFile; + private Artifact unpackedArtifact; + public ArtifactDownloadReport(Artifact artifact) { this.artifact = artifact; } @@ -164,6 +166,14 @@ public class ArtifactDownloadReport { return unpackedLocalFile; } + public void setUnpackedArtifact(final Artifact unpackedArtifact) { + this.unpackedArtifact = unpackedArtifact; + } + + public Artifact getUnpackedArtifact() { + return this.unpackedArtifact; + } + public int hashCode() { final int prime = 31; int result = 1; diff --git a/src/java/org/apache/ivy/core/report/ResolveReport.java b/src/java/org/apache/ivy/core/report/ResolveReport.java index 0f12488d..f2d5499a 100644 --- a/src/java/org/apache/ivy/core/report/ResolveReport.java +++ b/src/java/org/apache/ivy/core/report/ResolveReport.java @@ -23,18 +23,18 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.apache.ivy.core.cache.ResolutionCacheManager; +import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.Configuration; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; -import org.apache.ivy.core.module.descriptor.DependencyDescriptor; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.core.module.id.ModuleRevisionId; @@ -50,17 +50,16 @@ import org.apache.ivy.util.filter.Filter; public class ResolveReport { private ModuleDescriptor md; - /** String conf -> ConfigurationResolveReport report */ - private Map confReports = new LinkedHashMap(); + private Map confReports = new LinkedHashMap(); - private List problemMessages = new ArrayList(); + private List problemMessages = new ArrayList(); /** * the list of all dependencies resolved, ordered from the more dependent to the less dependent */ - private List/* */dependencies = new ArrayList(); + private List dependencies = new ArrayList(); - private List/* */artifacts = new ArrayList(); + private List artifacts = new ArrayList(); private long resolveTime; @@ -84,20 +83,20 @@ public class ResolveReport { } public ConfigurationResolveReport getConfigurationReport(String conf) { - return (ConfigurationResolveReport) confReports.get(conf); + return confReports.get(conf); } public String[] getConfigurations() { - return (String[]) confReports.keySet().toArray(new String[confReports.size()]); + return confReports.keySet().toArray(new String[confReports.size()]); } public boolean hasError() { - boolean hasError = false; - for (Iterator it = confReports.values().iterator(); it.hasNext() && !hasError;) { - ConfigurationResolveReport report = (ConfigurationResolveReport) it.next(); - hasError |= report.hasError(); + for (ConfigurationResolveReport report : confReports.values()) { + if (report.hasError()) { + return true; + } } - return hasError; + return false; } public void output(ReportOutputter[] outputters, ResolutionCacheManager cacheMgr, @@ -112,21 +111,19 @@ public class ResolveReport { } public IvyNode[] getEvictedNodes() { - Collection all = new LinkedHashSet(); - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport report = (ConfigurationResolveReport) iter.next(); + Collection all = new LinkedHashSet(); + for (ConfigurationResolveReport report : confReports.values()) { all.addAll(Arrays.asList(report.getEvictedNodes())); } - return (IvyNode[]) all.toArray(new IvyNode[all.size()]); + return all.toArray(new IvyNode[all.size()]); } public IvyNode[] getUnresolvedDependencies() { - Collection all = new LinkedHashSet(); - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport report = (ConfigurationResolveReport) iter.next(); + Collection all = new LinkedHashSet(); + for (ConfigurationResolveReport report : confReports.values()) { all.addAll(Arrays.asList(report.getUnresolvedDependencies())); } - return (IvyNode[]) all.toArray(new IvyNode[all.size()]); + return all.toArray(new IvyNode[all.size()]); } /** @@ -164,36 +161,32 @@ public class ResolveReport { */ public ArtifactDownloadReport[] getArtifactsReports(DownloadStatus downloadStatus, boolean withEvicted) { - Collection all = new LinkedHashSet(); - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport report = (ConfigurationResolveReport) iter.next(); + Collection all = new LinkedHashSet(); + for (ConfigurationResolveReport report : confReports.values()) { ArtifactDownloadReport[] reports = report.getArtifactsReports(downloadStatus, withEvicted); all.addAll(Arrays.asList(reports)); } - return (ArtifactDownloadReport[]) all.toArray(new ArtifactDownloadReport[all.size()]); + return all.toArray(new ArtifactDownloadReport[all.size()]); } public ArtifactDownloadReport[] getArtifactsReports(ModuleRevisionId mrid) { - Collection all = new LinkedHashSet(); - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport report = (ConfigurationResolveReport) iter.next(); + Collection all = new LinkedHashSet(); + for (ConfigurationResolveReport report : confReports.values()) { all.addAll(Arrays.asList(report.getDownloadReports(mrid))); } - return (ArtifactDownloadReport[]) all.toArray(new ArtifactDownloadReport[all.size()]); + return all.toArray(new ArtifactDownloadReport[all.size()]); } public void checkIfChanged() { - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport report = (ConfigurationResolveReport) iter.next(); + for (ConfigurationResolveReport report : confReports.values()) { report.checkIfChanged(); } } /** Can only be called if checkIfChanged has been called */ public boolean hasChanged() { - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport report = (ConfigurationResolveReport) iter.next(); + for (ConfigurationResolveReport report : confReports.values()) { if (report.hasChanged()) { return true; } @@ -201,18 +194,17 @@ public class ResolveReport { return false; } - public void setProblemMessages(List problems) { + public void setProblemMessages(List problems) { problemMessages = problems; } - public List getProblemMessages() { + public List getProblemMessages() { return problemMessages; } - public List getAllProblemMessages() { - List ret = new ArrayList(problemMessages); - for (Iterator iter = confReports.values().iterator(); iter.hasNext();) { - ConfigurationResolveReport r = (ConfigurationResolveReport) iter.next(); + public List getAllProblemMessages() { + List ret = new ArrayList(problemMessages); + for (ConfigurationResolveReport r : confReports.values()) { IvyNode[] unresolved = r.getUnresolvedDependencies(); for (int i = 0; i < unresolved.length; i++) { String errMsg = unresolved[i].getProblemMessage(); @@ -230,12 +222,11 @@ public class ResolveReport { return ret; } - public void setDependencies(List dependencies, Filter artifactFilter) { + public void setDependencies(List dependencies, Filter artifactFilter) { this.dependencies = dependencies; // collect list of artifacts - artifacts = new ArrayList(); - for (Iterator iter = dependencies.iterator(); iter.hasNext();) { - IvyNode dependency = (IvyNode) iter.next(); + artifacts = new ArrayList(); + for (IvyNode dependency : dependencies) { if (!dependency.isCompletelyEvicted() && !dependency.hasProblem()) { artifacts.addAll(Arrays.asList(dependency.getSelectedArtifacts(artifactFilter))); } @@ -257,7 +248,7 @@ public class ResolveReport { * * @return The list of all dependencies. */ - public List/* */getDependencies() { + public List getDependencies() { return dependencies; } @@ -267,7 +258,7 @@ public class ResolveReport { * * @return The list of all artifacts. */ - public List/* */getArtifacts() { + public List getArtifacts() { return artifacts; } @@ -276,11 +267,10 @@ public class ResolveReport { * * @return a list of ModuleId */ - public List getModuleIds() { - List ret = new ArrayList(); - List sortedDependencies = new ArrayList(dependencies); - for (Iterator iter = sortedDependencies.iterator(); iter.hasNext();) { - IvyNode dependency = (IvyNode) iter.next(); + public List getModuleIds() { + List ret = new ArrayList(); + List sortedDependencies = new ArrayList(dependencies); + for (IvyNode dependency : sortedDependencies) { ModuleId mid = dependency.getResolvedId().getModuleId(); if (!ret.contains(mid)) { ret.add(mid); @@ -371,6 +361,15 @@ public class ResolveReport { public ModuleDescriptor toFixedModuleDescriptor(IvySettings settings, List midToKeep) { DefaultModuleDescriptor fixedmd = new DefaultModuleDescriptor(md.getModuleRevisionId(), md.getStatus(), new Date()); + + // copy namespaces + for (Entry ns : md.getExtraAttributesNamespaces().entrySet()) { + fixedmd.addExtraAttributeNamespace(ns.getKey(), ns.getValue()); + } + + // copy info + fixedmd.setDescription(md.getDescription()); + fixedmd.setHomePage(md.getHomePage()); fixedmd.getExtraInfos().addAll(md.getExtraInfos()); // copy configurations @@ -379,55 +378,38 @@ public class ResolveReport { fixedmd.addConfiguration(new Configuration(conf)); } - if (midToKeep != null && !midToKeep.isEmpty()) { - // add dependency we want to keep from the original module descriptor - DependencyDescriptor[] deps = md.getDependencies(); - for (int i = 0; i < deps.length; i++) { - if (midToKeep.contains(deps[i].getDependencyId())) { - DefaultDependencyDescriptor dep = new DefaultDependencyDescriptor(fixedmd, - deps[i].getDependencyRevisionId(), true, false, false); - List confs = Arrays.asList(deps[i].getModuleConfigurations()); - if (confs.size() == 1 && confs.get(0).equals("*")) { - confs = resolvedConfs; - } - for (String conf : confs) { - String[] extendedConfs = getExtendingConfs(conf); - String[] depConfs = deps[i].getDependencyConfigurations(conf); - for (String extendedConf : extendedConfs) { - if (resolvedConfs.contains(extendedConf)) { - for (String depConf : depConfs) { - dep.addDependencyConfiguration(extendedConf, depConf); - } - } - } - } - fixedmd.addDependency(dep); - } + // copy artifacts + for (String conf : resolvedConfs) { + for (Artifact a : md.getArtifacts(conf)) { + fixedmd.addArtifact(conf, a); } } // add resolved dependencies - for (int i = 0; i < dependencies.size(); i++) { - IvyNode node = (IvyNode) dependencies.get(i); - if (midToKeep != null && midToKeep.contains(node.getModuleId())) { - continue; + for (IvyNode dep : dependencies) { + ModuleRevisionId depMrid; + boolean force; + if (midToKeep != null && midToKeep.contains(dep.getModuleId())) { + depMrid = dep.getId(); + force = false; + } else { + depMrid = dep.getResolvedId(); + force = true; } - String[] rootConfs = node.getRootModuleConfigurations(); - for (int j = 0; j < rootConfs.length; j++) { - if (node.isEvicted(rootConfs[j])) { + DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(fixedmd, depMrid, + force, false, false); + boolean evicted = true; + for (String rootConf : dep.getRootModuleConfigurations()) { + if (dep.isEvicted(rootConf)) { continue; } - if (node.getAllArtifacts().length == 0) { - // no artifact: it was probably useful transitively, hence it is useless here - break; + evicted = false; + for (String targetConf : dep.getConfigurations(rootConf)) { + dd.addDependencyConfiguration(rootConf, targetConf); } - DefaultDependencyDescriptor dep = new DefaultDependencyDescriptor(fixedmd, - node.getResolvedId(), true, false, false); - String[] targetConfs = node.getConfigurations(rootConfs[j]); - for (int k = 0; k < targetConfs.length; k++) { - dep.addDependencyConfiguration(rootConfs[j], targetConfs[k]); - } - fixedmd.addDependency(dep); + } + if (!evicted) { + fixedmd.addDependency(dd); } } diff --git a/src/java/org/apache/ivy/core/resolve/IvyNode.java b/src/java/org/apache/ivy/core/resolve/IvyNode.java index f4e77020..48b23db1 100644 --- a/src/java/org/apache/ivy/core/resolve/IvyNode.java +++ b/src/java/org/apache/ivy/core/resolve/IvyNode.java @@ -20,6 +20,7 @@ package org.apache.ivy.core.resolve; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -191,8 +192,7 @@ public class IvyNode implements Comparable { if (settings.getVersionMatcher().isDynamic(getId()) && settings.getVersionMatcher().isDynamic(module.getId())) { Message.error("impossible to resolve dynamic revision for " + getId() - + ": check your configuration and " - + "make sure revision is part of your pattern"); + + ": check your configuration and make sure revision is part of your pattern"); problem = new RuntimeException("impossible to resolve dynamic revision"); return false; } @@ -254,13 +254,12 @@ public class IvyNode implements Comparable { if (hasProblem()) { Message.debug("problem : " + problem.getMessage()); return false; - } else { - DependencyDescriptor dd = getDependencyDescriptor(parent); - if (dd != null) { - usage.addUsage(rootModuleConf, dd, parentConf); - } - return loaded; } + DependencyDescriptor dd = getDependencyDescriptor(parent); + if (dd != null) { + usage.addUsage(rootModuleConf, dd, parentConf); + } + return loaded; } private void moveToRealNode(String rootModuleConf, IvyNode parent, String parentConf, @@ -320,7 +319,7 @@ public class IvyNode implements Comparable { * the configuration to load of this node * @param requestedConf * the actual node conf requested, possibly extending the conf one. - * @return + * @return {@link Collection} of {@link IvyNode} */ public Collection getDependencies(String rootModuleConf, String conf, String requestedConf) { @@ -331,8 +330,8 @@ public class IvyNode implements Comparable { DependencyDescriptor[] dds = md.getDependencies(); // it's important to respect order => LinkedHashMap Map dependencies = new LinkedHashMap(); - for (int i = 0; i < dds.length; i++) { - DependencyDescriptor dd = data.mediate(dds[i]); + for (DependencyDescriptor dependencyDescriptor : dds) { + DependencyDescriptor dd = data.mediate(dependencyDescriptor); String[] dependencyConfigurations = dd.getDependencyConfigurations(conf, requestedConf); if (dependencyConfigurations.length == 0) { // no configuration of the dependency is required for current confs : @@ -416,9 +415,8 @@ public class IvyNode implements Comparable { return null; } return Boolean.valueOf(c.doesCallersExclude(rootModuleConf, artifact, callersStack)); - } else { - return Boolean.FALSE; } + return Boolean.FALSE; } public boolean hasConfigurationsToLoad() { @@ -438,23 +436,24 @@ public class IvyNode implements Comparable { if (md != null) { String[] confs = getRealConfs(conf); addRootModuleConfigurations(usage, rootModuleConf, confs); - for (int i = 0; i < confs.length; i++) { - Configuration c = md.getConfiguration(confs[i]); + for (String realConf : confs) { + Configuration c = md.getConfiguration(realConf); if (c == null) { confsToFetch.remove(conf); if (isConfRequiredByMergedUsageOnly(rootModuleConf, conf)) { Message.verbose("configuration required by evicted revision is not available in " + "selected revision. skipping " + conf + " in " + this); - } else if (!conf.equals(confs[i])) { + } else if (!conf.equals(realConf)) { problem = new RuntimeException("configuration not found in " + this + ": '" - + conf + "'. Missing configuration: '" + confs[i] + + conf + "'. Missing configuration: '" + realConf + "'. It was required from " + parent + " " + parentConf); } else { problem = new RuntimeException("configuration not found in " + this + ": '" - + confs[i] + "'. It was required from " + parent + " " + parentConf); + + realConf + "'. It was required from " + parent + " " + parentConf); } return false; - } else if (shouldBePublic && !isRoot() + } + if (shouldBePublic && !isRoot() && c.getVisibility() != Configuration.Visibility.PUBLIC) { confsToFetch.remove(conf); if (isConfRequiredByMergedUsageOnly(rootModuleConf, conf)) { @@ -479,20 +478,12 @@ public class IvyNode implements Comparable { private String getDefaultConf(String conf) { Matcher m = FALLBACK_CONF_PATTERN.matcher(conf); - if (m.matches()) { - return m.group(2); - } else { - return conf; - } + return m.matches() ? m.group(2) : conf; } private String getMainConf(String conf) { Matcher m = FALLBACK_CONF_PATTERN.matcher(conf); - if (m.matches()) { - return m.group(1); - } else { - return null; - } + return m.matches() ? m.group(1) : null; } public void updateConfsToFetch(Collection confs) { @@ -526,7 +517,7 @@ public class IvyNode implements Comparable { * returns the required configurations from the given node * * @param in - * @return + * @return array of configuration names */ public String[] getRequiredConfigurations(IvyNode in, String inConf) { Collection req = new LinkedHashSet(); @@ -534,7 +525,7 @@ public class IvyNode implements Comparable { for (IvyNodeUsage usage : mergedUsages.values()) { addAllIfNotNull(req, usage.getRequiredConfigurations(in, inConf)); } - return req == null ? new String[0] : req.toArray(new String[req.size()]); + return req.toArray(new String[req.size()]); } private void addAllIfNotNull(Collection into, Collection col) { @@ -546,7 +537,7 @@ public class IvyNode implements Comparable { /** * returns all the current required configurations of the node * - * @return + * @return array of configuration names */ public String[] getRequiredConfigurations() { Collection required = new ArrayList(confsToFetch.size() @@ -574,7 +565,7 @@ public class IvyNode implements Comparable { * Returns the configurations of the dependency required in a given root module configuration. * * @param rootModuleConf - * @return + * @return array of configuration names */ public String[] getConfigurations(String rootModuleConf) { Set depConfs = new LinkedHashSet(); @@ -613,29 +604,23 @@ public class IvyNode implements Comparable { private void addRootModuleConfigurations(IvyNodeUsage usage, String rootModuleConf, String[] dependencyConfs) { - Set depConfs = usage.addAndGetConfigurations(rootModuleConf); if (md != null) { // add all given dependency configurations to the set + extended ones - for (int i = 0; i < dependencyConfs.length; i++) { - depConfs.add(dependencyConfs[i]); - Configuration conf = md.getConfiguration(dependencyConfs[i]); + for (String dependencyConf : dependencyConfs) { + Configuration conf = md.getConfiguration(dependencyConf); if (conf != null) { - String[] exts = conf.getExtends(); // recursive add of extended - addRootModuleConfigurations(usage, rootModuleConf, exts); + addRootModuleConfigurations(usage, rootModuleConf, conf.getExtends()); } } - } else { - for (int i = 0; i < dependencyConfs.length; i++) { - depConfs.add(dependencyConfs[i]); - } } + Collections.addAll(usage.addAndGetConfigurations(rootModuleConf), dependencyConfs); } /** * Returns the root module configurations in which this dependency is required * - * @return + * @return array of configuration names */ public String[] getRootModuleConfigurations() { Set confs = getRootModuleConfigurationsSet(); @@ -645,7 +630,7 @@ public class IvyNode implements Comparable { /** * Returns the root module configurations in which this dependency is required * - * @return + * @return {@link Set} of configuration names */ public Set getRootModuleConfigurationsSet() { Set confs = new LinkedHashSet(); @@ -674,9 +659,10 @@ public class IvyNode implements Comparable { } conf = defaultConf; } - if (conf.startsWith("*")) { + if (conf.charAt(0) == '*') { return resolveSpecialConfigurations(new String[] {conf}); - } else if (conf.indexOf(',') != -1) { + } + if (conf.indexOf(',') != -1) { String[] confs = conf.split(","); for (int i = 0; i < confs.length; i++) { confs[i] = confs[i].trim(); @@ -705,8 +691,9 @@ public class IvyNode implements Comparable { } if (path.contains(parent)) { path.add(0, parent); - Message.verbose("circular dependency found while looking for the path for another one: " - + "was looking for " + from + " as a caller of " + path.get(path.size() - 1)); + Message.verbose( + "circular dependency found while looking for the path for another one: was looking for " + + from + " as a caller of " + path.get(path.size() - 1)); return path; } path.add(0, parent); @@ -761,7 +748,7 @@ public class IvyNode implements Comparable { /** * Returns all the artifacts of this dependency required in all the root module configurations * - * @return + * @return array of {@link Artifact}s */ public Artifact[] getAllArtifacts() { Set ret = new HashSet(); @@ -776,7 +763,7 @@ public class IvyNode implements Comparable { * which the node is not evicted nor blacklisted * * @param artifactFilter - * @return + * @return array of {@link Artifact}s */ public Artifact[] getSelectedArtifacts(Filter artifactFilter) { Collection ret = new HashSet(); @@ -794,7 +781,7 @@ public class IvyNode implements Comparable { * in the given root module configuration * * @param rootModuleConf - * @return + * @return array of {@link Artifact}s */ public Artifact[] getArtifacts(String rootModuleConf) { // first we look for the dependency configurations required @@ -807,7 +794,7 @@ public class IvyNode implements Comparable { if (md == null) { throw new IllegalStateException( "impossible to get artifacts when data has not been loaded. IvyNode = " - + this.toString()); + + this); } Set artifacts = new HashSet(); // the set we fill before returning @@ -966,7 +953,7 @@ public class IvyNode implements Comparable { if (md == null) { throw new IllegalStateException( "impossible to get conflict manager when data has not been loaded. IvyNode = " - + this.toString()); + + this); } ConflictManager cm = md.getConflictManager(mid); return cm == null ? settings.getConflictManager(mid) : cm; @@ -1020,11 +1007,11 @@ public class IvyNode implements Comparable { public ModuleRevisionId getResolvedId() { if (md != null && md.getResolvedModuleRevisionId().getRevision() != null) { return md.getResolvedModuleRevisionId(); - } else if (module != null) { - return module.getId(); - } else { - return getId(); } + if (module != null) { + return module.getId(); + } + return getId(); } /** @@ -1039,9 +1026,8 @@ public class IvyNode implements Comparable { // ///////////////////////////////////////////////////////////////////////////// boolean canExclude(String rootModuleConf) { - Caller[] callers = getCallers(rootModuleConf); - for (int i = 0; i < callers.length; i++) { - if (callers[i].canExclude()) { + for (Caller caller : getCallers(rootModuleConf)) { + if (caller.canExclude()) { return true; } } @@ -1250,10 +1236,8 @@ public class IvyNode implements Comparable { } private void clearEvictionDataInAllCallers(String rootModuleConf, Stack callerStack) { - IvyNode node = callerStack.peek(); - Caller[] callers = node.getCallers(rootModuleConf); - for (int i = 0; i < callers.length; i++) { - IvyNode callerNode = findNode(callers[i].getModuleRevisionId()); + for (Caller caller : callerStack.peek().getCallers(rootModuleConf)) { + IvyNode callerNode = findNode(caller.getModuleRevisionId()); if (callerNode != null) { callerNode.eviction = new IvyNodeEviction(callerNode); if (!callerStack.contains(callerNode)) { @@ -1291,9 +1275,8 @@ public class IvyNode implements Comparable { if (isRoot()) { return false; } - String[] rootModuleConfigurations = getRootModuleConfigurations(); - for (int i = 0; i < rootModuleConfigurations.length; i++) { - if (!isBlacklisted(rootModuleConfigurations[i])) { + for (String rootModuleConfiguration : getRootModuleConfigurations()) { + if (!isBlacklisted(rootModuleConfiguration)) { return false; } } diff --git a/src/java/org/apache/ivy/core/resolve/IvyNodeUsage.java b/src/java/org/apache/ivy/core/resolve/IvyNodeUsage.java index b6631f27..cb0eafea 100644 --- a/src/java/org/apache/ivy/core/resolve/IvyNodeUsage.java +++ b/src/java/org/apache/ivy/core/resolve/IvyNodeUsage.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.ivy.core.module.descriptor.DependencyArtifactDescriptor; import org.apache.ivy.core.module.descriptor.DependencyDescriptor; import org.apache.ivy.core.module.descriptor.IncludeRule; +import org.apache.ivy.core.module.descriptor.WorkspaceModuleDescriptor; /** * Class collecting usage data for an IvyNode. @@ -219,6 +220,10 @@ public class IvyNodeUsage { } protected Set getDependencyArtifactsSet(String rootModuleConf) { + if (node.getDescriptor() instanceof WorkspaceModuleDescriptor) { + // for a module in the "workspace" artifacts will be actually declared by the resolver + return null; + } Collection dependersInConf = dependers.get(rootModuleConf); if (dependersInConf == null) { return null; diff --git a/src/java/org/apache/ivy/core/resolve/ResolveData.java b/src/java/org/apache/ivy/core/resolve/ResolveData.java index 54cb661b..f6cb9a75 100644 --- a/src/java/org/apache/ivy/core/resolve/ResolveData.java +++ b/src/java/org/apache/ivy/core/resolve/ResolveData.java @@ -37,7 +37,8 @@ import org.apache.ivy.util.Message; public class ResolveData { private ResolveEngine engine; - private Map visitData; // shared map of all visit data: Map (ModuleRevisionId -> VisitData) + // shared map of all visit data + private Map visitData; private ConfigurationResolveReport report; @@ -55,16 +56,16 @@ public class ResolveData { } public ResolveData(ResolveEngine engine, ResolveOptions options) { - this(engine, options, null, new LinkedHashMap()); + this(engine, options, null, new LinkedHashMap()); } public ResolveData(ResolveEngine engine, ResolveOptions options, ConfigurationResolveReport report) { - this(engine, options, report, new LinkedHashMap()); + this(engine, options, report, new LinkedHashMap()); } public ResolveData(ResolveEngine engine, ResolveOptions options, - ConfigurationResolveReport report, Map visitData) { + ConfigurationResolveReport report, Map visitData) { this.engine = engine; this.report = report; this.visitData = visitData; @@ -80,30 +81,28 @@ public class ResolveData { return visitData == null ? null : visitData.getNode(); } - public Collection getNodes() { - Collection nodes = new ArrayList(); - for (Iterator iter = visitData.values().iterator(); iter.hasNext();) { - VisitData vdata = (VisitData) iter.next(); + public Collection getNodes() { + Collection nodes = new ArrayList(); + for (VisitData vdata : visitData.values()) { nodes.add(vdata.getNode()); } return nodes; } - public Collection getNodeIds() { + public Collection getNodeIds() { return visitData.keySet(); } public VisitData getVisitData(ModuleRevisionId mrid) { - VisitData result = (VisitData) visitData.get(mrid); + VisitData result = visitData.get(mrid); if (result == null) { // search again, now ignore the missing extra attributes - for (Iterator it = visitData.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Entry) it.next(); - ModuleRevisionId current = (ModuleRevisionId) entry.getKey(); + for (Entry entry : visitData.entrySet()) { + ModuleRevisionId current = entry.getKey(); if (isSubMap(mrid.getAttributes(), current.getAttributes())) { - result = (VisitData) entry.getValue(); + result = entry.getValue(); break; } } @@ -115,7 +114,7 @@ public class ResolveData { /** * Checks whether one map is a sub-map of the other. */ - private static boolean isSubMap(Map map1, Map map2) { + private static boolean isSubMap(Map map1, Map map2) { int map1Size = map1.size(); int map2Size = map2.size(); @@ -123,11 +122,10 @@ public class ResolveData { return map1.equals(map2); } - Map smallest = map1Size < map2Size ? map1 : map2; - Map largest = map1Size < map2Size ? map2 : map1; + Map smallest = map1Size < map2Size ? map1 : map2; + Map largest = map1Size < map2Size ? map2 : map1; - for (Iterator it = smallest.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Entry) it.next(); + for (Entry entry : smallest.entrySet()) { if (!largest.containsKey(entry.getKey())) { return false; @@ -258,9 +256,10 @@ public class ResolveData { } void blacklist(IvyNode node) { - for (Iterator iter = visitData.entrySet().iterator(); iter.hasNext();) { - Entry entry = (Entry) iter.next(); - VisitData vdata = (VisitData) entry.getValue(); + for (Iterator> iter = visitData.entrySet().iterator(); iter + .hasNext();) { + Entry entry = iter.next(); + VisitData vdata = entry.getValue(); if (vdata.getNode() == node && !node.getResolvedId().equals(entry.getKey())) { // this visit data was associated with the blacklisted node, // we discard this association @@ -298,14 +297,13 @@ public class ResolveData { VisitNode current = getCurrentVisitNode(); if (current != null) { // mediating dd through dependers stack - List dependers = new ArrayList(current.getPath()); + List dependers = new ArrayList(current.getPath()); // the returned path contains the currently visited node, we are only interested in // the dependers, so we remove the currently visted node from the end dependers.remove(dependers.size() - 1); // we want to apply mediation going up in the dependers stack, not the opposite Collections.reverse(dependers); - for (Iterator iterator = dependers.iterator(); iterator.hasNext();) { - VisitNode n = (VisitNode) iterator.next(); + for (VisitNode n : dependers) { ModuleDescriptor md = n.getDescriptor(); if (md != null) { dd = md.mediate(dd); diff --git a/src/java/org/apache/ivy/core/resolve/ResolveEngine.java b/src/java/org/apache/ivy/core/resolve/ResolveEngine.java index bb3bc95e..33e908dd 100644 --- a/src/java/org/apache/ivy/core/resolve/ResolveEngine.java +++ b/src/java/org/apache/ivy/core/resolve/ResolveEngine.java @@ -29,10 +29,8 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import java.util.ListIterator; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -88,7 +86,7 @@ public class ResolveEngine { private SortEngine sortEngine; - private Set fetchedSet = new HashSet(); + private Set fetchedSet = new HashSet(); private DependencyResolver dictatorResolver; @@ -251,7 +249,7 @@ public class ResolveEngine { .getResolvedModuleRevisionId()); Properties props = new Properties(); if (dependencies.length > 0) { - Map forcedRevisions = new HashMap(); + Map forcedRevisions = new HashMap(); for (int i = 0; i < dependencies.length; i++) { if (dependencies[i].getModuleRevision() != null && dependencies[i].getModuleRevision().isForce()) { @@ -262,8 +260,7 @@ public class ResolveEngine { IvyNode root = dependencies[0].getRoot(); - // (); - Map topLevelDeps = new HashMap(); // + Map topLevelDeps = new HashMap(); for (int i = 0; i < dependencies.length; i++) { if (!dependencies[i].hasProblem()) { DependencyDescriptor dd = dependencies[i].getDependencyDescriptor(root); @@ -279,7 +276,7 @@ public class ResolveEngine { DependencyDescriptor dd = dependencies[i].getDependencyDescriptor(root); if (dd == null) { ModuleId mid = dependencies[i].getModuleId(); - IvyNode tlDep = (IvyNode) topLevelDeps.get(mid); + IvyNode tlDep = topLevelDeps.get(mid); if (tlDep != null) { dd = tlDep.getDependencyDescriptor(root); } @@ -288,8 +285,8 @@ public class ResolveEngine { ModuleRevisionId depResolvedId = dependencies[i].getResolvedId(); ModuleDescriptor depDescriptor = dependencies[i].getDescriptor(); ModuleRevisionId depRevisionId = dd.getDependencyRevisionId(); - ModuleRevisionId forcedRevisionId = (ModuleRevisionId) forcedRevisions - .get(dependencies[i].getModuleId()); + ModuleRevisionId forcedRevisionId = forcedRevisions.get(dependencies[i] + .getModuleId()); if (dependencies[i].getModuleRevision() != null && dependencies[i].getModuleRevision().isForce() @@ -373,14 +370,14 @@ public class ResolveEngine { report.output(settings.getReportOutputters(), cacheMgr, options); } - public void downloadArtifacts(ResolveReport report, Filter artifactFilter, + public void downloadArtifacts(ResolveReport report, Filter artifactFilter, DownloadOptions options) { long start = System.currentTimeMillis(); - IvyNode[] dependencies = (IvyNode[]) report.getDependencies().toArray( + IvyNode[] dependencies = report.getDependencies().toArray( new IvyNode[report.getDependencies().size()]); - eventManager.fireIvyEvent(new PrepareDownloadEvent((Artifact[]) report.getArtifacts() - .toArray(new Artifact[report.getArtifacts().size()]))); + eventManager.fireIvyEvent(new PrepareDownloadEvent(report.getArtifacts().toArray( + new Artifact[report.getArtifacts().size()]))); long totalSize = 0; for (int i = 0; i < dependencies.length; i++) { @@ -541,7 +538,7 @@ public class ResolveEngine { throw new NullPointerException("module descriptor must not be null"); } String[] confs = options.getConfs(md); - Collection missingConfs = new ArrayList(); + Collection missingConfs = new ArrayList(); for (int i = 0; i < confs.length; i++) { if (confs[i] == null) { throw new NullPointerException("null conf not allowed: confs where: " @@ -608,41 +605,39 @@ public class ResolveEngine { } // clean data - for (Iterator iter = data.getNodes().iterator(); iter.hasNext();) { - IvyNode dep = (IvyNode) iter.next(); + for (IvyNode dep : data.getNodes()) { dep.clean(); } } // prune and reverse sort fectched dependencies - Collection nodes = data.getNodes(); + Collection nodes = data.getNodes(); // use a Set to avoid duplicates, linked to preserve order - Collection dependencies = new LinkedHashSet(nodes.size()); - for (Iterator iter = nodes.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + Collection dependencies = new LinkedHashSet(nodes.size()); + for (IvyNode node : nodes) { if (node != null && !node.isRoot() && !node.isCompletelyBlacklisted()) { dependencies.add(node); } } - List sortedDependencies = sortEngine.sortNodes(dependencies, SortOptions.SILENT); + List sortedDependencies = sortEngine.sortNodes(dependencies, + SortOptions.SILENT); Collections.reverse(sortedDependencies); handleTransiviteEviction(md, confs, data, sortedDependencies); - return (IvyNode[]) dependencies.toArray(new IvyNode[dependencies.size()]); + return dependencies.toArray(new IvyNode[dependencies.size()]); } finally { IvyContext.popContext(); } } private void handleTransiviteEviction(ModuleDescriptor md, String[] confs, ResolveData data, - List sortedDependencies) { + List sortedDependencies) { // handle transitive eviction now: // if a module has been evicted then all its dependencies required only by it should be // evicted too. Since nodes are now sorted from the more dependent to the less one, we // can traverse the list and check only the direct parent and not all the ancestors - for (ListIterator iter = sortedDependencies.listIterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + for (IvyNode node : sortedDependencies) { if (!node.isCompletelyEvicted()) { for (int i = 0; i < confs.length; i++) { IvyNodeCallers.Caller[] callers = node.getCallers(confs[i]); @@ -740,8 +735,7 @@ public class ResolveEngine { // update selected nodes with confs asked in evicted one EvictionData ed = node.getEvictedData(); if (ed.getSelected() != null) { - for (Iterator iter = ed.getSelected().iterator(); iter.hasNext();) { - IvyNode selected = (IvyNode) iter.next(); + for (IvyNode selected : ed.getSelected()) { if (!selected.isLoaded()) { // the node is not yet loaded, we can simply update its set of // configurations to fetch @@ -793,9 +787,8 @@ public class ResolveEngine { // now we can actually resolve this configuration dependencies if (!isDependenciesFetched(node.getNode(), conf) && node.isTransitive()) { - Collection/* */dependencies = node.getDependencies(conf); - for (Iterator iter = dependencies.iterator(); iter.hasNext();) { - VisitNode dep = (VisitNode) iter.next(); + Collection dependencies = node.getDependencies(conf); + for (VisitNode dep : dependencies) { dep.useRealNode(); // the node may have been resolved to another real one while // resolving other deps String[] confs = dep.getRequiredConfigurations(node, conf); @@ -853,7 +846,7 @@ public class ResolveEngine { } private void resolveConflict(VisitNode node, String conf) { - resolveConflict(node, node.getParent(), conf, Collections.EMPTY_SET); + resolveConflict(node, node.getParent(), conf, Collections. emptySet()); } /** @@ -870,7 +863,7 @@ public class ResolveEngine { * @return true if conflict resolution has been done, false it can't be done yet */ private boolean resolveConflict(VisitNode node, VisitNode ancestor, String conf, - Collection toevict) { + Collection toevict) { if (ancestor == null || node == ancestor) { return true; } @@ -907,15 +900,16 @@ public class ResolveEngine { } // compute conflicts - Set resolvedNodes = ancestor.getNode().getResolvedNodes(node.getModuleId(), + Set resolvedNodes = ancestor.getNode().getResolvedNodes(node.getModuleId(), node.getRootModuleConf()); resolvedNodes.addAll(ancestor.getNode().getPendingConflicts(node.getRootModuleConf(), node.getModuleId())); - Collection conflicts = computeConflicts(node, ancestor, conf, toevict, resolvedNodes); + Collection conflicts = computeConflicts(node, ancestor, conf, toevict, + resolvedNodes); ConflictManager conflictManager = ancestor.getNode().getConflictManager(node.getModuleId()); - Collection resolved = resolveConflicts(node, ancestor, conflicts, conflictManager); + Collection resolved = resolveConflicts(node, ancestor, conflicts, conflictManager); if (resolved == null) { if (debugConflictResolution) { @@ -939,8 +933,7 @@ public class ResolveEngine { toevict = resolvedNodes; toevict.removeAll(resolved); - for (Iterator iter = toevict.iterator(); iter.hasNext();) { - IvyNode te = (IvyNode) iter.next(); + for (IvyNode te : toevict) { te.markEvicted(node.getRootModuleConf(), ancestor.getNode(), conflictManager, resolved); @@ -956,14 +949,14 @@ public class ResolveEngine { ancestor.getNode().setResolvedNodes(node.getModuleId(), node.getRootModuleConf(), resolved); - Collection evicted = new HashSet(ancestor.getNode().getEvictedNodes(node.getModuleId(), - node.getRootModuleConf())); + Collection evicted = new HashSet(ancestor.getNode().getEvictedNodes( + node.getModuleId(), node.getRootModuleConf())); evicted.removeAll(resolved); evicted.addAll(toevict); ancestor.getNode().setEvictedNodes(node.getModuleId(), node.getRootModuleConf(), evicted); ancestor.getNode().setPendingConflicts(node.getModuleId(), node.getRootModuleConf(), - Collections.EMPTY_SET); + Collections. emptySet()); return resolveConflict(node, ancestor.getParent(), conf, toevict); } else { @@ -977,8 +970,8 @@ public class ResolveEngine { // it's time to update parent resolved and evicted with what was found - Collection evicted = new HashSet(ancestor.getNode().getEvictedNodes(node.getModuleId(), - node.getRootModuleConf())); + Collection evicted = new HashSet(ancestor.getNode().getEvictedNodes( + node.getModuleId(), node.getRootModuleConf())); toevict.removeAll(resolved); evicted.removeAll(resolved); evicted.addAll(toevict); @@ -986,7 +979,7 @@ public class ResolveEngine { ancestor.getNode().setEvictedNodes(node.getModuleId(), node.getRootModuleConf(), evicted); ancestor.getNode().setPendingConflicts(node.getModuleId(), node.getRootModuleConf(), - Collections.EMPTY_SET); + Collections. emptySet()); node.markEvicted(ancestor, conflictManager, resolved); if (debugConflictResolution) { @@ -994,14 +987,13 @@ public class ResolveEngine { } // if resolved changed we have to go up in the graph - Collection prevResolved = ancestor.getNode().getResolvedNodes(node.getModuleId(), - node.getRootModuleConf()); + Collection prevResolved = ancestor.getNode().getResolvedNodes( + node.getModuleId(), node.getRootModuleConf()); boolean solved = true; if (!prevResolved.equals(resolved)) { ancestor.getNode().setResolvedNodes(node.getModuleId(), node.getRootModuleConf(), resolved); - for (Iterator iter = resolved.iterator(); iter.hasNext();) { - IvyNode sel = (IvyNode) iter.next(); + for (IvyNode sel : resolved) { if (!prevResolved.contains(sel)) { solved &= resolveConflict(node.gotoNode(sel), ancestor.getParent(), conf, toevict); @@ -1012,8 +1004,8 @@ public class ResolveEngine { } } - private Collection resolveConflicts(VisitNode node, VisitNode ancestor, Collection conflicts, - ConflictManager conflictManager) { + private Collection resolveConflicts(VisitNode node, VisitNode ancestor, + Collection conflicts, ConflictManager conflictManager) { if (node.getParent() != ancestor // we are not handling the direct parent @@ -1064,9 +1056,9 @@ public class ResolveEngine { * @return a collection of IvyNode which may be in conflict with the given node in the given * ancestor. This collection always contain at least the given node. */ - private Collection computeConflicts(VisitNode node, VisitNode ancestor, String conf, - Collection toevict, Collection selectedNodes) { - Collection conflicts = new LinkedHashSet(); + private Collection computeConflicts(VisitNode node, VisitNode ancestor, String conf, + Collection toevict, Collection selectedNodes) { + Collection conflicts = new LinkedHashSet(); conflicts.add(node.getNode()); /* * We first try to remove all evicted nodes from the collection of selected nodes to update @@ -1087,11 +1079,11 @@ public class ResolveEngine { data.setCurrentVisitNode(ancestor); try { // In this case we need to compute selected nodes again. - Collection deps = ancestor.getNode().getDependencies(node.getRootModuleConf(), + Collection deps = ancestor.getNode().getDependencies( + node.getRootModuleConf(), ancestor.getNode().getConfigurations(node.getRootModuleConf()), ancestor.getRequestedConf()); - for (Iterator iter = deps.iterator(); iter.hasNext();) { - IvyNode dep = (IvyNode) iter.next(); + for (IvyNode dep : deps) { if (dep.getModuleId().equals(node.getModuleId())) { conflicts.add(dep); } @@ -1108,12 +1100,11 @@ public class ResolveEngine { * the parent direct dependencies in current root module conf. */ VisitNode parent = node.getParent(); - Collection parentDepIvyNodes = parent.getNode().getDependencies( + Collection parentDepIvyNodes = parent.getNode().getDependencies( node.getRootModuleConf(), parent.getNode().getConfigurations(node.getRootModuleConf()), parent.getRequestedConf()); - for (Iterator it = parentDepIvyNodes.iterator(); it.hasNext();) { - IvyNode parentDep = (IvyNode) it.next(); + for (IvyNode parentDep : parentDepIvyNodes) { if (parentDep.getModuleId().equals(node.getModuleId())) { conflicts.add(parentDep); } diff --git a/src/java/org/apache/ivy/core/resolve/ResolveOptions.java b/src/java/org/apache/ivy/core/resolve/ResolveOptions.java index 9ffe43f4..b872b4cc 100644 --- a/src/java/org/apache/ivy/core/resolve/ResolveOptions.java +++ b/src/java/org/apache/ivy/core/resolve/ResolveOptions.java @@ -20,6 +20,7 @@ package org.apache.ivy.core.resolve; import java.util.Date; import org.apache.ivy.core.LogOptions; +import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.util.ConfigurationUtils; @@ -100,7 +101,7 @@ public class ResolveOptions extends LogOptions { /** * A filter to use to avoid downloading all artifacts. */ - private Filter artifactFilter = FilterHelper.NO_FILTER; + private Filter artifactFilter = FilterHelper.NO_FILTER; /** * The resolve mode to use. Should be one of {@link #RESOLVEMODES}, or null to use @@ -140,11 +141,11 @@ public class ResolveOptions extends LogOptions { checkIfChanged = options.checkIfChanged; } - public Filter getArtifactFilter() { + public Filter getArtifactFilter() { return artifactFilter; } - public ResolveOptions setArtifactFilter(Filter artifactFilter) { + public ResolveOptions setArtifactFilter(Filter artifactFilter) { this.artifactFilter = artifactFilter; return this; } diff --git a/src/java/org/apache/ivy/core/resolve/VisitData.java b/src/java/org/apache/ivy/core/resolve/VisitData.java index 16a10ab5..3beb8770 100644 --- a/src/java/org/apache/ivy/core/resolve/VisitData.java +++ b/src/java/org/apache/ivy/core/resolve/VisitData.java @@ -38,7 +38,7 @@ public class VisitData { * The associated visit nodes, per rootModuleConf Note that the value is a List, because a node * can be visited from several parents during the resolution process */ - private Map visitNodes = new HashMap(); // Map (String rootModuleConf -> List(VisitNode)) + private Map> visitNodes = new HashMap>(); public VisitData(IvyNode node) { this.node = node; @@ -49,10 +49,10 @@ public class VisitData { getVisitNodes(rootModuleConf).add(node); } - public List getVisitNodes(String rootModuleConf) { - List visits = (List) visitNodes.get(rootModuleConf); + public List getVisitNodes(String rootModuleConf) { + List visits = visitNodes.get(rootModuleConf); if (visits == null) { - visits = new ArrayList(); + visits = new ArrayList(); visitNodes.put(rootModuleConf, visits); } return visits; @@ -66,7 +66,7 @@ public class VisitData { this.node = node; } - public void addVisitNodes(String rootModuleConf, List visitNodes) { + public void addVisitNodes(String rootModuleConf, List visitNodes) { getVisitNodes(rootModuleConf).addAll(visitNodes); } } diff --git a/src/java/org/apache/ivy/core/resolve/VisitNode.java b/src/java/org/apache/ivy/core/resolve/VisitNode.java index 1547a403..ff2d5a1e 100644 --- a/src/java/org/apache/ivy/core/resolve/VisitNode.java +++ b/src/java/org/apache/ivy/core/resolve/VisitNode.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -70,7 +69,7 @@ public class VisitNode { * Direct path from root to this node. Note that the colleciton is ordered but is not a list * implementation This collection is null until it is required, see getPath */ - private Collection path = null; // Collection(VisitNode) + private Collection path = null; /** * The configuration of the parent module in the current visit @@ -159,16 +158,16 @@ public class VisitNode { * * @return */ - public Collection/* */getPath() { + public Collection getPath() { if (path == null) { path = computePath(); } return path; } - private Collection/* */computePath() { + private Collection computePath() { if (parent != null) { - Collection p = new LinkedHashSet(parent.getPath()); + Collection p = new LinkedHashSet(parent.getPath()); p.add(this); return p; } else { @@ -200,7 +199,7 @@ public class VisitNode { public static VisitNode getRoot(VisitNode parent) { VisitNode root = parent; - Collection path = new HashSet(); + Collection path = new HashSet(); path.add(root); while (root.getParent() != null && !root.getNode().isRoot()) { if (path.contains(root.getParent())) { @@ -309,11 +308,10 @@ public class VisitNode { return loaded; } - public Collection/* */getDependencies(String conf) { - Collection/* */deps = node.getDependencies(rootModuleConf, conf, requestedConf); - Collection/* */ret = new ArrayList(deps.size()); - for (Iterator iter = deps.iterator(); iter.hasNext();) { - IvyNode depNode = (IvyNode) iter.next(); + public Collection getDependencies(String conf) { + Collection deps = node.getDependencies(rootModuleConf, conf, requestedConf); + Collection ret = new ArrayList(deps.size()); + for (IvyNode depNode : deps) { ret.add(traverseChild(conf, depNode)); } return ret; @@ -336,9 +334,8 @@ public class VisitNode { } VisitData visitData = data.getVisitData(node.getId()); if (visitData != null) { - List visitNodes = visitData.getVisitNodes(rootModuleConf); - for (Iterator iter = visitNodes.iterator(); iter.hasNext();) { - VisitNode vnode = (VisitNode) iter.next(); + List visitNodes = visitData.getVisitNodes(rootModuleConf); + for (VisitNode vnode : visitNodes) { if ((parent == null && vnode.getParent() == null) || (parent != null && parent.getId().equals(vnode.getParent().getId()))) { vnode.parentConf = parentConf; @@ -371,11 +368,10 @@ public class VisitNode { return new VisitNode(data, node, parent, rootModuleConf, parentConf, usage); } - private ModuleRevisionId[] toMrids(Collection path, ModuleRevisionId last) { + private ModuleRevisionId[] toMrids(Collection path, ModuleRevisionId last) { ModuleRevisionId[] ret = new ModuleRevisionId[path.size() + 1]; int i = 0; - for (Iterator iter = path.iterator(); iter.hasNext(); i++) { - VisitNode node = (VisitNode) iter.next(); + for (VisitNode node : path) { ret[i] = node.getNode().getId(); } ret[ret.length - 1] = last; @@ -386,7 +382,7 @@ public class VisitNode { return node.getResolvedId(); } - public void updateConfsToFetch(Collection confs) { + public void updateConfsToFetch(Collection confs) { node.updateConfsToFetch(confs); } @@ -432,8 +428,7 @@ public class VisitNode { if (parent != null) { isCircular = Boolean.FALSE; // asumme it's false, and see if it isn't by checking // the parent path - for (Iterator iter = parent.getPath().iterator(); iter.hasNext();) { - VisitNode ancestor = (VisitNode) iter.next(); + for (VisitNode ancestor : parent.getPath()) { if (getId().getModuleId().equals(ancestor.getId().getModuleId())) { isCircular = Boolean.TRUE; break; @@ -458,7 +453,7 @@ public class VisitNode { return node.getModuleId(); } - public Collection getResolvedRevisions(ModuleId mid) { + public Collection getResolvedRevisions(ModuleId mid) { return node.getResolvedRevisions(mid, rootModuleConf); } @@ -481,7 +476,8 @@ public class VisitNode { * @param selected * a Collection of {@link IvyNode} which have been selected */ - public void markEvicted(VisitNode parent, ConflictManager conflictMgr, Collection selected) { + public void markEvicted(VisitNode parent, ConflictManager conflictMgr, + Collection selected) { node.markEvicted(rootModuleConf, parent.getNode(), conflictMgr, selected); } @@ -493,7 +489,7 @@ public class VisitNode { return node.getEvictionDataInRoot(rootModuleConf, ancestor.getNode()); } - public Collection getEvictedRevisions(ModuleId moduleId) { + public Collection getEvictedRevisions(ModuleId moduleId) { return node.getEvictedRevisions(moduleId, rootModuleConf); } @@ -508,6 +504,7 @@ public class VisitNode { // rootModuleConf = rootModuleConf; // } + @Override public String toString() { return node.toString(); } diff --git a/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java b/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java index 7cfa6a86..57481dea 100644 --- a/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java +++ b/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java @@ -46,6 +46,7 @@ import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ArtifactRevisionId; import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.pack.PackagingManager; import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.core.resolve.ResolveOptions; import org.apache.ivy.plugins.report.XmlReportParser; @@ -331,12 +332,29 @@ public class RetrieveEngine { artifacts.add(parser.getMetadataArtifactReport(mrids[j])); } } - for (ArtifactDownloadReport adr : artifacts) { + final PackagingManager packagingManager = new PackagingManager(); + packagingManager.setSettings(IvyContext.getContext().getSettings()); - Artifact artifact = adr.getArtifact(); - String ext = artifact.getExt(); - if (adr.getUnpackedLocalFile() != null) { - ext = ""; + for (final ArtifactDownloadReport adr : artifacts) { + + final Artifact artifact = adr.getArtifact(); + final String ext; + if (adr.getUnpackedLocalFile() == null) { + ext = artifact.getExt(); + } else { + final Artifact unpackedArtifact; + // check if the download report is aware of the unpacked artifact + if (adr.getUnpackedArtifact() != null) { + unpackedArtifact = adr.getUnpackedArtifact(); + } else { + // use the packaging manager to get hold of the unpacked artifact + unpackedArtifact = packagingManager.getUnpackedArtifact(artifact); + } + if (unpackedArtifact == null) { + throw new RuntimeException("Could not determine unpacked artifact for " + artifact + + " while determining artifacts to copy for module " + mrid); + } + ext = unpackedArtifact.getExt(); } String destPattern = "ivy".equals(adr.getType()) ? destIvyPattern : destFilePattern; diff --git a/src/java/org/apache/ivy/core/search/SearchEngine.java b/src/java/org/apache/ivy/core/search/SearchEngine.java index 84c24435..b35ee926 100644 --- a/src/java/org/apache/ivy/core/search/SearchEngine.java +++ b/src/java/org/apache/ivy/core/search/SearchEngine.java @@ -22,7 +22,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -56,125 +55,119 @@ public class SearchEngine { * @param otherTokenValues * @return */ - public String[] listTokenValues(String token, Map otherTokenValues) { - Set entries = new LinkedHashSet(); + public String[] listTokenValues(String token, Map otherTokenValues) { + Set entries = new LinkedHashSet(); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] values = resolver.listTokenValues(new String[] {token}, otherTokenValues); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] values = resolver.listTokenValues(new String[] {token}, + otherTokenValues); for (int i = 0; i < values.length; i++) { entries.add(values[i].get(token)); } } - return (String[]) entries.toArray(new String[entries.size()]); + return entries.toArray(new String[entries.size()]); } public OrganisationEntry[] listOrganisationEntries() { - Set entries = new HashSet(); + Set entries = new HashSet(); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] orgs = resolver.listTokenValues(new String[] {IvyPatternHelper.ORGANISATION_KEY}, - new HashMap()); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] orgs = resolver.listTokenValues( + new String[] {IvyPatternHelper.ORGANISATION_KEY}, new HashMap()); for (int i = 0; i < orgs.length; i++) { - String org = (String) orgs[i].get(IvyPatternHelper.ORGANISATION_KEY); + String org = orgs[i].get(IvyPatternHelper.ORGANISATION_KEY); entries.add(new OrganisationEntry(resolver, org)); } } - return (OrganisationEntry[]) entries.toArray(new OrganisationEntry[entries.size()]); + return entries.toArray(new OrganisationEntry[entries.size()]); } public String[] listOrganisations() { - Set entries = new HashSet(); + Set entries = new HashSet(); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] orgs = resolver.listTokenValues(new String[] {IvyPatternHelper.ORGANISATION_KEY}, - new HashMap()); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] orgs = resolver.listTokenValues( + new String[] {IvyPatternHelper.ORGANISATION_KEY}, new HashMap()); for (int i = 0; i < orgs.length; i++) { entries.add(orgs[i].get(IvyPatternHelper.ORGANISATION_KEY)); } } - return (String[]) entries.toArray(new String[entries.size()]); + return entries.toArray(new String[entries.size()]); } public ModuleEntry[] listModuleEntries(OrganisationEntry org) { - Set entries = new HashSet(); + Set entries = new HashSet(); - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, org.getOrganisation()); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] modules = resolver.listTokenValues(new String[] {IvyPatternHelper.MODULE_KEY}, - tokenValues); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] modules = resolver.listTokenValues( + new String[] {IvyPatternHelper.MODULE_KEY}, tokenValues); for (int i = 0; i < modules.length; i++) { - String module = (String) modules[i].get(IvyPatternHelper.MODULE_KEY); + String module = modules[i].get(IvyPatternHelper.MODULE_KEY); entries.add(new ModuleEntry(org, module)); } } - return (ModuleEntry[]) entries.toArray(new ModuleEntry[entries.size()]); + return entries.toArray(new ModuleEntry[entries.size()]); } public String[] listModules(String org) { - Set entries = new HashSet(); + Set entries = new HashSet(); - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, org); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] modules = resolver.listTokenValues(new String[] {IvyPatternHelper.MODULE_KEY}, - tokenValues); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] modules = resolver.listTokenValues( + new String[] {IvyPatternHelper.MODULE_KEY}, tokenValues); for (int i = 0; i < modules.length; i++) { entries.add(modules[i].get(IvyPatternHelper.MODULE_KEY)); } } - return (String[]) entries.toArray(new String[entries.size()]); + return entries.toArray(new String[entries.size()]); } public RevisionEntry[] listRevisionEntries(ModuleEntry module) { - Set entries = new HashSet(); + Set entries = new HashSet(); - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, module.getOrganisation()); tokenValues.put(IvyPatternHelper.MODULE_KEY, module.getModule()); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] revisions = resolver.listTokenValues( + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] revisions = resolver.listTokenValues( new String[] {IvyPatternHelper.REVISION_KEY}, tokenValues); for (int i = 0; i < revisions.length; i++) { - String revision = (String) revisions[i].get(IvyPatternHelper.REVISION_KEY); + String revision = revisions[i].get(IvyPatternHelper.REVISION_KEY); entries.add(new RevisionEntry(module, revision)); } } - return (RevisionEntry[]) entries.toArray(new RevisionEntry[entries.size()]); + return entries.toArray(new RevisionEntry[entries.size()]); } public String[] listRevisions(String org, String module) { - Set entries = new HashSet(); + Set entries = new HashSet(); - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, org); tokenValues.put(IvyPatternHelper.MODULE_KEY, module); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] revisions = resolver.listTokenValues( + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] revisions = resolver.listTokenValues( new String[] {IvyPatternHelper.REVISION_KEY}, tokenValues); for (int i = 0; i < revisions.length; i++) { entries.add(revisions[i].get(IvyPatternHelper.REVISION_KEY)); } } - return (String[]) entries.toArray(new String[entries.size()]); + return entries.toArray(new String[entries.size()]); } /** @@ -189,9 +182,9 @@ public class SearchEngine { * @return */ public ModuleId[] listModules(ModuleId moduleCrit, PatternMatcher matcher) { - List ret = new ArrayList(); + List ret = new ArrayList(); - Map criteria = new HashMap(); + Map criteria = new HashMap(); addMatcher(matcher, moduleCrit.getOrganisation(), criteria, IvyPatternHelper.ORGANISATION_KEY); addMatcher(matcher, moduleCrit.getName(), criteria, IvyPatternHelper.MODULE_KEY); @@ -199,19 +192,18 @@ public class SearchEngine { String[] tokensToList = new String[] {IvyPatternHelper.ORGANISATION_KEY, IvyPatternHelper.MODULE_KEY}; - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] moduleIdAsMap = resolver.listTokenValues(tokensToList, criteria); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] moduleIdAsMap = resolver.listTokenValues(tokensToList, criteria); for (int i = 0; i < moduleIdAsMap.length; i++) { - String org = (String) moduleIdAsMap[i].get(IvyPatternHelper.ORGANISATION_KEY); - String name = (String) moduleIdAsMap[i].get(IvyPatternHelper.MODULE_KEY); + String org = moduleIdAsMap[i].get(IvyPatternHelper.ORGANISATION_KEY); + String name = moduleIdAsMap[i].get(IvyPatternHelper.MODULE_KEY); ModuleId modId = ModuleId.newInstance(org, name); ret.add(NameSpaceHelper.transform(modId, resolver.getNamespace() .getToSystemTransformer())); } } - return (ModuleId[]) ret.toArray(new ModuleId[ret.size()]); + return ret.toArray(new ModuleId[ret.size()]); } /** @@ -226,37 +218,33 @@ public class SearchEngine { * @return */ public ModuleRevisionId[] listModules(ModuleRevisionId moduleCrit, PatternMatcher matcher) { - List ret = new ArrayList(); + List ret = new ArrayList(); - Map criteria = new HashMap(); - for (Iterator it = moduleCrit.getAttributes().entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Entry) it.next(); - addMatcher(matcher, (String) entry.getValue(), criteria, (String) entry.getKey()); + Map criteria = new HashMap(); + for (Entry entry : moduleCrit.getAttributes().entrySet()) { + addMatcher(matcher, entry.getValue(), criteria, entry.getKey()); } - String[] tokensToList = (String[]) moduleCrit.getAttributes().keySet() + String[] tokensToList = moduleCrit.getAttributes().keySet() .toArray(new String[moduleCrit.getAttributes().size()]); - for (Iterator iter = settings.getResolvers().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] moduleIdAsMap = resolver.listTokenValues(tokensToList, criteria); + for (DependencyResolver resolver : settings.getResolvers()) { + Map[] moduleIdAsMap = resolver.listTokenValues(tokensToList, criteria); for (int i = 0; i < moduleIdAsMap.length; i++) { - String org = (String) moduleIdAsMap[i].get(IvyPatternHelper.ORGANISATION_KEY); - String name = (String) moduleIdAsMap[i].get(IvyPatternHelper.MODULE_KEY); - String branch = (String) moduleIdAsMap[i].get(IvyPatternHelper.BRANCH_KEY); - String rev = (String) moduleIdAsMap[i].get(IvyPatternHelper.REVISION_KEY); + String org = moduleIdAsMap[i].get(IvyPatternHelper.ORGANISATION_KEY); + String name = moduleIdAsMap[i].get(IvyPatternHelper.MODULE_KEY); + String branch = moduleIdAsMap[i].get(IvyPatternHelper.BRANCH_KEY); + String rev = moduleIdAsMap[i].get(IvyPatternHelper.REVISION_KEY); - Map foundExtraAtts = new HashMap(); - Set qualAttributes = moduleCrit.getQualifiedExtraAttributes().keySet(); - for (Iterator iter2 = qualAttributes.iterator(); iter2.hasNext();) { - String qualifiedKey = (String) iter2.next(); + Map foundExtraAtts = new HashMap(); + Set qualAttributes = moduleCrit.getQualifiedExtraAttributes().keySet(); + for (String qualifiedKey : qualAttributes) { String value = null; int colonIndex = qualifiedKey.indexOf(':'); if (colonIndex == -1) { - value = (String) moduleIdAsMap[i].get(qualifiedKey); + value = moduleIdAsMap[i].get(qualifiedKey); } else { - value = (String) moduleIdAsMap[i].get(qualifiedKey - .substring(colonIndex + 1)); + value = moduleIdAsMap[i].get(qualifiedKey.substring(colonIndex + 1)); } if (value != null) { @@ -270,7 +258,7 @@ public class SearchEngine { } } - return (ModuleRevisionId[]) ret.toArray(new ModuleRevisionId[ret.size()]); + return ret.toArray(new ModuleRevisionId[ret.size()]); } /** @@ -289,33 +277,32 @@ public class SearchEngine { */ public ModuleRevisionId[] listModules(DependencyResolver resolver, ModuleRevisionId moduleCrit, PatternMatcher matcher) { - Map criteria = new HashMap(); - for (Iterator it = moduleCrit.getAttributes().entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Entry) it.next(); - addMatcher(matcher, (String) entry.getValue(), criteria, (String) entry.getKey()); + Map criteria = new HashMap(); + for (Entry entry : moduleCrit.getAttributes().entrySet()) { + addMatcher(matcher, entry.getValue(), criteria, entry.getKey()); } - String[] tokensToList = (String[]) moduleCrit.getAttributes().keySet() + String[] tokensToList = moduleCrit.getAttributes().keySet() .toArray(new String[moduleCrit.getAttributes().size()]); - Map[] moduleIdAsMap = resolver.listTokenValues(tokensToList, criteria); - Set result = new LinkedHashSet(); // we use a Set to remove duplicates + Map[] moduleIdAsMap = resolver.listTokenValues(tokensToList, criteria); + Set result = new LinkedHashSet(); // we use a Set to + // remove duplicates for (int i = 0; i < moduleIdAsMap.length; i++) { - String org = (String) moduleIdAsMap[i].get(IvyPatternHelper.ORGANISATION_KEY); - String name = (String) moduleIdAsMap[i].get(IvyPatternHelper.MODULE_KEY); - String branch = (String) moduleIdAsMap[i].get(IvyPatternHelper.BRANCH_KEY); - String rev = (String) moduleIdAsMap[i].get(IvyPatternHelper.REVISION_KEY); + String org = moduleIdAsMap[i].get(IvyPatternHelper.ORGANISATION_KEY); + String name = moduleIdAsMap[i].get(IvyPatternHelper.MODULE_KEY); + String branch = moduleIdAsMap[i].get(IvyPatternHelper.BRANCH_KEY); + String rev = moduleIdAsMap[i].get(IvyPatternHelper.REVISION_KEY); - Map foundExtraAtts = new HashMap(); - Set qualExtraAttributes = moduleCrit.getQualifiedExtraAttributes().keySet(); - for (Iterator iter2 = qualExtraAttributes.iterator(); iter2.hasNext();) { - String qualifiedKey = (String) iter2.next(); + Map foundExtraAtts = new HashMap(); + Set qualExtraAttributes = moduleCrit.getQualifiedExtraAttributes().keySet(); + for (String qualifiedKey : qualExtraAttributes) { String value = null; int colonIndex = qualifiedKey.indexOf(':'); if (colonIndex == -1) { - value = (String) moduleIdAsMap[i].get(qualifiedKey); + value = moduleIdAsMap[i].get(qualifiedKey); } else { - value = (String) moduleIdAsMap[i].get(qualifiedKey.substring(colonIndex + 1)); + value = moduleIdAsMap[i].get(qualifiedKey.substring(colonIndex + 1)); } if (value != null) { @@ -328,11 +315,11 @@ public class SearchEngine { result.add(resolver.getNamespace().getToSystemTransformer().transform(modRevId)); } - return (ModuleRevisionId[]) result.toArray(new ModuleRevisionId[result.size()]); + return result.toArray(new ModuleRevisionId[result.size()]); } - private void addMatcher(PatternMatcher patternMatcher, String expression, Map criteria, - String key) { + private void addMatcher(PatternMatcher patternMatcher, String expression, + Map criteria, String key) { if (expression == null) { return; } @@ -345,9 +332,9 @@ public class SearchEngine { } } - public Collection findModuleRevisionIds(DependencyResolver resolver, ModuleRevisionId pattern, - PatternMatcher matcher) { - Collection mrids = new ArrayList(); + public Collection findModuleRevisionIds(DependencyResolver resolver, + ModuleRevisionId pattern, PatternMatcher matcher) { + Collection mrids = new ArrayList(); String resolverName = resolver.getName(); Message.verbose("looking for modules matching " + pattern + " using " + matcher.getName()); @@ -356,7 +343,7 @@ public class SearchEngine { fromNamespace = ((AbstractResolver) resolver).getNamespace(); } - Collection modules = new ArrayList(); + Collection modules = new ArrayList(); OrganisationEntry[] orgs = resolver.listOrganisations(); if (orgs == null || orgs.length == 0) { @@ -386,8 +373,7 @@ public class SearchEngine { Message.debug("found " + modules.size() + " modules for " + pattern.getOrganisation() + " on " + resolverName); boolean foundModule = false; - for (Iterator iter = modules.iterator(); iter.hasNext();) { - ModuleEntry mEntry = (ModuleEntry) iter.next(); + for (ModuleEntry mEntry : modules) { ModuleId foundMid = new ModuleId(mEntry.getOrganisation(), mEntry.getModule()); ModuleId systemMid = foundMid; diff --git a/src/java/org/apache/ivy/core/settings/IvySettings.java b/src/java/org/apache/ivy/core/settings/IvySettings.java index 1ef8dc79..b5f4849e 100644 --- a/src/java/org/apache/ivy/core/settings/IvySettings.java +++ b/src/java/org/apache/ivy/core/settings/IvySettings.java @@ -31,10 +31,10 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import org.apache.ivy.Ivy; @@ -76,6 +76,7 @@ import org.apache.ivy.plugins.latest.LatestLexicographicStrategy; import org.apache.ivy.plugins.latest.LatestRevisionStrategy; import org.apache.ivy.plugins.latest.LatestStrategy; import org.apache.ivy.plugins.latest.LatestTimeStrategy; +import org.apache.ivy.plugins.latest.WorkspaceLatestStrategy; import org.apache.ivy.plugins.lock.CreateFileLockStrategy; import org.apache.ivy.plugins.lock.LockStrategy; import org.apache.ivy.plugins.lock.NIOFileLockStrategy; @@ -92,10 +93,12 @@ import org.apache.ivy.plugins.parser.ParserSettings; import org.apache.ivy.plugins.report.LogReportOutputter; import org.apache.ivy.plugins.report.ReportOutputter; import org.apache.ivy.plugins.report.XmlReportOutputter; +import org.apache.ivy.plugins.resolver.AbstractWorkspaceResolver; import org.apache.ivy.plugins.resolver.ChainResolver; import org.apache.ivy.plugins.resolver.DependencyResolver; import org.apache.ivy.plugins.resolver.DualResolver; import org.apache.ivy.plugins.resolver.ResolverSettings; +import org.apache.ivy.plugins.resolver.WorkspaceChainResolver; import org.apache.ivy.plugins.signer.SignatureGenerator; import org.apache.ivy.plugins.trigger.Trigger; import org.apache.ivy.plugins.version.ChainVersionMatcher; @@ -115,9 +118,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P ResolveEngineSettings, RetrieveEngineSettings, RepositoryManagementEngineSettings { private static final long INTERUPT_TIMEOUT = 2000; - private Map typeDefs = new HashMap(); + private Map> typeDefs = new HashMap>(); - private Map resolversMap = new HashMap(); + private Map resolversMap = new HashMap(); private DependencyResolver defaultResolver; @@ -131,40 +134,29 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P private boolean checkUpToDate = true; - private ModuleRules moduleSettings = new ModuleRules(); + private ModuleRules moduleSettings = new ModuleRules(); - // Map (String conflictManagerName -> ConflictManager) - private Map conflictsManager = new HashMap(); + private Map conflictsManager = new HashMap(); - // Map (String latestStrategyName -> LatestStrategy) - private Map latestStrategies = new HashMap(); + private Map latestStrategies = new HashMap(); - // Map (String name -> LockStrategy) - private Map lockStrategies = new HashMap(); + private Map lockStrategies = new HashMap(); - // Map (String namespaceName -> Namespace) - private Map namespaces = new HashMap(); + private Map namespaces = new HashMap(); - // Map (String matcherName -> Matcher) - private Map matchers = new HashMap(); + private Map matchers = new HashMap(); - // Map (String outputterName -> ReportOutputter) - private Map reportOutputters = new HashMap(); + private Map reportOutputters = new HashMap(); - // Map (String matcherName -> VersionMatcher) - private Map versionMatchers = new HashMap(); + private Map versionMatchers = new HashMap(); - // Map (String name -> CircularDependencyStrategy) - private Map circularDependencyStrategies = new HashMap(); + private Map circularDependencyStrategies = new HashMap(); - // Map (String name -> RepositoryCacheManager) - private Map repositoryCacheManagers = new HashMap(); + private Map repositoryCacheManagers = new HashMap(); - // Map (String name -> SignatureGenerator) - private Map signatureGenerators = new HashMap(); + private Map signatureGenerators = new HashMap(); - // List (Trigger) - private List triggers = new ArrayList(); + private List triggers = new ArrayList(); private IvyVariableContainer variableContainer = new IvyVariableContainerImpl(); @@ -182,7 +174,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P private ResolutionCacheManager resolutionCacheManager = null; - private List listingIgnore = new ArrayList(); + private List listingIgnore = new ArrayList(); private boolean repositoriesConfigured; @@ -192,7 +184,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P private File baseDir = new File(".").getAbsoluteFile(); - private List classpathURLs = new ArrayList(); + private List classpathURLs = new ArrayList(); private ClassLoader classloader; @@ -218,6 +210,8 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P private PackingRegistry packingRegistry = new PackingRegistry(); + private AbstractWorkspaceResolver workspaceResolver; + public IvySettings() { this(new IvyVariableContainerImpl()); } @@ -278,8 +272,10 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P try { // GlobPatternMatcher is optional. Only add it when available. - Class globClazz = IvySettings.class.getClassLoader().loadClass( - "org.apache.ivy.plugins.matcher.GlobPatternMatcher"); + @SuppressWarnings("unchecked") + Class globClazz = (Class) IvySettings.class + .getClassLoader() + .loadClass("org.apache.ivy.plugins.matcher.GlobPatternMatcher"); Field instanceField = globClazz.getField("INSTANCE"); addMatcher((PatternMatcher) instanceField.get(null)); } catch (Exception e) { @@ -305,7 +301,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P private synchronized void addSystemProperties() { try { - addAllVariables((Map) System.getProperties().clone()); + addAllVariables((Map) System.getProperties().clone()); } catch (AccessControlException ex) { Message.verbose("access denied to getting all system properties: they won't be available as Ivy variables." + "\nset " + ex.getPermission() + " permission if you want to access them"); @@ -371,9 +367,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized void typeDefs(Properties p, boolean silentFail) { - for (Iterator iter = p.keySet().iterator(); iter.hasNext();) { - String name = (String) iter.next(); - typeDef(name, p.getProperty(name), silentFail); + for (Entry entry : p.entrySet()) { + String name = entry.getKey().toString(); + typeDef(name, entry.getValue().toString(), silentFail); } } @@ -532,13 +528,12 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if (!classpathURLs.isEmpty()) { Message.verbose("\t-- " + classpathURLs.size() + " custom classpath urls:"); - for (Iterator iter = classpathURLs.iterator(); iter.hasNext();) { - Message.debug("\t\t" + iter.next()); + for (URL url : classpathURLs) { + Message.debug("\t\t" + url); } } Message.verbose("\t-- " + resolversMap.size() + " resolvers:"); - for (Iterator iter = resolversMap.values().iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : resolversMap.values()) { resolver.dumpSettings(); } Message.debug("\tmodule settings:"); @@ -600,7 +595,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P variableContainer.setVariable(varName, value, overwrite); } - public synchronized void addAllVariables(Map variables) { + public synchronized void addAllVariables(Map variables) { addAllVariables(variables, true); } @@ -635,11 +630,10 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P * @return a new map of strings in which all current ivy variables in values have been * substituted by their value */ - public synchronized Map/* */substitute(Map/* */strings) { - Map substituted = new LinkedHashMap(); - for (Iterator it = strings.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Map.Entry) it.next(); - substituted.put(entry.getKey(), substitute((String) entry.getValue())); + public synchronized Map substitute(Map strings) { + Map substituted = new LinkedHashMap(); + for (Entry entry : strings.entrySet()) { + substituted.put(entry.getKey(), substitute(entry.getValue())); } return substituted; } @@ -654,19 +648,19 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P return variableContainer; } - public synchronized Class typeDef(String name, String className) { + public synchronized Class typeDef(String name, String className) { return typeDef(name, className, false); } - public synchronized Class typeDef(String name, String className, boolean silentFail) { - Class clazz = classForName(className, silentFail); + public synchronized Class typeDef(String name, String className, boolean silentFail) { + Class clazz = classForName(className, silentFail); if (clazz != null) { typeDefs.put(name, clazz); } return clazz; } - private Class classForName(String className, boolean silentFail) { + private Class classForName(String className, boolean silentFail) { try { return getClassLoader().loadClass(className); } catch (ClassNotFoundException e) { @@ -687,7 +681,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P classloader = Ivy.class.getClassLoader(); } else { classloader = new URLClassLoader( - (URL[]) classpathURLs.toArray(new URL[classpathURLs.size()]), + classpathURLs.toArray(new URL[classpathURLs.size()]), Ivy.class.getClassLoader()); } } @@ -699,12 +693,12 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P classloader = null; } - public synchronized Map getTypeDefs() { + public synchronized Map> getTypeDefs() { return typeDefs; } - public synchronized Class getTypeDef(String name) { - return (Class) typeDefs.get(name); + public synchronized Class getTypeDef(String name) { + return typeDefs.get(name); } // methods which match ivy conf method signature specs @@ -726,7 +720,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized SignatureGenerator getSignatureGenerator(String name) { - return (SignatureGenerator) signatureGenerators.get(name); + return signatureGenerators.get(name); } public synchronized void addResolver(DependencyResolver resolver) { @@ -736,9 +730,8 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P init(resolver); resolversMap.put(resolver.getName(), resolver); if (resolver instanceof ChainResolver) { - List subresolvers = ((ChainResolver) resolver).getResolvers(); - for (Iterator iter = subresolvers.iterator(); iter.hasNext();) { - DependencyResolver dr = (DependencyResolver) iter.next(); + List subresolvers = ((ChainResolver) resolver).getResolvers(); + for (DependencyResolver dr : subresolvers) { addResolver(dr); } } else if (resolver instanceof DualResolver) { @@ -783,8 +776,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P /** * regular expressions as explained in Pattern class may be used in attributes */ - public synchronized void addModuleConfiguration(Map attributes, PatternMatcher matcher, - String resolverName, String branch, String conflictManager, String resolveMode) { + public synchronized void addModuleConfiguration(Map attributes, + PatternMatcher matcher, String resolverName, String branch, String conflictManager, + String resolveMode) { checkResolverName(resolverName); moduleSettings.defineRule(new MapMatcher(attributes, matcher), new ModuleSettings( resolverName, branch, conflictManager, resolveMode)); @@ -890,9 +884,20 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P dictatorResolver = resolver; } + private DependencyResolver getDictatorResolver() { + if (dictatorResolver == null) { + return null; + } + if (workspaceResolver != null && !(dictatorResolver instanceof WorkspaceChainResolver)) { + dictatorResolver = new WorkspaceChainResolver(this, dictatorResolver, workspaceResolver); + } + return dictatorResolver; + } + public synchronized DependencyResolver getResolver(ModuleRevisionId mrid) { - if (dictatorResolver != null) { - return dictatorResolver; + DependencyResolver r = getDictatorResolver(); + if (r != null) { + return r; } String resolverName = getResolverName(mrid); return getResolver(resolverName); @@ -903,39 +908,48 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized DependencyResolver getResolver(String resolverName) { - if (dictatorResolver != null) { - return dictatorResolver; + DependencyResolver r = getDictatorResolver(); + if (r != null) { + return r; } - DependencyResolver resolver = (DependencyResolver) resolversMap.get(resolverName); + DependencyResolver resolver = resolversMap.get(resolverName); if (resolver == null) { Message.error("unknown resolver " + resolverName); + } else if (workspaceResolver != null && !(resolver instanceof WorkspaceChainResolver)) { + resolver = new WorkspaceChainResolver(this, resolver, workspaceResolver); + resolversMap.put(resolver.getName(), resolver); + resolversMap.put(resolverName, resolver); } return resolver; } public synchronized DependencyResolver getDefaultResolver() { - if (dictatorResolver != null) { - return dictatorResolver; + DependencyResolver r = getDictatorResolver(); + if (r != null) { + return r; } if (defaultResolver == null) { - defaultResolver = (DependencyResolver) resolversMap.get(defaultResolverName); + defaultResolver = resolversMap.get(defaultResolverName); + } + if (workspaceResolver != null && !(defaultResolver instanceof WorkspaceChainResolver)) { + defaultResolver = new WorkspaceChainResolver(this, defaultResolver, workspaceResolver); } return defaultResolver; } public synchronized String getResolverName(ModuleRevisionId mrid) { - ModuleSettings ms = (ModuleSettings) moduleSettings.getRule(mrid, new Filter() { - public boolean accept(Object o) { - return ((ModuleSettings) o).getResolverName() != null; + ModuleSettings ms = moduleSettings.getRule(mrid, new Filter() { + public boolean accept(ModuleSettings o) { + return o.getResolverName() != null; } }); return ms == null ? defaultResolverName : ms.getResolverName(); } public synchronized String getDefaultBranch(ModuleId moduleId) { - ModuleSettings ms = (ModuleSettings) moduleSettings.getRule(moduleId, new Filter() { - public boolean accept(Object o) { - return ((ModuleSettings) o).getBranch() != null; + ModuleSettings ms = moduleSettings.getRule(moduleId, new Filter() { + public boolean accept(ModuleSettings o) { + return o.getBranch() != null; } }); return ms == null ? getDefaultBranch() : ms.getBranch(); @@ -950,9 +964,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized ConflictManager getConflictManager(ModuleId moduleId) { - ModuleSettings ms = (ModuleSettings) moduleSettings.getRule(moduleId, new Filter() { - public boolean accept(Object o) { - return ((ModuleSettings) o).getConflictManager() != null; + ModuleSettings ms = moduleSettings.getRule(moduleId, new Filter() { + public boolean accept(ModuleSettings o) { + return o.getConflictManager() != null; } }); if (ms == null) { @@ -968,9 +982,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized String getResolveMode(ModuleId moduleId) { - ModuleSettings ms = (ModuleSettings) moduleSettings.getRule(moduleId, new Filter() { - public boolean accept(Object o) { - return ((ModuleSettings) o).getResolveMode() != null; + ModuleSettings ms = moduleSettings.getRule(moduleId, new Filter() { + public boolean accept(ModuleSettings o) { + return o.getResolveMode() != null; } }); return ms == null ? getDefaultResolveMode() : ms.getResolveMode(); @@ -992,7 +1006,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if ("default".equals(name)) { return getDefaultConflictManager(); } - return (ConflictManager) conflictsManager.get(name); + return conflictsManager.get(name); } public synchronized void addConflictManager(String name, ConflictManager cm) { @@ -1008,7 +1022,12 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if ("default".equals(name)) { return getDefaultLatestStrategy(); } - return (LatestStrategy) latestStrategies.get(name); + LatestStrategy strategy = latestStrategies.get(name); + if (workspaceResolver != null && !(strategy instanceof WorkspaceLatestStrategy)) { + strategy = new WorkspaceLatestStrategy(strategy); + latestStrategies.put(name, strategy); + } + return strategy; } public synchronized void addLatestStrategy(String name, LatestStrategy latest) { @@ -1024,7 +1043,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if ("default".equals(name)) { return getDefaultLockStrategy(); } - return (LockStrategy) lockStrategies.get(name); + return lockStrategies.get(name); } public synchronized void addLockStrategy(String name, LockStrategy lockStrategy) { @@ -1040,7 +1059,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if ("system".equals(name)) { return getSystemNamespace(); } - return (Namespace) namespaces.get(name); + return namespaces.get(name); } public final Namespace getSystemNamespace() { @@ -1057,7 +1076,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized PatternMatcher getMatcher(String name) { - return (PatternMatcher) matchers.get(name); + return matchers.get(name); } public synchronized void addMatcher(PatternMatcher m) { @@ -1070,7 +1089,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized RepositoryCacheManager getRepositoryCacheManager(String name) { - return (RepositoryCacheManager) repositoryCacheManagers.get(name); + return repositoryCacheManagers.get(name); } public synchronized void addRepositoryCacheManager(RepositoryCacheManager c) { @@ -1079,7 +1098,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized RepositoryCacheManager[] getRepositoryCacheManagers() { - return (RepositoryCacheManager[]) repositoryCacheManagers.values().toArray( + return repositoryCacheManagers.values().toArray( new RepositoryCacheManager[repositoryCacheManagers.size()]); } @@ -1088,7 +1107,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized ReportOutputter getReportOutputter(String name) { - return (ReportOutputter) reportOutputters.get(name); + return reportOutputters.get(name); } public synchronized void addReportOutputter(ReportOutputter outputter) { @@ -1097,8 +1116,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized ReportOutputter[] getReportOutputters() { - return (ReportOutputter[]) reportOutputters.values().toArray( - new ReportOutputter[reportOutputters.size()]); + return reportOutputters.values().toArray(new ReportOutputter[reportOutputters.size()]); } public synchronized void addConfigured(VersionMatcher vmatcher) { @@ -1106,7 +1124,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized VersionMatcher getVersionMatcher(String name) { - return (VersionMatcher) versionMatchers.get(name); + return versionMatchers.get(name); } public synchronized void addVersionMatcher(VersionMatcher vmatcher) { @@ -1124,8 +1142,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P } public synchronized VersionMatcher[] getVersionMatchers() { - return (VersionMatcher[]) versionMatchers.values().toArray( - new VersionMatcher[versionMatchers.size()]); + return versionMatchers.values().toArray(new VersionMatcher[versionMatchers.size()]); } public synchronized VersionMatcher getVersionMatcher() { @@ -1152,7 +1169,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if ("default".equals(name)) { name = "warn"; } - return (CircularDependencyStrategy) circularDependencyStrategies.get(name); + return circularDependencyStrategies.get(name); } public synchronized void setCircularDependencyStrategy(CircularDependencyStrategy strategy) { @@ -1188,7 +1205,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P * Returns the file names of the files that should be ignored when creating a file listing. */ public synchronized String[] getIgnorableFilenames() { - return (String[]) listingIgnore.toArray(new String[listingIgnore.size()]); + return listingIgnore.toArray(new String[listingIgnore.size()]); } /** @@ -1197,7 +1214,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P * * @param names */ - public synchronized void filterIgnore(Collection names) { + public synchronized void filterIgnore(Collection names) { names.removeAll(listingIgnore); } @@ -1237,6 +1254,10 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P if (defaultLatestStrategy == null) { defaultLatestStrategy = new LatestRevisionStrategy(); } + if (workspaceResolver != null + && !(defaultLatestStrategy instanceof WorkspaceLatestStrategy)) { + defaultLatestStrategy = new WorkspaceLatestStrategy(defaultLatestStrategy); + } return defaultLatestStrategy; } @@ -1286,7 +1307,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P triggers.add(trigger); } - public synchronized List getTriggers() { + public synchronized List getTriggers() { return triggers; } @@ -1375,6 +1396,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P this.resolveMode = resolveMode; } + @Override public String toString() { return (resolverName != null ? "resolver: " + resolverName : "") + (branch != null ? "branch: " + branch : "") @@ -1403,15 +1425,15 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P return INTERUPT_TIMEOUT; } - public synchronized Collection getResolvers() { + public synchronized Collection getResolvers() { return resolversMap.values(); } - public synchronized Collection getResolverNames() { + public synchronized Collection getResolverNames() { return resolversMap.keySet(); } - public synchronized Collection getMatcherNames() { + public synchronized Collection getMatcherNames() { return matchers.keySet(); } @@ -1492,9 +1514,8 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P * @throws IllegalStateException * if any of the objects is not valid. */ - private void validateAll(Collection values) { - for (Iterator iterator = values.iterator(); iterator.hasNext();) { - Object object = iterator.next(); + private void validateAll(Collection values) { + for (Object object : values) { if (object instanceof Validatable) { ((Validatable) object).validate(); } @@ -1513,4 +1534,20 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P public PackingRegistry getPackingRegistry() { return packingRegistry; } + + public void addConfigured(AbstractWorkspaceResolver workspaceResolver) { + this.workspaceResolver = workspaceResolver; + if (workspaceResolver != null) { + workspaceResolver.setSettings(this); + DefaultRepositoryCacheManager cacheManager = new DefaultRepositoryCacheManager(); + String cacheName = "workspace-resolver-cache-" + workspaceResolver.getName(); + cacheManager.setBasedir(new File(getDefaultCache(), cacheName)); + cacheManager.setCheckmodified(true); + cacheManager.setUseOrigin(true); + cacheManager.setName(cacheName); + addRepositoryCacheManager(cacheManager); + workspaceResolver.setCache(cacheName); + } + + } } diff --git a/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java b/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java index 66cced1d..e3311612 100644 --- a/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java +++ b/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java @@ -62,14 +62,24 @@ public class OSGiManifestParser implements ModuleDescriptorParser { public ModuleDescriptor parseDescriptor(ParserSettings ivySettings, URL descriptorURL, Resource res, boolean validate) throws ParseException, IOException { - Manifest m = new Manifest(res.openStream()); - BundleInfo bundleInfo = ManifestParser.parseManifest(m); + final InputStream resourceStream = res.openStream(); + final Manifest manifest; try { - bundleInfo.addArtifact(new BundleArtifact(false, new URI(res.getName()), null)); + manifest = new Manifest(resourceStream); + } finally { + try { + resourceStream.close(); + } catch (Exception e) { + // ignore + } + } + BundleInfo bundleInfo = ManifestParser.parseManifest(manifest); + try { + bundleInfo.addArtifact(new BundleArtifact(false, descriptorURL.toURI(), null)); } catch (URISyntaxException e) { throw new RuntimeException("Unsupported repository, resources names are not uris", e); } - return BundleInfoAdapter.toModuleDescriptor(this, null, bundleInfo, m, profileProvider); + return BundleInfoAdapter.toModuleDescriptor(this, null, bundleInfo, manifest, profileProvider); } public void toIvyFile(InputStream is, Resource res, File destFile, ModuleDescriptor md) diff --git a/src/java/org/apache/ivy/osgi/filter/AndFilter.java b/src/java/org/apache/ivy/osgi/filter/AndFilter.java index 7fe700ef..12a75679 100644 --- a/src/java/org/apache/ivy/osgi/filter/AndFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/AndFilter.java @@ -29,6 +29,7 @@ public class AndFilter extends MultiOperatorFilter { super(filters); } + @Override protected char operator() { return '&'; } diff --git a/src/java/org/apache/ivy/osgi/filter/CompareFilter.java b/src/java/org/apache/ivy/osgi/filter/CompareFilter.java index cc8f5643..13f33e3c 100644 --- a/src/java/org/apache/ivy/osgi/filter/CompareFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/CompareFilter.java @@ -24,7 +24,7 @@ public class CompareFilter extends OSGiFilter { public static enum Operator { EQUALS("="), LOWER_THAN("<"), LOWER_OR_EQUAL("<="), GREATER_THAN(">"), GREATER_OR_EQUAL( - ">="); + ">="), APPROX("~="), PRESENT("=*"); private String op; @@ -32,6 +32,7 @@ public class CompareFilter extends OSGiFilter { this.op = op; } + @Override public String toString() { return op; } @@ -43,10 +44,13 @@ public class CompareFilter extends OSGiFilter { private final String leftValue; + private boolean substring; + public CompareFilter(String leftValue, Operator operator, String rightValue) { this.leftValue = leftValue; this.rightValue = rightValue; this.operator = operator; + this.substring = operator == Operator.EQUALS && rightValue.contains("*"); } public String getLeftValue() { @@ -61,6 +65,7 @@ public class CompareFilter extends OSGiFilter { return rightValue; } + @Override public void append(StringBuffer builder) { builder.append("("); builder.append(leftValue); @@ -75,6 +80,17 @@ public class CompareFilter extends OSGiFilter { if (actualValue == null) { return false; } + if (operator == Operator.PRESENT) { + return true; + } + if (operator == Operator.APPROX) { + // TODO + return false; + } + if (substring) { + // TODO + return false; + } int diff = rightValue.compareTo(actualValue); switch (operator) { case EQUALS: @@ -92,6 +108,7 @@ public class CompareFilter extends OSGiFilter { } } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -101,6 +118,7 @@ public class CompareFilter extends OSGiFilter { return result; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java b/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java index f407c05d..8872d01c 100644 --- a/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/MultiOperatorFilter.java @@ -37,6 +37,7 @@ public abstract class MultiOperatorFilter extends OSGiFilter { abstract protected char operator(); + @Override public void append(StringBuffer builder) { builder.append('('); builder.append(operator()); @@ -54,6 +55,7 @@ public abstract class MultiOperatorFilter extends OSGiFilter { return subFilters; } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -63,6 +65,7 @@ public abstract class MultiOperatorFilter extends OSGiFilter { return result; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/src/java/org/apache/ivy/osgi/filter/NotFilter.java b/src/java/org/apache/ivy/osgi/filter/NotFilter.java index fce5cd88..5e436a63 100644 --- a/src/java/org/apache/ivy/osgi/filter/NotFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/NotFilter.java @@ -25,6 +25,7 @@ public class NotFilter extends UniOperatorFilter { super(subFilter); } + @Override protected char operator() { return '!'; } diff --git a/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java b/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java index e4067558..4d0b58a8 100644 --- a/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/OSGiFilter.java @@ -21,6 +21,7 @@ import java.util.Map; public abstract class OSGiFilter { + @Override public String toString() { StringBuffer builder = new StringBuffer(); append(builder); diff --git a/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java b/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java index cd3d6e22..7f21ea63 100644 --- a/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java +++ b/src/java/org/apache/ivy/osgi/filter/OSGiFilterParser.java @@ -92,6 +92,15 @@ public class OSGiFilterParser { if (c != '(') { throw new ParseException("Expecting '(' as the start of the filter", pos); } + OSGiFilter filter = parseFilterComp(); + readNext(); + if (c != ')') { + throw new ParseException("Expecting ')' as the end of the filter", pos); + } + return filter; + } + + private OSGiFilter parseFilterComp() throws ParseException { OSGiFilter filter; switch (readNext()) { case '&': @@ -105,17 +114,13 @@ public class OSGiFilterParser { break; default: unread(); - filter = parseCompare(); + filter = parseOperation(); break; } - readNext(); - if (c != ')') { - throw new ParseException("Expecting ')' as the end of the filter", pos); - } return filter; } - private OSGiFilter parseCompare() throws ParseException { + private OSGiFilter parseOperation() throws ParseException { String leftValue = parseCompareValue(); Operator operator = parseCompareOperator(); String rightValue = parseCompareValue(); @@ -137,12 +142,16 @@ public class OSGiFilterParser { } private boolean isOperator(char ch) { - return ch == '=' || ch == '<' || ch == '>'; + return ch == '=' || ch == '<' || ch == '>' || ch == '~'; } private Operator parseCompareOperator() throws ParseException { switch (readNext()) { case '=': + if (readNext() == '*') { + return Operator.PRESENT; + } + unread(); return Operator.EQUALS; case '>': if (readNext() == '=') { @@ -156,25 +165,30 @@ public class OSGiFilterParser { } unread(); return Operator.LOWER_THAN; + case '~': + if (readNext() == '=') { + return Operator.LOWER_OR_EQUAL; + } + unread(); default: break; } - throw new ParseException("Expecting an operator: =, <, <=, > or >=", pos); + throw new ParseException("Expecting an operator: =, <, <=, >, >=, ~= or =*", pos); } private OSGiFilter parseAnd() throws ParseException { AndFilter filter = new AndFilter(); - parseMultiOperator(filter); + parseFilterList(filter); return filter; } private OSGiFilter parseOr() throws ParseException { OrFilter filter = new OrFilter(); - parseMultiOperator(filter); + parseFilterList(filter); return filter; } - private void parseMultiOperator(MultiOperatorFilter filter) throws ParseException { + private void parseFilterList(MultiOperatorFilter filter) throws ParseException { do { skipWhiteSpace(); readNext(); diff --git a/src/java/org/apache/ivy/osgi/filter/OrFilter.java b/src/java/org/apache/ivy/osgi/filter/OrFilter.java index ef8b1266..e7e8031a 100644 --- a/src/java/org/apache/ivy/osgi/filter/OrFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/OrFilter.java @@ -29,6 +29,7 @@ public class OrFilter extends MultiOperatorFilter { super(filters); } + @Override protected char operator() { return '|'; } diff --git a/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java b/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java index 02e7ef50..59c6962c 100644 --- a/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java +++ b/src/java/org/apache/ivy/osgi/filter/UniOperatorFilter.java @@ -27,6 +27,7 @@ public abstract class UniOperatorFilter extends OSGiFilter { abstract protected char operator(); + @Override public void append(StringBuffer builder) { builder.append("("); builder.append(operator()); @@ -38,6 +39,7 @@ public abstract class UniOperatorFilter extends OSGiFilter { return subFilter; } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -45,6 +47,7 @@ public abstract class UniOperatorFilter extends OSGiFilter { return result; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; diff --git a/src/java/org/apache/ivy/osgi/obr/OBRResolver.java b/src/java/org/apache/ivy/osgi/obr/OBRResolver.java index 581be3c6..f4fb3e5d 100644 --- a/src/java/org/apache/ivy/osgi/obr/OBRResolver.java +++ b/src/java/org/apache/ivy/osgi/obr/OBRResolver.java @@ -25,7 +25,6 @@ import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.text.ParseException; import org.apache.ivy.core.cache.CacheResourceOptions; import org.apache.ivy.core.event.EventManager; @@ -62,6 +61,7 @@ public class OBRResolver extends AbstractOSGiResolver { this.forceMetadataUpdate = forceMetadataUpdate; } + @Override protected void init() { if (repoXmlFile != null && repoXmlURL != null) { throw new RuntimeException("The OBR repository resolver " + getName() @@ -125,10 +125,6 @@ public class OBRResolver extends AbstractOSGiResolver { } try { setRepoDescriptor(OBRXMLParser.parse(baseUri, in)); - } catch (ParseException e) { - throw new RuntimeException("The OBR repository resolver " + getName() - + " couldn't be configured: the file " + sourceLocation - + " is incorrectly formed (" + e.getMessage() + ")", e); } catch (IOException e) { throw new RuntimeException("The OBR repository resolver " + getName() + " couldn't be configured: the file " + sourceLocation diff --git a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java index 9353880e..3f9088c7 100644 --- a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java +++ b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLParser.java @@ -41,8 +41,8 @@ import org.xml.sax.SAXParseException; public class OBRXMLParser { - public static BundleRepoDescriptor parse(URI baseUri, InputStream in) throws ParseException, - IOException, SAXException { + public static BundleRepoDescriptor parse(URI baseUri, InputStream in) throws IOException, + SAXException { RepositoryHandler handler = new RepositoryHandler(baseUri); try { XMLHelper.parse(in, null, handler, null); @@ -68,12 +68,14 @@ public class OBRXMLParser { super(REPOSITORY); this.baseUri = baseUri; addChild(new ResourceHandler(), new ChildElementHandler() { + @Override public void childHanlded(ResourceHandler child) { repo.addBundle(child.bundleInfo); } }); } + @Override protected void handleAttributes(Attributes atts) { repo = new BundleRepoDescriptor(baseUri, ExecutionEnvironmentProfileProvider.getInstance()); @@ -109,6 +111,7 @@ public class OBRXMLParser { // resource addChild(new ResourceSourceHandler(), new ChildElementHandler() { + @Override public void childHanlded(ResourceSourceHandler child) { String uri = child.getBufferedChars().trim(); if (!uri.endsWith(".jar")) { @@ -129,23 +132,27 @@ public class OBRXMLParser { }); addChild(new ResourceDescriptionHandler(), new ChildElementHandler() { + @Override public void childHanlded(ResourceDescriptionHandler child) { bundleInfo.setDescription(child.getBufferedChars().trim()); } }); addChild(new ResourceDocumentationHandler(), new ChildElementHandler() { + @Override public void childHanlded(ResourceDocumentationHandler child) { bundleInfo.setDocumentation(child.getBufferedChars().trim()); } }); addChild(new ResourceLicenseHandler(), new ChildElementHandler() { + @Override public void childHanlded(ResourceLicenseHandler child) { bundleInfo.setLicense(child.getBufferedChars().trim()); } }); addChild(new ResourceSizeHandler(), new ChildElementHandler() { + @Override public void childHanlded(ResourceSizeHandler child) { String size = child.getBufferedChars().trim(); try { @@ -158,6 +165,7 @@ public class OBRXMLParser { } }); addChild(new CapabilityHandler(), new ChildElementHandler() { + @Override public void childHanlded(CapabilityHandler child) throws SAXParseException { try { @@ -169,6 +177,7 @@ public class OBRXMLParser { } }); addChild(new RequireHandler(), new ChildElementHandler() { + @Override public void childHanlded(RequireHandler child) throws SAXParseException { try { RequirementAdapter.adapt(bundleInfo, child.requirement); @@ -183,12 +192,14 @@ public class OBRXMLParser { } }); addChild(new ExtendHandler(), new ChildElementHandler() { + @Override public void childHanlded(ExtendHandler child) throws SAXParseException { // TODO handle fragment host } }); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String symbolicname = atts.getValue(SYMBOLIC_NAME); if (symbolicname == null) { @@ -224,6 +235,7 @@ public class OBRXMLParser { bundleInfo.setId(atts.getValue(ID)); } + @Override protected String getCurrentElementIdentifier() { return bundleInfo.getSymbolicName() + "/" + bundleInfo.getVersion(); } @@ -295,6 +307,7 @@ public class OBRXMLParser { super(CAPABILITY); addChild(new CapabilityPropertyHandler(), new ChildElementHandler() { + @Override public void childHanlded(CapabilityPropertyHandler child) { String name = child.name; String value = child.value; @@ -305,6 +318,7 @@ public class OBRXMLParser { }); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String name = getRequiredAttribute(atts, NAME); capability = new Capability(name); @@ -332,6 +346,7 @@ public class OBRXMLParser { super(CAPABILITY_PROPERTY); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { name = getRequiredAttribute(atts, NAME); value = getRequiredAttribute(atts, VALUE); @@ -357,6 +372,7 @@ public class OBRXMLParser { super(name); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String name = getRequiredAttribute(atts, NAME); diff --git a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java index 71d4d75f..0d3786f5 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java +++ b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java @@ -80,6 +80,7 @@ public class P2ArtifactParser implements XMLInputParser { // } // }); addChild(new MappingsHandler(), new ChildElementHandler() { + @Override public void childHanlded(MappingsHandler child) { for (Entry entry : child.outputByFilter.entrySet()) { OSGiFilter filter; @@ -95,6 +96,7 @@ public class P2ArtifactParser implements XMLInputParser { }); addChild(new ArtifactsHandler(p2Descriptor, artifactPatterns, repoUrl), new ChildElementHandler() { + @Override public void childHanlded(ArtifactsHandler child) { // nothing to do } @@ -118,12 +120,14 @@ public class P2ArtifactParser implements XMLInputParser { public MappingsHandler() { super(MAPPINGS); addChild(new RuleHandler(), new ChildElementHandler() { + @Override public void childHanlded(RuleHandler child) { outputByFilter.put(child.filter, child.output); } }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); outputByFilter = new LinkedHashMap(size); @@ -147,6 +151,7 @@ public class P2ArtifactParser implements XMLInputParser { super(RULE); } + @Override protected void handleAttributes(Attributes atts) { filter = atts.getValue(FILTER); output = atts.getValue(OUTPUT); @@ -164,6 +169,7 @@ public class P2ArtifactParser implements XMLInputParser { final Map artifactPatterns, final String repoUrl) { super(ARTIFACTS); addChild(new ArtifactHandler(), new ChildElementHandler() { + @Override public void childHanlded(ArtifactHandler child) throws SAXParseException { String url = getPattern(child.p2Artifact, child.properties); if (url != null) { @@ -224,12 +230,14 @@ public class P2ArtifactParser implements XMLInputParser { public ArtifactHandler() { super(ARTIFACT); addChild(new PropertiesHandler(), new ChildElementHandler() { + @Override public void childHanlded(PropertiesHandler child) { properties = child.properties; } }); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); Version version; diff --git a/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java b/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java index 8b1b0417..1a9bf78d 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java +++ b/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java @@ -66,6 +66,7 @@ public class P2CompositeParser implements XMLInputParser { public RepositoryHandler() { super(REPOSITORY); addChild(new ChildrenHandler(), new ChildElementHandler() { + @Override public void childHanlded(ChildrenHandler child) { childLocations = child.childLocations; } @@ -89,12 +90,14 @@ public class P2CompositeParser implements XMLInputParser { public ChildrenHandler() { super(CHILDREN); addChild(new ChildHandler(), new ChildElementHandler() { + @Override public void childHanlded(ChildHandler child) { childLocations.add(child.location); } }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); childLocations = new ArrayList(size); @@ -114,6 +117,7 @@ public class P2CompositeParser implements XMLInputParser { super(CHILD); } + @Override protected void handleAttributes(Attributes atts) { location = atts.getValue(LOCATION); } diff --git a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java index 1630424e..c8a24ad2 100644 --- a/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java +++ b/src/java/org/apache/ivy/osgi/p2/P2MetadataParser.java @@ -93,6 +93,7 @@ public class P2MetadataParser implements XMLInputParser { // } // }); addChild(new UnitsHandler(), new ChildElementHandler() { + @Override public void childHanlded(UnitsHandler child) { for (BundleInfo bundle : child.bundles) { p2Descriptor.addBundle(bundle); @@ -100,6 +101,7 @@ public class P2MetadataParser implements XMLInputParser { } }); addChild(new ReferencesHandler(), new ChildElementHandler() { + @Override public void childHanlded(ReferencesHandler child) { } }); @@ -126,12 +128,14 @@ public class P2MetadataParser implements XMLInputParser { super(REFERENCES); addChild(new RepositoryReferenceHandler(), new ChildElementHandler() { + @Override public void childHanlded(RepositoryReferenceHandler child) { repositoryUris.add(child.uri); } }); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { int size = Integer.parseInt(atts.getValue(SIZE)); repositoryUris = new ArrayList(size); @@ -164,6 +168,7 @@ public class P2MetadataParser implements XMLInputParser { URI uri; + @Override protected void handleAttributes(Attributes atts) throws SAXException { // type = Integer.parseInt(atts.getValue(TYPE)); // options = Integer.parseInt(atts.getValue(OPTIONS)); @@ -202,6 +207,7 @@ public class P2MetadataParser implements XMLInputParser { public UnitsHandler() { super(UNITS); addChild(new UnitHandler(), new ChildElementHandler() { + @Override public void childHanlded(UnitHandler child) { if (child.bundleInfo != null && !child.bundleInfo.getCapabilities().isEmpty()) { bundles.add(child.bundleInfo); @@ -210,6 +216,7 @@ public class P2MetadataParser implements XMLInputParser { }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); bundles = new ArrayList(size); @@ -239,6 +246,7 @@ public class P2MetadataParser implements XMLInputParser { // }); addChild(new PropertiesHandler(CATEGORY_PROPERTY), new ChildElementHandler() { + @Override public void childHanlded(PropertiesHandler child) { String category = child.properties.get(CATEGORY_PROPERTY); if (category != null && Boolean.valueOf(category).booleanValue()) { @@ -249,6 +257,7 @@ public class P2MetadataParser implements XMLInputParser { } }); addChild(new ProvidesHandler(), new ChildElementHandler() { + @Override public void childHanlded(ProvidesHandler child) { if ("source".equals(child.eclipseType)) { // this is some source of some bundle @@ -270,10 +279,12 @@ public class P2MetadataParser implements XMLInputParser { } }); addChild(new FilterHandler(), new ChildElementHandler() { + @Override public void childHanlded(FilterHandler child) { } }); addChild(new RequiresHandler(), new ChildElementHandler() { + @Override public void childHanlded(RequiresHandler child) { for (BundleRequirement requirement : child.requirements) { bundleInfo.addRequirement(requirement); @@ -282,15 +293,18 @@ public class P2MetadataParser implements XMLInputParser { }); addChild(new HostRequirementsHandler(), new ChildElementHandler() { + @Override public void childHanlded(HostRequirementsHandler child) { } }); addChild(new MetaRequirementsHandler(), new ChildElementHandler() { + @Override public void childHanlded(MetaRequirementsHandler child) { } }); addChild(new ArtifactsHandler(), new ChildElementHandler() { + @Override public void childHanlded(ArtifactsHandler child) { } }); @@ -299,6 +313,7 @@ public class P2MetadataParser implements XMLInputParser { // } // }); addChild(new TouchpointDataHandler(), new ChildElementHandler() { + @Override public void childHanlded(TouchpointDataHandler child) throws SAXParseException { if (child.zipped != null) { bundleInfo.setHasInnerClasspath(child.zipped.booleanValue()); @@ -375,6 +390,7 @@ public class P2MetadataParser implements XMLInputParser { } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); String version = atts.getValue(VERSION); @@ -448,6 +464,7 @@ public class P2MetadataParser implements XMLInputParser { public ProvidesHandler() { super(PROVIDES); addChild(new ProvidedHandler(), new ChildElementHandler() { + @Override public void childHanlded(ProvidedHandler child) { if (child.namespace.equals("org.eclipse.equinox.p2.eclipse.type")) { eclipseType = child.name; @@ -472,6 +489,7 @@ public class P2MetadataParser implements XMLInputParser { }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); capabilities = new ArrayList(size); @@ -499,6 +517,7 @@ public class P2MetadataParser implements XMLInputParser { super(PROVIDED); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { namespace = atts.getValue(NAMESPACE); name = atts.getValue(NAME); @@ -521,6 +540,7 @@ public class P2MetadataParser implements XMLInputParser { public AbstractRequirementHandler(String name) { super(name); addChild(new RequiredHandler(), new ChildElementHandler() { + @Override public void childHanlded(RequiredHandler child) { String name = child.name; VersionRange range = child.range; @@ -538,6 +558,7 @@ public class P2MetadataParser implements XMLInputParser { }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); requirements = new ArrayList(size); @@ -590,6 +611,7 @@ public class P2MetadataParser implements XMLInputParser { // }); } + @Override protected void handleAttributes(Attributes atts) throws SAXParseException { namespace = atts.getValue(NAMESPACE); name = atts.getValue(NAME); @@ -635,12 +657,14 @@ public class P2MetadataParser implements XMLInputParser { public ArtifactsHandler() { super(ARTIFACTS); addChild(new ArtifactHandler(), new ChildElementHandler() { + @Override public void childHanlded(ArtifactHandler child) { artifacts.add(child.artifact); } }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); artifacts = new ArrayList(size); @@ -664,6 +688,7 @@ public class P2MetadataParser implements XMLInputParser { super(ARTIFACT); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); String version = atts.getValue(VERSION); @@ -710,6 +735,7 @@ public class P2MetadataParser implements XMLInputParser { public TouchpointDataHandler() { super(TOUCHPOINTDATA); addChild(new InstructionsHandler(), new ChildElementHandler() { + @Override public void childHanlded(InstructionsHandler child) { manifest = child.manifest; zipped = child.zipped; @@ -717,6 +743,7 @@ public class P2MetadataParser implements XMLInputParser { }); } + @Override protected void handleAttributes(Attributes atts) { // String size = atts.getValue(SIZE); } @@ -736,6 +763,7 @@ public class P2MetadataParser implements XMLInputParser { public InstructionsHandler() { super(INSTRUCTIONS); addChild(new InstructionHandler(), new ChildElementHandler() { + @Override public void childHanlded(InstructionHandler child) { manifest = null; zipped = null; @@ -749,6 +777,7 @@ public class P2MetadataParser implements XMLInputParser { }); } + @Override protected void handleAttributes(Attributes atts) { // String size = atts.getValue(SIZE); } @@ -768,6 +797,7 @@ public class P2MetadataParser implements XMLInputParser { setBufferingChar(true); } + @Override protected void handleAttributes(Attributes atts) { key = atts.getValue(KEY); } diff --git a/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java b/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java index 60cb96b4..5e1c7057 100644 --- a/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java +++ b/src/java/org/apache/ivy/osgi/p2/PropertiesParser.java @@ -39,6 +39,7 @@ public class PropertiesParser { super(PROPERTIES); final List propList = Arrays.asList(props); addChild(new PropertyHandler(), new ChildElementHandler() { + @Override public void childHanlded(PropertyHandler child) { if (propList.isEmpty() || propList.contains(child.name)) { properties.put(child.name, child.value); @@ -47,6 +48,7 @@ public class PropertiesParser { }); } + @Override protected void handleAttributes(Attributes atts) { int size = Integer.parseInt(atts.getValue(SIZE)); properties = new HashMap(size); @@ -70,6 +72,7 @@ public class PropertiesParser { super(PROPERTY); } + @Override protected void handleAttributes(Attributes atts) { name = atts.getValue(NAME); value = atts.getValue(VALUE); diff --git a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java index 45e92ed7..8a773f25 100644 --- a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java +++ b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java @@ -289,6 +289,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { return found; } + @Override public ResolvedResource findArtifactRef(Artifact artifact, Date date) { URL url = artifact.getUrl(); if (url == null) { @@ -313,20 +314,20 @@ public abstract class AbstractOSGiResolver extends BasicResolver { } @Override - protected Collection/* */filterNames(Collection/* */names) { + protected Collection filterNames(Collection names) { getSettings().filterIgnore(names); return names; } @Override - protected Collection findNames(Map tokenValues, String token) { + protected Collection findNames(Map tokenValues, String token) { if (IvyPatternHelper.ORGANISATION_KEY.equals(token)) { return getRepoDescriptor().getCapabilities(); } - String osgiType = (String) tokenValues.get(IvyPatternHelper.ORGANISATION_KEY); + String osgiType = tokenValues.get(IvyPatternHelper.ORGANISATION_KEY); if (osgiType == null || osgiType.length() == 0) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } if (IvyPatternHelper.MODULE_KEY.equals(token)) { @@ -334,7 +335,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { } if (IvyPatternHelper.REVISION_KEY.equals(token)) { - String name = (String) tokenValues.get(IvyPatternHelper.MODULE_KEY); + String name = tokenValues.get(IvyPatternHelper.MODULE_KEY); List versions = new ArrayList(); Set mds = getRepoDescriptor().findModules(osgiType, name); if (mds != null) { @@ -346,9 +347,9 @@ public abstract class AbstractOSGiResolver extends BasicResolver { } if (IvyPatternHelper.CONF_KEY.equals(token)) { - String name = (String) tokenValues.get(IvyPatternHelper.MODULE_KEY); + String name = tokenValues.get(IvyPatternHelper.MODULE_KEY); if (name == null) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } if (osgiType.equals(BundleInfo.PACKAGE_TYPE)) { return Collections.singletonList(BundleInfoAdapter.CONF_USE_PREFIX + name); @@ -356,11 +357,11 @@ public abstract class AbstractOSGiResolver extends BasicResolver { Collection mds = ModuleDescriptorWrapper.unwrap(getRepoDescriptor() .findModules(osgiType, name)); if (mds == null) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } - String version = (String) tokenValues.get(IvyPatternHelper.REVISION_KEY); + String version = tokenValues.get(IvyPatternHelper.REVISION_KEY); if (version == null) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } ModuleDescriptor found = null; for (ModuleDescriptor md : mds) { @@ -369,12 +370,12 @@ public abstract class AbstractOSGiResolver extends BasicResolver { } } if (found == null) { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } List confs = Arrays.asList(found.getConfigurationsNames()); return confs; } - return Collections.EMPTY_LIST; + return Collections.emptyList(); } /** @@ -404,54 +405,62 @@ public abstract class AbstractOSGiResolver extends BasicResolver { } @Override - public Map[] listTokenValues(String[] tokens, Map criteria) { + public Map[] listTokenValues(String[] tokens, Map criteria) { Set tokenSet = new HashSet(Arrays.asList(tokens)); Set> listTokenValues = listTokenValues(tokenSet, criteria); return listTokenValues.toArray(new Map[listTokenValues.size()]); } private Set> listTokenValues(Set tokens, - Map criteria) { + Map criteria) { + Map stringCriteria = new HashMap(); + for (Entry entry : criteria.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + if (!(value instanceof String)) { + // no support for matcher for now + return Collections.emptySet(); + } + stringCriteria.put(key, (String) value); + } + if (tokens.isEmpty()) { - return Collections.singleton(criteria); + // no more tokens to resolve + return Collections.singleton(stringCriteria); } Set remainingTokens = new HashSet(tokens); - Map values = new HashMap(); - remainingTokens.remove(IvyPatternHelper.ORGANISATION_KEY); - String osgiType = criteria.get(IvyPatternHelper.ORGANISATION_KEY); - if (osgiType == null || osgiType.length() == 0) { - return Collections.emptySet(); - } - values.put(IvyPatternHelper.ORGANISATION_KEY, osgiType); - + String osgiType = stringCriteria.get(IvyPatternHelper.ORGANISATION_KEY); if (osgiType == null) { Set> tokenValues = new HashSet>(); - Map newCriteria = new HashMap(criteria); + Map newCriteria = new HashMap(criteria); newCriteria.put(IvyPatternHelper.ORGANISATION_KEY, BundleInfo.BUNDLE_TYPE); tokenValues.addAll(listTokenValues(remainingTokens, newCriteria)); - newCriteria = new HashMap(criteria); + newCriteria = new HashMap(criteria); newCriteria.put(IvyPatternHelper.ORGANISATION_KEY, BundleInfo.PACKAGE_TYPE); tokenValues.addAll(listTokenValues(remainingTokens, newCriteria)); - newCriteria = new HashMap(criteria); + newCriteria = new HashMap(criteria); newCriteria.put(IvyPatternHelper.ORGANISATION_KEY, BundleInfo.SERVICE_TYPE); tokenValues.addAll(listTokenValues(remainingTokens, newCriteria)); return tokenValues; } + Map values = new HashMap(); + values.put(IvyPatternHelper.ORGANISATION_KEY, osgiType); + Set capabilities = getRepoDescriptor().getCapabilityValues(osgiType); if (capabilities == null || capabilities.isEmpty()) { return Collections.emptySet(); } remainingTokens.remove(IvyPatternHelper.MODULE_KEY); - String module = criteria.get(IvyPatternHelper.MODULE_KEY); + String module = stringCriteria.get(IvyPatternHelper.MODULE_KEY); if (module == null) { Set> tokenValues = new HashSet>(); for (String name : capabilities) { - Map newCriteria = new HashMap(criteria); + Map newCriteria = new HashMap(criteria); newCriteria.put(IvyPatternHelper.MODULE_KEY, name); tokenValues.addAll(listTokenValues(remainingTokens, newCriteria)); } @@ -460,7 +469,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { values.put(IvyPatternHelper.MODULE_KEY, module); remainingTokens.remove(IvyPatternHelper.REVISION_KEY); - String rev = criteria.get(IvyPatternHelper.REVISION_KEY); + String rev = stringCriteria.get(IvyPatternHelper.REVISION_KEY); if (rev == null) { Set mdws = getRepoDescriptor().findModules(osgiType, module); if (mdws == null || mdws.isEmpty()) { @@ -468,7 +477,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { } Set> tokenValues = new HashSet>(); for (ModuleDescriptorWrapper mdw : mdws) { - Map newCriteria = new HashMap(criteria); + Map newCriteria = new HashMap(criteria); newCriteria.put(IvyPatternHelper.REVISION_KEY, mdw.getBundleInfo().getVersion() .toString()); tokenValues.addAll(listTokenValues(remainingTokens, newCriteria)); @@ -478,7 +487,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { values.put(IvyPatternHelper.REVISION_KEY, rev); remainingTokens.remove(IvyPatternHelper.CONF_KEY); - String conf = criteria.get(IvyPatternHelper.CONF_KEY); + String conf = stringCriteria.get(IvyPatternHelper.CONF_KEY); if (conf == null) { if (osgiType.equals(BundleInfo.PACKAGE_TYPE)) { values.put(IvyPatternHelper.CONF_KEY, BundleInfoAdapter.CONF_USE_PREFIX + module); @@ -508,7 +517,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { List configurations = BundleInfoAdapter .getConfigurations(found.getBundleInfo()); for (int i = 0; i < configurations.size(); i++) { - Map newCriteria = new HashMap(criteria); + Map newCriteria = new HashMap(stringCriteria); newCriteria.put(IvyPatternHelper.CONF_KEY, configurations.get(i)); tokenValues.add(newCriteria); } @@ -519,6 +528,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { return Collections.singleton(values); } + @Override protected long get(Resource resource, File dest) throws IOException { Message.verbose("\t" + getName() + ": downloading " + resource.getName()); Message.debug("\t\tto " + dest); @@ -529,6 +539,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver { return dest.length(); } + @Override protected Resource getResource(String source) throws IOException { return getRepository().getResource(source); } diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java b/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java index 08f2fb99..887ed691 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/EclipseUpdateSiteParser.java @@ -34,7 +34,7 @@ import org.xml.sax.SAXException; public class EclipseUpdateSiteParser { - public static UpdateSite parse(InputStream in) throws ParseException, IOException, SAXException { + public static UpdateSite parse(InputStream in) throws IOException, SAXException { SiteHandler handler = new SiteHandler(); try { XMLHelper.parse(in, null, handler, null); @@ -68,6 +68,7 @@ public class EclipseUpdateSiteParser { // } // }); addChild(new FeatureHandler(), new ChildElementHandler() { + @Override public void childHanlded(FeatureHandler child) { updatesite.addFeature(child.feature); } @@ -84,6 +85,7 @@ public class EclipseUpdateSiteParser { // }); } + @Override protected void handleAttributes(Attributes atts) { updatesite = new UpdateSite(); @@ -170,12 +172,14 @@ public class EclipseUpdateSiteParser { public FeatureHandler() { super(FEATURE); addChild(new CategoryHandler(), new ChildElementHandler() { + @Override public void childHanlded(CategoryHandler child) { feature.addCategory(child.name); } }); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); String version = atts.getValue(VERSION); @@ -213,6 +217,7 @@ public class EclipseUpdateSiteParser { super(CATEGORY); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { name = atts.getValue(NAME); } diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java b/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java index 739b8284..444097ae 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/FeatureParser.java @@ -33,8 +33,7 @@ import org.xml.sax.SAXException; public class FeatureParser { - public static EclipseFeature parse(InputStream in) throws ParseException, IOException, - SAXException { + public static EclipseFeature parse(InputStream in) throws IOException, SAXException { FeatureHandler handler = new FeatureHandler(); try { XMLHelper.parse(in, null, handler, null); @@ -81,26 +80,31 @@ public class FeatureParser { public FeatureHandler() { super(FEATURE); addChild(new DescriptionHandler(), new ChildElementHandler() { + @Override public void childHanlded(DescriptionHandler child) { feature.setDescription(child.getBufferedChars().trim()); } }); addChild(new LicenseHandler(), new ChildElementHandler() { + @Override public void childHanlded(LicenseHandler child) { feature.setLicense(child.getBufferedChars().trim()); } }); addChild(new CopyrightHandler(), new ChildElementHandler() { + @Override public void childHanlded(CopyrightHandler child) { feature.setCopyright(child.getBufferedChars().trim()); } }); addChild(new PluginHandler(), new ChildElementHandler() { + @Override public void childHanlded(PluginHandler child) { feature.addPlugin(child.plugin); } }); addChild(new RequiresHandler(), new ChildElementHandler() { + @Override public void childHanlded(RequiresHandler child) { for (Require require : child.requires) { feature.addRequire(require); @@ -113,6 +117,7 @@ public class FeatureParser { // }); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { String id = atts.getValue(ID); String version = atts.getValue(VERSION); @@ -159,6 +164,7 @@ public class FeatureParser { super(PLUGIN); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { plugin = new EclipsePlugin(); @@ -189,6 +195,7 @@ public class FeatureParser { setBufferingChar(true); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { // String url = atts.getValue(URL); } @@ -205,6 +212,7 @@ public class FeatureParser { setBufferingChar(true); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { // String url = atts.getValue(URL); } @@ -222,6 +230,7 @@ public class FeatureParser { setBufferingChar(true); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { // String url = atts.getValue(URL); } @@ -236,6 +245,7 @@ public class FeatureParser { public RequiresHandler() { super(REQUIRES); addChild(new ImportHandler(), new ChildElementHandler() { + @Override public void childHanlded(ImportHandler child) { requires.add(child.require); } @@ -263,6 +273,7 @@ public class FeatureParser { super(IMPORT); } + @Override protected void handleAttributes(Attributes atts) throws SAXException { require = new Require(); diff --git a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java index 681823b8..16fa1693 100644 --- a/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java +++ b/src/java/org/apache/ivy/osgi/updatesite/xml/UpdateSiteDigestParser.java @@ -19,7 +19,6 @@ package org.apache.ivy.osgi.updatesite.xml; import java.io.IOException; import java.io.InputStream; -import java.text.ParseException; import javax.xml.parsers.ParserConfigurationException; @@ -32,8 +31,8 @@ import org.xml.sax.SAXException; public class UpdateSiteDigestParser { - public static UpdateSiteDescriptor parse(InputStream in, UpdateSite site) - throws ParseException, IOException, SAXException { + public static UpdateSiteDescriptor parse(InputStream in, UpdateSite site) throws IOException, + SAXException { DigestHandler handler = new DigestHandler(site); try { XMLHelper.parse(in, null, handler, null); @@ -54,6 +53,7 @@ public class UpdateSiteDigestParser { repoDescriptor = new UpdateSiteDescriptor(site.getUri(), ExecutionEnvironmentProfileProvider.getInstance()); addChild(new FeatureHandler(), new ChildElementHandler() { + @Override public void childHanlded(FeatureHandler child) { repoDescriptor.addFeature(child.feature); } diff --git a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java index 05fb53a4..5434d8a8 100644 --- a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java +++ b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java @@ -92,6 +92,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con return charBuffer.toString(); } + @Override public void setDocumentLocator(Locator locator) { this.locator = locator; for (DelegatingHandler subHandler : saxHandlerMapping.values()) { @@ -146,6 +147,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con } } + @Override public final void startDocument() throws SAXException { if (skip) { return; @@ -164,6 +166,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void endDocument() throws SAXException { if (skip) { return; @@ -182,6 +185,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void startElement(final String uri, final String localName, final String n, final Attributes atts) throws SAXException { // reset the char buffer @@ -246,6 +250,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void endElement(final String uri, final String localName, final String n) throws SAXException { if (delegate != null) { @@ -297,6 +302,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con } + @Override public final void characters(char[] ch, int start, int length) throws SAXException { if (skip) { return; @@ -317,6 +323,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con } } + @Override public final void startPrefixMapping(String prefix, String uri) throws SAXException { if (skip) { return; @@ -335,6 +342,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void endPrefixMapping(String prefix) throws SAXException { if (skip) { return; @@ -353,6 +361,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { if (skip) { return; @@ -371,6 +380,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void notationDecl(String name, String publicId, String systemId) throws SAXException { if (skip) { @@ -391,6 +401,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void processingInstruction(String target, String data) throws SAXException { if (skip) { return; @@ -409,6 +420,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void skippedEntity(String name) throws SAXException { if (skip) { return; @@ -427,9 +439,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } - /** - * @throws SAXException - */ + @Override public final void unparsedEntityDecl(String name, String publicId, String systemId, String notationName) throws SAXException { if (skip) { @@ -452,6 +462,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // ERROR HANDLING + @Override public final void warning(SAXParseException exception) throws SAXException { if (skip) { return; @@ -470,6 +481,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void error(SAXParseException exception) throws SAXException { if (skip) { return; @@ -488,6 +500,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con // by default do nothing } + @Override public final void fatalError(SAXParseException exception) throws SAXException { if (skip) { return; diff --git a/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java index ee683371..531f6325 100644 --- a/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/AbstractConflictManager.java @@ -20,6 +20,7 @@ package org.apache.ivy.plugins.conflict; import java.util.Collection; import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.plugins.IvySettingsAware; @@ -44,10 +45,12 @@ public abstract class AbstractConflictManager implements ConflictManager, IvySet this.name = name; } + @Override public String toString() { return name; } - public void handleAllBlacklistedRevisions(DependencyDescriptor dd, Collection foundBlacklisted) { + public void handleAllBlacklistedRevisions(DependencyDescriptor dd, + Collection foundBlacklisted) { } } diff --git a/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java index 46c20606..645cbe55 100644 --- a/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/ConflictManager.java @@ -20,6 +20,7 @@ package org.apache.ivy.plugins.conflict; import java.util.Collection; import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.resolve.IvyNode; public interface ConflictManager { @@ -38,7 +39,7 @@ public interface ConflictManager { * @return a Collection of IvyNode which have not been evicted, or null if conflict management * resolution is not possible yet */ - Collection resolveConflicts(IvyNode parent, Collection conflicts); + Collection resolveConflicts(IvyNode parent, Collection conflicts); String getName(); @@ -56,5 +57,5 @@ public interface ConflictManager { * the list of all ModuleRevisionId found which are blacklisted */ void handleAllBlacklistedRevisions(DependencyDescriptor dd, - Collection/* */foundBlacklisted); + Collection foundBlacklisted); } diff --git a/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java index 34815bfa..b178fb1a 100644 --- a/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/FixedConflictManager.java @@ -20,22 +20,21 @@ package org.apache.ivy.plugins.conflict; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; import org.apache.ivy.core.resolve.IvyNode; public class FixedConflictManager extends AbstractConflictManager { - private Collection revisions; + + private Collection revisions; public FixedConflictManager(String[] revs) { revisions = Arrays.asList(revs); setName("fixed" + revisions); } - public Collection resolveConflicts(IvyNode parent, Collection conflicts) { - Collection resolved = new ArrayList(conflicts.size()); - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + public Collection resolveConflicts(IvyNode parent, Collection conflicts) { + Collection resolved = new ArrayList(conflicts.size()); + for (IvyNode node : conflicts) { String revision = node.getResolvedId().getRevision(); if (revisions.contains(revision)) { resolved.add(node); @@ -44,7 +43,7 @@ public class FixedConflictManager extends AbstractConflictManager { return resolved; } - public Collection getRevs() { + public Collection getRevs() { return revisions; } diff --git a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java index f4e775cf..a9e4c99e 100644 --- a/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManager.java @@ -71,19 +71,20 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { super(name, strategy); } - public Collection resolveConflicts(IvyNode parent, Collection conflicts) { + @Override + public Collection resolveConflicts(IvyNode parent, Collection conflicts) { if (conflicts.size() < 2) { return conflicts; } VersionMatcher versionMatcher = getSettings().getVersionMatcher(); - Iterator iter = conflicts.iterator(); - IvyNode node = (IvyNode) iter.next(); + Iterator iter = conflicts.iterator(); + IvyNode node = iter.next(); ModuleRevisionId mrid = node.getResolvedId(); if (versionMatcher.isDynamic(mrid)) { while (iter.hasNext()) { - IvyNode other = (IvyNode) iter.next(); + IvyNode other = iter.next(); if (versionMatcher.isDynamic(other.getResolvedId())) { // two dynamic versions in conflict, not enough information yet return null; @@ -98,17 +99,17 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { if (conflicts.size() == 2) { // very common special case of only two modules in conflict, // let's return the second one (static) - Iterator it = conflicts.iterator(); + Iterator it = conflicts.iterator(); it.next(); return Collections.singleton(it.next()); } - Collection newConflicts = new LinkedHashSet(conflicts); + Collection newConflicts = new LinkedHashSet(conflicts); newConflicts.remove(node); return super.resolveConflicts(parent, newConflicts); } else { // the first node is a static revision, let's see if all other versions match while (iter.hasNext()) { - IvyNode other = (IvyNode) iter.next(); + IvyNode other = iter.next(); if (!versionMatcher.accept(other.getResolvedId(), mrid)) { // incompatibility found if (!handleIncompatibleConflict(parent, conflicts, node, other)) { @@ -152,8 +153,8 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { * @return true if the incompatible conflict has been handled, false otherwise (in which case * resolveConflicts should return null) */ - private boolean handleIncompatibleConflict(IvyNode parent, Collection conflicts, IvyNode node, - IvyNode other) { + private boolean handleIncompatibleConflict(IvyNode parent, Collection conflicts, + IvyNode node, IvyNode other) { // we never actually return anything else than false or throw an exception, // but returning a boolean make the calling code cleaner try { @@ -184,14 +185,14 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { private void blackListIncompatibleCallerAndRestartResolveIfPossible(IvySettings settings, IvyNode parent, IvyNode selected, IvyNode evicted) { - Stack callerStack = new Stack(); + Stack callerStack = new Stack(); callerStack.push(evicted); - final Collection toBlacklist = blackListIncompatibleCaller(settings.getVersionMatcher(), - parent, selected, evicted, callerStack); + Collection toBlacklist = blackListIncompatibleCaller( + settings.getVersionMatcher(), parent, selected, evicted, callerStack); if (toBlacklist != null) { final StringBuffer blacklisted = new StringBuffer(); - for (Iterator iterator = toBlacklist.iterator(); iterator.hasNext();) { - IvyNodeBlacklist blacklist = (IvyNodeBlacklist) iterator.next(); + for (Iterator iterator = toBlacklist.iterator(); iterator.hasNext();) { + IvyNodeBlacklist blacklist = iterator.next(); blacklist.getBlacklistedNode().blacklist(blacklist); blacklisted.append(blacklist.getBlacklistedNode()); if (iterator.hasNext()) { @@ -212,9 +213,9 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { } } - private boolean handleIncompatibleCaller(Stack callerStack, IvyNode node, IvyNode callerNode, - IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode, - Collection blacklisted, VersionMatcher versionMatcher) { + private boolean handleIncompatibleCaller(Stack callerStack, IvyNode node, + IvyNode callerNode, IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode, + Collection blacklisted, VersionMatcher versionMatcher) { if (callerStack.subList(0, callerStack.size() - 1).contains(node)) { // circular dependency found and handled: the current top of the stack (node) // was already contained in the rest of the stack, the circle is closed, nothing @@ -222,8 +223,8 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { return true; } else { callerStack.push(callerNode); - Collection sub = blackListIncompatibleCaller(versionMatcher, conflictParent, - selectedNode, evictedNode, callerStack); + Collection sub = blackListIncompatibleCaller(versionMatcher, + conflictParent, selectedNode, evictedNode, callerStack); callerStack.pop(); if (sub == null) { // propagate the fact that a path with unblacklistable caller has been found @@ -251,11 +252,11 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { * @return the collection of blacklisting to do, null if a blacklist is not possible in at least * one caller path */ - private Collection/* */blackListIncompatibleCaller( - VersionMatcher versionMatcher, IvyNode conflictParent, IvyNode selectedNode, - IvyNode evictedNode, Stack/* */callerStack) { - Collection/* */blacklisted = new ArrayList/* */(); - IvyNode node = (IvyNode) callerStack.peek(); + private Collection blackListIncompatibleCaller(VersionMatcher versionMatcher, + IvyNode conflictParent, IvyNode selectedNode, IvyNode evictedNode, + Stack callerStack) { + Collection blacklisted = new ArrayList(); + IvyNode node = callerStack.peek(); String rootModuleConf = conflictParent.getData().getReport().getConfiguration(); Caller[] callers = node.getCallers(rootModuleConf); for (int i = 0; i < callers.length; i++) { @@ -282,30 +283,30 @@ public class LatestCompatibleConflictManager extends LatestConflictManager { return blacklisted; } - protected void handleUnsolvableConflict(IvyNode parent, Collection conflicts, IvyNode node1, - IvyNode node2) { + protected void handleUnsolvableConflict(IvyNode parent, Collection conflicts, + IvyNode node1, IvyNode node2) { throw new StrictConflictException(node1, node2); } + @Override public void handleAllBlacklistedRevisions(DependencyDescriptor dd, - Collection/* */foundBlacklisted) { + Collection foundBlacklisted) { ResolveData resolveData = IvyContext.getContext().getResolveData(); - Collection/* */blacklisted = new HashSet(); - for (Iterator iterator = foundBlacklisted.iterator(); iterator.hasNext();) { - ModuleRevisionId mrid = (ModuleRevisionId) iterator.next(); + Collection blacklisted = new HashSet(); + for (ModuleRevisionId mrid : foundBlacklisted) { blacklisted.add(resolveData.getNode(mrid)); } - for (Iterator iterator = blacklisted.iterator(); iterator.hasNext();) { - IvyNode node = (IvyNode) iterator.next(); + for (IvyNode node : blacklisted) { IvyNodeBlacklist bdata = node.getBlacklistData(resolveData.getReport() .getConfiguration()); handleUnsolvableConflict(bdata.getConflictParent(), - Arrays.asList(new Object[] {bdata.getEvictedNode(), bdata.getSelectedNode()}), + Arrays.asList(bdata.getEvictedNode(), bdata.getSelectedNode()), bdata.getEvictedNode(), bdata.getSelectedNode()); } } + @Override public String toString() { return getName(); } diff --git a/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java index aafe069d..9cccb59a 100644 --- a/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java @@ -20,7 +20,6 @@ package org.apache.ivy.plugins.conflict; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.List; import org.apache.ivy.core.module.descriptor.DependencyDescriptor; @@ -78,12 +77,11 @@ public class LatestConflictManager extends AbstractConflictManager { this.strategy = strategy; } - public Collection resolveConflicts(IvyNode parent, Collection conflicts) { + public Collection resolveConflicts(IvyNode parent, Collection conflicts) { if (conflicts.size() < 2) { return conflicts; } - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + for (IvyNode node : conflicts) { DependencyDescriptor dd = node.getDependencyDescriptor(parent); if (dd != null && dd.isForce() && parent.getResolvedId().equals(dd.getParentRevisionId())) { @@ -95,17 +93,15 @@ public class LatestConflictManager extends AbstractConflictManager { * If the list of conflicts contains dynamic revisions, delay the conflict calculation until * they are resolved. TODO: we probably could already evict some of the dynamic revisions! */ - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + for (IvyNode node : conflicts) { ModuleRevisionId modRev = node.getResolvedId(); if (getSettings().getVersionMatcher().isDynamic(modRev)) { return null; } } - ArrayList unevicted = new ArrayList(); - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + ArrayList unevicted = new ArrayList(); + for (IvyNode node : conflicts) { if (!node.isCompletelyEvicted()) unevicted.add(node); } @@ -128,13 +124,12 @@ public class LatestConflictManager extends AbstractConflictManager { } } - protected ArtifactInfo[] toArtifactInfo(Collection conflicts) { - List artifacts = new ArrayList(conflicts.size()); - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + protected ArtifactInfo[] toArtifactInfo(Collection conflicts) { + List artifacts = new ArrayList(conflicts.size()); + for (IvyNode node : conflicts) { artifacts.add(new IvyNodeArtifactInfo(node)); } - return (ArtifactInfo[]) artifacts.toArray(new ArtifactInfo[artifacts.size()]); + return artifacts.toArray(new ArtifactInfo[artifacts.size()]); } public LatestStrategy getStrategy() { @@ -165,6 +160,7 @@ public class LatestConflictManager extends AbstractConflictManager { this.strategy = strategy; } + @Override public String toString() { return strategy != null ? String.valueOf(strategy) : strategyName; } diff --git a/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java index cd6f5cee..39dc8f43 100644 --- a/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/NoConflictManager.java @@ -26,7 +26,7 @@ public class NoConflictManager extends AbstractConflictManager { setName("all"); } - public Collection resolveConflicts(IvyNode parent, Collection conflicts) { + public Collection resolveConflicts(IvyNode parent, Collection conflicts) { return conflicts; } } diff --git a/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java index b003cbf3..3dec1683 100644 --- a/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/RegexpConflictManager.java @@ -20,7 +20,6 @@ package org.apache.ivy.plugins.conflict; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,10 +65,9 @@ public class RegexpConflictManager extends AbstractConflictManager { mIgnoreNonMatching = ignoreNonMatching; } - public Collection resolveConflicts(IvyNode parent, Collection conflicts) { + public Collection resolveConflicts(IvyNode parent, Collection conflicts) { IvyNode lastNode = null; - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); + for (IvyNode node : conflicts) { if (lastNode != null && !matchEquals(node, lastNode)) { String msg = lastNode + ":" + getMatch(lastNode) + " (needed by " diff --git a/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java b/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java index 7d3fde4b..b9af702a 100644 --- a/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java +++ b/src/java/org/apache/ivy/plugins/conflict/StrictConflictManager.java @@ -19,7 +19,6 @@ package org.apache.ivy.plugins.conflict; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import org.apache.ivy.core.resolve.IvyNode; import org.apache.ivy.plugins.version.VersionMatcher; @@ -29,13 +28,11 @@ public class StrictConflictManager extends AbstractConflictManager { public StrictConflictManager() { } - public Collection resolveConflicts(IvyNode parent, Collection conflicts) { + public Collection resolveConflicts(IvyNode parent, Collection conflicts) { VersionMatcher versionMatcher = getSettings().getVersionMatcher(); IvyNode lastNode = null; - for (Iterator iter = conflicts.iterator(); iter.hasNext();) { - IvyNode node = (IvyNode) iter.next(); - + for (IvyNode node : conflicts) { if (versionMatcher.isDynamic(node.getResolvedId())) { // dynamic revision, not enough information to resolve conflict return null; diff --git a/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java index 9c35d514..dbd24dc3 100644 --- a/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/AbstractLatestStrategy.java @@ -32,17 +32,18 @@ public abstract class AbstractLatestStrategy implements LatestStrategy { this.name = name; } + @Override public String toString() { return name; } public ArtifactInfo findLatest(ArtifactInfo[] infos, Date date) { - List l = sort(infos); + List l = sort(infos); // the latest revision comes last, use a ListIterator to iterate the // sorted list in the reverse direction. - for (ListIterator iter = l.listIterator(l.size()); iter.hasPrevious();) { - ArtifactInfo info = (ArtifactInfo) iter.previous(); + for (ListIterator iter = l.listIterator(l.size()); iter.hasPrevious();) { + ArtifactInfo info = iter.previous(); if (date == null || info.getLastModified() < date.getTime()) { return info; } diff --git a/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java index 8ad66778..4adc5a35 100644 --- a/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/ComparatorLatestStrategy.java @@ -25,26 +25,26 @@ import java.util.List; public class ComparatorLatestStrategy extends AbstractLatestStrategy { - private Comparator comparator; + private Comparator comparator; public ComparatorLatestStrategy() { } - public ComparatorLatestStrategy(Comparator comparator) { + public ComparatorLatestStrategy(Comparator comparator) { this.comparator = comparator; } - public List sort(ArtifactInfo[] infos) { - List ret = new ArrayList(Arrays.asList(infos)); + public List sort(ArtifactInfo[] infos) { + List ret = new ArrayList(Arrays.asList(infos)); Collections.sort(ret, comparator); return ret; } - public Comparator getComparator() { + public Comparator getComparator() { return comparator; } - public void setComparator(Comparator comparator) { + public void setComparator(Comparator comparator) { this.comparator = comparator; } diff --git a/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java b/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java index b33bce87..c8ba3fe9 100644 --- a/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/LatestLexicographicStrategy.java @@ -26,10 +26,10 @@ public class LatestLexicographicStrategy extends ComparatorLatestStrategy { * assumed to be the greater. If a partial latest is found, then it is assumed to be greater * than any matching fixed revision. */ - private static final Comparator COMPARATOR = new Comparator() { - public int compare(Object o1, Object o2) { - String rev1 = ((ArtifactInfo) o1).getRevision(); - String rev2 = ((ArtifactInfo) o2).getRevision(); + private static final Comparator COMPARATOR = new Comparator() { + public int compare(ArtifactInfo o1, ArtifactInfo o2) { + String rev1 = o1.getRevision(); + String rev2 = o2.getRevision(); if (rev1.startsWith("latest")) { return 1; } diff --git a/src/java/org/apache/ivy/plugins/latest/LatestRevisionStrategy.java b/src/java/org/apache/ivy/plugins/latest/LatestRevisionStrategy.java index 51d72d15..7fc32936 100644 --- a/src/java/org/apache/ivy/plugins/latest/LatestRevisionStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/LatestRevisionStrategy.java @@ -31,10 +31,10 @@ public class LatestRevisionStrategy extends ComparatorLatestStrategy { * Compares two ModuleRevisionId by their revision. Revisions are compared using an algorithm * inspired by PHP version_compare one. */ - final class MridComparator implements Comparator { - public int compare(Object o1, Object o2) { - String rev1 = ((ModuleRevisionId) o1).getRevision(); - String rev2 = ((ModuleRevisionId) o2).getRevision(); + final class MridComparator implements Comparator { + public int compare(ModuleRevisionId o1, ModuleRevisionId o2) { + String rev1 = o1.getRevision(); + String rev2 = o2.getRevision(); rev1 = rev1.replaceAll("([a-zA-Z])(\\d)", "$1.$2"); rev1 = rev1.replaceAll("(\\d)([a-zA-Z])", "$1.$2"); @@ -61,9 +61,9 @@ public class LatestRevisionStrategy extends ComparatorLatestStrategy { return Long.valueOf(parts1[i]).compareTo(Long.valueOf(parts2[i])); } // both are strings, we compare them taking into account special meaning - Map specialMeanings = getSpecialMeanings(); - Integer sm1 = (Integer) specialMeanings.get(parts1[i].toLowerCase(Locale.US)); - Integer sm2 = (Integer) specialMeanings.get(parts2[i].toLowerCase(Locale.US)); + Map specialMeanings = getSpecialMeanings(); + Integer sm1 = specialMeanings.get(parts1[i].toLowerCase(Locale.US)); + Integer sm2 = specialMeanings.get(parts2[i].toLowerCase(Locale.US)); if (sm1 != null) { sm2 = sm2 == null ? new Integer(0) : sm2; return sm1.compareTo(sm2); @@ -92,10 +92,10 @@ public class LatestRevisionStrategy extends ComparatorLatestStrategy { * inspired by PHP version_compare one, unless a dynamic revision is given, in which case the * version matcher is used to perform the comparison. */ - final class ArtifactInfoComparator implements Comparator { - public int compare(Object o1, Object o2) { - String rev1 = ((ArtifactInfo) o1).getRevision(); - String rev2 = ((ArtifactInfo) o2).getRevision(); + final class ArtifactInfoComparator implements Comparator { + public int compare(ArtifactInfo o1, ArtifactInfo o2) { + String rev1 = o1.getRevision(); + String rev2 = o2.getRevision(); /* * The revisions can still be not resolved, so we use the current version matcher to @@ -152,19 +152,19 @@ public class LatestRevisionStrategy extends ComparatorLatestStrategy { } } - private static final Map DEFAULT_SPECIAL_MEANINGS; + private static final Map DEFAULT_SPECIAL_MEANINGS; static { - DEFAULT_SPECIAL_MEANINGS = new HashMap(); + DEFAULT_SPECIAL_MEANINGS = new HashMap(); DEFAULT_SPECIAL_MEANINGS.put("dev", new Integer(-1)); DEFAULT_SPECIAL_MEANINGS.put("rc", new Integer(1)); DEFAULT_SPECIAL_MEANINGS.put("final", new Integer(2)); } - private final Comparator mridComparator = new MridComparator(); + private final Comparator mridComparator = new MridComparator(); - private final Comparator artifactInfoComparator = new ArtifactInfoComparator(); + private final Comparator artifactInfoComparator = new ArtifactInfoComparator(); - private Map specialMeanings = null; + private Map specialMeanings = null; private boolean usedefaultspecialmeanings = true; @@ -178,9 +178,9 @@ public class LatestRevisionStrategy extends ComparatorLatestStrategy { getSpecialMeanings().put(meaning.getName().toLowerCase(Locale.US), meaning.getValue()); } - public synchronized Map getSpecialMeanings() { + public synchronized Map getSpecialMeanings() { if (specialMeanings == null) { - specialMeanings = new HashMap(); + specialMeanings = new HashMap(); if (isUsedefaultspecialmeanings()) { specialMeanings.putAll(DEFAULT_SPECIAL_MEANINGS); } diff --git a/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java index 3666d6a6..b9ceb992 100644 --- a/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/LatestStrategy.java @@ -39,7 +39,7 @@ public interface LatestStrategy { * @param infos * @return */ - List sort(ArtifactInfo[] infos); + List sort(ArtifactInfo[] infos); String getName(); } diff --git a/src/java/org/apache/ivy/plugins/latest/LatestTimeStrategy.java b/src/java/org/apache/ivy/plugins/latest/LatestTimeStrategy.java index e5f8ccf7..7ae7b6c6 100644 --- a/src/java/org/apache/ivy/plugins/latest/LatestTimeStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/LatestTimeStrategy.java @@ -20,10 +20,10 @@ package org.apache.ivy.plugins.latest; import java.util.Comparator; public class LatestTimeStrategy extends ComparatorLatestStrategy { - private static final Comparator COMPARATOR = new Comparator() { - public int compare(Object o1, Object o2) { - long d1 = ((ArtifactInfo) o1).getLastModified(); - long d2 = ((ArtifactInfo) o2).getLastModified(); + private static final Comparator COMPARATOR = new Comparator() { + public int compare(ArtifactInfo o1, ArtifactInfo o2) { + long d1 = o1.getLastModified(); + long d2 = o2.getLastModified(); return new Long(d1).compareTo(new Long(d2)); } diff --git a/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java new file mode 100644 index 00000000..64ef7ec7 --- /dev/null +++ b/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.ivy.plugins.latest; + +import java.util.ArrayList; +import java.util.List; + +/** + * A strategy which delegate to another strategy, unless for the latest and working revisions which + * are considered as superior to any other revision. < br/> + * NB : it is for internal usage of Ivy only! + */ +public class WorkspaceLatestStrategy extends AbstractLatestStrategy { + + private LatestStrategy delegate; + + public WorkspaceLatestStrategy(LatestStrategy delegate) { + this.delegate = delegate; + setName("workspace-" + delegate.getName()); + } + + public List sort(ArtifactInfo[] infos) { + List sorted = delegate.sort(infos); + + List head = new ArrayList(); + List tail = new ArrayList(); + + for (ArtifactInfo ai : sorted) { + String rev = ai.getRevision(); + boolean latestRev = rev.startsWith("latest") || rev.startsWith("working"); + if (latestRev) { + head.add(ai); + } else { + tail.add(ai); + } + } + + head.addAll(tail); + return head; + } + +} \ No newline at end of file diff --git a/src/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcher.java index cf90573b..28aecfd7 100644 --- a/src/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/AbstractPatternMatcher.java @@ -57,6 +57,7 @@ public abstract class AbstractPatternMatcher implements PatternMatcher { */ protected abstract/* @NotNull */Matcher newMatcher(/* @NotNull */String expression); + @Override public String toString() { return getName(); } diff --git a/src/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcher.java index 116a47a2..68e2f745 100644 --- a/src/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/ExactOrRegexpPatternMatcher.java @@ -36,6 +36,7 @@ public/* @Immutable */final class ExactOrRegexpPatternMatcher extends AbstractPa super(EXACT_OR_REGEXP); } + @Override protected Matcher newMatcher(String expression) { return new ExactOrRegexpMatcher(expression); } diff --git a/src/java/org/apache/ivy/plugins/matcher/ExactPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/ExactPatternMatcher.java index 565ee24d..0613e380 100644 --- a/src/java/org/apache/ivy/plugins/matcher/ExactPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/ExactPatternMatcher.java @@ -31,6 +31,7 @@ public/* @Immutable */final class ExactPatternMatcher extends AbstractPatternMat super(EXACT); } + @Override protected Matcher newMatcher(String expression) { return new ExactMatcher(expression); } diff --git a/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java index 544cb238..5afc5a23 100644 --- a/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/GlobPatternMatcher.java @@ -51,6 +51,7 @@ public/* @Immutable */final class GlobPatternMatcher extends AbstractPatternMatc super(GLOB); } + @Override protected Matcher newMatcher(String expression) { return new GlobMatcher(expression); } diff --git a/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java b/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java index fb1bc816..540d8f93 100644 --- a/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java @@ -19,35 +19,31 @@ package org.apache.ivy.plugins.matcher; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; public class MapMatcher { - private Map/* */matchers = new HashMap(); + private Map matchers = new HashMap(); private PatternMatcher pm; - private Map attributes; + private Map attributes; - public MapMatcher(Map attributes, PatternMatcher pm) { + public MapMatcher(Map attributes, PatternMatcher pm) { this.attributes = attributes; this.pm = pm; - for (Iterator iter = attributes.entrySet().iterator(); iter.hasNext();) { - Entry entry = (Entry) iter.next(); - String value = (String) entry.getValue(); + for (Entry entry : attributes.entrySet()) { + String value = entry.getValue(); if (value != null) { matchers.put(entry.getKey(), pm.getMatcher(value)); } } } - public boolean matches(Map/* */m) { - for (Iterator iter = matchers.entrySet().iterator(); iter.hasNext();) { - Entry entry = (Entry) iter.next(); - - Matcher matcher = (Matcher) entry.getValue(); - String value = (String) m.get(entry.getKey()); + public boolean matches(Map m) { + for (Entry entry : matchers.entrySet()) { + Matcher matcher = entry.getValue(); + String value = m.get(entry.getKey()); if ((value == null) || !matcher.matches(value)) { return false; } @@ -56,11 +52,12 @@ public class MapMatcher { return true; } + @Override public String toString() { return attributes + " (" + pm.getName() + ")"; } - public Map getAttributes() { + public Map getAttributes() { return Collections.unmodifiableMap(attributes); } diff --git a/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java b/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java index 832ab845..5be28f6b 100644 --- a/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java +++ b/src/java/org/apache/ivy/plugins/matcher/RegexpPatternMatcher.java @@ -38,6 +38,7 @@ public final/* @Immutable */class RegexpPatternMatcher extends AbstractPatternMa super(REGEXP); } + @Override protected Matcher newMatcher(String expression) { return new RegexpMatcher(expression); } diff --git a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java index 25ec67cf..0dd9bb37 100644 --- a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java @@ -69,7 +69,7 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor private Resource res; - private List errors = new ArrayList(); + private List errors = new ArrayList(); private DefaultModuleDescriptor md; @@ -258,7 +258,7 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor private void addExtendingConfigurations(String conf, DefaultDependencyDescriptor dd, boolean useDefaultMappingToGuessRightOperande) { - Set configsToAdd = new HashSet(); + Set configsToAdd = new HashSet(); Configuration[] configs = md.getConfigurations(); for (int i = 0; i < configs.length; i++) { String[] ext = configs[i].getExtends(); @@ -272,7 +272,7 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor } } - String[] confs = (String[]) configsToAdd.toArray(new String[configsToAdd.size()]); + String[] confs = configsToAdd.toArray(new String[configsToAdd.size()]); parseDepsConfs(confs, dd, useDefaultMappingToGuessRightOperande); } @@ -293,14 +293,17 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor } } + @Override public void warning(SAXParseException ex) { Message.warn("xml parsing: " + getLocationString(ex) + ": " + ex.getMessage()); } + @Override public void error(SAXParseException ex) { addError("xml parsing: " + getLocationString(ex) + ": " + ex.getMessage()); } + @Override public void fatalError(SAXParseException ex) throws SAXException { addError("[Fatal Error] " + getLocationString(ex) + ": " + ex.getMessage()); } diff --git a/src/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistry.java b/src/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistry.java index f2150d22..b7626dfd 100644 --- a/src/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistry.java +++ b/src/java/org/apache/ivy/plugins/parser/ModuleDescriptorParserRegistry.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.text.ParseException; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -40,7 +39,7 @@ public final class ModuleDescriptorParserRegistry extends AbstractModuleDescript return INSTANCE; } - private List parsers = new LinkedList(); + private List parsers = new LinkedList(); private ModuleDescriptorParserRegistry() { parsers.add(PomModuleDescriptorParser.getInstance()); @@ -63,13 +62,11 @@ public final class ModuleDescriptorParserRegistry extends AbstractModuleDescript } public ModuleDescriptorParser[] getParsers() { - return (ModuleDescriptorParser[]) parsers - .toArray(new ModuleDescriptorParser[parsers.size()]); + return parsers.toArray(new ModuleDescriptorParser[parsers.size()]); } public ModuleDescriptorParser getParser(Resource res) { - for (Iterator iter = parsers.iterator(); iter.hasNext();) { - ModuleDescriptorParser parser = (ModuleDescriptorParser) iter.next(); + for (ModuleDescriptorParser parser : parsers) { if (parser.accept(res)) { return parser; } diff --git a/src/java/org/apache/ivy/plugins/parser/ParserSettings.java b/src/java/org/apache/ivy/plugins/parser/ParserSettings.java index e3064217..662736c7 100644 --- a/src/java/org/apache/ivy/plugins/parser/ParserSettings.java +++ b/src/java/org/apache/ivy/plugins/parser/ParserSettings.java @@ -34,7 +34,7 @@ public interface ParserSettings { String substitute(String value); - Map/* */substitute(Map/* */strings); + Map substitute(Map strings); ResolutionCacheManager getResolutionCacheManager(); @@ -59,4 +59,5 @@ public interface ParserSettings { */ Namespace getContextNamespace(); + String getVariable(String string); } diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java b/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java index 6b6b0af4..011e188c 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java @@ -19,6 +19,8 @@ package org.apache.ivy.plugins.parser.m2; import java.util.List; +import org.apache.ivy.core.module.id.ModuleId; + public interface PomDependencyMgt { public abstract String getGroupId(); @@ -29,5 +31,5 @@ public interface PomDependencyMgt { public abstract String getScope(); - public List /* */getExcludedModules(); + public List getExcludedModules(); } \ No newline at end of file diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java index 40a007a9..cbb2eed1 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java @@ -23,12 +23,10 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.ivy.Ivy; import org.apache.ivy.core.cache.ArtifactOrigin; @@ -91,7 +89,7 @@ public class PomModuleDescriptorBuilder { null), new Configuration( "test", - Visibility.PRIVATE, + Visibility.PUBLIC, "this scope indicates that the dependency is not required for normal use of " + "the application, and is only available for the test compilation and " + "execution phases.", new String[] {"runtime"}, true, null), @@ -110,7 +108,7 @@ public class PomModuleDescriptorBuilder { new Configuration("optional", Visibility.PUBLIC, "contains all optional dependencies", new String[0], true, null)}; - static final Map MAVEN2_CONF_MAPPING = new HashMap(); + static final Map MAVEN2_CONF_MAPPING = new HashMap(); private static final String DEPENDENCY_MANAGEMENT = "m:dependency.management"; @@ -118,9 +116,9 @@ public class PomModuleDescriptorBuilder { private static final String EXTRA_INFO_DELIMITER = "__"; - private static final Collection/* */JAR_PACKAGINGS = Arrays.asList(new String[] { - "ejb", "bundle", "maven-plugin", "eclipse-plugin", "jbi-component", - "jbi-shared-library", "orbit", "hk2-jar"}); + private static final Collection JAR_PACKAGINGS = Arrays.asList(new String[] {"ejb", + "bundle", "maven-plugin", "eclipse-plugin", "jbi-component", "jbi-shared-library", + "orbit", "hk2-jar"}); static interface ConfMapper { public void addMappingConfs(DefaultDependencyDescriptor dd, boolean isOptional); @@ -285,19 +283,28 @@ public class PomModuleDescriptorBuilder { ModuleRevisionId moduleRevId = ModuleRevisionId.newInstance(dep.getGroupId(), dep.getArtifactId(), version); - // Some POMs depend on theirselfves, don't add this dependency: Ivy doesn't allow this! + // Some POMs depend on themselves; Ivy doesn't allow this. Don't add this dependency! // Example: https://repo1.maven.org/maven2/net/jini/jsk-platform/2.1/jsk-platform-2.1.pom ModuleRevisionId mRevId = ivyModuleDescriptor.getModuleRevisionId(); if ((mRevId != null) && mRevId.getModuleId().equals(moduleRevId.getModuleId())) { return; } - + // experimentation shows the following, excluded modules are + // inherited from parent POMs if either of the following is true: + // the element is missing or the element + // is present, but empty. + List excluded = dep.getExcludedModules(); + if (excluded.isEmpty()) { + excluded = getDependencyMgtExclusions(ivyModuleDescriptor, dep.getGroupId(), + dep.getArtifactId()); + } + final boolean excludeAllTransitiveDeps = shouldExcludeAllTransitiveDeps(excluded); DefaultDependencyDescriptor dd = new PomDependencyDescriptor(dep, ivyModuleDescriptor, - moduleRevId); + moduleRevId, !excludeAllTransitiveDeps); scope = (scope == null || scope.length() == 0) ? getDefaultScope(dep) : scope; - ConfMapper mapping = (ConfMapper) MAVEN2_CONF_MAPPING.get(scope); + ConfMapper mapping = MAVEN2_CONF_MAPPING.get(scope); mapping.addMappingConfs(dd, dep.isOptional()); - Map extraAtt = new HashMap(); + Map extraAtt = new HashMap(); if ((dep.getClassifier() != null) || ((dep.getType() != null) && !"jar".equals(dep.getType()))) { String type = "jar"; @@ -328,17 +335,12 @@ public class PomModuleDescriptorBuilder { dd.addDependencyArtifact(optionalizedScope, depArtifact); } - // experimentation shows the following, excluded modules are - // inherited from parent POMs if either of the following is true: - // the element is missing or the element - // is present, but empty. - List /* */excluded = dep.getExcludedModules(); - if (excluded.isEmpty()) { - excluded = getDependencyMgtExclusions(ivyModuleDescriptor, dep.getGroupId(), - dep.getArtifactId()); - } - for (Iterator itExcl = excluded.iterator(); itExcl.hasNext();) { - ModuleId excludedModule = (ModuleId) itExcl.next(); + for (ModuleId excludedModule : excluded) { + // This represents exclude all transitive dependencies, which we have already taken + // in account while defining the DefaultDependencyDescriptor itself + if ("*".equals(excludedModule.getOrganisation()) && "*".equals(excludedModule.getName())) { + continue; + } String[] confs = dd.getModuleConfigurations(); for (int k = 0; k < confs.length; k++) { dd.addExcludeRule(confs[k], new DefaultExcludeRule(new ArtifactId(excludedModule, @@ -350,6 +352,21 @@ public class PomModuleDescriptorBuilder { ivyModuleDescriptor.addDependency(dd); } + private static boolean shouldExcludeAllTransitiveDeps(final List exclusions) { + if (exclusions == null || exclusions.isEmpty()) { + return false; + } + for (final ModuleId exclusion : exclusions) { + if (exclusion == null) { + continue; + } + if ("*".equals(exclusion.getOrganisation()) && "*".equals(exclusion.getName())) { + return true; + } + } + return false; + } + public void addDependency(DependencyDescriptor descriptor) { // Some POMs depend on themselves through their parent pom, don't add this dependency // since Ivy doesn't allow this! @@ -375,11 +392,10 @@ public class PomModuleDescriptorBuilder { overwriteExtraInfoIfExists(scopeKey, dep.getScope()); } if (!dep.getExcludedModules().isEmpty()) { - final String exclusionPrefix = getDependencyMgtExtraInfoPrefixForExclusion( - dep.getGroupId(), dep.getArtifactId()); + String exclusionPrefix = getDependencyMgtExtraInfoPrefixForExclusion(dep.getGroupId(), + dep.getArtifactId()); int index = 0; - for (final Iterator iter = dep.getExcludedModules().iterator(); iter.hasNext();) { - final ModuleId excludedModule = (ModuleId) iter.next(); + for (ModuleId excludedModule : dep.getExcludedModules()) { overwriteExtraInfoIfExists( exclusionPrefix + index, excludedModule.getOrganisation() + EXTRA_INFO_DELIMITER @@ -413,11 +429,11 @@ public class PomModuleDescriptorBuilder { extraInfoByTagName.setContent(pluginExtraInfo); } - public static List /* */getPlugins(ModuleDescriptor md) { - List result = new ArrayList(); + public static List getPlugins(ModuleDescriptor md) { + List result = new ArrayList(); String plugins = md.getExtraInfoContentByTagName("m:maven.plugins"); if (plugins == null) { - return new ArrayList(); + return new ArrayList(); } String[] pluginsArray = plugins.split("\\|"); for (int i = 0; i < pluginsArray.length; i++) { @@ -457,16 +473,15 @@ public class PomModuleDescriptorBuilder { return null; } - public List /* */getExcludedModules() { - return Collections.EMPTY_LIST; // probably not used? + public List getExcludedModules() { + return Collections.emptyList(); // probably not used? } } private String getDefaultVersion(PomDependencyData dep) { ModuleId moduleId = ModuleId.newInstance(dep.getGroupId(), dep.getArtifactId()); if (ivyModuleDescriptor.getDependencyManagementMap().containsKey(moduleId)) { - return ((PomDependencyMgt) ivyModuleDescriptor.getDependencyManagementMap().get( - moduleId)).getVersion(); + return ivyModuleDescriptor.getDependencyManagementMap().get(moduleId).getVersion(); } String key = getDependencyMgtExtraInfoKeyForVersion(dep.getGroupId(), dep.getArtifactId()); return ivyModuleDescriptor.getExtraInfoContentByTagName(key); @@ -476,8 +491,7 @@ public class PomModuleDescriptorBuilder { String result; ModuleId moduleId = ModuleId.newInstance(dep.getGroupId(), dep.getArtifactId()); if (ivyModuleDescriptor.getDependencyManagementMap().containsKey(moduleId)) { - result = ((PomDependencyMgt) ivyModuleDescriptor.getDependencyManagementMap().get( - moduleId)).getScope(); + result = ivyModuleDescriptor.getDependencyManagementMap().get(moduleId).getScope(); } else { String key = getDependencyMgtExtraInfoKeyForScope(dep.getGroupId(), dep.getArtifactId()); result = ivyModuleDescriptor.getExtraInfoContentByTagName(key); @@ -508,17 +522,17 @@ public class PomModuleDescriptorBuilder { + artifaceId + EXTRA_INFO_DELIMITER + "exclusion_"; } - private static List /* */getDependencyMgtExclusions(ModuleDescriptor descriptor, + private static List getDependencyMgtExclusions(ModuleDescriptor descriptor, String groupId, String artifactId) { if (descriptor instanceof PomModuleDescriptor) { - PomDependencyMgt dependencyMgt = (PomDependencyMgt) ((PomModuleDescriptor) descriptor) + PomDependencyMgt dependencyMgt = ((PomModuleDescriptor) descriptor) .getDependencyManagementMap().get(ModuleId.newInstance(groupId, artifactId)); if (dependencyMgt != null) { return dependencyMgt.getExcludedModules(); } } String exclusionPrefix = getDependencyMgtExtraInfoPrefixForExclusion(groupId, artifactId); - List /* */exclusionIds = new LinkedList /* */(); + List exclusionIds = new LinkedList(); for (ExtraInfoHolder extraInfoHolder : descriptor.getExtraInfos()) { String key = extraInfoHolder.getName(); if (key.startsWith(exclusionPrefix)) { @@ -535,14 +549,12 @@ public class PomModuleDescriptorBuilder { return exclusionIds; } - public static Map/* */ - getDependencyManagementMap(ModuleDescriptor md) { - Map ret = new LinkedHashMap(); + public static Map getDependencyManagementMap(ModuleDescriptor md) { + Map ret = new LinkedHashMap(); if (md instanceof PomModuleDescriptor) { - for (final Iterator iterator = ((PomModuleDescriptor) md).getDependencyManagementMap() - .entrySet().iterator(); iterator.hasNext();) { - Map.Entry e = (Entry) iterator.next(); - PomDependencyMgt dependencyMgt = (PomDependencyMgt) e.getValue(); + for (Map.Entry e : ((PomModuleDescriptor) md) + .getDependencyManagementMap().entrySet()) { + PomDependencyMgt dependencyMgt = e.getValue(); ret.put(e.getKey(), dependencyMgt.getVersion()); } } else { @@ -563,15 +575,15 @@ public class PomModuleDescriptorBuilder { return ret; } - public static List getDependencyManagements(ModuleDescriptor md) { - List result = new ArrayList(); + public static List getDependencyManagements(ModuleDescriptor md) { + List result = new ArrayList(); if (md instanceof PomModuleDescriptor) { result.addAll(((PomModuleDescriptor) md).getDependencyManagementMap().values()); } else { for (ExtraInfoHolder extraInfoHolder : md.getExtraInfos()) { String key = extraInfoHolder.getName(); - if ((key).startsWith(DEPENDENCY_MANAGEMENT)) { + if (key.startsWith(DEPENDENCY_MANAGEMENT)) { String[] parts = key.split(EXTRA_INFO_DELIMITER); if (parts.length != DEPENDENCY_MANAGEMENT_KEY_PARTS_COUNT) { Message.warn("what seem to be a dependency management extra info " @@ -586,7 +598,7 @@ public class PomModuleDescriptorBuilder { String version = md.getExtraInfoContentByTagName(versionKey); String scope = md.getExtraInfoContentByTagName(scopeKey); - List /* */exclusions = getDependencyMgtExclusions(md, parts[1], + List exclusions = getDependencyMgtExclusions(md, parts[1], parts[2]); result.add(new DefaultPomDependencyMgt(parts[1], parts[2], version, scope, exclusions)); @@ -598,12 +610,9 @@ public class PomModuleDescriptorBuilder { } @Deprecated - public void addExtraInfos(Map extraAttributes) { - for (Iterator it = extraAttributes.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Entry) it.next(); - String key = (String) entry.getKey(); - String value = (String) entry.getValue(); - addExtraInfo(key, value); + public void addExtraInfos(Map extraAttributes) { + for (Map.Entry entry : extraAttributes.entrySet()) { + addExtraInfo(entry.getKey(), entry.getValue()); } } @@ -633,21 +642,20 @@ public class PomModuleDescriptorBuilder { } @Deprecated - public static Map extractPomProperties(Map extraInfo) { - Map r = new HashMap(); - for (Iterator it = extraInfo.entrySet().iterator(); it.hasNext();) { - Map.Entry extraInfoEntry = (Map.Entry) it.next(); - if (((String) extraInfoEntry.getKey()).startsWith(PROPERTIES)) { - String prop = ((String) extraInfoEntry.getKey()).substring(PROPERTIES.length() - + EXTRA_INFO_DELIMITER.length()); + public static Map extractPomProperties(Map extraInfo) { + Map r = new HashMap(); + for (Map.Entry extraInfoEntry : extraInfo.entrySet()) { + if (extraInfoEntry.getKey().startsWith(PROPERTIES)) { + String prop = extraInfoEntry.getKey().substring( + PROPERTIES.length() + EXTRA_INFO_DELIMITER.length()); r.put(prop, extraInfoEntry.getValue()); } } return r; } - public static Map extractPomProperties(List extraInfos) { - Map r = new HashMap(); + public static Map extractPomProperties(List extraInfos) { + Map r = new HashMap(); for (ExtraInfoHolder extraInfoHolder : extraInfos) { if ((extraInfoHolder.getName()).startsWith(PROPERTIES)) { String prop = (extraInfoHolder.getName()).substring(PROPERTIES.length() @@ -701,8 +709,8 @@ public class PomModuleDescriptorBuilder { private final PomDependencyData pomDependencyData; private PomDependencyDescriptor(PomDependencyData pomDependencyData, - ModuleDescriptor moduleDescriptor, ModuleRevisionId revisionId) { - super(moduleDescriptor, revisionId, true, false, true); + ModuleDescriptor moduleDescriptor, ModuleRevisionId revisionId, final boolean transitive) { + super(moduleDescriptor, revisionId, true, false, transitive); this.pomDependencyData = pomDependencyData; } @@ -717,7 +725,7 @@ public class PomModuleDescriptorBuilder { } public static class PomModuleDescriptor extends DefaultModuleDescriptor { - private final Map/* */dependencyManagementMap = new HashMap(); + private final Map dependencyManagementMap = new LinkedHashMap(); public PomModuleDescriptor(ModuleDescriptorParser parser, Resource res) { super(parser, res); @@ -729,7 +737,7 @@ public class PomModuleDescriptorBuilder { dependencyMgt); } - public Map getDependencyManagementMap() { + public Map getDependencyManagementMap() { return dependencyManagementMap; } } diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java index 6017e3ae..c7d82bae 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.net.URL; import java.text.ParseException; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -35,6 +34,7 @@ import org.apache.ivy.core.module.descriptor.Configuration.Visibility; import org.apache.ivy.core.module.descriptor.DefaultArtifact; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.descriptor.License; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.resolve.ResolveData; @@ -47,6 +47,8 @@ import org.apache.ivy.plugins.parser.ParserSettings; import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorBuilder.PomDependencyDescriptor; import org.apache.ivy.plugins.parser.m2.PomReader.PomDependencyData; import org.apache.ivy.plugins.parser.m2.PomReader.PomDependencyMgtElement; +import org.apache.ivy.plugins.parser.m2.PomReader.PomPluginElement; +import org.apache.ivy.plugins.parser.m2.PomReader.PomProfileElement; import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter; import org.apache.ivy.plugins.repository.Resource; import org.apache.ivy.plugins.repository.url.URLResource; @@ -121,11 +123,10 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { domReader.setProperty("project.parent.version", domReader.getParentVersion()); domReader.setProperty("project.parent.groupId", domReader.getParentGroupId()); - Map pomProperties = domReader.getPomProperties(); - for (Iterator iter = pomProperties.entrySet().iterator(); iter.hasNext();) { - Map.Entry prop = (Map.Entry) iter.next(); - domReader.setProperty((String) prop.getKey(), (String) prop.getValue()); - mdBuilder.addProperty((String) prop.getKey(), (String) prop.getValue()); + Map pomProperties = domReader.getPomProperties(); + for (Map.Entry prop : pomProperties.entrySet()) { + domReader.setProperty(prop.getKey(), prop.getValue()); + mdBuilder.addProperty(prop.getKey(), prop.getValue()); } ModuleDescriptor parentDescr = null; @@ -136,18 +137,16 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { domReader.getParentGroupId(), domReader.getParentArtifactId(), domReader.getParentVersion()); ResolvedModuleRevision parentModule = parseOtherPom(ivySettings, parentModRevID); - if (parentModule != null) { - parentDescr = parentModule.getDescriptor(); - } else { - throw new IOException("Impossible to load parent for " + res.getName() + "." - + " Parent=" + parentModRevID); + if (parentModule == null) { + throw new IOException("Impossible to load parent for " + res.getName() + + ". Parent=" + parentModRevID); } + parentDescr = parentModule.getDescriptor(); if (parentDescr != null) { - Map parentPomProps = PomModuleDescriptorBuilder + Map parentPomProps = PomModuleDescriptorBuilder .extractPomProperties(parentDescr.getExtraInfos()); - for (Iterator iter = parentPomProps.entrySet().iterator(); iter.hasNext();) { - Map.Entry prop = (Map.Entry) iter.next(); - domReader.setProperty((String) prop.getKey(), (String) prop.getValue()); + for (Map.Entry prop : parentPomProps.entrySet()) { + domReader.setProperty(prop.getKey(), prop.getValue()); } } } @@ -159,13 +158,18 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { mdBuilder.setHomePage(domReader.getHomePage()); mdBuilder.setDescription(domReader.getDescription()); - mdBuilder.setLicenses(domReader.getLicenses()); + // if this module doesn't have an explicit license, use the parent's license (if any) + final License[] licenses = domReader.getLicenses(); + if (licenses != null && licenses.length > 0) { + mdBuilder.setLicenses(licenses); + } else if (parentDescr != null) { + mdBuilder.setLicenses(parentDescr.getLicenses()); + } ModuleRevisionId relocation = domReader.getRelocation(); if (relocation != null) { - if (groupId != null && artifactId != null - && artifactId.equals(relocation.getName()) + if (groupId != null && artifactId != null && artifactId.equals(relocation.getName()) && groupId.equals(relocation.getOrganisation())) { Message.error("Relocation to an other version number not supported in ivy : " + mdBuilder.getModuleDescriptor().getModuleRevisionId() @@ -175,28 +179,28 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { + " Artefact and other metadata will be ignored."); ResolvedModuleRevision relocatedModule = parseOtherPom(ivySettings, relocation); if (relocatedModule == null) { - throw new ParseException("impossible to load module " + relocation - + " to which " - + mdBuilder.getModuleDescriptor().getModuleRevisionId() - + " has been relocated", 0); + throw new ParseException( + "impossible to load module " + relocation + " to which " + + mdBuilder.getModuleDescriptor().getModuleRevisionId() + + " has been relocated", + 0); } - DependencyDescriptor[] dds = relocatedModule.getDescriptor().getDependencies(); - for (int i = 0; i < dds.length; i++) { - mdBuilder.addDependency(dds[i]); + for (DependencyDescriptor dd : relocatedModule.getDescriptor() + .getDependencies()) { + mdBuilder.addDependency(dd); } } else { - Message.info(mdBuilder.getModuleDescriptor().getModuleRevisionId() - + " is relocated to " + relocation - + ". Please update your dependencies."); + Message.info( + mdBuilder.getModuleDescriptor().getModuleRevisionId() + " is relocated to " + + relocation + ". Please update your dependencies."); Message.verbose("Relocated module will be considered as a dependency"); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor( mdBuilder.getModuleDescriptor(), relocation, true, false, true); /* Map all public dependencies */ Configuration[] m2Confs = PomModuleDescriptorBuilder.MAVEN2_CONFIGURATIONS; - for (int i = 0; i < m2Confs.length; i++) { - if (Visibility.PUBLIC.equals(m2Confs[i].getVisibility())) { - dd.addDependencyConfiguration(m2Confs[i].getName(), - m2Confs[i].getName()); + for (Configuration m2Conf : m2Confs) { + if (Visibility.PUBLIC.equals(m2Conf.getVisibility())) { + dd.addDependencyConfiguration(m2Conf.getName(), m2Conf.getName()); } } mdBuilder.addDependency(dd); @@ -216,9 +220,9 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { mdBuilder.addExtraInfos(parentDescr.getExtraInfos()); // add dependency management info from parent - List depMgt = PomModuleDescriptorBuilder.getDependencyManagements(parentDescr); - for (Iterator it = depMgt.iterator(); it.hasNext();) { - PomDependencyMgt dep = (PomDependencyMgt) it.next(); + List depMgt = PomModuleDescriptorBuilder + .getDependencyManagements(parentDescr); + for (PomDependencyMgt dep : depMgt) { if (dep instanceof PomDependencyMgtElement) { dep = domReader.new PomDependencyMgtElement( (PomDependencyMgtElement) dep); @@ -227,52 +231,40 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { } // add plugins from parent - List /* */plugins = PomModuleDescriptorBuilder - .getPlugins(parentDescr); - for (Iterator it = plugins.iterator(); it.hasNext();) { - mdBuilder.addPlugin((PomDependencyMgt) it.next()); + for (PomDependencyMgt pomDependencyMgt : PomModuleDescriptorBuilder + .getPlugins(parentDescr)) { + mdBuilder.addPlugin((PomDependencyMgt) pomDependencyMgt); } } - for (Iterator it = domReader.getDependencyMgt().iterator(); it.hasNext();) { - PomDependencyMgt dep = (PomDependencyMgt) it.next(); - if ("import".equals(dep.getScope())) { - ModuleRevisionId importModRevID = ModuleRevisionId.newInstance( - dep.getGroupId(), dep.getArtifactId(), dep.getVersion()); - ResolvedModuleRevision importModule = parseOtherPom(ivySettings, - importModRevID); - if (importModule != null) { - ModuleDescriptor importDescr = importModule.getDescriptor(); - - // add dependency management info from imported module - List depMgt = PomModuleDescriptorBuilder - .getDependencyManagements(importDescr); - for (Iterator it2 = depMgt.iterator(); it2.hasNext();) { - PomDependencyMgt importedDepMgt = (PomDependencyMgt) it2.next(); - mdBuilder.addDependencyMgt(new DefaultPomDependencyMgt( - importedDepMgt.getGroupId(), - importedDepMgt.getArtifactId(), - importedDepMgt.getVersion(), importedDepMgt.getScope(), - importedDepMgt.getExcludedModules())); - } - } else { - throw new IOException("Impossible to import module for " - + res.getName() + "." + " Import=" + importModRevID); - } - - } else { - mdBuilder.addDependencyMgt(dep); - } + for (PomDependencyMgt dep : domReader.getDependencyMgt()) { + addTo(mdBuilder, dep, ivySettings); } - - for (Iterator it = domReader.getDependencies().iterator(); it.hasNext();) { - PomReader.PomDependencyData dep = (PomReader.PomDependencyData) it.next(); + for (PomDependencyData dep : domReader.getDependencies()) { mdBuilder.addDependency(res, dep); } + for (PomPluginElement plugin : domReader.getPlugins()) { + mdBuilder.addPlugin(plugin); + } + + // consult active profiles: + for (PomProfileElement profile : domReader.getProfiles()) { + if (profile.isActive()) { + for (PomDependencyMgt dep : profile.getDependencyMgt()) { + addTo(mdBuilder, dep, ivySettings); + } + for (PomDependencyData dep : profile.getDependencies()) { + mdBuilder.addDependency(res, dep); + } + for (PomPluginElement plugin : profile.getPlugins()) { + mdBuilder.addPlugin(plugin); + } + } + } + if (parentDescr != null) { - for (int i = 0; i < parentDescr.getDependencies().length; i++) { - DependencyDescriptor descriptor = parentDescr.getDependencies()[i]; + for (DependencyDescriptor descriptor : parentDescr.getDependencies()) { if (descriptor instanceof PomDependencyDescriptor) { PomDependencyData parentDep = ((PomDependencyDescriptor) descriptor) .getPomDependencyData(); @@ -284,11 +276,6 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { } } - for (Iterator it = domReader.getPlugins().iterator(); it.hasNext();) { - PomReader.PomPluginElement plugin = (PomReader.PomPluginElement) it.next(); - mdBuilder.addPlugin(plugin); - } - mdBuilder.addMainArtifact(artifactId, domReader.getPackaging()); addSourcesAndJavadocArtifactsIfPresent(mdBuilder, ivySettings); @@ -300,49 +287,96 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser { return mdBuilder.getModuleDescriptor(); } + private void addTo(PomModuleDescriptorBuilder mdBuilder, PomDependencyMgt dep, + ParserSettings ivySettings) throws ParseException, IOException { + if ("import".equals(dep.getScope())) { + ModuleRevisionId importModRevID = ModuleRevisionId.newInstance(dep.getGroupId(), + dep.getArtifactId(), dep.getVersion()); + ResolvedModuleRevision importModule = parseOtherPom(ivySettings, importModRevID); + if (importModule == null) { + throw new IOException("Impossible to import module for " + + mdBuilder.getModuleDescriptor().getResource().getName() + ". Import=" + + importModRevID); + } + ModuleDescriptor importDescr = importModule.getDescriptor(); + + // add dependency management info from imported module + List depMgt = PomModuleDescriptorBuilder + .getDependencyManagements(importDescr); + for (PomDependencyMgt importedDepMgt : depMgt) { + mdBuilder.addDependencyMgt(new DefaultPomDependencyMgt(importedDepMgt.getGroupId(), + importedDepMgt.getArtifactId(), importedDepMgt.getVersion(), + importedDepMgt.getScope(), importedDepMgt.getExcludedModules())); + } + } else { + mdBuilder.addDependencyMgt(dep); + } + + } + private void addSourcesAndJavadocArtifactsIfPresent(PomModuleDescriptorBuilder mdBuilder, ParserSettings ivySettings) { if (mdBuilder.getMainArtifact() == null) { // no main artifact in pom, we don't need to search for meta artifacts return; } + + boolean sourcesLookup = !"false" + .equals(ivySettings.getVariable("ivy.maven.lookup.sources")); + boolean javadocLookup = !"false" + .equals(ivySettings.getVariable("ivy.maven.lookup.javadoc")); + if (!sourcesLookup && !javadocLookup) { + Message.debug("Sources and javadocs lookup disabled"); + return; + } + ModuleDescriptor md = mdBuilder.getModuleDescriptor(); ModuleRevisionId mrid = md.getModuleRevisionId(); DependencyResolver resolver = ivySettings.getResolver(mrid); if (resolver == null) { - Message.debug("no resolver found for " + mrid - + ": no source or javadoc artifact lookup"); + Message.debug( + "no resolver found for " + mrid + ": no source or javadoc artifact lookup"); } else { ArtifactOrigin mainArtifact = resolver.locate(mdBuilder.getMainArtifact()); if (!ArtifactOrigin.isUnknown(mainArtifact)) { String mainArtifactLocation = mainArtifact.getLocation(); - ArtifactOrigin sourceArtifact = resolver.locate(mdBuilder.getSourceArtifact()); - if (!ArtifactOrigin.isUnknown(sourceArtifact) - && !sourceArtifact.getLocation().equals(mainArtifactLocation)) { - Message.debug("source artifact found for " + mrid); - mdBuilder.addSourceArtifact(); - } else { - // it seems that sometimes the 'src' classifier is used instead of 'sources' - // Cfr. IVY-1138 - ArtifactOrigin srcArtifact = resolver.locate(mdBuilder.getSrcArtifact()); - if (!ArtifactOrigin.isUnknown(srcArtifact) - && !srcArtifact.getLocation().equals(mainArtifactLocation)) { + if (sourcesLookup) { + ArtifactOrigin sourceArtifact = resolver.locate(mdBuilder.getSourceArtifact()); + if (!ArtifactOrigin.isUnknown(sourceArtifact) + && !sourceArtifact.getLocation().equals(mainArtifactLocation)) { Message.debug("source artifact found for " + mrid); - mdBuilder.addSrcArtifact(); + mdBuilder.addSourceArtifact(); } else { - Message.debug("no source artifact found for " + mrid); + // it seems that sometimes the 'src' classifier is used instead of 'sources' + // Cfr. IVY-1138 + ArtifactOrigin srcArtifact = resolver.locate(mdBuilder.getSrcArtifact()); + if (!ArtifactOrigin.isUnknown(srcArtifact) + && !srcArtifact.getLocation().equals(mainArtifactLocation)) { + Message.debug("source artifact found for " + mrid); + mdBuilder.addSrcArtifact(); + } else { + Message.debug("no source artifact found for " + mrid); + } } - } - ArtifactOrigin javadocArtifact = resolver.locate(mdBuilder.getJavadocArtifact()); - if (!ArtifactOrigin.isUnknown(javadocArtifact) - && !javadocArtifact.getLocation().equals(mainArtifactLocation)) { - Message.debug("javadoc artifact found for " + mrid); - mdBuilder.addJavadocArtifact(); } else { - Message.debug("no javadoc artifact found for " + mrid); + Message.debug("sources lookup disabled"); + } + + if (javadocLookup) { + ArtifactOrigin javadocArtifact = resolver + .locate(mdBuilder.getJavadocArtifact()); + if (!ArtifactOrigin.isUnknown(javadocArtifact) + && !javadocArtifact.getLocation().equals(mainArtifactLocation)) { + Message.debug("javadoc artifact found for " + mrid); + mdBuilder.addJavadocArtifact(); + } else { + Message.debug("no javadoc artifact found for " + mrid); + } + } else { + Message.debug("javadocs lookup disabled"); } } } diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java index 5cd254ab..7dc318f8 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java @@ -28,6 +28,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -51,7 +52,7 @@ public final class PomModuleDescriptorWriter { private static final String SKIP_LINE = "SKIP_LINE"; private static final ConfigurationScopeMapping DEFAULT_MAPPING = new ConfigurationScopeMapping( - new HashMap() { + new LinkedHashMap() { { put("compile", "compile"); put("runtime", "runtime"); @@ -178,6 +179,8 @@ public final class PomModuleDescriptorWriter { } if (options.getDescription() != null) { variables.setVariable("ivy.pom.description", options.getDescription(), true); + } else if (md.getDescription() != null && md.getDescription().length() > 0) { + variables.setVariable("ivy.pom.description", md.getDescription(), true); } if (md.getHomePage() != null) { variables.setVariable("ivy.pom.url", md.getHomePage(), true); diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java index 081db579..bfefe7c0 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java @@ -27,7 +27,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -53,6 +52,8 @@ import org.xml.sax.SAXParseException; */ public class PomReader { + private static final String PROFILES_ELEMENT = "profiles"; + private static final String PACKAGING = "packaging"; private static final String DEPENDENCY = "dependency"; @@ -107,15 +108,17 @@ public class PomReader { private static final String TYPE = "type"; - private HashMap properties = new HashMap(); + private static final String PROFILE = "profile"; + + private HashMap properties = new HashMap(); private final Element projectElement; private final Element parentElement; public PomReader(URL descriptorURL, Resource res) throws IOException, SAXException { - InputStream stream = new AddDTDFilterInputStream(URLHandlerRegistry.getDefault() - .openStream(descriptorURL)); + InputStream stream = new AddDTDFilterInputStream( + URLHandlerRegistry.getDefault().openStream(descriptorURL)); InputSource source = new InputSource(stream); source.setSystemId(XMLHelper.toSystemId(descriptorURL)); try { @@ -123,8 +126,8 @@ public class PomReader { public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { if ((systemId != null) && systemId.endsWith("m2-entities.ent")) { - return new InputSource(PomReader.class - .getResourceAsStream("m2-entities.ent")); + return new InputSource( + PomReader.class.getResourceAsStream("m2-entities.ent")); } return null; } @@ -238,9 +241,8 @@ public class PomReader { return new License[0]; } licenses.normalize(); - List/* */lics = new ArrayList(); - for (Iterator it = getAllChilds(licenses).iterator(); it.hasNext();) { - Element license = (Element) it.next(); + List lics = new ArrayList(); + for (Element license : getAllChilds(licenses)) { if (LICENSE.equals(license.getNodeName())) { String name = getFirstChildText(license, LICENSE_NAME); String url = getFirstChildText(license, LICENSE_URL); @@ -258,7 +260,7 @@ public class PomReader { lics.add(new License(name, url)); } } - return (License[]) lics.toArray(new License[lics.size()]); + return lics.toArray(new License[lics.size()]); } public ModuleRevisionId getRelocation() { @@ -277,37 +279,63 @@ public class PomReader { } } - public List /* */getDependencies() { - Element dependenciesElement = getFirstChildElement(projectElement, DEPENDENCIES); - LinkedList dependencies = new LinkedList(); - if (dependenciesElement != null) { - NodeList childs = dependenciesElement.getChildNodes(); - for (int i = 0; i < childs.getLength(); i++) { - Node node = childs.item(i); - if (node instanceof Element && DEPENDENCY.equals(node.getNodeName())) { - dependencies.add(new PomDependencyData((Element) node)); - } + public List getDependencies() { + return getDependencies(projectElement); + } + + private List getDependencies(Element parent) { + Element dependenciesElement = getFirstChildElement(parent, DEPENDENCIES); + if (dependenciesElement == null) { + return Collections.emptyList(); + } + List dependencies = new LinkedList(); + NodeList children = dependenciesElement.getChildNodes(); + for (int i = 0, sz = children.getLength(); i < sz; i++) { + Node node = children.item(i); + if (node instanceof Element && DEPENDENCY.equals(node.getNodeName())) { + dependencies.add(new PomDependencyData((Element) node)); } } return dependencies; } - public List /* */getDependencyMgt() { - Element dependenciesElement = getFirstChildElement(projectElement, DEPENDENCY_MGT); - dependenciesElement = getFirstChildElement(dependenciesElement, DEPENDENCIES); - LinkedList dependencies = new LinkedList(); - if (dependenciesElement != null) { - NodeList childs = dependenciesElement.getChildNodes(); - for (int i = 0; i < childs.getLength(); i++) { - Node node = childs.item(i); - if (node instanceof Element && DEPENDENCY.equals(node.getNodeName())) { - dependencies.add(new PomDependencyMgtElement((Element) node)); - } + public List getDependencyMgt() { + return getDependencyMgt(projectElement); + } + + private List getDependencyMgt(Element parent) { + Element dependenciesElement = getFirstChildElement( + getFirstChildElement(parent, DEPENDENCY_MGT), DEPENDENCIES); + if (dependenciesElement == null) { + return Collections.emptyList(); + } + List dependencies = new LinkedList(); + NodeList children = dependenciesElement.getChildNodes(); + for (int i = 0, sz = children.getLength(); i < sz; i++) { + Node node = children.item(i); + if (node instanceof Element && DEPENDENCY.equals(node.getNodeName())) { + dependencies.add(new PomDependencyMgtElement((Element) node)); } } return dependencies; } + public List getProfiles() { + Element profilesElement = getFirstChildElement(projectElement, PROFILES_ELEMENT); + if (profilesElement == null) { + return Collections.emptyList(); + } + List result = new LinkedList(); + NodeList children = profilesElement.getChildNodes(); + for (int i = 0, sz = children.getLength(); i < sz; i++) { + Node node = children.item(i); + if (node instanceof Element && PROFILE.equals(node.getNodeName())) { + result.add(new PomProfileElement((Element) node)); + } + } + return result; + } + public class PomDependencyMgtElement implements PomDependencyMgt { private final Element depElement; @@ -321,7 +349,6 @@ public class PomReader { /* * (non-Javadoc) - * * @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getGroupId() */ public String getGroupId() { @@ -331,7 +358,6 @@ public class PomReader { /* * (non-Javadoc) - * * @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getArtifaceId() */ public String getArtifactId() { @@ -341,7 +367,6 @@ public class PomReader { /* * (non-Javadoc) - * * @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getVersion() */ public String getVersion() { @@ -354,19 +379,20 @@ public class PomReader { return replaceProps(val); } - public List /* */getExcludedModules() { + public List getExcludedModules() { Element exclusionsElement = getFirstChildElement(depElement, EXCLUSIONS); - LinkedList exclusions = new LinkedList(); - if (exclusionsElement != null) { - NodeList childs = exclusionsElement.getChildNodes(); - for (int i = 0; i < childs.getLength(); i++) { - Node node = childs.item(i); - if (node instanceof Element && EXCLUSION.equals(node.getNodeName())) { - String groupId = getFirstChildText((Element) node, GROUP_ID); - String artifactId = getFirstChildText((Element) node, ARTIFACT_ID); - if ((groupId != null) && (artifactId != null)) { - exclusions.add(ModuleId.newInstance(groupId, artifactId)); - } + if (exclusionsElement == null) { + return Collections.emptyList(); + } + LinkedList exclusions = new LinkedList(); + NodeList children = exclusionsElement.getChildNodes(); + for (int i = 0, sz = children.getLength(); i < sz; i++) { + Node node = children.item(i); + if (node instanceof Element && EXCLUSION.equals(node.getNodeName())) { + String groupId = getFirstChildText((Element) node, GROUP_ID); + String artifactId = getFirstChildText((Element) node, ARTIFACT_ID); + if ((groupId != null) && (artifactId != null)) { + exclusions.add(ModuleId.newInstance(groupId, artifactId)); } } } @@ -374,22 +400,23 @@ public class PomReader { } } - public List /* */getPlugins() { - LinkedList plugins = new LinkedList(); - - Element buildElement = getFirstChildElement(projectElement, "build"); - if (buildElement == null) { - return plugins; - } + public List getPlugins() { + return getPlugins(projectElement); + } + private List getPlugins(Element parent) { + Element buildElement = getFirstChildElement(parent, "build"); Element pluginsElement = getFirstChildElement(buildElement, PLUGINS); - if (pluginsElement != null) { - NodeList childs = pluginsElement.getChildNodes(); - for (int i = 0; i < childs.getLength(); i++) { - Node node = childs.item(i); - if (node instanceof Element && PLUGIN.equals(node.getNodeName())) { - plugins.add(new PomPluginElement((Element) node)); - } + + if (pluginsElement == null) { + return Collections.emptyList(); + } + NodeList children = pluginsElement.getChildNodes(); + List plugins = new LinkedList(); + for (int i = 0; i < children.getLength(); i++) { + Node node = children.item(i); + if (node instanceof Element && PLUGIN.equals(node.getNodeName())) { + plugins.add(new PomPluginElement((Element) node)); } } return plugins; @@ -421,8 +448,8 @@ public class PomReader { return null; // not used } - public List /* */getExcludedModules() { - return Collections.EMPTY_LIST; // probably not used? + public List getExcludedModules() { + return Collections.emptyList(); // probably not used? } } @@ -438,6 +465,7 @@ public class PomReader { this.depElement = depElement; } + @Override public String getScope() { String val = getFirstChildText(depElement, SCOPE); return replaceProps(val); @@ -454,8 +482,80 @@ public class PomReader { } public boolean isOptional() { - Element e = getFirstChildElement(depElement, OPTIONAL); - return (e != null) && "true".equalsIgnoreCase(getTextContent(e)); + return Boolean.parseBoolean(getFirstChildText(depElement, OPTIONAL)); + } + + } + + public class PomProfileElement { + + private static final String VALUE = "value"; + + private static final String NAME = "name"; + + private static final String PROPERTY = "property"; + + private static final String ID_ELEMENT = "id"; + + private static final String ACTIVATION_ELEMENT = "activation"; + + private static final String ACTIVE_BY_DEFAULT_ELEMENT = "activeByDefault"; + + private final Element profileElement; + + PomProfileElement(Element profileElement) { + this.profileElement = profileElement; + } + + public String getId() { + return getFirstChildText(profileElement, ID_ELEMENT); + } + + public boolean isActive() { + return isActiveByDefault() || isActivatedByProperty(); + } + + public boolean isActiveByDefault() { + Element activation = getFirstChildElement(profileElement, ACTIVATION_ELEMENT); + return Boolean.parseBoolean(getFirstChildText(activation, ACTIVE_BY_DEFAULT_ELEMENT)); + } + + public boolean isActivatedByProperty() { + Element activation = getFirstChildElement(profileElement, ACTIVATION_ELEMENT); + Element propertyActivation = getFirstChildElement(activation, PROPERTY); + String propertyName = getFirstChildText(propertyActivation, NAME); + if (propertyName == null || "".equals(propertyName)) { + return false; + } + boolean negate = propertyName.charAt(0) == '!'; + if (negate) { + propertyName = propertyName.substring(1); + } + if ("".equals(propertyName)) { + return false; + } + String propertyValue = getFirstChildText(propertyActivation, VALUE); + + Map pomProperties = PomReader.this.getPomProperties(); + boolean matched; + if (propertyValue == null || "".equals(propertyValue)) { + matched = pomProperties.containsKey(propertyName); + } else { + matched = propertyValue.equals(pomProperties.get(propertyName)); + } + return matched ^ negate; + } + + public List getDependencies() { + return PomReader.this.getDependencies(profileElement); + } + + public List getDependencyMgt() { + return PomReader.this.getDependencyMgt(profileElement); + } + + public List getPlugins() { + return PomReader.this.getPlugins(profileElement); } } @@ -463,14 +563,13 @@ public class PomReader { /** * @return the content of the properties tag into the pom. */ - public Map/* */getPomProperties() { - Map pomProperties = new HashMap(); + public Map getPomProperties() { + Map pomProperties = new HashMap(); Element propsEl = getFirstChildElement(projectElement, PROPERTIES); if (propsEl != null) { propsEl.normalize(); } - for (Iterator it = getAllChilds(propsEl).iterator(); it.hasNext();) { - Element prop = (Element) it.next(); + for (Element prop : getAllChilds(propsEl)) { pomProperties.put(prop.getNodeName(), getTextContent(prop)); } return pomProperties; @@ -485,7 +584,7 @@ public class PomReader { } private static String getTextContent(Element element) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); NodeList childNodes = element.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { @@ -527,14 +626,14 @@ public class PomReader { return null; } - private static List/* */getAllChilds(Element parent) { - List r = new LinkedList(); + private static List getAllChilds(Element parent) { + List r = new LinkedList(); if (parent != null) { NodeList childs = parent.getChildNodes(); for (int i = 0; i < childs.getLength(); i++) { Node node = childs.item(i); if (node instanceof Element) { - r.add(node); + r.add((Element) node); } } } @@ -590,6 +689,7 @@ public class PomReader { } } + @Override public int read() throws IOException { if (count < prefix.length) { return prefix[count++]; @@ -599,6 +699,7 @@ public class PomReader { return result; } + @Override public int read(byte[] b, int off, int len) throws IOException { if (b == null) { throw new NullPointerException(); diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java b/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java index 544d9327..212ea1b1 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomWriterOptions.java @@ -19,7 +19,7 @@ package org.apache.ivy.plugins.parser.m2; import java.io.File; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -37,7 +37,7 @@ public class PomWriterOptions { private String artifactPackaging; - private List/* */extraDependencies = new ArrayList(); + private List extraDependencies = new ArrayList(); private String description; @@ -91,11 +91,11 @@ public class PomWriterOptions { return this; } - public List/* */getExtraDependencies() { + public List getExtraDependencies() { return extraDependencies; } - public PomWriterOptions setExtraDependencies(List/* */extraDependencies) { + public PomWriterOptions setExtraDependencies(List extraDependencies) { this.extraDependencies = extraDependencies; return this; } @@ -128,10 +128,11 @@ public class PomWriterOptions { } public static class ConfigurationScopeMapping { - private Map/* */scopes; + private Map scopes; - public ConfigurationScopeMapping(Map/* */scopesMapping) { - this.scopes = new HashMap(scopesMapping); + public ConfigurationScopeMapping(Map scopesMapping) { + // preserve the order + this.scopes = new LinkedHashMap(scopesMapping); } /** @@ -144,7 +145,7 @@ public class PomWriterOptions { public String getScope(String[] confs) { for (int i = 0; i < confs.length; i++) { if (scopes.containsKey(confs[i])) { - return (String) scopes.get(confs[i]); + return scopes.get(confs[i]); } } diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java index de28d743..1a247bbd 100644 --- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java +++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java @@ -122,7 +122,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { /** Used for test purpose */ ModuleDescriptor parseDescriptor(ParserSettings ivySettings, InputStream descriptor, - Resource res, boolean validate) throws ParseException, IOException { + Resource res, boolean validate) throws ParseException { Parser parser = newParser(ivySettings); parser.setValidate(validate); parser.setResource(res); @@ -209,8 +209,8 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { } } - protected static final List ALLOWED_VERSIONS = Arrays.asList(new String[] {"1.0", "1.1", - "1.2", "1.3", "1.4", "2.0", "2.1", "2.2", "2.3", "2.4"}); + protected static final List ALLOWED_VERSIONS = Arrays.asList(new String[] {"1.0", + "1.1", "1.2", "1.3", "1.4", "2.0", "2.1", "2.2", "2.3", "2.4"}); /* how and what do we have to parse */ private ParserSettings settings; @@ -261,7 +261,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { this.validate = validate; } - public void parse() throws ParseException, IOException { + public void parse() throws ParseException { try { URL schemaURL = validate ? getSchemaURL() : null; if (descriptorURL != null) { @@ -297,6 +297,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { } } + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { try { @@ -426,7 +427,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { String extendType = attributes.getValue("extendType") != null ? settings .substitute(attributes.getValue("extendType").toLowerCase(Locale.US)) : "all"; - List/* */extendTypes = Arrays.asList(extendType.split(",")); + List extendTypes = Arrays.asList(extendType.split(",")); ModuleId parentMid = new ModuleId(parentOrganisation, parentModule); ModuleRevisionId parentMrid = new ModuleRevisionId(parentMid, parentRevision); @@ -472,7 +473,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { } DefaultExtendsDescriptor ed = new DefaultExtendsDescriptor(parent, location, - (String[]) extendTypes.toArray(new String[extendTypes.size()]), local); + extendTypes.toArray(new String[extendTypes.size()]), local); getMd().addInheritedDescriptor(ed); mergeWithOtherModuleDescriptor(extendTypes, parent); @@ -487,8 +488,8 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { * @param parent * a given parent module descriptor */ - protected void mergeWithOtherModuleDescriptor(List/* */extendTypes, - ModuleDescriptor parent) throws ParseException { + protected void mergeWithOtherModuleDescriptor(List extendTypes, + ModuleDescriptor parent) { if (extendTypes.contains("all")) { mergeAll(parent); @@ -577,8 +578,10 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { return override == null ? inherited : override; } - private static Map mergeValues(Map inherited, Map overrides) { - LinkedHashMap dup = new LinkedHashMap(inherited.size() + overrides.size()); + private static Map mergeValues(Map inherited, + Map overrides) { + LinkedHashMap dup = new LinkedHashMap(inherited.size() + + overrides.size()); dup.putAll(inherited); dup.putAll(overrides); return dup; @@ -696,7 +699,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { FileResource res = new FileResource(null, file); ModuleDescriptorParser parser = ModuleDescriptorParserRegistry.getInstance().getParser( res); - return parser.parseDescriptor(getSettings(), file.toURL(), res, isValidate()); + return parser.parseDescriptor(getSettings(), file.toURI().toURL(), res, isValidate()); } /** @@ -922,8 +925,8 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { String rev = settings.substitute(attributes.getValue("rev")); String revConstraint = settings.substitute(attributes.getValue("revConstraint")); - Map extraAttributes = ExtendableItemHelper.getExtraAttributes(settings, attributes, - DEPENDENCY_REGULAR_ATTRIBUTES); + Map extraAttributes = ExtendableItemHelper.getExtraAttributes(settings, + attributes, DEPENDENCY_REGULAR_ATTRIBUTES); ModuleRevisionId revId = ModuleRevisionId.newInstance(org, name, branch, rev, extraAttributes); @@ -1124,8 +1127,8 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { ext = ext != null ? ext : type; if (state == State.DEP_ARTIFACT) { String url = settings.substitute(attributes.getValue("url")); - Map extraAtt = ExtendableItemHelper.getExtraAttributes(settings, attributes, - new String[] {"name", "type", "ext", "url", "conf"}); + Map extraAtt = ExtendableItemHelper.getExtraAttributes(settings, + attributes, new String[] {"name", "type", "ext", "url", "conf"}); confAware = new DefaultDependencyArtifactDescriptor(dd, name, type, ext, url == null ? null : new URL(url), extraAtt); } else if (state == State.ARTIFACT_INCLUDE) { @@ -1135,8 +1138,9 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { String module = settings.substitute(attributes.getValue("module")); module = module == null ? PatternMatcher.ANY_EXPRESSION : module; ArtifactId aid = new ArtifactId(new ModuleId(org, module), name, type, ext); - Map extraAtt = ExtendableItemHelper.getExtraAttributes(settings, attributes, - new String[] {"org", "module", "name", "type", "ext", "matcher", "conf"}); + Map extraAtt = ExtendableItemHelper.getExtraAttributes(settings, + attributes, new String[] {"org", "module", "name", "type", "ext", "matcher", + "conf"}); confAware = new DefaultIncludeRule(aid, matcher, extraAtt); } else { // _state == ARTIFACT_EXCLUDE || EXCLUDE PatternMatcher matcher = getPatternMatcher(attributes.getValue("matcher")); @@ -1145,8 +1149,9 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { String module = settings.substitute(attributes.getValue("module")); module = module == null ? PatternMatcher.ANY_EXPRESSION : module; ArtifactId aid = new ArtifactId(new ModuleId(org, module), name, type, ext); - Map extraAtt = ExtendableItemHelper.getExtraAttributes(settings, attributes, - new String[] {"org", "module", "name", "type", "ext", "matcher", "conf"}); + Map extraAtt = ExtendableItemHelper.getExtraAttributes(settings, + attributes, new String[] {"org", "module", "name", "type", "ext", "matcher", + "conf"}); confAware = new DefaultExcludeRule(aid, matcher, extraAtt); } String confs = settings.substitute(attributes.getValue("conf")); @@ -1197,12 +1202,14 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { return matcher; } + @Override public void characters(char[] ch, int start, int length) throws SAXException { if (buffer != null) { buffer.append(ch, start, length); } } + @Override public void endElement(String uri, String localName, String qName) throws SAXException { if (state == State.PUB && "artifact".equals(qName) && artifact.getConfigurations().length == 0) { @@ -1380,6 +1387,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser { } } + @Override public String toString() { return "ivy parser"; } diff --git a/src/java/org/apache/ivy/plugins/repository/AbstractRepository.java b/src/java/org/apache/ivy/plugins/repository/AbstractRepository.java index f1f42388..f5419bc9 100644 --- a/src/java/org/apache/ivy/plugins/repository/AbstractRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/AbstractRepository.java @@ -121,6 +121,7 @@ public abstract class AbstractRepository implements Repository { this.name = name; } + @Override public String toString() { return getName(); } diff --git a/src/java/org/apache/ivy/plugins/repository/Repository.java b/src/java/org/apache/ivy/plugins/repository/Repository.java index 9534c999..5bec7656 100644 --- a/src/java/org/apache/ivy/plugins/repository/Repository.java +++ b/src/java/org/apache/ivy/plugins/repository/Repository.java @@ -98,11 +98,11 @@ public interface Repository { * * @param parent * The parent directory from which to generate the listing. - * @return A listing of the parent directory's file content, as a List of String. + * @return A listing of the parent directory's file content * @throws IOException * On listing failure. */ - List list(String parent) throws IOException; + List list(String parent) throws IOException; /** * Add a listener to the repository. diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java b/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java index 94b41dfd..e8a5aedd 100644 --- a/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java +++ b/src/java/org/apache/ivy/plugins/repository/ssh/AbstractSshBasedRepository.java @@ -29,7 +29,10 @@ import org.apache.ivy.util.Credentials; import org.apache.ivy.util.CredentialsUtil; import org.apache.ivy.util.Message; +import com.jcraft.jsch.ConfigRepository.Config; import com.jcraft.jsch.Session; +import com.jcraft.jsch.OpenSSHConfig; +import com.jcraft.jsch.ConfigRepository; public abstract class AbstractSshBasedRepository extends AbstractRepository { @@ -49,6 +52,8 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { private boolean allowedAgentUse = false; + private String sshConfig = null; + public AbstractSshBasedRepository() { super(); } @@ -74,6 +79,8 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { int port = getPort(); String user = getUser(); String userPassword = getUserPassword(); + String sshConfig = getSshConfig(); + File keyFile = getKeyFile(); if (uri != null && uri.getScheme() != null) { if (uri.getHost() != null) { host = uri.getHost(); @@ -91,10 +98,26 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { } } } + + if (sshConfig != null) { + ConfigRepository configRepository = OpenSSHConfig.parseFile(sshConfig); + Config config = configRepository.getConfig(host); + host = config.getHostname(); + if (user == null) { + user = config.getUser(); + } + String keyFilePath = config.getValue("IdentityFile"); + if (keyFilePath != null && keyFile == null) { + keyFile = new File(keyFilePath); + } + } + + if (host == null) { throw new IllegalArgumentException( "missing host information. host should be provided either " - + "directly on the repository or in the connection URI"); + + "directly on the repository or in the connection URI " + + ", or in the openssh config file specified by sshConfig"); } if (user == null) { Credentials c = requestCredentials(host); @@ -105,7 +128,7 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { Message.error("username is not set"); } } - return SshCache.getInstance().getSession(host, port, user, userPassword, getKeyFile(), + return SshCache.getInstance().getSession(host, port, user, userPassword, keyFile, getKeyFilePassword(), getPassFile(), isAllowedAgentUse()); } @@ -315,6 +338,21 @@ public abstract class AbstractSshBasedRepository extends AbstractRepository { this.allowedAgentUse = allowedAgentUse; } + /** + * @return sshConfig Path to a local ssh config file + */ + public String getSshConfig() { + return sshConfig; + } + + /** + * @param sshConfig + * Path to a local ssh config file + */ + public void setSshConfig(String sshConfig) { + this.sshConfig = sshConfig; + } + protected abstract String getRepositoryScheme(); } diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java index a0f205b7..b813d386 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import java.util.ListIterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -49,9 +48,9 @@ import org.apache.ivy.util.Message; */ public abstract class AbstractPatternsBasedResolver extends BasicResolver { - private List ivyPatterns = new ArrayList(); // List (String pattern) + private List ivyPatterns = new ArrayList(); - private List artifactPatterns = new ArrayList(); // List (String pattern) + private List artifactPatterns = new ArrayList(); private boolean m2compatible = false; @@ -68,6 +67,7 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { data.getDate()); } + @Override public ResolvedResource findArtifactRef(Artifact artifact, Date date) { ModuleRevisionId mrid = artifact.getModuleRevisionId(); if (isM2compatible()) { @@ -77,6 +77,7 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { getDefaultRMDParser(artifact.getModuleRevisionId().getModuleId()), date); } + @Override public ResolvedResource findResource(ResolvedResource[] rress, ResourceMDParser rmdparser, ModuleRevisionId mrid, Date date) { if (isM2compatible()) { @@ -87,13 +88,13 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { } protected ResolvedResource findResourceUsingPatterns(ModuleRevisionId moduleRevision, - List patternList, Artifact artifact, ResourceMDParser rmdparser, Date date) { - List resolvedResources = new ArrayList(); - Set foundRevisions = new HashSet(); + List patternList, Artifact artifact, ResourceMDParser rmdparser, Date date) { + List resolvedResources = new ArrayList(); + Set foundRevisions = new HashSet(); boolean dynamic = getSettings().getVersionMatcher().isDynamic(moduleRevision); boolean stop = false; - for (Iterator iter = patternList.iterator(); iter.hasNext() && !stop;) { - String pattern = (String) iter.next(); + for (Iterator iter = patternList.iterator(); iter.hasNext() && !stop;) { + String pattern = iter.next(); ResolvedResource rres = findResourceUsingPattern(moduleRevision, pattern, artifact, rmdparser, date); if ((rres != null) && !foundRevisions.contains(rres.getRevision())) { @@ -105,11 +106,11 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { } if (resolvedResources.size() > 1) { - ResolvedResource[] rress = (ResolvedResource[]) resolvedResources + ResolvedResource[] rress = resolvedResources .toArray(new ResolvedResource[resolvedResources.size()]); return findResource(rress, rmdparser, moduleRevision, date); } else if (resolvedResources.size() == 1) { - return (ResolvedResource) resolvedResources.get(0); + return resolvedResources.get(0); } else { return null; } @@ -118,8 +119,9 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { protected abstract ResolvedResource findResourceUsingPattern(ModuleRevisionId mrid, String pattern, Artifact artifact, ResourceMDParser rmdparser, Date date); - protected Collection findNames(Map tokenValues, String token) { - Collection names = new HashSet(); + @Override + protected Collection findNames(Map tokenValues, String token) { + Collection names = new HashSet(); names.addAll(findIvyNames(tokenValues, token)); if (isAllownomd()) { names.addAll(findArtifactNames(tokenValues, token)); @@ -127,9 +129,9 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { return names; } - protected Collection findIvyNames(Map tokenValues, String token) { - Collection names = new HashSet(); - tokenValues = new HashMap(tokenValues); + protected Collection findIvyNames(Map tokenValues, String token) { + Collection names = new HashSet(); + tokenValues = new HashMap(tokenValues); tokenValues.put(IvyPatternHelper.ARTIFACT_KEY, "ivy"); tokenValues.put(IvyPatternHelper.TYPE_KEY, "ivy"); tokenValues.put(IvyPatternHelper.EXT_KEY, "xml"); @@ -141,9 +143,9 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { return names; } - protected Collection findArtifactNames(Map tokenValues, String token) { - Collection names = new HashSet(); - tokenValues = new HashMap(tokenValues); + protected Collection findArtifactNames(Map tokenValues, String token) { + Collection names = new HashSet(); + tokenValues = new HashMap(tokenValues); tokenValues .put(IvyPatternHelper.ARTIFACT_KEY, tokenValues.get(IvyPatternHelper.MODULE_KEY)); tokenValues.put(IvyPatternHelper.TYPE_KEY, "jar"); @@ -156,54 +158,53 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { return names; } - public Map[] listTokenValues(String[] tokens, Map criteria) { - Set result = new LinkedHashSet(); + @Override + public Map[] listTokenValues(String[] tokens, Map criteria) { + Set> result = new LinkedHashSet>(); // use ivy patterns - List ivyPatterns = getIvyPatterns(); - Map tokenValues = new HashMap(criteria); - tokenValues.put(IvyPatternHelper.TYPE_KEY, "ivy"); - tokenValues.put(IvyPatternHelper.EXT_KEY, getModuleDescriptorExtension()); + List ivyPatterns = getIvyPatterns(); + Map subcriteria = new HashMap(criteria); + subcriteria.put(IvyPatternHelper.TYPE_KEY, "ivy"); + subcriteria.put(IvyPatternHelper.EXT_KEY, getModuleDescriptorExtension()); if (isM2compatible()) { - convertM2TokenValuesForResourceSearch(tokenValues); + convertM2CriteriaForResourceSearch(subcriteria); } - for (Iterator it = ivyPatterns.iterator(); it.hasNext();) { - String ivyPattern = (String) it.next(); - result.addAll(resolveTokenValues(tokens, ivyPattern, tokenValues, false)); + for (String ivyPattern : ivyPatterns) { + result.addAll(resolveTokenValues(tokens, ivyPattern, subcriteria, false)); } if (isAllownomd()) { - List artifactPatterns = getArtifactPatterns(); - tokenValues = new HashMap(criteria); - tokenValues.put(IvyPatternHelper.TYPE_KEY, "jar"); - tokenValues.put(IvyPatternHelper.EXT_KEY, "jar"); + List artifactPatterns = getArtifactPatterns(); + subcriteria = new HashMap(criteria); + subcriteria.put(IvyPatternHelper.TYPE_KEY, "jar"); + subcriteria.put(IvyPatternHelper.EXT_KEY, "jar"); if (isM2compatible()) { - convertM2TokenValuesForResourceSearch(tokenValues); + convertM2CriteriaForResourceSearch(subcriteria); } - for (Iterator it = artifactPatterns.iterator(); it.hasNext();) { - String artifactPattern = (String) it.next(); - result.addAll(resolveTokenValues(tokens, artifactPattern, tokenValues, true)); + for (String artifactPattern : artifactPatterns) { + result.addAll(resolveTokenValues(tokens, artifactPattern, subcriteria, true)); } } - return (Map[]) result.toArray(new Map[result.size()]); + return result.toArray(new Map[result.size()]); } protected String getModuleDescriptorExtension() { return "xml"; } - private Set resolveTokenValues(String[] tokens, String pattern, Map criteria, boolean noMd) { - Set result = new LinkedHashSet(); - Set tokenSet = new HashSet(Arrays.asList(tokens)); + private Set> resolveTokenValues(String[] tokens, String pattern, + Map criteria, boolean noMd) { + Set> result = new LinkedHashSet>(); + Set tokenSet = new HashSet(Arrays.asList(tokens)); - Map tokenValues = new HashMap(); - for (Iterator it = criteria.entrySet().iterator(); it.hasNext();) { - Map.Entry entry = (Entry) it.next(); - Object key = entry.getKey(); + Map tokenValues = new HashMap(); + for (Entry entry : criteria.entrySet()) { + String key = entry.getKey(); Object value = entry.getValue(); if (value instanceof String) { - tokenValues.put(key, value); + tokenValues.put(key, (String) value); } } @@ -234,11 +235,10 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { return result; } - List vals = new ArrayList(Arrays.asList(values)); + List vals = new ArrayList(Arrays.asList(values)); filterNames(vals); - for (Iterator it = vals.iterator(); it.hasNext();) { - String value = (String) it.next(); + for (String value : vals) { if ((matcher != null) && !matcher.matches(value)) { continue; } @@ -247,16 +247,15 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { String moreResolvedPattern = IvyPatternHelper.substituteTokens( partiallyResolvedPattern, tokenValues); - Map newCriteria = new HashMap(criteria); + Map newCriteria = new HashMap(criteria); newCriteria.put(token, value); if (noMd && "artifact".equals(token)) { newCriteria.put("module", value); } else if (noMd && "module".equals(token)) { newCriteria.put("artifact", value); } - result.addAll(resolveTokenValues( - (String[]) tokenSet.toArray(new String[tokenSet.size()]), moreResolvedPattern, - newCriteria, noMd)); + result.addAll(resolveTokenValues(tokenSet.toArray(new String[tokenSet.size()]), + moreResolvedPattern, newCriteria, noMd)); } return result; @@ -266,7 +265,8 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { protected abstract boolean exist(String path); - protected void findTokenValues(Collection names, List patterns, Map tokenValues, String token) { + protected void findTokenValues(Collection names, List patterns, + Map tokenValues, String token) { // to be overridden by subclasses wanting to have listing features } @@ -283,19 +283,19 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { artifactPatterns.add(pattern); } - public List getIvyPatterns() { + public List getIvyPatterns() { return Collections.unmodifiableList(ivyPatterns); } - public List getArtifactPatterns() { + public List getArtifactPatterns() { return Collections.unmodifiableList(artifactPatterns); } - protected void setIvyPatterns(List patterns) { + protected void setIvyPatterns(List patterns) { ivyPatterns = patterns; } - protected void setArtifactPatterns(List patterns) { + protected void setArtifactPatterns(List patterns) { artifactPatterns = patterns; } @@ -310,17 +310,16 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { artifactPatterns.add(p.getPattern()); } + @Override public void dumpSettings() { super.dumpSettings(); Message.debug("\t\tm2compatible: " + isM2compatible()); Message.debug("\t\tivy patterns:"); - for (ListIterator iter = getIvyPatterns().listIterator(); iter.hasNext();) { - String p = (String) iter.next(); + for (String p : getIvyPatterns()) { Message.debug("\t\t\t" + p); } Message.debug("\t\tartifact patterns:"); - for (ListIterator iter = getArtifactPatterns().listIterator(); iter.hasNext();) { - String p = (String) iter.next(); + for (String p : getArtifactPatterns()) { Message.debug("\t\t\t" + p); } } @@ -355,11 +354,17 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { return org.replace('.', '/'); } - protected void convertM2TokenValuesForResourceSearch(Map tokenValues) { - if (tokenValues.get(IvyPatternHelper.ORGANISATION_KEY) instanceof String) { - tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, - convertM2OrganizationForResourceSearch((String) tokenValues - .get(IvyPatternHelper.ORGANISATION_KEY))); + protected void convertM2TokenValuesForResourceSearch(Map tokenValues) { + tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, + convertM2OrganizationForResourceSearch(tokenValues + .get(IvyPatternHelper.ORGANISATION_KEY))); + } + + protected void convertM2CriteriaForResourceSearch(Map criteria) { + Object org = criteria.get(IvyPatternHelper.ORGANISATION_KEY); + if (org instanceof String) { + criteria.put(IvyPatternHelper.ORGANISATION_KEY, + convertM2OrganizationForResourceSearch((String) org)); } } diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java index 7f0d75f1..7c5af9e4 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java @@ -170,11 +170,11 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS Message.verbose("no failure report implemented by " + getName()); } - public String[] listTokenValues(String token, Map otherTokenValues) { + public String[] listTokenValues(String token, Map otherTokenValues) { return new String[0]; } - public Map[] listTokenValues(String[] tokens, Map criteria) { + public Map[] listTokenValues(String[] tokens, Map criteria) { return new Map[0]; } @@ -190,6 +190,7 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS return new RevisionEntry[0]; } + @Override public String toString() { return getName(); } @@ -434,6 +435,7 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS .setCheckmodified( data.getOptions().isUseCacheOnly() ? Boolean.FALSE : checkmodified) .setValidate(doValidate(data)).setNamespace(getNamespace()) + .setUseCacheOnly(data.getOptions().isUseCacheOnly()) .setForce(data.getOptions().isRefresh()) .setListener(getDownloadListener(getDownloadOptions(data.getOptions()))); } @@ -512,22 +514,22 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS Checks.checkNotNull(dd, "dd"); Checks.checkNotNull(data, "data"); + // always cache dynamic mrids because we can store per-resolver values + saveModuleRevisionIfNeeded(dd, newModuleFound); + // check if latest is asked and compare to return the most recent ResolvedModuleRevision previousModuleFound = data.getCurrentResolvedModuleRevision(); String newModuleDesc = describe(newModuleFound); Message.debug("\tchecking " + newModuleDesc + " against " + describe(previousModuleFound)); if (previousModuleFound == null) { Message.debug("\tmodule revision kept as first found: " + newModuleDesc); - saveModuleRevisionIfNeeded(dd, newModuleFound); return newModuleFound; } else if (isAfter(newModuleFound, previousModuleFound, data.getDate())) { Message.debug("\tmodule revision kept as younger: " + newModuleDesc); - saveModuleRevisionIfNeeded(dd, newModuleFound); return newModuleFound; } else if (!newModuleFound.getDescriptor().isDefault() && previousModuleFound.getDescriptor().isDefault()) { Message.debug("\tmodule revision kept as better (not default): " + newModuleDesc); - saveModuleRevisionIfNeeded(dd, newModuleFound); return newModuleFound; } else { Message.debug("\tmodule revision discarded as older: " + newModuleDesc); @@ -539,8 +541,8 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS ResolvedModuleRevision newModuleFound) { if (newModuleFound != null && getSettings().getVersionMatcher().isDynamic(dd.getDependencyRevisionId())) { - getRepositoryCacheManager().saveResolvedRevision(dd.getDependencyRevisionId(), - newModuleFound.getId().getRevision()); + getRepositoryCacheManager().saveResolvedRevision(getName(), + dd.getDependencyRevisionId(), newModuleFound.getId().getRevision()); } } @@ -602,5 +604,9 @@ public abstract class AbstractResolver implements DependencyResolver, HasLatestS return AbstractResolver.this.getSettings().substitute(value); } + public String getVariable(String value) { + return AbstractResolver.this.getSettings().getVariable(value); + } + } } diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java index f85ce86a..c3098934 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractSshBasedResolver.java @@ -143,5 +143,17 @@ public abstract class AbstractSshBasedResolver extends RepositoryResolver { getSshBasedRepository().setPort(port); } + /** + * sets the path to an OpenSSH-style config file to be used for reading configuration values for + * an ssh repository, such as a username + * + * @param path + * of the config file + */ + public void setSshConfig(String sshConfig) { + getSshBasedRepository().setSshConfig(sshConfig); + } + + @Override public abstract String getTypeName(); } diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java new file mode 100644 index 00000000..5444ab0c --- /dev/null +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractWorkspaceResolver.java @@ -0,0 +1,239 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.ivy.plugins.resolver; + +import java.io.File; +import java.io.IOException; +import java.text.ParseException; +import java.util.List; + +import org.apache.ivy.Ivy; +import org.apache.ivy.core.module.descriptor.Artifact; +import org.apache.ivy.core.module.descriptor.Configuration; +import org.apache.ivy.core.module.descriptor.DefaultArtifact; +import org.apache.ivy.core.module.descriptor.DefaultWorkspaceModuleDescriptor; +import org.apache.ivy.core.module.descriptor.DependencyDescriptor; +import org.apache.ivy.core.module.descriptor.ExcludeRule; +import org.apache.ivy.core.module.descriptor.License; +import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.descriptor.WorkspaceModuleDescriptor; +import org.apache.ivy.core.module.id.ModuleId; +import org.apache.ivy.core.module.id.ModuleRevisionId; +import org.apache.ivy.core.report.DownloadStatus; +import org.apache.ivy.core.report.MetadataArtifactDownloadReport; +import org.apache.ivy.core.resolve.ResolveData; +import org.apache.ivy.core.resolve.ResolvedModuleRevision; +import org.apache.ivy.osgi.core.BundleInfo; +import org.apache.ivy.osgi.core.ManifestHeaderElement; +import org.apache.ivy.osgi.core.ManifestHeaderValue; +import org.apache.ivy.plugins.resolver.util.ResolvedResource; +import org.apache.ivy.plugins.version.VersionMatcher; +import org.apache.ivy.util.Message; + +public abstract class AbstractWorkspaceResolver extends AbstractResolver { + + private boolean ignoreBranch; + + private boolean ignoreVersion; + + public void setIgnoreBranch(boolean ignoreBranch) { + this.ignoreBranch = ignoreBranch; + } + + public void setIgnoreVersion(boolean ignoreVersion) { + this.ignoreVersion = ignoreVersion; + } + + protected ResolvedModuleRevision checkCandidate(DependencyDescriptor dd, ModuleDescriptor md, + String workspaceModuleName) { + + if (workspaceModuleName == null) { + workspaceModuleName = dd.getDependencyId().toString(); + } + + ModuleRevisionId dependencyMrid = dd.getDependencyRevisionId(); + String org = dependencyMrid.getModuleId().getOrganisation(); + String module = dependencyMrid.getModuleId().getName(); + + VersionMatcher versionMatcher = getSettings().getVersionMatcher(); + + ModuleRevisionId candidateMrid = md.getModuleRevisionId(); + + // search a match on the organization and the module name + + if (org.equals(BundleInfo.BUNDLE_TYPE)) { + // looking for an OSGi bundle via its symbolic name + String sn = md.getExtraInfoContentByTagName("Bundle-SymbolicName"); + if (sn == null || !module.equals(sn)) { + // not found, skip to next + return null; + } + } else if (org.equals(BundleInfo.PACKAGE_TYPE)) { + // looking for an OSGi bundle via its exported package + String exportedPackages = md.getExtraInfoContentByTagName("Export-Package"); + if (exportedPackages == null) { + // not found, skip to next + return null; + } + boolean found = false; + String version = null; + ManifestHeaderValue exportElements; + try { + exportElements = new ManifestHeaderValue(exportedPackages); + } catch (ParseException e) { + // wrong OSGi header: skip it + return null; + } + for (ManifestHeaderElement exportElement : exportElements.getElements()) { + if (exportElement.getValues().contains(module)) { + found = true; + version = exportElement.getAttributes().get("version"); + break; + } + } + if (!found) { + // not found, skip to next + return null; + } + if (version == null) { + // no version means anything can match. Let's trick the version matcher by + // setting the exact expected version + version = dependencyMrid.getRevision(); + } + md.setResolvedModuleRevisionId(ModuleRevisionId.newInstance(org, module, version)); + } else { + if (!candidateMrid.getModuleId().equals(dependencyMrid.getModuleId())) { + // it doesn't match org#module, skip to next + return null; + } + } + + Message.verbose("Workspace resolver found potential matching workspace module " + + workspaceModuleName + " with module " + candidateMrid + " for module " + + dependencyMrid); + + if (!ignoreBranch) { + ModuleId mid = dependencyMrid.getModuleId(); + String defaultBranch = getSettings().getDefaultBranch(mid); + String dependencyBranch = dependencyMrid.getBranch(); + String candidateBranch = candidateMrid.getBranch(); + if (dependencyBranch == null) { + dependencyBranch = defaultBranch; + } + if (candidateBranch == null) { + candidateBranch = defaultBranch; + } + if (dependencyBranch != candidateBranch) { + // Both cannot be null + if (dependencyBranch == null || candidateBranch == null) { + Message.verbose("\t\trejected since branches doesn't match (one is set, the other isn't)"); + return null; + } + if (!dependencyBranch.equals(candidateBranch)) { + Message.verbose("\t\trejected since branches doesn't match"); + return null; + } + } + } + + // Found one; check if it is for the module we need + if (!ignoreVersion + && !md.getModuleRevisionId().getRevision().equals(Ivy.getWorkingRevision()) + && !versionMatcher.accept(dd.getDependencyRevisionId(), md)) { + Message.verbose("\t\treject as version didn't match"); + return null; + } + + if (ignoreVersion) { + Message.verbose("\t\tmatched (version are ignored)"); + } else { + Message.verbose("\t\tversion matched"); + } + + WorkspaceModuleDescriptor workspaceMd = createWorkspaceMd(md); + + Artifact mdaf = md.getMetadataArtifact(); + if (mdaf == null) { + mdaf = new DefaultArtifact(md.getModuleRevisionId(), md.getPublicationDate(), + workspaceModuleName, "ivy", ""); + } + MetadataArtifactDownloadReport madr = new MetadataArtifactDownloadReport(mdaf); + madr.setDownloadStatus(DownloadStatus.SUCCESSFUL); + madr.setSearched(true); + + return new ResolvedModuleRevision(this, this, workspaceMd, madr); + } + + protected WorkspaceModuleDescriptor createWorkspaceMd(ModuleDescriptor md) { + DefaultWorkspaceModuleDescriptor newMd = new DefaultWorkspaceModuleDescriptor( + md.getModuleRevisionId(), "release", null, true); + newMd.addConfiguration(new Configuration(ModuleDescriptor.DEFAULT_CONFIGURATION)); + newMd.setLastModified(System.currentTimeMillis()); + + newMd.setDescription(md.getDescription()); + newMd.setHomePage(md.getHomePage()); + newMd.setLastModified(md.getLastModified()); + newMd.setPublicationDate(md.getPublicationDate()); + newMd.setResolvedPublicationDate(md.getResolvedPublicationDate()); + newMd.setStatus(md.getStatus()); + + List artifacts = createWorkspaceArtifacts(md); + + Configuration[] allConfs = md.getConfigurations(); + for (Artifact af : artifacts) { + if (allConfs.length == 0) { + newMd.addArtifact(ModuleDescriptor.DEFAULT_CONFIGURATION, af); + } else { + for (int k = 0; k < allConfs.length; k++) { + newMd.addConfiguration(allConfs[k]); + newMd.addArtifact(allConfs[k].getName(), af); + } + } + } + + DependencyDescriptor[] dependencies = md.getDependencies(); + for (int k = 0; k < dependencies.length; k++) { + newMd.addDependency(dependencies[k]); + } + + ExcludeRule[] allExcludeRules = md.getAllExcludeRules(); + for (int k = 0; k < allExcludeRules.length; k++) { + newMd.addExcludeRule(allExcludeRules[k]); + } + + newMd.getExtraInfos().addAll(md.getExtraInfos()); + + License[] licenses = md.getLicenses(); + for (int k = 0; k < licenses.length; k++) { + newMd.addLicense(licenses[k]); + } + + return newMd; + } + + abstract protected List createWorkspaceArtifacts(ModuleDescriptor md); + + public void publish(Artifact artifact, File src, boolean overwrite) throws IOException { + throw new UnsupportedOperationException("publish not supported by " + getName()); + } + + public ResolvedResource findIvyFileRef(DependencyDescriptor dd, ResolveData data) { + return null; + } + +} diff --git a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java index ce1309d4..389998d2 100644 --- a/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java @@ -31,11 +31,9 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.ListIterator; import java.util.Map; -import java.util.Map.Entry; import org.apache.ivy.core.IvyContext; import org.apache.ivy.core.IvyPatternHelper; @@ -61,6 +59,7 @@ import org.apache.ivy.core.search.ModuleEntry; import org.apache.ivy.core.search.OrganisationEntry; import org.apache.ivy.core.search.RevisionEntry; import org.apache.ivy.plugins.conflict.ConflictManager; +import org.apache.ivy.plugins.latest.ArtifactInfo; import org.apache.ivy.plugins.namespace.Namespace; import org.apache.ivy.plugins.parser.ModuleDescriptorParser; import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry; @@ -97,6 +96,8 @@ public abstract class BasicResolver extends AbstractResolver { *

*/ private static class UnresolvedDependencyException extends RuntimeException { + private static final long serialVersionUID = 1L; + private boolean error; /** @@ -138,9 +139,9 @@ public abstract class BasicResolver extends AbstractResolver { */ private boolean envDependent = true; - private List ivyattempts = new ArrayList(); + private List ivyattempts = new ArrayList(); - private Map artattempts = new HashMap(); + private Map> artattempts = new HashMap>(); private boolean checkconsistency = true; @@ -204,8 +205,7 @@ public abstract class BasicResolver extends AbstractResolver { boolean isDynamic = getAndCheckIsDynamic(systemMrid); // we first search for the dependency in cache - ResolvedModuleRevision rmr = null; - rmr = findModuleInCache(systemDd, data); + ResolvedModuleRevision rmr = findModuleInCache(systemDd, data); if (rmr != null) { if (rmr.getDescriptor().isDefault() && rmr.getResolver() != this) { Message.verbose("\t" + getName() + ": found revision in cache: " + systemMrid @@ -277,30 +277,29 @@ public abstract class BasicResolver extends AbstractResolver { } if (!rmr.getReport().isDownloaded() && rmr.getReport().getLocalFile() != null) { return checkLatest(systemDd, checkForcedResolvedModuleRevision(rmr), data); - } else { - nsMd = rmr.getDescriptor(); - - // check descriptor data is in sync with resource revision and names - systemMd = toSystem(nsMd); - if (isCheckconsistency()) { - checkDescriptorConsistency(systemMrid, systemMd, ivyRef); - checkDescriptorConsistency(nsMrid, nsMd, ivyRef); - } else { - if (systemMd instanceof DefaultModuleDescriptor) { - DefaultModuleDescriptor defaultMd = (DefaultModuleDescriptor) systemMd; - ModuleRevisionId revision = getRevision(ivyRef, systemMrid, systemMd); - defaultMd.setModuleRevisionId(revision); - defaultMd.setResolvedModuleRevisionId(revision); - } else { - Message.warn("consistency disabled with instance of non DefaultModuleDescriptor..." - + " module info can't be updated, so consistency check will be done"); - checkDescriptorConsistency(nsMrid, nsMd, ivyRef); - checkDescriptorConsistency(systemMrid, systemMd, ivyRef); - } - } - rmr = new ResolvedModuleRevision(this, this, systemMd, - toSystem(rmr.getReport()), isForce()); } + nsMd = rmr.getDescriptor(); + + // check descriptor data is in sync with resource revision and names + systemMd = toSystem(nsMd); + if (isCheckconsistency()) { + checkDescriptorConsistency(systemMrid, systemMd, ivyRef); + checkDescriptorConsistency(nsMrid, nsMd, ivyRef); + } else { + if (systemMd instanceof DefaultModuleDescriptor) { + DefaultModuleDescriptor defaultMd = (DefaultModuleDescriptor) systemMd; + ModuleRevisionId revision = getRevision(ivyRef, systemMrid, systemMd); + defaultMd.setModuleRevisionId(revision); + defaultMd.setResolvedModuleRevisionId(revision); + } else { + Message.warn( + "consistency disabled with instance of non DefaultModuleDescriptor... module info can't be updated, so consistency check will be done"); + checkDescriptorConsistency(nsMrid, nsMd, ivyRef); + checkDescriptorConsistency(systemMrid, systemMd, ivyRef); + } + } + rmr = new ResolvedModuleRevision(this, this, systemMd, + toSystem(rmr.getReport()), isForce()); } resolveAndCheckRevision(systemMd, systemMrid, ivyRef, isDynamic); @@ -390,9 +389,7 @@ public abstract class BasicResolver extends AbstractResolver { DefaultModuleDescriptor dmd = (DefaultModuleDescriptor) systemMd; if (dmd.isNamespaceUseful()) { Message.warn("the module descriptor " + ivyRef.getResource() - + " has information which can't be converted into " - + "the system namespace. " - + "It will require the availability of the namespace '" + + " has information which can't be converted into the system namespace. It will require the availability of the namespace '" + getNamespace().getName() + "' to be fully usable."); } } @@ -407,7 +404,8 @@ public abstract class BasicResolver extends AbstractResolver { throw new UnresolvedDependencyException("\t" + getName() + ": unacceptable publication date => was=" + new Date(pubDate) + " required=" + data.getDate()); - } else if (pubDate == -1) { + } + if (pubDate == -1) { throw new UnresolvedDependencyException("\t" + getName() + ": impossible to guess publication date: artifact missing for " + systemMrid); @@ -437,7 +435,7 @@ public abstract class BasicResolver extends AbstractResolver { private void checkRevision(ModuleRevisionId systemMrid) { // check revision - int index = systemMrid.getRevision().indexOf("@"); + int index = systemMrid.getRevision().indexOf('@'); if (index != -1 && !systemMrid.getRevision().substring(index + 1).equals(workspaceName)) { throw new UnresolvedDependencyException("\t" + getName() + ": unhandled revision => " + systemMrid.getRevision()); @@ -471,8 +469,8 @@ public abstract class BasicResolver extends AbstractResolver { } private ModuleRevisionId getRevision(ResolvedResource ivyRef, ModuleRevisionId askedMrid, - ModuleDescriptor md) throws ParseException { - Map allAttributes = new HashMap(); + ModuleDescriptor md) { + Map allAttributes = new HashMap(); allAttributes.putAll(md.getQualifiedExtraAttributes()); allAttributes.putAll(askedMrid.getQualifiedExtraAttributes()); @@ -545,15 +543,13 @@ public abstract class BasicResolver extends AbstractResolver { try { ResolvedModuleRevision rmr = BasicResolver.this.parse(new ResolvedResource( resource, rev), dd, data); - if (rmr == null) { - return null; - } else { + if (rmr != null) { return new MDResolvedResource(resource, rev, rmr); } } catch (ParseException e) { Message.warn("Failed to parse the file '" + resource + "'", e); - return null; } + return null; } }; @@ -582,7 +578,7 @@ public abstract class BasicResolver extends AbstractResolver { private void checkDescriptorConsistency(ModuleRevisionId mrid, ModuleDescriptor md, ResolvedResource ivyRef) throws ParseException { boolean ok = true; - StringBuffer errors = new StringBuffer(); + StringBuilder errors = new StringBuilder(); if (!mrid.getOrganisation().equals(md.getModuleRevisionId().getOrganisation())) { Message.error("\t" + getName() + ": bad organisation found in " + ivyRef.getResource() + ": expected='" + mrid.getOrganisation() + "' found='" @@ -626,13 +622,12 @@ public abstract class BasicResolver extends AbstractResolver { errors.append("bad status: '" + md.getStatus() + "'; "); ok = false; } - for (Iterator it = mrid.getExtraAttributes().entrySet().iterator(); it.hasNext();) { - Entry extra = (Entry) it.next(); + for (Map.Entry extra : mrid.getExtraAttributes().entrySet()) { if (extra.getValue() != null - && !extra.getValue().equals(md.getExtraAttribute((String) extra.getKey()))) { + && !extra.getValue().equals(md.getExtraAttribute(extra.getKey()))) { String errorMsg = "bad " + extra.getKey() + " found in " + ivyRef.getResource() + ": expected='" + extra.getValue() + "' found='" - + md.getExtraAttribute((String) extra.getKey()) + "'"; + + md.getExtraAttribute(extra.getKey()) + "'"; Message.error("\t" + getName() + ": " + errorMsg); errors.append(errorMsg + ";"); ok = false; @@ -663,18 +658,20 @@ public abstract class BasicResolver extends AbstractResolver { VersionMatcher versionMatcher = getSettings().getVersionMatcher(); ResolvedResource found = null; - List sorted = getLatestStrategy().sort(rress); - List rejected = new ArrayList(); - List foundBlacklisted = new ArrayList(); + List sorted = getLatestStrategy().sort(rress); + List rejected = new ArrayList(); + List foundBlacklisted = new ArrayList(); IvyContext context = IvyContext.getContext(); - for (ListIterator iter = sorted.listIterator(sorted.size()); iter.hasPrevious();) { + for (ListIterator iter = sorted.listIterator(sorted.size()); iter + .hasPrevious();) { ResolvedResource rres = (ResolvedResource) iter.previous(); // we start by filtering based on information already available, // even though we don't even know if the resource actually exist. // But checking for existence is most of the time more costly than checking // name, blacklisting and first level version matching - if (filterNames(new ArrayList(Collections.singleton(rres.getRevision()))).isEmpty()) { + if (filterNames(new ArrayList(Collections.singleton(rres.getRevision()))) + .isEmpty()) { Message.debug("\t" + name + ": filtered by name: " + rres); continue; } @@ -720,13 +717,13 @@ public abstract class BasicResolver extends AbstractResolver { + "requiring module descriptor: " + rres); rejected.add(rres.getRevision() + " (MD)"); continue; - } else if (!versionMatcher.accept(mrid, md)) { + } + if (!versionMatcher.accept(mrid, md)) { Message.debug("\t" + name + ": md rejected by version matcher: " + rres); rejected.add(rres.getRevision() + " (MD)"); continue; - } else { - found = r; } + found = r; } else { found = rres; } @@ -760,7 +757,7 @@ public abstract class BasicResolver extends AbstractResolver { * the list to filter. * @return the filtered list */ - protected Collection filterNames(Collection names) { + protected Collection filterNames(Collection names) { getSettings().filterIgnore(names); return names; } @@ -776,9 +773,9 @@ public abstract class BasicResolver extends AbstractResolver { } protected void logArtifactAttempt(Artifact art, String attempt) { - List attempts = (List) artattempts.get(art); + List attempts = artattempts.get(art); if (attempts == null) { - attempts = new ArrayList(); + attempts = new ArrayList(); artattempts.put(art, attempts); } attempts.add(attempt); @@ -794,31 +791,30 @@ public abstract class BasicResolver extends AbstractResolver { } } + @Override public void reportFailure() { Message.warn("==== " + getName() + ": tried"); - for (ListIterator iter = ivyattempts.listIterator(); iter.hasNext();) { - String m = (String) iter.next(); + for (String m : ivyattempts) { Message.warn(" " + m); } - for (Iterator iter = artattempts.keySet().iterator(); iter.hasNext();) { - Artifact art = (Artifact) iter.next(); - List attempts = (List) artattempts.get(art); + for (Map.Entry> entry : artattempts.entrySet()) { + Artifact art = entry.getKey(); + List attempts = entry.getValue(); if (attempts != null) { Message.warn(" -- artifact " + art + ":"); - for (ListIterator iterator = attempts.listIterator(); iterator.hasNext();) { - String m = (String) iterator.next(); + for (String m : attempts) { Message.warn(" " + m); } } } } + @Override public void reportFailure(Artifact art) { Message.warn("==== " + getName() + ": tried"); - List attempts = (List) artattempts.get(art); + List attempts = artattempts.get(art); if (attempts != null) { - for (ListIterator iter = attempts.listIterator(); iter.hasNext();) { - String m = (String) iter.next(); + for (String m : attempts) { Message.warn(" " + m); } } @@ -857,6 +853,7 @@ public abstract class BasicResolver extends AbstractResolver { artattempts.clear(); } + @Override public ArtifactDownloadReport download(final ArtifactOrigin origin, DownloadOptions options) { Checks.checkNotNull(origin, "origin"); return getRepositoryCacheManager().download(origin.getArtifact(), @@ -864,21 +861,21 @@ public abstract class BasicResolver extends AbstractResolver { public ResolvedResource resolve(Artifact artifact) { try { Resource resource = getResource(origin.getLocation()); - if (resource == null) { - return null; + if (resource != null) { + String revision = origin.getArtifact().getModuleRevisionId().getRevision(); + return new ResolvedResource(resource, revision); } - String revision = origin.getArtifact().getModuleRevisionId().getRevision(); - return new ResolvedResource(resource, revision); } catch (IOException e) { Message.debug(e); - return null; } + return null; } }, downloader, getCacheDownloadOptions(options)); } protected abstract Resource getResource(String source) throws IOException; + @Override public boolean exists(Artifact artifact) { ResolvedResource artifactRef = getArtifactRef(artifact, null); if (artifactRef != null) { @@ -887,6 +884,7 @@ public abstract class BasicResolver extends AbstractResolver { return false; } + @Override public ArtifactOrigin locate(Artifact artifact) { ArtifactOrigin origin = getRepositoryCacheManager().getSavedArtifactOrigin( toSystem(artifact)); @@ -912,63 +910,63 @@ public abstract class BasicResolver extends AbstractResolver { return -1; } + @Override public String toString() { return getName(); } - public String[] listTokenValues(String token, Map otherTokenValues) { - Collection ret = findNames(otherTokenValues, token); - return (String[]) ret.toArray(new String[ret.size()]); + @Override + public String[] listTokenValues(String token, Map otherTokenValues) { + Collection ret = findNames(otherTokenValues, token); + return ret.toArray(new String[ret.size()]); } + @Override public OrganisationEntry[] listOrganisations() { - Collection names = findNames(Collections.EMPTY_MAP, IvyPatternHelper.ORGANISATION_KEY); + Collection names = findNames(Collections. emptyMap(), + IvyPatternHelper.ORGANISATION_KEY); OrganisationEntry[] ret = new OrganisationEntry[names.size()]; int i = 0; - for (Iterator iter = names.iterator(); iter.hasNext(); i++) { - String org = (String) iter.next(); - ret[i] = new OrganisationEntry(this, org); + for (String org : names) { + ret[i++] = new OrganisationEntry(this, org); } return ret; } + @Override public ModuleEntry[] listModules(OrganisationEntry org) { - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, org.getOrganisation()); - Collection names = findNames(tokenValues, IvyPatternHelper.MODULE_KEY); + Collection names = findNames(tokenValues, IvyPatternHelper.MODULE_KEY); ModuleEntry[] ret = new ModuleEntry[names.size()]; int i = 0; - for (Iterator iter = names.iterator(); iter.hasNext(); i++) { - String name = (String) iter.next(); - ret[i] = new ModuleEntry(org, name); + for (String name : names) { + ret[i++] = new ModuleEntry(org, name); } return ret; } + @Override public RevisionEntry[] listRevisions(ModuleEntry mod) { - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, mod.getOrganisation()); tokenValues.put(IvyPatternHelper.MODULE_KEY, mod.getModule()); - Collection names = findNames(tokenValues, IvyPatternHelper.REVISION_KEY); + Collection names = findNames(tokenValues, IvyPatternHelper.REVISION_KEY); RevisionEntry[] ret = new RevisionEntry[names.size()]; int i = 0; - for (Iterator iter = names.iterator(); iter.hasNext(); i++) { - String name = (String) iter.next(); - ret[i] = new RevisionEntry(mod, name); + for (String name : names) { + ret[i++] = new RevisionEntry(mod, name); } return ret; } - protected abstract Collection findNames(Map tokenValues, String token); + protected abstract Collection findNames(Map tokenValues, String token); protected ResolvedResource findFirstArtifactRef(ModuleDescriptor md, DependencyDescriptor dd, ResolveData data) { - ResolvedResource ret = null; - String[] conf = md.getConfigurationsNames(); - for (int i = 0; i < conf.length; i++) { - Artifact[] artifacts = md.getArtifacts(conf[i]); - for (int j = 0; j < artifacts.length; j++) { - ret = getArtifactRef(artifacts[j], data.getDate()); + for (String configName : md.getConfigurationsNames()) { + for (Artifact artifact : md.getArtifacts(configName)) { + ResolvedResource ret = getArtifactRef(artifact, data.getDate()); if (ret != null) { return ret; } @@ -979,10 +977,10 @@ public abstract class BasicResolver extends AbstractResolver { protected long getAndCheck(Resource resource, File dest) throws IOException { long size = get(resource, dest); - String[] checksums = getChecksumAlgorithms(); - boolean checked = false; - for (int i = 0; i < checksums.length && !checked; i++) { - checked = check(resource, dest, checksums[i]); + for (String checksum : getChecksumAlgorithms()) { + if (check(resource, dest, checksum)) { + break; + } } return size; } @@ -1117,15 +1115,14 @@ public abstract class BasicResolver extends AbstractResolver { } // csDef is a comma separated list of checksum algorithms to use with this resolver // we parse and return it as a String[] - String[] checksums = csDef.split(","); - List algos = new ArrayList(); - for (int i = 0; i < checksums.length; i++) { - String cs = checksums[i].trim(); + List algos = new ArrayList(); + for (String checksum : csDef.split(",")) { + String cs = checksum.trim(); if (!"".equals(cs) && !"none".equals(cs)) { algos.add(cs); } } - return (String[]) algos.toArray(new String[algos.size()]); + return algos.toArray(new String[algos.size()]); } public void setChecksums(String checksums) { diff --git a/src/java/org/apache/ivy/plugins/resolver/BintrayResolver.java b/src/java/org/apache/ivy/plugins/resolver/BintrayResolver.java index c8d7b26e..9466d188 100644 --- a/src/java/org/apache/ivy/plugins/resolver/BintrayResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/BintrayResolver.java @@ -21,7 +21,6 @@ package org.apache.ivy.plugins.resolver; * BintrayResolver is a resolver which can be used to resolve dependencies found in the Bintray * artifacts repository. */ -@SuppressWarnings("ClassTooDeepInInheritanceTree") public class BintrayResolver extends IBiblioResolver { private static final String JCENTER = "https://jcenter.bintray.com/"; @@ -55,7 +54,6 @@ public class BintrayResolver extends IBiblioResolver { updateRoot(); } - @SuppressWarnings("MethodWithMultipleReturnPoints") private void updateRoot() { if (isEmpty(subject) || isEmpty(repo)) { return; diff --git a/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java b/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java index 27ac887a..a08226db 100644 --- a/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java @@ -51,6 +51,7 @@ public class CacheResolver extends FileSystemResolver { setName("cache"); } + @Override public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data) throws ParseException { clearIvyAttempts(); @@ -101,6 +102,7 @@ public class CacheResolver extends FileSystemResolver { } } + @Override public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { ensureConfigured(); clearArtifactAttempts(); @@ -125,44 +127,51 @@ public class CacheResolver extends FileSystemResolver { return dr; } + @Override public boolean exists(Artifact artifact) { ensureConfigured(); return super.exists(artifact); } + @Override public ArtifactOrigin locate(Artifact artifact) { ensureConfigured(); return super.locate(artifact); } + @Override public void publish(Artifact artifact, File src, boolean overwrite) throws IOException { ensureConfigured(); super.publish(artifact, src, overwrite); } + @Override public OrganisationEntry[] listOrganisations() { ensureConfigured(); return super.listOrganisations(); } + @Override public ModuleEntry[] listModules(OrganisationEntry org) { ensureConfigured(); return super.listModules(org); } + @Override public RevisionEntry[] listRevisions(ModuleEntry module) { ensureConfigured(); return super.listRevisions(module); } + @Override public void dumpSettings() { Message.verbose("\t" + getName() + " [cache]"); } private void ensureConfigured() { if (getIvyPatterns().isEmpty()) { - setIvyPatterns(new ArrayList()); - setArtifactPatterns(new ArrayList()); + setIvyPatterns(new ArrayList()); + setArtifactPatterns(new ArrayList()); RepositoryCacheManager[] caches = getSettings().getRepositoryCacheManagers(); for (int i = 0; i < caches.length; i++) { if (caches[i] instanceof DefaultRepositoryCacheManager) { @@ -179,6 +188,7 @@ public class CacheResolver extends FileSystemResolver { } } + @Override public String getTypeName() { return "cache"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java b/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java index 63b6c1a3..e4a2987f 100644 --- a/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java @@ -69,7 +69,7 @@ public class ChainResolver extends AbstractResolver { private boolean returnFirst = false; - private List chain = new ArrayList(); + private List chain = new ArrayList(); private boolean dual; @@ -81,7 +81,7 @@ public class ChainResolver extends AbstractResolver { throws ParseException { data = new ResolveData(data, doValidate(data)); - List errors = new ArrayList(); + List errors = new ArrayList(); ResolvedModuleRevision resolved = data.getCurrentResolvedModuleRevision(); ResolvedModuleRevision mr = resolved; @@ -95,8 +95,7 @@ public class ChainResolver extends AbstractResolver { } } - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { LatestStrategy oldLatest = setLatestIfRequired(resolver, getLatestStrategy()); try { ResolvedModuleRevision previouslyResolved = mr; @@ -117,7 +116,7 @@ public class ChainResolver extends AbstractResolver { } if (mr == null && !errors.isEmpty()) { if (errors.size() == 1) { - Exception ex = (Exception) errors.get(0); + Exception ex = errors.get(0); if (ex instanceof RuntimeException) { throw (RuntimeException) ex; } else if (ex instanceof ParseException) { @@ -127,8 +126,7 @@ public class ChainResolver extends AbstractResolver { } } else { StringBuffer err = new StringBuffer(); - for (Iterator iter = errors.iterator(); iter.hasNext();) { - Exception ex = (Exception) iter.next(); + for (Exception ex : errors) { err.append("\t").append(StringUtils.getErrorMessage(ex)).append("\n"); } err.setLength(err.length() - 1); @@ -173,8 +171,7 @@ public class ChainResolver extends AbstractResolver { } public ResolvedResource findIvyFileRef(DependencyDescriptor dd, ResolveData data) { - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { ResolvedResource result = resolver.findIvyFileRef(dd, data); if (result != null) { return result; @@ -184,39 +181,40 @@ public class ChainResolver extends AbstractResolver { return null; } - public Map[] listTokenValues(String[] tokens, Map criteria) { - Set result = new HashSet(); - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); - Map[] temp = resolver.listTokenValues(tokens, new HashMap(criteria)); + @Override + public Map[] listTokenValues(String[] tokens, Map criteria) { + Set> result = new HashSet>(); + for (DependencyResolver resolver : chain) { + Map[] temp = resolver.listTokenValues(tokens, + new HashMap(criteria)); result.addAll(Arrays.asList(temp)); } - return (Map[]) result.toArray(new Map[result.size()]); + return result.toArray(new Map[result.size()]); } + @Override public void reportFailure() { - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { resolver.reportFailure(); } } + @Override public void reportFailure(Artifact art) { - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { resolver.reportFailure(art); } } public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { - List artifactsToDownload = new ArrayList(Arrays.asList(artifacts)); + List artifactsToDownload = new ArrayList(Arrays.asList(artifacts)); DownloadReport report = new DownloadReport(); - for (Iterator iter = chain.iterator(); iter.hasNext() && !artifactsToDownload.isEmpty();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (Iterator iter = chain.iterator(); iter.hasNext() + && !artifactsToDownload.isEmpty();) { + DependencyResolver resolver = iter.next(); DownloadReport r = resolver.download( - (Artifact[]) artifactsToDownload.toArray(new Artifact[artifactsToDownload.size()]), - options); + artifactsToDownload.toArray(new Artifact[artifactsToDownload.size()]), options); ArtifactDownloadReport[] adr = r.getArtifactsReports(); for (int i = 0; i < adr.length; i++) { if (adr[i].getDownloadStatus() != DownloadStatus.FAILED) { @@ -225,8 +223,7 @@ public class ChainResolver extends AbstractResolver { } } } - for (Iterator iter = artifactsToDownload.iterator(); iter.hasNext();) { - Artifact art = (Artifact) iter.next(); + for (Artifact art : artifactsToDownload) { ArtifactDownloadReport adr = new ArtifactDownloadReport(art); adr.setDownloadStatus(DownloadStatus.FAILED); report.addArtifactReport(adr); @@ -234,7 +231,7 @@ public class ChainResolver extends AbstractResolver { return report; } - public List getResolvers() { + public List getResolvers() { return chain; } @@ -243,15 +240,18 @@ public class ChainResolver extends AbstractResolver { getFirstResolver().publish(artifact, src, overwrite); } + @Override public void abortPublishTransaction() throws IOException { getFirstResolver().abortPublishTransaction(); } + @Override public void beginPublishTransaction(ModuleRevisionId module, boolean overwrite) throws IOException { getFirstResolver().beginPublishTransaction(module, overwrite); } + @Override public void commitPublishTransaction() throws IOException { getFirstResolver().commitPublishTransaction(); } @@ -260,7 +260,7 @@ public class ChainResolver extends AbstractResolver { if (chain.isEmpty()) { throw new IllegalStateException("invalid chain resolver with no sub resolver"); } - return ((DependencyResolver) chain.get(0)); + return chain.get(0); } public boolean isReturnFirst() { @@ -271,19 +271,19 @@ public class ChainResolver extends AbstractResolver { this.returnFirst = returnFirst; } + @Override public void dumpSettings() { Message.verbose("\t" + getName() + " [chain] " + chain); Message.debug("\t\treturn first: " + isReturnFirst()); Message.debug("\t\tdual: " + isDual()); - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver r = (DependencyResolver) iter.next(); - Message.debug("\t\t-> " + r.getName()); + for (DependencyResolver resolver : chain) { + Message.debug("\t\t-> " + resolver.getName()); } } + @Override public boolean exists(Artifact artifact) { - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { if (resolver.exists(artifact)) { return true; } @@ -291,9 +291,9 @@ public class ChainResolver extends AbstractResolver { return false; } + @Override public ArtifactOrigin locate(Artifact artifact) { - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { ArtifactOrigin origin = resolver.locate(artifact); if (!ArtifactOrigin.isUnknown(origin)) { return origin; @@ -302,9 +302,9 @@ public class ChainResolver extends AbstractResolver { return ArtifactOrigin.unkwnown(artifact); } + @Override public ArtifactDownloadReport download(ArtifactOrigin artifact, DownloadOptions options) { - for (Iterator iter = chain.iterator(); iter.hasNext();) { - DependencyResolver resolver = (DependencyResolver) iter.next(); + for (DependencyResolver resolver : chain) { ArtifactDownloadReport adr = resolver.download(artifact, options); if (adr.getDownloadStatus() != DownloadStatus.FAILED) { return adr; diff --git a/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java b/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java index c1ee3766..5d4c76c7 100644 --- a/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java @@ -169,7 +169,7 @@ public interface DependencyResolver { * with the Namespace returned by {@link #getNamespace()}. *

*/ - String[] listTokenValues(String token, Map otherTokenValues); + String[] listTokenValues(String token, Map otherTokenValues); /** * Same as {@link #listTokenValues(String, Map)} but more generic. @@ -178,9 +178,9 @@ public interface DependencyResolver { * the tokens of the query * @param criteria * the token which have values - * @return the list of token values (Map[]), must not be null + * @return the list of token values, must not be null */ - Map[] listTokenValues(String[] tokens, Map criteria); + Map[] listTokenValues(String[] tokens, Map criteria); OrganisationEntry[] listOrganisations(); diff --git a/src/java/org/apache/ivy/plugins/resolver/DualResolver.java b/src/java/org/apache/ivy/plugins/resolver/DualResolver.java index e23b9fff..76b7e543 100644 --- a/src/java/org/apache/ivy/plugins/resolver/DualResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/DualResolver.java @@ -137,22 +137,26 @@ public class DualResolver extends AbstractResolver { } } + @Override public void abortPublishTransaction() throws IOException { ivyResolver.abortPublishTransaction(); artifactResolver.abortPublishTransaction(); } + @Override public void beginPublishTransaction(ModuleRevisionId module, boolean overwrite) throws IOException { ivyResolver.beginPublishTransaction(module, overwrite); artifactResolver.beginPublishTransaction(module, overwrite); } + @Override public void commitPublishTransaction() throws IOException { ivyResolver.commitPublishTransaction(); artifactResolver.commitPublishTransaction(); } + @Override public void dumpSettings() { if (ivyResolver == null || artifactResolver == null) { throw new IllegalStateException( @@ -162,6 +166,7 @@ public class DualResolver extends AbstractResolver { + artifactResolver.getName() + "]"); } + @Override public boolean exists(Artifact artifact) { if (artifact.isMetadata()) { return ivyResolver.exists(artifact); @@ -170,6 +175,7 @@ public class DualResolver extends AbstractResolver { } } + @Override public ArtifactOrigin locate(Artifact artifact) { if (artifact.isMetadata()) { return ivyResolver.locate(artifact); @@ -178,6 +184,7 @@ public class DualResolver extends AbstractResolver { } } + @Override public ArtifactDownloadReport download(ArtifactOrigin artifact, DownloadOptions options) { if (artifact.getArtifact().isMetadata()) { return ivyResolver.download(artifact, options); diff --git a/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java b/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java index a7cee6be..fe0d0f2d 100644 --- a/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java @@ -67,7 +67,7 @@ public class FileSystemResolver extends RepositoryResolver { * Map between actual patterns and patterns used during the transaction to put files in a * temporary directory */ - private Map/* */fullTransactionPatterns = new HashMap(); + private Map fullTransactionPatterns = new HashMap(); /** * Location where files are published during the transaction @@ -83,6 +83,7 @@ public class FileSystemResolver extends RepositoryResolver { setRepository(new FileRepository()); } + @Override public String getTypeName() { return "file"; } @@ -99,10 +100,11 @@ public class FileSystemResolver extends RepositoryResolver { return (FileRepository) getRepository(); } + @Override protected String getDestination(String pattern, Artifact artifact, ModuleRevisionId mrid) { if (supportTransaction() && isTransactionStarted()) { - String destPattern = (String) fullTransactionPatterns.get(pattern); + String destPattern = fullTransactionPatterns.get(pattern); if (destPattern == null) { throw new IllegalArgumentException( "unsupported pattern for publish destination pattern: " + pattern @@ -118,6 +120,7 @@ public class FileSystemResolver extends RepositoryResolver { return transactionTempDir != null; } + @Override public void abortPublishTransaction() throws IOException { if (supportTransaction()) { if (isTransactionStarted()) { @@ -133,6 +136,7 @@ public class FileSystemResolver extends RepositoryResolver { } } + @Override public void commitPublishTransaction() throws IOException { if (supportTransaction()) { if (!isTransactionStarted()) { @@ -169,6 +173,7 @@ public class FileSystemResolver extends RepositoryResolver { } } + @Override public void beginPublishTransaction(ModuleRevisionId module, boolean overwrite) throws IOException { if (supportTransaction()) { @@ -194,11 +199,12 @@ public class FileSystemResolver extends RepositoryResolver { } } - protected Collection filterNames(Collection values) { + @Override + protected Collection filterNames(Collection values) { if (supportTransaction()) { values = super.filterNames(values); - for (Iterator iterator = values.iterator(); iterator.hasNext();) { - String v = (String) iterator.next(); + for (Iterator iterator = values.iterator(); iterator.hasNext();) { + String v = iterator.next(); if (v.endsWith(TRANSACTION_DESTINATION_SUFFIX)) { iterator.remove(); } @@ -225,11 +231,11 @@ public class FileSystemResolver extends RepositoryResolver { private void checkSupportTransaction() { if (supportTransaction == null) { supportTransaction = Boolean.FALSE; - List ivyPatterns = getIvyPatterns(); - List artifactPatterns = getArtifactPatterns(); + List ivyPatterns = getIvyPatterns(); + List artifactPatterns = getArtifactPatterns(); if (ivyPatterns.size() > 0) { - String pattern = (String) ivyPatterns.get(0); + String pattern = ivyPatterns.get(0); Matcher m = TRANSACTION_PATTERN.matcher(pattern); if (!m.matches()) { unsupportedTransaction("ivy pattern does not use revision as a directory"); @@ -241,7 +247,7 @@ public class FileSystemResolver extends RepositoryResolver { } } if (artifactPatterns.size() > 0) { - String pattern = (String) artifactPatterns.get(0); + String pattern = artifactPatterns.get(0); Matcher m = TRANSACTION_PATTERN.matcher(pattern); if (!m.matches()) { unsupportedTransaction("artifact pattern does not use revision as a directory"); @@ -299,23 +305,27 @@ public class FileSystemResolver extends RepositoryResolver { this.transactional = transactional; } + @Override public void addConfiguredIvy(IvyPattern p) { File file = Checks.checkAbsolute(p.getPattern(), "ivy pattern"); p.setPattern(file.getAbsolutePath()); super.addConfiguredIvy(p); } + @Override public void addIvyPattern(String pattern) { File file = Checks.checkAbsolute(pattern, "ivy pattern"); super.addIvyPattern(file.getAbsolutePath()); } + @Override public void addConfiguredArtifact(IvyPattern p) { File file = Checks.checkAbsolute(p.getPattern(), "artifact pattern"); p.setPattern(file.getAbsolutePath()); super.addConfiguredArtifact(p); } + @Override public void addArtifactPattern(String pattern) { File file = Checks.checkAbsolute(pattern, "artifact pattern"); super.addArtifactPattern(file.getAbsolutePath()); diff --git a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java index 8072e3f3..7fa4780f 100644 --- a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -87,6 +86,7 @@ public class IBiblioResolver extends URLResolver { setChangingPattern(".*-SNAPSHOT"); } + @Override public ResolvedResource findIvyFileRef(DependencyDescriptor dd, ResolveData data) { if (isM2compatible() && isUsepoms()) { ModuleRevisionId mrid = dd.getDependencyRevisionId(); @@ -109,6 +109,7 @@ public class IBiblioResolver extends URLResolver { } } + @Override public ResolvedResource findArtifactRef(Artifact artifact, Date date) { ensureConfigured(getSettings()); ModuleRevisionId mrid = artifact.getModuleRevisionId(); @@ -172,6 +173,7 @@ public class IBiblioResolver extends URLResolver { final StringBuffer timestamp = new StringBuffer(); final StringBuffer buildNumer = new StringBuffer(); XMLHelper.parse(metadataStream, null, new ContextualSAXHandler() { + @Override public void endElement(String uri, String localName, String qName) throws SAXException { if ("metadata/versioning/snapshot/timestamp".equals(getContext())) { @@ -213,6 +215,7 @@ public class IBiblioResolver extends URLResolver { return null; } + @Override public void setM2compatible(boolean m2compatible) { super.setM2compatible(m2compatible); if (m2compatible) { @@ -250,6 +253,7 @@ public class IBiblioResolver extends URLResolver { } } + @Override protected String getModuleDescriptorExtension() { return "pom"; } @@ -301,7 +305,7 @@ public class IBiblioResolver extends URLResolver { if (isM2compatible() && isUsepoms()) { setIvyPatterns(Collections.singletonList(getWholePattern())); } else { - setIvyPatterns(Collections.EMPTY_LIST); + setIvyPatterns(Collections. emptyList()); } setArtifactPatterns(Collections.singletonList(getWholePattern())); } @@ -311,7 +315,8 @@ public class IBiblioResolver extends URLResolver { } // we do not allow to list organisations on ibiblio, nor modules in ibiblio 1 - public String[] listTokenValues(String token, Map otherTokenValues) { + @Override + public String[] listTokenValues(String token, Map otherTokenValues) { if (IvyPatternHelper.ORGANISATION_KEY.equals(token)) { return new String[0]; } @@ -322,6 +327,7 @@ public class IBiblioResolver extends URLResolver { return super.listTokenValues(token, otherTokenValues); } + @Override protected String[] listTokenValues(String pattern, String token) { if (IvyPatternHelper.ORGANISATION_KEY.equals(token)) { return new String[0]; @@ -350,9 +356,9 @@ public class IBiblioResolver extends URLResolver { String metadataLocation = pattern.substring(0, pattern.lastIndexOf(partiallyResolvedM2PerModulePattern)) + "maven-metadata.xml"; - List revs = listRevisionsWithMavenMetadata(getRepository(), metadataLocation); + List revs = listRevisionsWithMavenMetadata(getRepository(), metadataLocation); if (revs != null) { - return (String[]) revs.toArray(new String[revs.size()]); + return revs.toArray(new String[revs.size()]); } } else { /* @@ -368,10 +374,12 @@ public class IBiblioResolver extends URLResolver { return super.listTokenValues(pattern, token); } + @Override public OrganisationEntry[] listOrganisations() { return new OrganisationEntry[0]; } + @Override public ModuleEntry[] listModules(OrganisationEntry org) { if (isM2compatible()) { ensureConfigured(getSettings()); @@ -380,21 +388,22 @@ public class IBiblioResolver extends URLResolver { return new ModuleEntry[0]; } + @Override public RevisionEntry[] listRevisions(ModuleEntry mod) { ensureConfigured(getSettings()); return super.listRevisions(mod); } + @Override protected ResolvedResource[] listResources(Repository repository, ModuleRevisionId mrid, String pattern, Artifact artifact) { if (shouldUseMavenMetadata(pattern)) { - List revs = listRevisionsWithMavenMetadata(repository, mrid.getModuleId() + List revs = listRevisionsWithMavenMetadata(repository, mrid.getModuleId() .getAttributes()); if (revs != null) { Message.debug("\tfound revs: " + revs); - List rres = new ArrayList(); - for (Iterator iter = revs.iterator(); iter.hasNext();) { - String rev = (String) iter.next(); + List rres = new ArrayList(); + for (String rev : revs) { ModuleRevisionId historicalMrid = ModuleRevisionId.newInstance(mrid, rev); String patternForRev = pattern; @@ -421,7 +430,7 @@ public class IBiblioResolver extends URLResolver { + rres, e); } } - return (ResolvedResource[]) rres.toArray(new ResolvedResource[rres.size()]); + return rres.toArray(new ResolvedResource[rres.size()]); } else { // maven metadata not available or something went wrong, // use default listing capability @@ -432,22 +441,25 @@ public class IBiblioResolver extends URLResolver { } } - private List listRevisionsWithMavenMetadata(Repository repository, Map tokenValues) { + private List listRevisionsWithMavenMetadata(Repository repository, + Map tokenValues) { String metadataLocation = IvyPatternHelper.substituteTokens(root + "[organisation]/[module]/maven-metadata.xml", tokenValues); return listRevisionsWithMavenMetadata(repository, metadataLocation); } - private List listRevisionsWithMavenMetadata(Repository repository, String metadataLocation) { - List revs = null; + private List listRevisionsWithMavenMetadata(Repository repository, + String metadataLocation) { + List revs = null; InputStream metadataStream = null; try { Resource metadata = repository.getResource(metadataLocation); if (metadata.exists()) { Message.verbose("\tlisting revisions from maven-metadata: " + metadata); - final List metadataRevs = new ArrayList(); + final List metadataRevs = new ArrayList(); metadataStream = metadata.openStream(); XMLHelper.parse(metadataStream, null, new ContextualSAXHandler() { + @Override public void endElement(String uri, String localName, String qName) throws SAXException { if ("metadata/versioning/versions/version".equals(getContext())) { @@ -478,10 +490,12 @@ public class IBiblioResolver extends URLResolver { return revs; } - protected void findTokenValues(Collection names, List patterns, Map tokenValues, String token) { + @Override + protected void findTokenValues(Collection names, List patterns, + Map tokenValues, String token) { if (IvyPatternHelper.REVISION_KEY.equals(token)) { if (shouldUseMavenMetadata(getWholePattern())) { - List revs = listRevisionsWithMavenMetadata(getRepository(), tokenValues); + List revs = listRevisionsWithMavenMetadata(getRepository(), tokenValues); if (revs != null) { names.addAll(filterNames(revs)); return; @@ -495,33 +509,39 @@ public class IBiblioResolver extends URLResolver { return isUseMavenMetadata() && isM2compatible() && pattern.endsWith(M2_PATTERN); } + @Override public String getTypeName() { return "ibiblio"; } // override some methods to ensure configuration + @Override public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data) throws ParseException { ensureConfigured(data.getSettings()); return super.getDependency(dd, data); } + @Override public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { ensureConfigured(getSettings()); return super.download(artifacts, options); } + @Override public boolean exists(Artifact artifact) { ensureConfigured(getSettings()); return super.exists(artifact); } + @Override public ArtifactOrigin locate(Artifact artifact) { ensureConfigured(getSettings()); return super.locate(artifact); } - public List getArtifactPatterns() { + @Override + public List getArtifactPatterns() { ensureConfigured(getSettings()); return super.getArtifactPatterns(); } @@ -543,6 +563,7 @@ public class IBiblioResolver extends URLResolver { this.useMavenMetadata = useMavenMetadata; } + @Override public void dumpSettings() { ensureConfigured(getSettings()); super.dumpSettings(); diff --git a/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java b/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java index 12e1e2ba..7e08bbc2 100644 --- a/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/IvyRepResolver.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -168,6 +167,7 @@ public class IvyRepResolver extends URLResolver { updateWholeIvyPattern(); } + @Override public void setM2compatible(boolean m2compatible) { if (m2compatible) { throw new IllegalArgumentException( @@ -219,12 +219,14 @@ public class IvyRepResolver extends URLResolver { updateWholeArtPattern(); } + @Override public OrganisationEntry[] listOrganisations() { ensureIvyConfigured(getSettings()); try { URL content = new URL(ivyroot + "content.xml"); - final List ret = new ArrayList(); + final List ret = new ArrayList(); XMLHelper.parse(content, null, new DefaultHandler() { + @Override public void startElement(String uri, String localName, String qName, org.xml.sax.Attributes attributes) throws SAXException { if ("organisation".equals(qName)) { @@ -235,7 +237,7 @@ public class IvyRepResolver extends URLResolver { } } }); - return (OrganisationEntry[]) ret.toArray(new OrganisationEntry[ret.size()]); + return ret.toArray(new OrganisationEntry[ret.size()]); } catch (MalformedURLException e) { // ??? } catch (Exception e) { @@ -246,63 +248,72 @@ public class IvyRepResolver extends URLResolver { // overwrite parent to use only ivy patterns (and not artifact ones, cause ibiblio is too slow // to answer) + @Override public ModuleEntry[] listModules(OrganisationEntry org) { ensureIvyConfigured(getSettings()); - Map tokenValues = new HashMap(); + Map tokenValues = new HashMap(); tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, org.getOrganisation()); - Collection names = findIvyNames(tokenValues, IvyPatternHelper.MODULE_KEY); + Collection names = findIvyNames(tokenValues, IvyPatternHelper.MODULE_KEY); ModuleEntry[] ret = new ModuleEntry[names.size()]; int i = 0; - for (Iterator iter = names.iterator(); iter.hasNext(); i++) { - String name = (String) iter.next(); + for (String name : names) { ret[i] = new ModuleEntry(org, name); } return ret; } + @Override public RevisionEntry[] listRevisions(ModuleEntry mod) { ensureIvyConfigured(getSettings()); ensureArtifactConfigured(getSettings()); return super.listRevisions(mod); } + @Override public String getTypeName() { return "ivyrep"; } // override some methods to ensure configuration + @Override public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data) throws ParseException { ensureIvyConfigured(data.getSettings()); return super.getDependency(dd, data); } + @Override public ResolvedResource findArtifactRef(Artifact artifact, Date date) { ensureArtifactConfigured(getSettings()); return super.findArtifactRef(artifact, date); } + @Override public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { ensureArtifactConfigured(getSettings()); return super.download(artifacts, options); } + @Override public boolean exists(Artifact artifact) { ensureArtifactConfigured(getSettings()); return super.exists(artifact); } + @Override public ArtifactOrigin locate(Artifact artifact) { ensureArtifactConfigured(getSettings()); return super.locate(artifact); } - public List getIvyPatterns() { + @Override + public List getIvyPatterns() { ensureIvyConfigured(getSettings()); return super.getIvyPatterns(); } - public List getArtifactPatterns() { + @Override + public List getArtifactPatterns() { ensureArtifactConfigured(getSettings()); return super.getArtifactPatterns(); } diff --git a/src/java/org/apache/ivy/plugins/resolver/JarResolver.java b/src/java/org/apache/ivy/plugins/resolver/JarResolver.java index f305cf6b..623a5f56 100644 --- a/src/java/org/apache/ivy/plugins/resolver/JarResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/JarResolver.java @@ -40,6 +40,7 @@ public class JarResolver extends RepositoryResolver { setRepository(new JarRepository()); } + @Override public String getTypeName() { return "jar"; } @@ -72,6 +73,7 @@ public class JarResolver extends RepositoryResolver { getJarRepository().setJarFile(jar); } + @Override public void setSettings(ResolverSettings settings) { super.setSettings(settings); // let's resolve the url diff --git a/src/java/org/apache/ivy/plugins/resolver/MirroredURLResolver.java b/src/java/org/apache/ivy/plugins/resolver/MirroredURLResolver.java index 09777adb..2d173083 100644 --- a/src/java/org/apache/ivy/plugins/resolver/MirroredURLResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/MirroredURLResolver.java @@ -25,12 +25,12 @@ import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.ivy.core.cache.CacheResourceOptions; import org.apache.ivy.core.report.ArtifactDownloadReport; import org.apache.ivy.osgi.repo.RelativeURLRepository; +import org.apache.ivy.plugins.repository.Repository; import org.apache.ivy.plugins.repository.url.ChainedRepository; import org.apache.ivy.plugins.repository.url.URLRepository; import org.apache.ivy.plugins.repository.url.URLResource; @@ -50,17 +50,15 @@ public class MirroredURLResolver extends RepositoryResolver { private void setupMirrors() { File mirrorListFile = downloadMirrorList(); - List mirrorBaseUrls; + List mirrorBaseUrls; try { mirrorBaseUrls = readMirrorList(mirrorListFile); } catch (IOException e) { throw new IllegalStateException("The mirror list could not be read from " + mirrorListUrl + " (" + e.getMessage() + ")"); } - List/* */repositories = new ArrayList(); - Iterator it = mirrorBaseUrls.iterator(); - while (it.hasNext()) { - String baseUrl = (String) it.next(); + List repositories = new ArrayList(); + for (String baseUrl : mirrorBaseUrls) { URL url = null; try { url = new URL(baseUrl); @@ -88,10 +86,10 @@ public class MirroredURLResolver extends RepositoryResolver { return report.getLocalFile(); } - private List/* */readMirrorList(File mirrorListFile) throws IOException { + private List readMirrorList(File mirrorListFile) throws IOException { BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream( mirrorListFile))); - List/* */list = new ArrayList(); + List list = new ArrayList(); try { String line = in.readLine(); while (line != null) { @@ -104,10 +102,12 @@ public class MirroredURLResolver extends RepositoryResolver { return list; } + @Override public String getTypeName() { return "mirroredurl"; } + @Override public void validate() { super.validate(); setupMirrors(); diff --git a/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java b/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java index 59dbf676..32c42ab2 100644 --- a/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -73,6 +72,7 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { this.repository = repository; } + @Override public void setName(String name) { super.setName(name); if (repository instanceof AbstractRepository) { @@ -84,6 +84,7 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { this.signerName = signerName; } + @Override protected ResolvedResource findResourceUsingPattern(ModuleRevisionId mrid, String pattern, Artifact artifact, ResourceMDParser rmdparser, Date date) { String name = getName(); @@ -160,6 +161,7 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { } } + @Override protected Resource getResource(String source) throws IOException { return repository.getResource(source); } @@ -184,6 +186,7 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { return ResolverHelper.findAll(repository, mrid, pattern, artifact); } + @Override protected long get(Resource resource, File dest) throws IOException { Message.verbose("\t" + getName() + ": downloading " + resource.getName()); Message.debug("\t\tto " + dest); @@ -197,9 +200,9 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { public void publish(Artifact artifact, File src, boolean overwrite) throws IOException { String destPattern; if ("ivy".equals(artifact.getType()) && !getIvyPatterns().isEmpty()) { - destPattern = (String) getIvyPatterns().get(0); + destPattern = getIvyPatterns().get(0); } else if (!getArtifactPatterns().isEmpty()) { - destPattern = (String) getArtifactPatterns().get(0); + destPattern = getArtifactPatterns().get(0); } else { throw new IllegalStateException("impossible to publish " + artifact + " using " + this + ": no artifact pattern defined"); @@ -276,6 +279,7 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { } } + @Override public DownloadReport download(Artifact[] artifacts, DownloadOptions options) { EventManager eventManager = getEventManager(); try { @@ -290,23 +294,26 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { } } - protected void findTokenValues(Collection names, List patterns, Map tokenValues, String token) { - for (Iterator iter = patterns.iterator(); iter.hasNext();) { - String pattern = (String) iter.next(); + @Override + protected void findTokenValues(Collection names, List patterns, + Map tokenValues, String token) { + for (String pattern : patterns) { String partiallyResolvedPattern = IvyPatternHelper.substituteTokens(pattern, tokenValues); String[] values = ResolverHelper.listTokenValues(repository, partiallyResolvedPattern, token); if (values != null) { - names.addAll(filterNames(new ArrayList(Arrays.asList(values)))); + names.addAll(filterNames(new ArrayList(Arrays.asList(values)))); } } } + @Override protected String[] listTokenValues(String pattern, String token) { return ResolverHelper.listTokenValues(repository, pattern, token); } + @Override protected boolean exist(String path) { try { Resource resource = repository.getResource(path); @@ -317,15 +324,18 @@ public class RepositoryResolver extends AbstractPatternsBasedResolver { } } + @Override public String getTypeName() { return "repository"; } + @Override public void dumpSettings() { super.dumpSettings(); Message.debug("\t\trepository: " + getRepository()); } + @Override public void setSettings(ResolverSettings settings) { super.setSettings(settings); if (settings != null) { diff --git a/src/java/org/apache/ivy/plugins/resolver/ResolverSettings.java b/src/java/org/apache/ivy/plugins/resolver/ResolverSettings.java index 5401801a..27e897be 100644 --- a/src/java/org/apache/ivy/plugins/resolver/ResolverSettings.java +++ b/src/java/org/apache/ivy/plugins/resolver/ResolverSettings.java @@ -51,7 +51,7 @@ public interface ResolverSettings extends ParserSettings { String getResolveMode(ModuleId moduleId); - void filterIgnore(Collection names); + void filterIgnore(Collection names); SignatureGenerator getSignatureGenerator(String name); diff --git a/src/java/org/apache/ivy/plugins/resolver/SFTPResolver.java b/src/java/org/apache/ivy/plugins/resolver/SFTPResolver.java index 190d1502..096df8d6 100644 --- a/src/java/org/apache/ivy/plugins/resolver/SFTPResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/SFTPResolver.java @@ -31,6 +31,7 @@ public class SFTPResolver extends AbstractSshBasedResolver { setRepository(new SFTPRepository()); } + @Override public String getTypeName() { return "sftp"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/SshResolver.java b/src/java/org/apache/ivy/plugins/resolver/SshResolver.java index 8a4f8594..f1114de2 100644 --- a/src/java/org/apache/ivy/plugins/resolver/SshResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/SshResolver.java @@ -83,6 +83,7 @@ public class SshResolver extends AbstractSshBasedResolver { ((SshRepository) getRepository()).setExistCommand(cmd); } + @Override public String getTypeName() { return "ssh"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/URLResolver.java b/src/java/org/apache/ivy/plugins/resolver/URLResolver.java index 7afacdc3..d34ad33f 100644 --- a/src/java/org/apache/ivy/plugins/resolver/URLResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/URLResolver.java @@ -28,6 +28,7 @@ public class URLResolver extends RepositoryResolver { setRepository(new URLRepository()); } + @Override public String getTypeName() { return "url"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java b/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java index a897a36d..afae993e 100644 --- a/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java @@ -34,10 +34,12 @@ public class VfsResolver extends RepositoryResolver { setRepository(new VfsRepository()); } + @Override public String getTypeName() { return "vfs"; } + @Override public String hidePassword(String name) { return prepareForDisplay(name); } diff --git a/src/java/org/apache/ivy/plugins/resolver/VsftpResolver.java b/src/java/org/apache/ivy/plugins/resolver/VsftpResolver.java index e2c4e245..07a81da7 100644 --- a/src/java/org/apache/ivy/plugins/resolver/VsftpResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/VsftpResolver.java @@ -28,6 +28,7 @@ public class VsftpResolver extends RepositoryResolver { setRepository(new VsftpRepository()); } + @Override public String getTypeName() { return "vsftp"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/WorkspaceChainResolver.java b/src/java/org/apache/ivy/plugins/resolver/WorkspaceChainResolver.java new file mode 100644 index 00000000..a3662cfe --- /dev/null +++ b/src/java/org/apache/ivy/plugins/resolver/WorkspaceChainResolver.java @@ -0,0 +1,37 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +package org.apache.ivy.plugins.resolver; + +import org.apache.ivy.core.settings.IvySettings; + +/** + * Resolver which decorate normal resolver so that the workspace resolver can hijack the resolve + * process
+ * NB : it is for internal usage of Ivy only! + */ +public class WorkspaceChainResolver extends ChainResolver { + + public WorkspaceChainResolver(IvySettings settings, DependencyResolver delegate, + AbstractWorkspaceResolver workspaceResolver) { + setName("workspace-chain-" + delegate.getName()); + setSettings(settings); + setReturnFirst(true); + add(workspaceResolver); + add(delegate); + } +} diff --git a/src/java/org/apache/ivy/plugins/resolver/util/ApacheHttpURLLister.java b/src/java/org/apache/ivy/plugins/resolver/util/ApacheHttpURLLister.java index 90d68b01..374d9421 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/ApacheHttpURLLister.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/ApacheHttpURLLister.java @@ -30,10 +30,11 @@ public class ApacheHttpURLLister implements URLLister { return pattern.startsWith("http"); } - public List listAll(URL url) throws IOException { + public List listAll(URL url) throws IOException { return lister.listAll(url); } + @Override public String toString() { return "apache http lister"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/util/FileURLLister.java b/src/java/org/apache/ivy/plugins/resolver/util/FileURLLister.java index 26cd04d1..f5c680d2 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/FileURLLister.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/FileURLLister.java @@ -41,7 +41,7 @@ public class FileURLLister implements URLLister { return pattern.startsWith("file"); } - public List listAll(URL url) throws IOException { + public List listAll(URL url) throws IOException { String path; try { path = new File(new URI(url.toExternalForm())).getPath(); @@ -52,17 +52,18 @@ public class FileURLLister implements URLLister { File file = basedir == null ? new File(path) : new File(basedir, path); if (file.exists() && file.isDirectory()) { String[] files = file.list(); - List ret = new ArrayList(files.length); + List ret = new ArrayList(files.length); URL context = url.getPath().endsWith("/") ? url : new URL(url.toExternalForm() + "/"); for (int i = 0; i < files.length; i++) { ret.add(new URL(context, files[i])); } return ret; } else { - return Collections.EMPTY_LIST; + return Collections.emptyList(); } } + @Override public String toString() { return "file lister"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/util/ResolvedResource.java b/src/java/org/apache/ivy/plugins/resolver/util/ResolvedResource.java index e655112e..52e5c2f8 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/ResolvedResource.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/ResolvedResource.java @@ -38,6 +38,7 @@ public class ResolvedResource implements ArtifactInfo { return res; } + @Override public String toString() { return res + " (" + rev + ")"; } diff --git a/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java b/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java index 91411a99..d2575ede 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java @@ -22,7 +22,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -83,7 +82,7 @@ public final class ResolverHelper { } } Message.debug("\t\t" + ret.size() + " matched " + pattern); - return (String[]) ret.toArray(new String[ret.size()]); + return ret.toArray(new String[ret.size()]); } else { return null; } @@ -98,19 +97,18 @@ public final class ResolverHelper { try { String fileSep = rep.getFileSeparator(); Message.debug("\tusing " + rep + " to list all in " + parent); - List all = rep.list(parent); + List all = rep.list(parent); if (all != null) { Message.debug("\t\tfound " + all.size() + " resources"); - List names = new ArrayList(all.size()); - for (Iterator iter = all.iterator(); iter.hasNext();) { - String path = (String) iter.next(); + List names = new ArrayList(all.size()); + for (String path : all) { if (path.endsWith(fileSep)) { path = path.substring(0, path.length() - 1); } int slashIndex = path.lastIndexOf(fileSep); names.add(path.substring(slashIndex + 1)); } - return (String[]) names.toArray(new String[names.size()]); + return names.toArray(new String[names.size()]); } else { Message.debug("\t\tno resources found"); return null; @@ -137,7 +135,7 @@ public final class ResolverHelper { IvyPatternHelper.REVISION_KEY); if (revs != null) { Message.debug("\tfound revs: " + Arrays.asList(revs)); - List ret = new ArrayList(revs.length); + List ret = new ArrayList(revs.length); for (int i = 0; i < revs.length; i++) { String rres = IvyPatternHelper.substituteToken(partiallyResolvedPattern, IvyPatternHelper.REVISION_KEY, revs[i]); @@ -157,7 +155,7 @@ public final class ResolverHelper { if (revs.length != ret.size()) { Message.debug("\tfound resolved res: " + ret); } - return (ResolvedResource[]) ret.toArray(new ResolvedResource[ret.size()]); + return ret.toArray(new ResolvedResource[ret.size()]); } else if (partiallyResolvedPattern.indexOf("[" + IvyPatternHelper.REVISION_KEY + "]") == -1) { // the partially resolved pattern is completely resolved, check the resource try { @@ -267,9 +265,9 @@ public final class ResolverHelper { try { Message.debug("\tusing " + lister + " to list all in " + root); - List all = lister.listAll(new URL(root)); + List all = lister.listAll(new URL(root)); Message.debug("\t\tfound " + all.size() + " urls"); - List ret = new ArrayList(all.size()); + List ret = new ArrayList(all.size()); int endNameIndex = pattern.indexOf('/', slashIndex + 1); String namePattern; if (endNameIndex != -1) { @@ -281,8 +279,7 @@ public final class ResolverHelper { + IvyPatternHelper.substituteToken(namePattern, token, "([^/]+)") + ".*"; Pattern p = Pattern.compile(acceptNamePattern.toString()); - for (Iterator iter = all.iterator(); iter.hasNext();) { - URL url = (URL) iter.next(); + for (URL url : all) { String path = standardize(url.getPath()); Matcher m = p.matcher(path); if (m.matches()) { @@ -291,7 +288,7 @@ public final class ResolverHelper { } } Message.debug("\t\t" + ret.size() + " matched " + pattern); - return (String[]) ret.toArray(new String[ret.size()]); + return ret.toArray(new String[ret.size()]); } catch (Exception e) { Message.warn("problem while listing files in " + root, e); return null; @@ -309,11 +306,10 @@ public final class ResolverHelper { try { if (lister.accept(root.toExternalForm())) { Message.debug("\tusing " + lister + " to list all in " + root); - List all = lister.listAll(root); + List all = lister.listAll(root); Message.debug("\t\tfound " + all.size() + " urls"); - List names = new ArrayList(all.size()); - for (Iterator iter = all.iterator(); iter.hasNext();) { - URL dir = (URL) iter.next(); + List names = new ArrayList(all.size()); + for (URL dir : all) { String path = dir.getPath(); if (path.endsWith("/")) { path = path.substring(0, path.length() - 1); @@ -321,7 +317,7 @@ public final class ResolverHelper { int slashIndex = path.lastIndexOf('/'); names.add(path.substring(slashIndex + 1)); } - return (String[]) names.toArray(new String[names.size()]); + return names.toArray(new String[names.size()]); } return null; } catch (Exception e) { diff --git a/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java b/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java index 6e7258ad..b8bc9017 100644 --- a/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java +++ b/src/java/org/apache/ivy/plugins/resolver/util/URLLister.java @@ -31,5 +31,5 @@ public interface URLLister { */ boolean accept(String pattern); - List listAll(URL url) throws IOException; + List listAll(URL url) throws IOException; } diff --git a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java index af7beaee..c90608b8 100644 --- a/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java +++ b/src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java @@ -23,10 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; import java.security.Security; -import java.security.SignatureException; import java.util.Iterator; import org.apache.ivy.plugins.signer.SignatureGenerator; @@ -41,6 +38,11 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.bouncycastle.openpgp.PGPSignature; import org.bouncycastle.openpgp.PGPSignatureGenerator; import org.bouncycastle.openpgp.PGPUtil; +import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; +import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder; +import org.bouncycastle.openpgp.operator.bc.BcPGPContentSignerBuilder; +import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider; public class OpenPGPSignatureGenerator implements SignatureGenerator { @@ -101,11 +103,12 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { pgpSec = readSecretKey(keyIn); } - PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(password.toCharArray(), - BouncyCastleProvider.PROVIDER_NAME); - PGPSignatureGenerator sGen = new PGPSignatureGenerator(pgpSec.getPublicKey() - .getAlgorithm(), PGPUtil.SHA1, BouncyCastleProvider.PROVIDER_NAME); - sGen.initSign(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); + PBESecretKeyDecryptor decryptor = new BcPBESecretKeyDecryptorBuilder( + new BcPGPDigestCalculatorProvider()).build(password.toCharArray()); + PGPPrivateKey pgpPrivKey = pgpSec.extractPrivateKey(decryptor); + PGPSignatureGenerator sGen = new PGPSignatureGenerator(new BcPGPContentSignerBuilder( + pgpSec.getPublicKey().getAlgorithm(), PGPUtil.SHA1)); + sGen.init(PGPSignature.BINARY_DOCUMENT, pgpPrivKey); in = new FileInputStream(src); out = new BCPGOutputStream(new ArmoredOutputStream(new FileOutputStream(dest))); @@ -116,22 +119,10 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { } sGen.generate().encode(out); - } catch (SignatureException e) { - IOException ioexc = new IOException(); - ioexc.initCause(e); - throw ioexc; } catch (PGPException e) { IOException ioexc = new IOException(); ioexc.initCause(e); throw ioexc; - } catch (NoSuchAlgorithmException e) { - IOException ioexc = new IOException(); - ioexc.initCause(e); - throw ioexc; - } catch (NoSuchProviderException e) { - IOException ioexc = new IOException(); - ioexc.initCause(e); - throw ioexc; } finally { if (out != null) { try { @@ -156,14 +147,16 @@ public class OpenPGPSignatureGenerator implements SignatureGenerator { private PGPSecretKey readSecretKey(InputStream in) throws IOException, PGPException { in = PGPUtil.getDecoderStream(in); - PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in); + PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(in, + new BcKeyFingerprintCalculator()); PGPSecretKey key = null; - for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext();) { - PGPSecretKeyRing kRing = (PGPSecretKeyRing) it.next(); + for (Iterator it = pgpSec.getKeyRings(); key == null && it.hasNext();) { + PGPSecretKeyRing kRing = it.next(); - for (Iterator it2 = kRing.getSecretKeys(); key == null && it2.hasNext();) { - PGPSecretKey k = (PGPSecretKey) it2.next(); + for (Iterator it2 = kRing.getSecretKeys(); key == null + && it2.hasNext();) { + PGPSecretKey k = it2.next(); if ((keyId == null) && k.isSigningKey()) { key = k; } diff --git a/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java b/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java index ba5b153b..2ab2b33f 100644 --- a/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java +++ b/src/java/org/apache/ivy/plugins/version/LatestVersionMatcher.java @@ -39,13 +39,20 @@ public class LatestVersionMatcher extends AbstractVersionMatcher { } public boolean needModuleDescriptor(ModuleRevisionId askedMrid, ModuleRevisionId foundMrid) { - List statuses = StatusManager.getCurrent().getStatuses(); + List statuses = StatusManager.getCurrent().getStatuses(); Status lowest = (Status) statuses.get(statuses.size() - 1); String latestLowest = "latest." + lowest.getName(); return !latestLowest.equals(askedMrid.getRevision()); } public boolean accept(ModuleRevisionId askedMrid, ModuleDescriptor foundMD) { + String askedBranch = askedMrid.getBranch(); + String foundBranch = foundMD.getModuleRevisionId().getBranch(); + boolean sameBranch = (askedBranch == null) ? foundBranch == null + : askedBranch.equals(foundBranch); + if (!sameBranch) { + return false; + } String askedStatus = askedMrid.getRevision().substring("latest.".length()); return StatusManager.getCurrent().getPriority(askedStatus) >= StatusManager.getCurrent() .getPriority(foundMD.getStatus()); diff --git a/src/java/org/apache/ivy/util/AbstractMessageLogger.java b/src/java/org/apache/ivy/util/AbstractMessageLogger.java index 118db667..5e2f8e92 100644 --- a/src/java/org/apache/ivy/util/AbstractMessageLogger.java +++ b/src/java/org/apache/ivy/util/AbstractMessageLogger.java @@ -24,75 +24,40 @@ import java.util.List; * An abstract base class to ease {@link MessageLogger} implementation. */ public abstract class AbstractMessageLogger implements MessageLogger { - private List problems = new ArrayList(); + private List problems = new ArrayList(); - private List warns = new ArrayList(); + private List warns = new ArrayList(); - private List errors = new ArrayList(); + private List errors = new ArrayList(); private boolean showProgress = true; - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#debug(java.lang.String) - */ public void debug(String msg) { log(msg, Message.MSG_DEBUG); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#verbose(java.lang.String) - */ public void verbose(String msg) { log(msg, Message.MSG_VERBOSE); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#deprecated(java.lang.String) - */ public void deprecated(String msg) { log("DEPRECATED: " + msg, Message.MSG_WARN); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#info(java.lang.String) - */ public void info(String msg) { log(msg, Message.MSG_INFO); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#info(java.lang.String) - */ public void rawinfo(String msg) { rawlog(msg, Message.MSG_INFO); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#warn(java.lang.String) - */ public void warn(String msg) { log("WARN: " + msg, Message.MSG_VERBOSE); problems.add("WARN: " + msg); getWarns().add(msg); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#error(java.lang.String) - */ public void error(String msg) { // log in verbose mode because message is appended as a problem, and will be // logged at the end at error level @@ -101,20 +66,10 @@ public abstract class AbstractMessageLogger implements MessageLogger { getErrors().add(msg); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#getProblems() - */ - public List getProblems() { + public List getProblems() { return problems; } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#sumupProblems() - */ public void sumupProblems() { MessageLoggerHelper.sumupProblems(this); clearProblems(); @@ -126,59 +81,34 @@ public abstract class AbstractMessageLogger implements MessageLogger { errors.clear(); } - public List getErrors() { + public List getErrors() { return errors; } - public List getWarns() { + public List getWarns() { return warns; } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#progress() - */ public void progress() { if (showProgress) { doProgress(); } } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#endProgress() - */ public void endProgress() { endProgress(""); } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#endProgress(java.lang.String) - */ public void endProgress(String msg) { if (showProgress) { doEndProgress(msg); } } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#isShowProgress() - */ public boolean isShowProgress() { return showProgress; } - /* - * (non-Javadoc) - * - * @see org.apache.ivy.util.MessageLogger#setShowProgress(boolean) - */ public void setShowProgress(boolean progress) { showProgress = progress; } diff --git a/src/java/org/apache/ivy/util/ChecksumHelper.java b/src/java/org/apache/ivy/util/ChecksumHelper.java index 56aa9362..792f1e3f 100644 --- a/src/java/org/apache/ivy/util/ChecksumHelper.java +++ b/src/java/org/apache/ivy/util/ChecksumHelper.java @@ -37,6 +37,31 @@ public final class ChecksumHelper { static { algorithms.put("md5", "MD5"); algorithms.put("sha1", "SHA-1"); + + // higher versions of JRE support these algorithms https://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html#MessageDigest + // conditionally add them + if (isAlgorithmSupportedInJRE("SHA-256")) { + algorithms.put("SHA-256", "SHA-256"); + } + if (isAlgorithmSupportedInJRE("SHA-512")) { + algorithms.put("SHA-512", "SHA-512"); + } + if (isAlgorithmSupportedInJRE("SHA-384")) { + algorithms.put("SHA-384", "SHA-384"); + } + + } + + private static boolean isAlgorithmSupportedInJRE(final String algorithm) { + if (algorithm == null) { + return false; + } + try { + MessageDigest.getInstance(algorithm); + return true; + } catch (NoSuchAlgorithmException e) { + return false; + } } /** diff --git a/src/java/org/apache/ivy/util/ContextualSAXHandler.java b/src/java/org/apache/ivy/util/ContextualSAXHandler.java index daf85c07..64992ae3 100644 --- a/src/java/org/apache/ivy/util/ContextualSAXHandler.java +++ b/src/java/org/apache/ivy/util/ContextualSAXHandler.java @@ -17,7 +17,6 @@ */ package org.apache.ivy.util; -import java.util.Iterator; import java.util.Stack; import org.xml.sax.Attributes; @@ -26,20 +25,23 @@ import org.xml.sax.helpers.DefaultHandler; public class ContextualSAXHandler extends DefaultHandler { - private Stack contextStack = new Stack(); + private Stack contextStack = new Stack(); private StringBuffer buffer = new StringBuffer(); + @Override public void characters(char[] ch, int start, int length) throws SAXException { buffer.append(ch, start, length); } + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { contextStack.push(qName); buffer.setLength(0); } + @Override public void endElement(String uri, String localName, String qName) throws SAXException { contextStack.pop(); buffer.setLength(0); @@ -47,8 +49,7 @@ public class ContextualSAXHandler extends DefaultHandler { protected String getContext() { StringBuffer buf = new StringBuffer(); - for (Iterator iter = contextStack.iterator(); iter.hasNext();) { - String ctx = (String) iter.next(); + for (String ctx : contextStack) { buf.append(ctx).append("/"); } if (buf.length() > 0) { diff --git a/src/java/org/apache/ivy/util/MessageLoggerEngine.java b/src/java/org/apache/ivy/util/MessageLoggerEngine.java index 21bc72f4..07c56584 100644 --- a/src/java/org/apache/ivy/util/MessageLoggerEngine.java +++ b/src/java/org/apache/ivy/util/MessageLoggerEngine.java @@ -18,7 +18,6 @@ package org.apache.ivy.util; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Stack; @@ -34,20 +33,20 @@ import java.util.Stack; *

*/ public class MessageLoggerEngine implements MessageLogger { - private final ThreadLocal/* > */loggerStacks = new ThreadLocal(); + private final ThreadLocal> loggerStacks = new ThreadLocal>(); private MessageLogger defaultLogger = null; - private List problems = new ArrayList(); + private List problems = new ArrayList(); - private List warns = new ArrayList(); + private List warns = new ArrayList(); - private List errors = new ArrayList(); + private List errors = new ArrayList(); - private Stack getLoggerStack() { - Stack stack = (Stack) loggerStacks.get(); + private Stack getLoggerStack() { + Stack stack = loggerStacks.get(); if (stack == null) { - stack = new Stack(); + stack = new Stack(); loggerStacks.set(stack); } return stack; @@ -98,7 +97,7 @@ public class MessageLoggerEngine implements MessageLogger { if (getLoggerStack().isEmpty()) { return getDefaultLogger(); } - return (MessageLogger) getLoggerStack().peek(); + return getLoggerStack().peek(); } private MessageLogger getDefaultLogger() { @@ -120,15 +119,15 @@ public class MessageLoggerEngine implements MessageLogger { errors.add(msg); } - public List getErrors() { + public List getErrors() { return errors; } - public List getProblems() { + public List getProblems() { return problems; } - public List getWarns() { + public List getWarns() { return warns; } @@ -139,8 +138,7 @@ public class MessageLoggerEngine implements MessageLogger { public void clearProblems() { getDefaultLogger().clearProblems(); - for (Iterator iter = getLoggerStack().iterator(); iter.hasNext();) { - MessageLogger l = (MessageLogger) iter.next(); + for (MessageLogger l : getLoggerStack()) { l.clearProblems(); } problems.clear(); @@ -151,8 +149,7 @@ public class MessageLoggerEngine implements MessageLogger { public void setShowProgress(boolean progress) { getDefaultLogger().setShowProgress(progress); // updates all loggers in the stack - for (Iterator iter = getLoggerStack().iterator(); iter.hasNext();) { - MessageLogger l = (MessageLogger) iter.next(); + for (MessageLogger l : getLoggerStack()) { l.setShowProgress(progress); } } diff --git a/src/java/org/apache/ivy/util/cli/CommandLineParser.java b/src/java/org/apache/ivy/util/cli/CommandLineParser.java index 7b2212d1..a24ab70a 100644 --- a/src/java/org/apache/ivy/util/cli/CommandLineParser.java +++ b/src/java/org/apache/ivy/util/cli/CommandLineParser.java @@ -20,7 +20,6 @@ package org.apache.ivy.util.cli; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.ListIterator; @@ -34,22 +33,23 @@ public class CommandLineParser { private static final int MAX_SPEC_WIDTH = 30; - private Map/* */options = new LinkedHashMap(); + private Map options = new LinkedHashMap(); - private Map/* > */categories = new LinkedHashMap(); + private Map> categories = new LinkedHashMap>(); public CommandLineParser() { } public CommandLineParser addCategory(String category) { - categories.put(category, new ArrayList()); + categories.put(category, new ArrayList + + org.owasp.esapi + esapi + 2.1.0 + + + * + * + + + diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-parent-with-licenses.pom b/test/java/org/apache/ivy/plugins/parser/m2/test-parent-with-licenses.pom new file mode 100644 index 00000000..e39eb23e --- /dev/null +++ b/test/java/org/apache/ivy/plugins/parser/m2/test-parent-with-licenses.pom @@ -0,0 +1,36 @@ + + + + 4.0.0 + org.apache + test-ivy-license-parent + jar + Test License parent project + + 1.0.1 + + + MIT License + http://opensource.org/licenses/MIT + repo + + + diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-project-with-overridden-licenses.pom b/test/java/org/apache/ivy/plugins/parser/m2/test-project-with-overridden-licenses.pom new file mode 100644 index 00000000..9b6a91b1 --- /dev/null +++ b/test/java/org/apache/ivy/plugins/parser/m2/test-project-with-overridden-licenses.pom @@ -0,0 +1,43 @@ + + + + 4.0.0 + + org.apache + test-ivy-license-parent + 1.0.1 + + org.apache + test-ivy-license-overridden + jar + Test License project + + 1.0.2 + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + diff --git a/test/java/org/apache/ivy/plugins/parser/m2/test-project-with-parent-licenses.pom b/test/java/org/apache/ivy/plugins/parser/m2/test-project-with-parent-licenses.pom new file mode 100644 index 00000000..a856df86 --- /dev/null +++ b/test/java/org/apache/ivy/plugins/parser/m2/test-project-with-parent-licenses.pom @@ -0,0 +1,34 @@ + + + + 4.0.0 + + org.apache + test-ivy-license-parent + 1.0.1 + + org.apache + test-ivy-license + jar + Test License project + + 1.0.2 + diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java index 9f50b7e3..89e3b57d 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleUpdaterTest.java @@ -32,8 +32,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ivy.Ivy; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.Configuration; @@ -45,6 +43,8 @@ import org.apache.ivy.plugins.repository.BasicResource; import org.apache.ivy.util.FileUtil; import org.xml.sax.SAXParseException; +import junit.framework.TestCase; + public class XmlModuleUpdaterTest extends TestCase { protected void tearDown() throws Exception { diff --git a/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml b/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml index 40c5fb24..d5598e1c 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml +++ b/test/java/org/apache/ivy/plugins/parser/xml/test-write-extrainfo-from-maven.xml @@ -38,7 +38,7 @@ - + diff --git a/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java b/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java index e1309db0..8a80a3f9 100644 --- a/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java +++ b/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java @@ -19,44 +19,30 @@ package org.apache.ivy.plugins.report; import java.io.File; -import junit.framework.TestCase; - import org.apache.ivy.Ivy; +import org.apache.ivy.TestHelper; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.report.ResolveReport; import org.apache.ivy.core.resolve.ResolveOptions; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; + +import junit.framework.TestCase; public class XmlReportParserTest extends TestCase { - private Ivy _ivy; - private File _cache; + private Ivy ivy; protected void setUp() throws Exception { - _ivy = new Ivy(); - _ivy.configure(new File("test/repositories/ivysettings.xml")); - createCache(); - } - - private void createCache() { - _cache = new File("build/cache"); - _cache.mkdirs(); + ivy = new Ivy(); + ivy.configure(new File("test/repositories/ivysettings.xml")); + TestHelper.createCache(); } protected void tearDown() throws Exception { - cleanCache(); - } - - private void cleanCache() { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(_cache); - del.execute(); + TestHelper.cleanCache(); } public void testGetResolvedModule() throws Exception { - ResolveReport report = _ivy.resolve( + ResolveReport report = ivy.resolve( new File("test/java/org/apache/ivy/plugins/report/ivy-with-info.xml"), getResolveOptions(new String[] {"default"}).setValidate(false).setResolveId( "testGetResolvedModule")); @@ -65,7 +51,7 @@ public class XmlReportParserTest extends TestCase { ModuleRevisionId modRevId = report.getModuleDescriptor().getModuleRevisionId(); XmlReportParser parser = new XmlReportParser(); - parser.parse(_ivy.getResolutionCacheManager().getConfigurationResolveReportInCache( + parser.parse(ivy.getResolutionCacheManager().getConfigurationResolveReportInCache( "testGetResolvedModule", "default")); ModuleRevisionId parsedModRevId = parser.getResolvedModule(); diff --git a/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java b/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java index 3da205c7..1ba7d4b7 100644 --- a/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java +++ b/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java @@ -21,8 +21,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import junit.framework.TestCase; - import org.apache.ivy.Ivy; import org.apache.ivy.core.report.ResolveReport; import org.apache.ivy.core.resolve.ResolveOptions; @@ -30,6 +28,8 @@ import org.apache.ivy.util.CacheCleaner; import org.apache.ivy.util.XMLHelper; import org.xml.sax.helpers.DefaultHandler; +import junit.framework.TestCase; + public class XmlReportWriterTest extends TestCase { private Ivy _ivy; diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java index 16b9f0f1..ec70ba83 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java @@ -21,10 +21,10 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; -import junit.framework.TestCase; - import org.apache.ivy.util.FileUtil; +import junit.framework.TestCase; + /** * Testing Testing was the single biggest hurdle I faced. I have tried to provide a complete test * suite that covers all protocols and which can be easily extended. It does differ - somewhat - in diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java index 699ed1c3..d79e4d9c 100644 --- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java +++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java @@ -24,10 +24,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; - import org.apache.commons.lang.StringUtils; +import junit.framework.TestCase; + public class VfsResourceTest extends TestCase { private VfsTestHelper helper = null; diff --git a/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java index 9fddc2be..40bf4f26 100644 --- a/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java @@ -17,10 +17,10 @@ */ package org.apache.ivy.plugins.resolver; -import junit.framework.TestCase; - import org.apache.ivy.core.resolve.DownloadOptions; +import junit.framework.TestCase; + public class AbstractDependencyResolverTest extends TestCase { protected DownloadOptions downloadOptions() { diff --git a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java index fdcf9ae2..a3596f7b 100644 --- a/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/BintrayResolverTest.java @@ -17,8 +17,7 @@ */ package org.apache.ivy.plugins.resolver; -import java.io.File; - +import org.apache.ivy.TestHelper; import org.apache.ivy.core.IvyContext; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; @@ -38,8 +37,6 @@ import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.plugins.matcher.ExactPatternMatcher; import org.apache.ivy.util.MockMessageLogger; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; public class BintrayResolverTest extends AbstractDependencyResolverTest { @@ -49,24 +46,17 @@ public class BintrayResolverTest extends AbstractDependencyResolverTest { private ResolveData _data; - private File _cache; - @Override protected void setUp() throws Exception { _settings = new IvySettings(); _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _cache = new File("build/cache"); _data = new ResolveData(_engine, new ResolveOptions()); - _cache.mkdirs(); - _settings.setDefaultCache(_cache); + _settings.setDefaultCache(TestHelper.cache); } @Override protected void tearDown() throws Exception { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(_cache); - del.execute(); + TestHelper.cleanCache(); } public void testDefaults() { diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java index 18c049be..9ff1a394 100644 --- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java @@ -17,13 +17,13 @@ */ package org.apache.ivy.plugins.resolver; -import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import org.apache.ivy.TestHelper; import org.apache.ivy.core.IvyContext; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; @@ -44,35 +44,28 @@ import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.plugins.latest.LatestRevisionStrategy; import org.apache.ivy.plugins.latest.LatestTimeStrategy; import org.apache.ivy.util.MockMessageLogger; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; /** * Tests ChainResolver */ public class ChainResolverTest extends AbstractDependencyResolverTest { + private IvySettings settings; private ResolveEngine engine; private ResolveData data; - private File cache; - protected void setUp() throws Exception { settings = new IvySettings(); engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); - cache = new File("build/cache"); + TestHelper.createCache(); data = new ResolveData(engine, new ResolveOptions()); - cache.mkdirs(); - settings.setDefaultCache(cache); + settings.setDefaultCache(TestHelper.cache); } protected void tearDown() throws Exception { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(cache); - del.execute(); + TestHelper.cleanCache(); } public void testOrderFromConf() throws Exception { diff --git a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java index 863f436b..c692a3ca 100644 --- a/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java @@ -242,6 +242,64 @@ public class FileSystemResolverTest extends AbstractDependencyResolverTest { assertEquals(1, dr.getArtifactsReports(DownloadStatus.SUCCESSFUL).length); } + /** + * Tests that SHA-256 algorithm can be used for checksums on resolvers + * @throws Exception + */ + public void testSHA256Checksum() throws Exception { + final FileSystemResolver resolver = new FileSystemResolver(); + resolver.setName("sha256-checksum-resolver"); + resolver.setSettings(settings); + + resolver.addIvyPattern(settings.getBaseDir() + + "/test/repositories/checksums/[module]/[revision]/[artifact]-[revision].[ext]"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/checksums/[module]/[revision]/[artifact]-[revision].[ext]"); + + resolver.setChecksums("SHA-256"); + final ModuleRevisionId mrid = ModuleRevisionId.newInstance("test", "allright", "2.0"); + final ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), data); + assertNotNull("Resolved module revision was null for " + mrid, rmr); + final DownloadReport dr = resolver.download(rmr.getDescriptor().getAllArtifacts(), getDownloadOptions()); + final ArtifactDownloadReport[] successfulDownloadReports = dr.getArtifactsReports(DownloadStatus.SUCCESSFUL); + assertNotNull("No artifacts were downloaded successfully", successfulDownloadReports); + assertEquals("Unexpected number of successfully downloaded artifacts", 1, successfulDownloadReports.length); + final ArtifactDownloadReport successfulDownloadReport = successfulDownloadReports[0]; + final Artifact downloadedArtifact = successfulDownloadReport.getArtifact(); + assertEquals("Unexpected organization of downloaded artifact", "test", downloadedArtifact.getModuleRevisionId().getOrganisation()); + assertEquals("Unexpected module of downloaded artifact", "allright", downloadedArtifact.getModuleRevisionId().getModuleId().getName()); + assertEquals("Unexpected revision of downloaded artifact", "2.0", downloadedArtifact.getModuleRevisionId().getRevision()); + } + + /** + * Tests that SHA-512 algorithm can be used for checksums on resolvers + * @throws Exception + */ + public void testSHA512Checksum() throws Exception { + final FileSystemResolver resolver = new FileSystemResolver(); + resolver.setName("sha256-checksum-resolver"); + resolver.setSettings(settings); + + resolver.addIvyPattern(settings.getBaseDir() + + "/test/repositories/checksums/[module]/[revision]/[artifact]-[revision].[ext]"); + resolver.addArtifactPattern(settings.getBaseDir() + + "/test/repositories/checksums/[module]/[revision]/[artifact]-[revision].[ext]"); + + resolver.setChecksums("SHA-512"); + final ModuleRevisionId mrid = ModuleRevisionId.newInstance("test", "allright", "3.0"); + final ResolvedModuleRevision rmr = resolver.getDependency(new DefaultDependencyDescriptor(mrid, false), data); + assertNotNull("Resolved module revision was null for " + mrid, rmr); + final DownloadReport dr = resolver.download(rmr.getDescriptor().getAllArtifacts(), getDownloadOptions()); + final ArtifactDownloadReport[] successfulDownloadReports = dr.getArtifactsReports(DownloadStatus.SUCCESSFUL); + assertNotNull("No artifacts were downloaded successfully", successfulDownloadReports); + assertEquals("Unexpected number of successfully downloaded artifacts", 1, successfulDownloadReports.length); + final ArtifactDownloadReport successfulDownloadReport = successfulDownloadReports[0]; + final Artifact downloadedArtifact = successfulDownloadReport.getArtifact(); + assertEquals("Unexpected organization of downloaded artifact", "test", downloadedArtifact.getModuleRevisionId().getOrganisation()); + assertEquals("Unexpected module of downloaded artifact", "allright", downloadedArtifact.getModuleRevisionId().getModuleId().getName()); + assertEquals("Unexpected revision of downloaded artifact", "3.0", downloadedArtifact.getModuleRevisionId().getRevision()); + } + public void testCheckModified() throws Exception { FileSystemResolver resolver = new FileSystemResolver(); resolver.setName("test"); diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java index 131de90d..adc04a11 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java @@ -34,15 +34,13 @@ public class IBiblioHelper { public static String getIBiblioMirror() throws Exception { if (!_checked) { - String[] mirrors = new String[] {"https://repo1.maven.org/maven/REPOSITORY-V1.txt", - "http://www.ibiblio.org/maven"}; - String[] mirrorsRoot = new String[] {"https://repo1.maven.org/maven", - "http://www.ibiblio.org/maven"}; + String[] mirrors = new String[] {"http://maven.ibiblio.org/maven"}; + String[] mirrorsRoot = new String[] {"http://maven.ibiblio.org/maven"}; long best = -1; for (int i = 0; i < mirrors.length; i++) { long start = System.currentTimeMillis(); - if (handler.isReachable(new URL(mirrors[i]), 300)) { + if (handler.isReachable(new URL(mirrors[i]), 500)) { long took = System.currentTimeMillis() - start; System.out.println("reached " + mirrors[i] + " in " + took + "ms"); if (best == -1 || took < best) { diff --git a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java index de79421d..29291ce8 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java @@ -17,13 +17,13 @@ */ package org.apache.ivy.plugins.resolver; -import java.io.File; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.ivy.TestHelper; import org.apache.ivy.core.IvyContext; import org.apache.ivy.core.IvyPatternHelper; import org.apache.ivy.core.event.EventManager; @@ -47,8 +47,6 @@ import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.plugins.matcher.ExactPatternMatcher; import org.apache.ivy.util.MockMessageLogger; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; /** * @@ -62,22 +60,16 @@ public class IBiblioResolverTest extends AbstractDependencyResolverTest { private ResolveData _data; - private File _cache; - protected void setUp() throws Exception { _settings = new IvySettings(); _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _cache = new File("build/cache"); _data = new ResolveData(_engine, new ResolveOptions()); - _cache.mkdirs(); - _settings.setDefaultCache(_cache); + TestHelper.createCache(); + _settings.setDefaultCache(TestHelper.cache); } protected void tearDown() throws Exception { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(_cache); - del.execute(); + TestHelper.cleanCache(); } public void testDefaults() { diff --git a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java index cda5a694..322c576d 100644 --- a/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java @@ -20,6 +20,7 @@ package org.apache.ivy.plugins.resolver; import java.io.File; import java.util.List; +import org.apache.ivy.TestHelper; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.DefaultArtifact; @@ -34,8 +35,6 @@ import org.apache.ivy.core.resolve.ResolveOptions; import org.apache.ivy.core.resolve.ResolvedModuleRevision; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; /** * @@ -47,22 +46,16 @@ public class IvyRepResolverTest extends AbstractDependencyResolverTest { private ResolveData _data; - private File _cache; - protected void setUp() throws Exception { _settings = new IvySettings(); _engine = new ResolveEngine(_settings, new EventManager(), new SortEngine(_settings)); - _cache = new File("build/cache"); _data = new ResolveData(_engine, new ResolveOptions()); - _cache.mkdirs(); - _settings.setDefaultCache(_cache); + TestHelper.createCache(); + _settings.setDefaultCache(TestHelper.cache); } protected void tearDown() throws Exception { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(_cache); - del.execute(); + TestHelper.cleanCache(); } public void testDefaults() { diff --git a/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java index 8226eee5..86570c87 100644 --- a/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/JarResolverTest.java @@ -19,8 +19,6 @@ package org.apache.ivy.plugins.resolver; import java.io.File; -import junit.framework.TestCase; - import org.apache.ivy.core.cache.DefaultRepositoryCacheManager; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; @@ -33,6 +31,8 @@ import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.util.CacheCleaner; +import junit.framework.TestCase; + public class JarResolverTest extends TestCase { private IvySettings settings; diff --git a/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java b/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java index 48f7ab16..b49ab55f 100644 --- a/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java @@ -20,8 +20,6 @@ package org.apache.ivy.plugins.resolver; import java.io.File; import java.net.MalformedURLException; -import junit.framework.TestCase; - import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; @@ -33,6 +31,8 @@ import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.util.CacheCleaner; +import junit.framework.TestCase; + public class Maven2LocalTest extends TestCase { private IvySettings settings; diff --git a/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java index 82d6fdb5..06b0ea9f 100644 --- a/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/MirroredURLResolverTest.java @@ -17,10 +17,7 @@ */ package org.apache.ivy.plugins.resolver; -import java.io.File; - -import junit.framework.TestCase; - +import org.apache.ivy.TestHelper; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; @@ -31,8 +28,8 @@ import org.apache.ivy.core.resolve.ResolvedModuleRevision; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.settings.XmlSettingsParser; import org.apache.ivy.core.sort.SortEngine; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; + +import junit.framework.TestCase; public class MirroredURLResolverTest extends TestCase { @@ -42,15 +39,12 @@ public class MirroredURLResolverTest extends TestCase { private ResolveData data; - private File cache; - protected void setUp() throws Exception { settings = new IvySettings(); engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); - cache = new File("build/cache"); data = new ResolveData(engine, new ResolveOptions()); - cache.mkdirs(); - settings.setDefaultCache(cache); + TestHelper.createCache(); + settings.setDefaultCache(TestHelper.cache); settings.setVariable("test.mirroredurl.mirrorlist-solo.url", this.getClass().getResource("mirrorlist-solo.txt").toExternalForm()); settings.setVariable("test.mirroredurl.mirrorlist-failover.url", this.getClass() @@ -62,10 +56,7 @@ public class MirroredURLResolverTest extends TestCase { } protected void tearDown() throws Exception { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(cache); - del.execute(); + TestHelper.cleanCache(); } public void testSolo() throws Exception { diff --git a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java index 169b6e11..e0d941b7 100644 --- a/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java +++ b/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java @@ -19,12 +19,12 @@ package org.apache.ivy.plugins.resolver; import java.util.Arrays; -import junit.framework.Assert; - import org.apache.ivy.core.search.ModuleEntry; import org.apache.ivy.core.search.OrganisationEntry; import org.apache.ivy.core.search.RevisionEntry; +import junit.framework.Assert; + /** * */ diff --git a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java index 067436ac..e5380ea1 100644 --- a/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java @@ -21,6 +21,7 @@ import java.io.File; import java.util.Date; import java.util.GregorianCalendar; +import org.apache.ivy.TestHelper; import org.apache.ivy.core.cache.DefaultRepositoryCacheManager; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.module.descriptor.Artifact; @@ -40,8 +41,6 @@ import org.apache.ivy.core.resolve.ResolvedModuleRevision; import org.apache.ivy.core.settings.IvySettings; import org.apache.ivy.core.sort.SortEngine; import org.apache.ivy.plugins.matcher.ExactPatternMatcher; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Delete; /** * Tests URLResolver. Http tests are based upon ibiblio site. @@ -54,22 +53,16 @@ public class URLResolverTest extends AbstractDependencyResolverTest { private ResolveData data; - private File cache; - protected void setUp() throws Exception { settings = new IvySettings(); engine = new ResolveEngine(settings, new EventManager(), new SortEngine(settings)); - cache = new File("build/cache"); data = new ResolveData(engine, new ResolveOptions()); - cache.mkdirs(); - settings.setDefaultCache(cache); + TestHelper.createCache(); + settings.setDefaultCache(TestHelper.cache); } protected void tearDown() throws Exception { - Delete del = new Delete(); - del.setProject(new Project()); - del.setDir(cache); - del.execute(); + TestHelper.cleanCache(); } public void testFile() throws Exception { diff --git a/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java b/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java index dfe6e2d3..4d6bc670 100644 --- a/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java +++ b/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java @@ -20,10 +20,10 @@ package org.apache.ivy.plugins.resolver.util; import java.io.File; import java.util.Arrays; -import junit.framework.TestCase; - import org.apache.ivy.plugins.repository.file.FileRepository; +import junit.framework.TestCase; + public class ResolverHelperTest extends TestCase { public void testListTokenValuesForIvy1238() { diff --git a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java index 27bab56d..884c9be0 100644 --- a/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java +++ b/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java @@ -20,8 +20,6 @@ package org.apache.ivy.plugins.trigger; import java.io.File; import java.util.Date; -import junit.framework.TestCase; - import org.apache.ivy.core.event.resolve.StartResolveEvent; import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; @@ -29,6 +27,8 @@ import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.Message; import org.apache.ivy.util.MockMessageLogger; +import junit.framework.TestCase; + public class LogTriggerTest extends TestCase { private static final String LINE_SEPARATOR = System.getProperty("line.separator"); diff --git a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java index 654bf119..5997e83d 100644 --- a/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java @@ -17,13 +17,14 @@ */ package org.apache.ivy.plugins.version; -import junit.framework.TestCase; - import org.apache.ivy.core.IvyContext; +import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.core.module.status.Status; import org.apache.ivy.core.module.status.StatusManager; +import junit.framework.TestCase; + public class LatestVersionMatcherTest extends TestCase { private LatestVersionMatcher vm = new LatestVersionMatcher(); @@ -49,9 +50,50 @@ public class LatestVersionMatcherTest extends TestCase { assertNeed("latest.snapshot", false); } + public void testAcceptForStandardStatus() throws Exception { + assertAccept("latest.release", "release", true); + assertAccept("latest.release", "milestone", false); + assertAccept("latest.release", "integration", false); + } + + public void testAcceptForSameBranches() throws Exception { + assertAccept("latest.release", "trunk", "release", "trunk", true); + assertAccept("latest.release", "trunk", "milestone", "trunk", false); + assertAccept("latest.release", "trunk", "integration", "trunk", false); + } + + public void testAcceptForDifferentBranches() throws Exception { + assertAccept("latest.release", "trunk", "release", "feature", false); + assertAccept("latest.release", "trunk", "milestone", "feature", false); + assertAccept("latest.release", "trunk", "integration", "feature", false); + } + // assertion helper methods private void assertNeed(String askedVersion, boolean b) { assertEquals(b, vm.needModuleDescriptor( ModuleRevisionId.newInstance("org", "name", askedVersion), null)); } + + private void assertNeed(String askedVersion, String askedBranch, boolean b) { + assertEquals(b, vm.needModuleDescriptor( + ModuleRevisionId.newInstance("org", "name", askedBranch, askedVersion), null)); + } + + private void assertAccept(String askedVersion, String foundStatus, boolean b) { + ModuleRevisionId askedMrid = ModuleRevisionId.newInstance("org", "name", askedVersion); + DefaultModuleDescriptor foundMD = DefaultModuleDescriptor + .newDefaultInstance(ModuleRevisionId.newInstance("org", "name", null)); + foundMD.setStatus(foundStatus); + assertEquals(b, vm.accept(askedMrid, foundMD)); + } + + private void assertAccept(String askedVersion, String askedBranch, String foundStatus, + String foundBranch, boolean b) { + ModuleRevisionId askedMrid = ModuleRevisionId.newInstance("org", "name", askedBranch, + askedVersion); + DefaultModuleDescriptor foundMD = DefaultModuleDescriptor.newDefaultInstance( + ModuleRevisionId.newInstance("org", "name", foundBranch, (String) null)); + foundMD.setStatus(foundStatus); + assertEquals(b, vm.accept(askedMrid, foundMD)); + } } diff --git a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java index f3f378e5..14503263 100644 --- a/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java @@ -17,10 +17,10 @@ */ package org.apache.ivy.plugins.version; -import junit.framework.TestCase; - import org.apache.ivy.core.module.id.ModuleRevisionId; +import junit.framework.TestCase; + public class PatternVersionMatcherTest extends TestCase { public void testSingleMatch() { PatternVersionMatcher pvm = new PatternVersionMatcher(); diff --git a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java index e1dd7795..0e1e8d15 100644 --- a/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java +++ b/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java @@ -17,11 +17,11 @@ */ package org.apache.ivy.plugins.version; -import junit.framework.TestCase; - import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.plugins.latest.LatestRevisionStrategy; +import junit.framework.TestCase; + public class VersionRangeMatcherTest extends TestCase { VersionMatcher vm = new VersionRangeMatcher("range", new LatestRevisionStrategy()); diff --git a/test/java/org/apache/ivy/util/IvyPatternHelperTest.java b/test/java/org/apache/ivy/util/IvyPatternHelperTest.java index 20f42be4..694408e3 100644 --- a/test/java/org/apache/ivy/util/IvyPatternHelperTest.java +++ b/test/java/org/apache/ivy/util/IvyPatternHelperTest.java @@ -20,10 +20,10 @@ package org.apache.ivy.util; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ivy.core.IvyPatternHelper; +import junit.framework.TestCase; + public class IvyPatternHelperTest extends TestCase { public void testSubstitute() { String pattern = "[organisation]/[module]/build/archives/[type]s/[artifact]-[revision].[ext]"; diff --git a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java index fdd53af6..0f1ff1af 100644 --- a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java @@ -22,10 +22,10 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import junit.framework.TestCase; - import org.apache.ivy.util.CopyProgressListener; +import junit.framework.TestCase; + public class AbstractURLHandlerTest extends TestCase { /** diff --git a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java index 69560889..c6da184b 100644 --- a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java @@ -20,10 +20,10 @@ package org.apache.ivy.util.url; import java.io.File; import java.net.URL; -import junit.framework.TestCase; - import org.apache.ivy.util.FileUtil; +import junit.framework.TestCase; + /** * Test BasicURLHandler */ @@ -45,15 +45,16 @@ public class BasicURLHandlerTest extends TestCase { } public void testIsReachable() throws Exception { - assertTrue(handler.isReachable(new URL("http://www.google.fr/"))); - assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html"))); + final int connectionTimeoutInMillis = 15000; // 15 seconds + assertTrue(handler.isReachable(new URL("http://www.google.fr/"), connectionTimeoutInMillis)); + assertFalse(handler.isReachable(new URL("http://www.google.fr/unknownpage.html"), connectionTimeoutInMillis)); - assertTrue(handler.isReachable(new File("build.xml").toURI().toURL())); - assertFalse(handler.isReachable(new File("unknownfile.xml").toURI().toURL())); + assertTrue(handler.isReachable(new File("build.xml").toURI().toURL(), connectionTimeoutInMillis)); + assertFalse(handler.isReachable(new File("unknownfile.xml").toURI().toURL(), connectionTimeoutInMillis)); // to test ftp we should know of an anonymous ftp site... ! // assertTrue(handler.isReachable(new URL("ftp://ftp.mozilla.org/pub/dir.sizes"))); - assertFalse(handler.isReachable(new URL("ftp://ftp.mozilla.org/unknown.file"))); + assertFalse(handler.isReachable(new URL("ftp://ftp.mozilla.org/unknown.file"), connectionTimeoutInMillis)); } public void testContentEncoding() throws Exception { diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java index 630a9735..e88263ee 100644 --- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java @@ -20,11 +20,11 @@ package org.apache.ivy.util.url; import java.io.File; import java.net.URL; -import junit.framework.TestCase; - import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.url.URLHandler.URLInfo; +import junit.framework.TestCase; + /** * Test HttpClientHandler */ diff --git a/test/repositories/1/org2/mod2.9/ivys/ivy-0.6.xml b/test/repositories/1/org2/mod2.9/ivys/ivy-0.6.xml new file mode 100644 index 00000000..95bbd200 --- /dev/null +++ b/test/repositories/1/org2/mod2.9/ivys/ivy-0.6.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + diff --git a/test/repositories/1/packaging/module10/ivys/ivy-1.0.xml b/test/repositories/1/packaging/module10/ivys/ivy-1.0.xml new file mode 100644 index 00000000..403e8ac8 --- /dev/null +++ b/test/repositories/1/packaging/module10/ivys/ivy-1.0.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/test/repositories/1/packaging/module9/ivys/ivy-1.0.xml b/test/repositories/1/packaging/module9/ivys/ivy-1.0.xml new file mode 100644 index 00000000..88219aa6 --- /dev/null +++ b/test/repositories/1/packaging/module9/ivys/ivy-1.0.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/test/repositories/1/packaging/module9/jars/module9-1.0.jar.pack.gz b/test/repositories/1/packaging/module9/jars/module9-1.0.jar.pack.gz new file mode 100644 index 00000000..6345656b Binary files /dev/null and b/test/repositories/1/packaging/module9/jars/module9-1.0.jar.pack.gz differ diff --git a/test/repositories/1/usecacheonly/mod4/ivys/ivy-1.0.xml b/test/repositories/1/usecacheonly/mod4/ivys/ivy-1.0.xml new file mode 100644 index 00000000..233e65e0 --- /dev/null +++ b/test/repositories/1/usecacheonly/mod4/ivys/ivy-1.0.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/test/repositories/1/usecacheonly/mod4/jars/mod4-1.0.jar b/test/repositories/1/usecacheonly/mod4/jars/mod4-1.0.jar new file mode 100644 index 00000000..945c9b46 --- /dev/null +++ b/test/repositories/1/usecacheonly/mod4/jars/mod4-1.0.jar @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/test/repositories/1/usecacheonly/mod5/ivys/ivy-1.0.0-SNAPSHOT.xml b/test/repositories/1/usecacheonly/mod5/ivys/ivy-1.0.0-SNAPSHOT.xml new file mode 100644 index 00000000..16e04157 --- /dev/null +++ b/test/repositories/1/usecacheonly/mod5/ivys/ivy-1.0.0-SNAPSHOT.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/test/repositories/1/usecacheonly/mod5/jars/mod5-1.0.0-SNAPSHOT.jar b/test/repositories/1/usecacheonly/mod5/jars/mod5-1.0.0-SNAPSHOT.jar new file mode 100644 index 00000000..945c9b46 --- /dev/null +++ b/test/repositories/1/usecacheonly/mod5/jars/mod5-1.0.0-SNAPSHOT.jar @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/test/repositories/checksums/.gitattributes b/test/repositories/checksums/.gitattributes new file mode 100644 index 00000000..c65094ef --- /dev/null +++ b/test/repositories/checksums/.gitattributes @@ -0,0 +1,2 @@ +# Set the eol of the Ivy files to Unix LF because that is where the checksums are calculated on +*.xml text eol=lf \ No newline at end of file diff --git a/test/repositories/checksums/allright/2.0/allright-2.0.jar b/test/repositories/checksums/allright/2.0/allright-2.0.jar new file mode 100644 index 00000000..caf50696 --- /dev/null +++ b/test/repositories/checksums/allright/2.0/allright-2.0.jar @@ -0,0 +1 @@ +this is a completely fake jar file !!! \ No newline at end of file diff --git a/test/repositories/checksums/allright/2.0/allright-2.0.jar.SHA-256 b/test/repositories/checksums/allright/2.0/allright-2.0.jar.SHA-256 new file mode 100644 index 00000000..43e5f0df --- /dev/null +++ b/test/repositories/checksums/allright/2.0/allright-2.0.jar.SHA-256 @@ -0,0 +1 @@ +1e0d1eae4b95f4e2070b46b8d8f6418ce915d336b9f9c6cd438d1817c19c22ea \ No newline at end of file diff --git a/test/repositories/checksums/allright/2.0/ivy-2.0.xml b/test/repositories/checksums/allright/2.0/ivy-2.0.xml new file mode 100644 index 00000000..8c8ba223 --- /dev/null +++ b/test/repositories/checksums/allright/2.0/ivy-2.0.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/test/repositories/checksums/allright/2.0/ivy-2.0.xml.SHA-256 b/test/repositories/checksums/allright/2.0/ivy-2.0.xml.SHA-256 new file mode 100644 index 00000000..8d01fe5a --- /dev/null +++ b/test/repositories/checksums/allright/2.0/ivy-2.0.xml.SHA-256 @@ -0,0 +1 @@ +6e07f0c04dea757cdaf5811a8b682b7f4d286db0ba16db5ff6c65309ff76409b \ No newline at end of file diff --git a/test/repositories/checksums/allright/3.0/allright-3.0.jar b/test/repositories/checksums/allright/3.0/allright-3.0.jar new file mode 100644 index 00000000..caf50696 --- /dev/null +++ b/test/repositories/checksums/allright/3.0/allright-3.0.jar @@ -0,0 +1 @@ +this is a completely fake jar file !!! \ No newline at end of file diff --git a/test/repositories/checksums/allright/3.0/allright-3.0.jar.SHA-512 b/test/repositories/checksums/allright/3.0/allright-3.0.jar.SHA-512 new file mode 100644 index 00000000..421674a4 --- /dev/null +++ b/test/repositories/checksums/allright/3.0/allright-3.0.jar.SHA-512 @@ -0,0 +1 @@ +9c9759e09bcc1c52c135aee8042f7e63e81dcc04df0c9696bb41273502c4b7e5feabbfe780e761e7a8878f9061ad1ba860f9782d238fbc33a1b4c54c173911ac \ No newline at end of file diff --git a/test/repositories/checksums/allright/3.0/ivy-3.0.xml b/test/repositories/checksums/allright/3.0/ivy-3.0.xml new file mode 100644 index 00000000..e45e0ae1 --- /dev/null +++ b/test/repositories/checksums/allright/3.0/ivy-3.0.xml @@ -0,0 +1,28 @@ + + + + + + + diff --git a/test/repositories/checksums/allright/3.0/ivy-3.0.xml.SHA-512 b/test/repositories/checksums/allright/3.0/ivy-3.0.xml.SHA-512 new file mode 100644 index 00000000..7c4a3b15 --- /dev/null +++ b/test/repositories/checksums/allright/3.0/ivy-3.0.xml.SHA-512 @@ -0,0 +1 @@ +805b1d9877ba8859682be6b7bd82cb06ff2c5b370ec3bf039b57d26bd9b75008588a72b252488e539ee6d4f4637185fbc83a8ddb5ae3156d1784bfd392fdb419 \ No newline at end of file diff --git a/test/repositories/osgi/module1/META-INF/MANIFEST.MF b/test/repositories/osgi/module1/META-INF/MANIFEST.MF new file mode 100644 index 00000000..c2c8bfdc --- /dev/null +++ b/test/repositories/osgi/module1/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Bundle-SymbolicName: module1 +Bundle-Version: 1.2.3 + diff --git a/test/workspace/ivysettings.xml b/test/workspace/ivysettings.xml new file mode 100644 index 00000000..26ebeaa2 --- /dev/null +++ b/test/workspace/ivysettings.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/workspace/project1/ivy.xml b/test/workspace/project1/ivy.xml new file mode 100644 index 00000000..bc8cc54a --- /dev/null +++ b/test/workspace/project1/ivy.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/test/workspace/project2/ivy.xml b/test/workspace/project2/ivy.xml new file mode 100644 index 00000000..d995e6d1 --- /dev/null +++ b/test/workspace/project2/ivy.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/test/workspace/project3/ivy.xml b/test/workspace/project3/ivy.xml new file mode 100644 index 00000000..82441dd3 --- /dev/null +++ b/test/workspace/project3/ivy.xml @@ -0,0 +1,26 @@ + + + + + + + + + \ No newline at end of file diff --git a/test/workspace/repo/org.acme/module1/1.1/ivy.xml b/test/workspace/repo/org.acme/module1/1.1/ivy.xml new file mode 100644 index 00000000..754cc1fe --- /dev/null +++ b/test/workspace/repo/org.acme/module1/1.1/ivy.xml @@ -0,0 +1,21 @@ + + + + \ No newline at end of file diff --git a/test/workspace/repo/org.acme/module1/1.1/module1.jar b/test/workspace/repo/org.acme/module1/1.1/module1.jar new file mode 100644 index 00000000..e69de29b diff --git a/test/workspace/repo/org.acme/module2/1.2/ivy.xml b/test/workspace/repo/org.acme/module2/1.2/ivy.xml new file mode 100644 index 00000000..990acfbc --- /dev/null +++ b/test/workspace/repo/org.acme/module2/1.2/ivy.xml @@ -0,0 +1,21 @@ + + + + \ No newline at end of file diff --git a/test/workspace/repo/org.acme/module2/1.2/module2.jar b/test/workspace/repo/org.acme/module2/1.2/module2.jar new file mode 100644 index 00000000..e69de29b
ElementDescriptionCardinality