mirror of https://github.com/apache/ant-ivy
REFACTOR: deep review of packages structure, more structured
git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/core/trunk@501379 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Xavier Hanin
parent
e7b08a9bce
commit
4433e9201d
13
build.xml
13
build.xml
|
|
@ -154,6 +154,19 @@
|
|||
<!-- =================================================================
|
||||
TESTS
|
||||
================================================================= -->
|
||||
<target name="build-custom-resolver-jar" depends="jar">
|
||||
<mkdir dir="${build.dir}/custom-classpath" />
|
||||
<javac srcdir="${basedir}/test/custom-classpath"
|
||||
destdir="${build.dir}/custom-classpath"
|
||||
classpathref="run.classpath"
|
||||
source="${ivy.minimum.javaversion}"
|
||||
target="${ivy.minimum.javaversion}"
|
||||
debug="${debug.mode}"
|
||||
includeantruntime="no"/>
|
||||
<jar destfile="${test.dir}/org/apache/ivy/core/settings/custom-resolver.jar"
|
||||
basedir="${build.dir}/custom-classpath"/>
|
||||
</target>
|
||||
|
||||
<target name="init-tests-offline" if="offline">
|
||||
<fileset id="test.fileset" dir="${test.dir}">
|
||||
<include name="**/*Test.java"/>
|
||||
|
|
|
|||
|
|
@ -50,73 +50,95 @@ import java.util.StringTokenizer;
|
|||
|
||||
import javax.swing.event.EventListenerList;
|
||||
|
||||
import org.apache.ivy.IvyNode.EvictionData;
|
||||
import org.apache.ivy.circular.CircularDependencyStrategy;
|
||||
import org.apache.ivy.circular.ErrorCircularDependencyStrategy;
|
||||
import org.apache.ivy.circular.IgnoreCircularDependencyStrategy;
|
||||
import org.apache.ivy.circular.WarnCircularDependencyStrategy;
|
||||
import org.apache.ivy.conflict.LatestConflictManager;
|
||||
import org.apache.ivy.conflict.NoConflictManager;
|
||||
import org.apache.ivy.conflict.StrictConflictManager;
|
||||
import org.apache.ivy.event.FilteredIvyListener;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.event.IvyEventFilter;
|
||||
import org.apache.ivy.event.IvyListener;
|
||||
import org.apache.ivy.event.Trigger;
|
||||
import org.apache.ivy.event.download.PrepareDownloadEvent;
|
||||
import org.apache.ivy.event.resolve.EndResolveEvent;
|
||||
import org.apache.ivy.event.resolve.StartResolveEvent;
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.filter.FilterHelper;
|
||||
import org.apache.ivy.latest.LatestLexicographicStrategy;
|
||||
import org.apache.ivy.latest.LatestRevisionStrategy;
|
||||
import org.apache.ivy.latest.LatestTimeStrategy;
|
||||
import org.apache.ivy.matcher.ExactOrRegexpPatternMatcher;
|
||||
import org.apache.ivy.matcher.ExactPatternMatcher;
|
||||
import org.apache.ivy.matcher.GlobPatternMatcher;
|
||||
import org.apache.ivy.matcher.Matcher;
|
||||
import org.apache.ivy.matcher.MatcherHelper;
|
||||
import org.apache.ivy.matcher.ModuleIdMatcher;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.matcher.RegexpPatternMatcher;
|
||||
import org.apache.ivy.namespace.NameSpaceHelper;
|
||||
import org.apache.ivy.namespace.Namespace;
|
||||
import org.apache.ivy.parser.ModuleDescriptorParser;
|
||||
import org.apache.ivy.parser.ModuleDescriptorParserRegistry;
|
||||
import org.apache.ivy.report.ArtifactDownloadReport;
|
||||
import org.apache.ivy.report.ConfigurationResolveReport;
|
||||
import org.apache.ivy.report.DownloadReport;
|
||||
import org.apache.ivy.report.DownloadStatus;
|
||||
import org.apache.ivy.report.LogReportOutputter;
|
||||
import org.apache.ivy.report.ReportOutputter;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.report.XmlReportOutputter;
|
||||
import org.apache.ivy.repository.TransferEvent;
|
||||
import org.apache.ivy.repository.TransferListener;
|
||||
import org.apache.ivy.repository.url.URLResource;
|
||||
import org.apache.ivy.resolver.AbstractResolver;
|
||||
import org.apache.ivy.resolver.CacheResolver;
|
||||
import org.apache.ivy.resolver.ChainResolver;
|
||||
import org.apache.ivy.resolver.DualResolver;
|
||||
import org.apache.ivy.resolver.ModuleEntry;
|
||||
import org.apache.ivy.resolver.OrganisationEntry;
|
||||
import org.apache.ivy.resolver.RevisionEntry;
|
||||
import org.apache.ivy.status.StatusManager;
|
||||
import org.apache.ivy.url.URLHandlerRegistry;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.cache.ArtifactOrigin;
|
||||
import org.apache.ivy.core.deliver.PublishingDependencyRevisionResolver;
|
||||
import org.apache.ivy.core.event.FilteredIvyListener;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.core.event.IvyEventFilter;
|
||||
import org.apache.ivy.core.event.IvyListener;
|
||||
import org.apache.ivy.core.event.download.PrepareDownloadEvent;
|
||||
import org.apache.ivy.core.event.resolve.EndResolveEvent;
|
||||
import org.apache.ivy.core.event.resolve.StartResolveEvent;
|
||||
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.DefaultDependencyDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.MDArtifact;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.status.StatusManager;
|
||||
import org.apache.ivy.core.report.ArtifactDownloadReport;
|
||||
import org.apache.ivy.core.report.ConfigurationResolveReport;
|
||||
import org.apache.ivy.core.report.DownloadReport;
|
||||
import org.apache.ivy.core.report.DownloadStatus;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.core.resolve.DefaultModuleRevision;
|
||||
import org.apache.ivy.core.resolve.IvyNode;
|
||||
import org.apache.ivy.core.resolve.ResolveData;
|
||||
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
|
||||
import org.apache.ivy.core.resolve.IvyNode.EvictionData;
|
||||
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.core.settings.XmlSettingsParser;
|
||||
import org.apache.ivy.core.sort.ModuleDescriptorSorter;
|
||||
import org.apache.ivy.plugins.IvyAware;
|
||||
import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
|
||||
import org.apache.ivy.plugins.circular.ErrorCircularDependencyStrategy;
|
||||
import org.apache.ivy.plugins.circular.IgnoreCircularDependencyStrategy;
|
||||
import org.apache.ivy.plugins.circular.WarnCircularDependencyStrategy;
|
||||
import org.apache.ivy.plugins.conflict.ConflictManager;
|
||||
import org.apache.ivy.plugins.conflict.LatestConflictManager;
|
||||
import org.apache.ivy.plugins.conflict.NoConflictManager;
|
||||
import org.apache.ivy.plugins.conflict.StrictConflictManager;
|
||||
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.matcher.ExactOrRegexpPatternMatcher;
|
||||
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
|
||||
import org.apache.ivy.plugins.matcher.GlobPatternMatcher;
|
||||
import org.apache.ivy.plugins.matcher.Matcher;
|
||||
import org.apache.ivy.plugins.matcher.MatcherHelper;
|
||||
import org.apache.ivy.plugins.matcher.ModuleIdMatcher;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.ivy.plugins.matcher.RegexpPatternMatcher;
|
||||
import org.apache.ivy.plugins.namespace.NameSpaceHelper;
|
||||
import org.apache.ivy.plugins.namespace.Namespace;
|
||||
import org.apache.ivy.plugins.parser.ModuleDescriptorParser;
|
||||
import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry;
|
||||
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
|
||||
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorUpdater;
|
||||
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.report.XmlReportParser;
|
||||
import org.apache.ivy.plugins.repository.TransferEvent;
|
||||
import org.apache.ivy.plugins.repository.TransferListener;
|
||||
import org.apache.ivy.plugins.repository.url.URLResource;
|
||||
import org.apache.ivy.plugins.resolver.AbstractResolver;
|
||||
import org.apache.ivy.plugins.resolver.CacheResolver;
|
||||
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.trigger.Trigger;
|
||||
import org.apache.ivy.plugins.version.ChainVersionMatcher;
|
||||
import org.apache.ivy.plugins.version.ExactVersionMatcher;
|
||||
import org.apache.ivy.plugins.version.LatestVersionMatcher;
|
||||
import org.apache.ivy.plugins.version.SubVersionMatcher;
|
||||
import org.apache.ivy.plugins.version.VersionMatcher;
|
||||
import org.apache.ivy.plugins.version.VersionRangeMatcher;
|
||||
import org.apache.ivy.util.FileUtil;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.PropertiesFile;
|
||||
import org.apache.ivy.version.ChainVersionMatcher;
|
||||
import org.apache.ivy.version.ExactVersionMatcher;
|
||||
import org.apache.ivy.version.LatestVersionMatcher;
|
||||
import org.apache.ivy.version.SubVersionMatcher;
|
||||
import org.apache.ivy.version.VersionMatcher;
|
||||
import org.apache.ivy.version.VersionRangeMatcher;
|
||||
import org.apache.ivy.xml.XmlIvyConfigurationParser;
|
||||
import org.apache.ivy.xml.XmlModuleDescriptorParser;
|
||||
import org.apache.ivy.xml.XmlModuleDescriptorUpdater;
|
||||
import org.apache.ivy.xml.XmlReportParser;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
import org.apache.ivy.util.filter.FilterHelper;
|
||||
import org.apache.ivy.util.url.URLHandlerRegistry;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
|
||||
|
|
@ -209,7 +231,7 @@ public class Ivy implements TransferListener {
|
|||
private boolean _interrupted;
|
||||
|
||||
public Ivy() {
|
||||
setVariable("ivy.default.conf.dir", Ivy.class.getResource("conf").toExternalForm(), true);
|
||||
setVariable("ivy.default.conf.dir", getSettingsURL().toExternalForm(), true);
|
||||
|
||||
String ivyTypeDefs = System.getProperty("ivy.typedef.files");
|
||||
if (ivyTypeDefs != null) {
|
||||
|
|
@ -225,7 +247,7 @@ public class Ivy implements TransferListener {
|
|||
}
|
||||
} else {
|
||||
try {
|
||||
typeDefs(Ivy.class.getResourceAsStream("typedef.properties"), true);
|
||||
typeDefs(getSettingsURL("typedef.properties").openStream(), true);
|
||||
} catch (IOException e) {
|
||||
Message.warn("impossible to load default type defs");
|
||||
}
|
||||
|
|
@ -300,10 +322,15 @@ public class Ivy implements TransferListener {
|
|||
}
|
||||
}
|
||||
if (!configured) {
|
||||
InputStream repositoryPropsStream = null;
|
||||
try {
|
||||
props.load(Ivy.class.getResourceAsStream("repository.properties"));
|
||||
repositoryPropsStream = getSettingsURL("repository.properties").openStream();
|
||||
props.load(repositoryPropsStream);
|
||||
} catch (IOException e) {
|
||||
Message.error("unable to use internal repository configuration: "+e.getMessage());
|
||||
if (repositoryPropsStream != null) {
|
||||
try {repositoryPropsStream.close();} catch(Exception ex) {};
|
||||
}
|
||||
}
|
||||
}
|
||||
addAllVariables(props, false);
|
||||
|
|
@ -355,7 +382,7 @@ public class Ivy implements TransferListener {
|
|||
|
||||
loadDefaultProperties();
|
||||
try {
|
||||
new XmlIvyConfigurationParser(this).parse(configurationFile.toURL());
|
||||
new XmlSettingsParser(this).parse(configurationFile.toURL());
|
||||
} catch (MalformedURLException e) {
|
||||
IllegalArgumentException iae = new IllegalArgumentException("given file cannot be transformed to url: "+configurationFile);
|
||||
iae.initCause(e);
|
||||
|
|
@ -379,14 +406,26 @@ public class Ivy implements TransferListener {
|
|||
getDefaultCache();
|
||||
|
||||
loadDefaultProperties();
|
||||
new XmlIvyConfigurationParser(this).parse(configurationURL);
|
||||
new XmlSettingsParser(this).parse(configurationURL);
|
||||
setVariable("ivy.default.ivy.user.dir", getDefaultIvyUserDir().getAbsolutePath(), false);
|
||||
Message.verbose("configuration done ("+(System.currentTimeMillis()-start)+"ms)");
|
||||
dumpConfig();
|
||||
}
|
||||
|
||||
private void loadDefaultProperties() throws IOException {
|
||||
loadProperties(Ivy.class.getResource("ivy.properties"), false);
|
||||
loadProperties(getDefaultPropertiesURL(), false);
|
||||
}
|
||||
|
||||
public static URL getDefaultPropertiesURL() {
|
||||
return getSettingsURL("ivy.properties");
|
||||
}
|
||||
|
||||
private static URL getSettingsURL() {
|
||||
return XmlSettingsParser.class.getResource("");
|
||||
}
|
||||
|
||||
private static URL getSettingsURL(String file) {
|
||||
return XmlSettingsParser.class.getResource(file);
|
||||
}
|
||||
|
||||
public void configureDefault() throws ParseException, IOException {
|
||||
|
|
@ -2918,7 +2957,7 @@ public class Ivy implements TransferListener {
|
|||
}
|
||||
|
||||
public static URL getDefaultConfigurationURL() {
|
||||
return Ivy.class.getResource("conf/ivyconf.xml");
|
||||
return getSettingsURL("ivyconf.xml");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -39,15 +39,21 @@ import org.apache.commons.cli.Option;
|
|||
import org.apache.commons.cli.OptionBuilder;
|
||||
import org.apache.commons.cli.Options;
|
||||
import org.apache.commons.cli.ParseException;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.url.CredentialsStore;
|
||||
import org.apache.ivy.url.URLHandler;
|
||||
import org.apache.ivy.url.URLHandlerDispatcher;
|
||||
import org.apache.ivy.url.URLHandlerRegistry;
|
||||
import org.apache.ivy.core.deliver.DefaultPublishingDRResolver;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
|
||||
import org.apache.ivy.plugins.report.XmlReportParser;
|
||||
import org.apache.ivy.util.DefaultMessageImpl;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.xml.XmlModuleDescriptorWriter;
|
||||
import org.apache.ivy.xml.XmlReportParser;
|
||||
import org.apache.ivy.util.url.CredentialsStore;
|
||||
import org.apache.ivy.util.url.URLHandler;
|
||||
import org.apache.ivy.util.url.URLHandlerDispatcher;
|
||||
import org.apache.ivy.util.url.URLHandlerRegistry;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
/*
|
||||
* 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;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
|
||||
import org.apache.ivy.util.Message;
|
||||
|
||||
|
||||
public class ResolvedURL implements ArtifactInfo {
|
||||
URL url;
|
||||
String revision;
|
||||
private Long _lastModified;
|
||||
|
||||
public ResolvedURL(URL url, String revision) {
|
||||
this.url = url;
|
||||
this.revision = revision;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return url + "(" + revision + ")";
|
||||
}
|
||||
|
||||
public String getRevision() {
|
||||
return revision;
|
||||
}
|
||||
|
||||
public long getLastModified() {
|
||||
if (_lastModified == null) {
|
||||
URLConnection con = null;
|
||||
try {
|
||||
con = url.openConnection();
|
||||
_lastModified = new Long(con.getLastModified());
|
||||
} catch (IOException e) {
|
||||
Message.warn("impossible to open connection to "+url+": "+e.getMessage());
|
||||
_lastModified = new Long(0);
|
||||
} finally {
|
||||
if (con instanceof HttpURLConnection) {
|
||||
((HttpURLConnection)con).disconnect();
|
||||
}
|
||||
}
|
||||
}
|
||||
return _lastModified.longValue();
|
||||
}
|
||||
|
||||
public URL getURL() {
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
|
@ -23,11 +23,11 @@ import java.util.Collection;
|
|||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.IvyContext;
|
||||
import org.apache.ivy.event.AbstractTrigger;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.event.Trigger;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.plugins.trigger.AbstractTrigger;
|
||||
import org.apache.ivy.plugins.trigger.Trigger;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.MessageImpl;
|
||||
import org.apache.tools.ant.Project;
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ import java.util.Collection;
|
|||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.IvyContext;
|
||||
import org.apache.ivy.event.AbstractTrigger;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.event.Trigger;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.plugins.trigger.AbstractTrigger;
|
||||
import org.apache.ivy.plugins.trigger.Trigger;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.MessageImpl;
|
||||
import org.apache.tools.ant.Project;
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ package org.apache.ivy.ant;
|
|||
|
||||
import java.io.File;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.xml.XmlReportParser;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.plugins.report.XmlReportParser;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@ import javax.xml.transform.sax.SAXTransformerFactory;
|
|||
import javax.xml.transform.sax.TransformerHandler;
|
||||
import javax.xml.transform.stream.StreamResult;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ArtifactOrigin;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.IvyNode;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.core.cache.ArtifactOrigin;
|
||||
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.resolve.IvyNode;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.xml.sax.SAXException;
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
import org.apache.ivy.DependencyDescriptor;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.parser.ModuleDescriptorParserRegistry;
|
||||
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.plugins.parser.ModuleDescriptorParserRegistry;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.DirectoryScanner;
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
package org.apache.ivy.ant;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.ResolvedModuleRevision;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ package org.apache.ivy.ant;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.types.FileSet;
|
||||
import org.apache.tools.ant.types.PatternSet.NameEntry;
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ package org.apache.ivy.ant;
|
|||
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.apache.tools.ant.types.Path;
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ import java.util.LinkedHashSet;
|
|||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.report.ArtifactDownloadReport;
|
||||
import org.apache.ivy.report.ConfigurationResolveReport;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.report.ArtifactDownloadReport;
|
||||
import org.apache.ivy.core.report.ConfigurationResolveReport;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.plugins.report.XmlReportParser;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.xml.XmlReportParser;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ import java.net.URL;
|
|||
import java.util.Properties;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.url.CredentialsStore;
|
||||
import org.apache.ivy.url.URLHandler;
|
||||
import org.apache.ivy.url.URLHandlerDispatcher;
|
||||
import org.apache.ivy.url.URLHandlerRegistry;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.url.CredentialsStore;
|
||||
import org.apache.ivy.util.url.URLHandler;
|
||||
import org.apache.ivy.util.url.URLHandlerDispatcher;
|
||||
import org.apache.ivy.util.url.URLHandlerRegistry;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.apache.tools.ant.taskdefs.Property;
|
||||
|
|
@ -167,7 +167,7 @@ public class IvyConfigure extends IvyTask {
|
|||
private void loadDefaultProperties() {
|
||||
Property prop = new Property() {
|
||||
public void execute() throws BuildException {
|
||||
URL url = Ivy.class.getResource("ivy.properties");
|
||||
URL url = Ivy.getDefaultPropertiesURL();
|
||||
// this is copy of loadURL code from ant Property task (not available in 1.5.1)
|
||||
Properties props = new Properties();
|
||||
Message.verbose("Loading " + url);
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ import java.net.MalformedURLException;
|
|||
import java.text.ParseException;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.external.m2.PomModuleDescriptorParser;
|
||||
import org.apache.ivy.repository.url.URLResource;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParser;
|
||||
import org.apache.ivy.plugins.repository.url.URLResource;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ package org.apache.ivy.ant;
|
|||
import java.io.File;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.ivy.DefaultPublishingDRResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.IvyContext;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.PublishingDependencyRevisionResolver;
|
||||
import org.apache.ivy.status.StatusManager;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.deliver.DefaultPublishingDRResolver;
|
||||
import org.apache.ivy.core.deliver.PublishingDependencyRevisionResolver;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.status.StatusManager;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.MessageImpl;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
import org.apache.tools.ant.filters.LineContainsRegExp;
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
package org.apache.ivy.ant;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.ResolvedModuleRevision;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ import java.text.ParseException;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ivy.Configuration;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.Configuration.Visibility;
|
||||
import org.apache.ivy.parser.ModuleDescriptorParserRegistry;
|
||||
import org.apache.ivy.core.module.descriptor.Configuration;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
|
||||
import org.apache.ivy.plugins.parser.ModuleDescriptorParserRegistry;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@ package org.apache.ivy.ant;
|
|||
import java.io.File;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.filter.FilterHelper;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.ivy.util.filter.FilterHelper;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
package org.apache.ivy.ant;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,12 +20,12 @@ package org.apache.ivy.ant;
|
|||
import java.io.File;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.filter.FilterHelper;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.StringUtils;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
import org.apache.ivy.util.filter.FilterHelper;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ArtifactRevisionId;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.core.module.id.ArtifactRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,10 +24,10 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.report.XmlReportOutputter;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.plugins.report.XmlReportOutputter;
|
||||
import org.apache.ivy.util.FileUtil;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.taskdefs.XSLTProcess;
|
||||
|
|
|
|||
|
|
@ -23,15 +23,15 @@ import java.util.ArrayList;
|
|||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ivy.DefaultModuleDescriptor;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.filter.FilterHelper;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.report.XmlReportOutputter;
|
||||
import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.ivy.plugins.report.XmlReportOutputter;
|
||||
import org.apache.ivy.util.FileUtil;
|
||||
import org.apache.ivy.util.filter.FilterHelper;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.taskdefs.XSLTProcess;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@ import java.net.MalformedURLException;
|
|||
import java.text.ParseException;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.filter.FilterHelper;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.filter.FilterHelper;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
import org.apache.tools.ant.Project;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
package org.apache.ivy.ant;
|
||||
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ import java.util.HashSet;
|
|||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.IvyContext;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.StringUtils;
|
||||
import org.apache.tools.ant.BuildException;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
package org.apache.ivy.ant;
|
||||
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.circular.CircularDependencyStrategy;
|
||||
import org.apache.ivy.util.IvyThread;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
|
||||
import org.apache.ivy.util.MessageImpl;
|
||||
|
||||
|
||||
|
|
@ -95,14 +95,14 @@ public class IvyContext {
|
|||
}
|
||||
return _defaultIvy;
|
||||
}
|
||||
void setIvy(Ivy ivy) {
|
||||
public void setIvy(Ivy ivy) {
|
||||
_ivy = new WeakReference(ivy);
|
||||
_operatingThread = Thread.currentThread();
|
||||
}
|
||||
public File getCache() {
|
||||
return _cache == null ? getIvy().getDefaultCache() : _cache;
|
||||
}
|
||||
void setCache(File cache) {
|
||||
public void setCache(File cache) {
|
||||
_cache = cache;
|
||||
}
|
||||
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.util;
|
||||
package org.apache.ivy.core;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -27,12 +27,12 @@ import java.util.Stack;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ArtifactOrigin;
|
||||
import org.apache.ivy.DefaultArtifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.IvyContext;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.cache.ArtifactOrigin;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.util.Message;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,9 +15,8 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.util;
|
||||
package org.apache.ivy.core;
|
||||
|
||||
import org.apache.ivy.IvyContext;
|
||||
|
||||
/**
|
||||
* A simple thread subclass associated the same IvyContext as the thread in which it is instanciated.
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.cache;
|
||||
|
||||
/**
|
||||
* This class contains information about the origin of an artifact.
|
||||
|
|
@ -15,7 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.deliver;
|
||||
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
|
||||
public class DefaultPublishingDRResolver implements PublishingDependencyRevisionResolver {
|
||||
|
|
@ -15,7 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.deliver;
|
||||
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
/**
|
||||
* @author Xavier Hanin
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event;
|
||||
package org.apache.ivy.core.event;
|
||||
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
|
||||
public class FilteredIvyListener implements IvyListener {
|
||||
private IvyListener _listener;
|
||||
|
|
@ -15,15 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event;
|
||||
package org.apache.ivy.core.event;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.util.StringUtils;
|
||||
|
||||
|
||||
|
|
@ -15,16 +15,16 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event;
|
||||
package org.apache.ivy.core.event;
|
||||
|
||||
import org.apache.ivy.filter.AndFilter;
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.filter.NoFilter;
|
||||
import org.apache.ivy.filter.NotFilter;
|
||||
import org.apache.ivy.filter.OrFilter;
|
||||
import org.apache.ivy.matcher.ExactPatternMatcher;
|
||||
import org.apache.ivy.matcher.Matcher;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
|
||||
import org.apache.ivy.plugins.matcher.Matcher;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.ivy.util.filter.AndFilter;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
import org.apache.ivy.util.filter.NoFilter;
|
||||
import org.apache.ivy.util.filter.NotFilter;
|
||||
import org.apache.ivy.util.filter.OrFilter;
|
||||
|
||||
/**
|
||||
* A filter implementation filtering {@link IvyEvent} based upon
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event;
|
||||
package org.apache.ivy.core.event;
|
||||
|
||||
import java.util.EventListener;
|
||||
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.download;
|
||||
package org.apache.ivy.core.event.download;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
|
||||
public abstract class DownloadEvent extends IvyEvent {
|
||||
private Artifact _artifact;
|
||||
|
|
@ -15,15 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.download;
|
||||
package org.apache.ivy.core.event.download;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ArtifactOrigin;
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.report.ArtifactDownloadReport;
|
||||
import org.apache.ivy.core.cache.ArtifactOrigin;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.core.report.ArtifactDownloadReport;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
|
||||
public class EndArtifactDownloadEvent extends DownloadEvent {
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.download;
|
||||
package org.apache.ivy.core.event.download;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
public class NeedArtifactEvent extends DownloadEvent {
|
||||
public static final String NAME = "need-artifact";
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.download;
|
||||
package org.apache.ivy.core.event.download;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
|
||||
public class PrepareDownloadEvent extends IvyEvent {
|
||||
public static final String NAME = "prepare-download";
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.download;
|
||||
package org.apache.ivy.core.event.download;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ArtifactOrigin;
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.core.cache.ArtifactOrigin;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
public class StartArtifactDownloadEvent extends DownloadEvent {
|
||||
public static final String NAME = "pre-download-artifact";
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.resolve;
|
||||
package org.apache.ivy.core.event.resolve;
|
||||
|
||||
import org.apache.ivy.DependencyDescriptor;
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ResolvedModuleRevision;
|
||||
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
|
||||
import org.apache.ivy.core.resolve.ResolvedModuleRevision;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
public class EndResolveDependencyEvent extends ResolveDependencyEvent {
|
||||
public static final String NAME = "post-resolve-dependency";
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.resolve;
|
||||
package org.apache.ivy.core.event.resolve;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.report.ResolveReport;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.report.ResolveReport;
|
||||
|
||||
public class EndResolveEvent extends ResolveEvent {
|
||||
public static final String NAME = "post-resolve";
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.resolve;
|
||||
package org.apache.ivy.core.event.resolve;
|
||||
|
||||
import org.apache.ivy.DependencyDescriptor;
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
public class ResolveDependencyEvent extends IvyEvent {
|
||||
private DependencyResolver _resolver;
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.resolve;
|
||||
package org.apache.ivy.core.event.resolve;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.event.IvyEvent;
|
||||
import org.apache.ivy.core.event.IvyEvent;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
|
||||
public class ResolveEvent extends IvyEvent {
|
||||
private ModuleDescriptor _md;
|
||||
|
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.resolve;
|
||||
package org.apache.ivy.core.event.resolve;
|
||||
|
||||
import org.apache.ivy.DependencyDescriptor;
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
public class StartResolveDependencyEvent extends ResolveDependencyEvent {
|
||||
public static final String NAME = "pre-resolve-dependency";
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.event.resolve;
|
||||
package org.apache.ivy.core.event.resolve;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
|
||||
public class StartResolveEvent extends ResolveEvent {
|
||||
public static final String NAME = "pre-resolve";
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -15,12 +15,14 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.ivy.extendable.ExtendableItem;
|
||||
import org.apache.ivy.core.module.id.ArtifactRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.util.extendable.ExtendableItem;
|
||||
|
||||
|
||||
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.ivy.extendable.DefaultExtendableItem;
|
||||
import org.apache.ivy.util.extendable.DefaultExtendableItem;
|
||||
|
||||
|
||||
|
||||
|
|
@ -15,12 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.core.module.id.ArtifactRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
/**
|
||||
* @author Hanin
|
||||
*
|
||||
|
|
@ -15,13 +15,14 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.core.module.id.ArtifactId;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
|
||||
|
||||
public class DefaultDependencyArtifactDescriptor implements DependencyArtifactDescriptor {
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -30,10 +30,13 @@ import java.util.Set;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.ivy.matcher.MatcherHelper;
|
||||
import org.apache.ivy.namespace.NameSpaceHelper;
|
||||
import org.apache.ivy.namespace.Namespace;
|
||||
import org.apache.ivy.namespace.NamespaceTransformer;
|
||||
import org.apache.ivy.core.module.id.ArtifactId;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.matcher.MatcherHelper;
|
||||
import org.apache.ivy.plugins.namespace.NameSpaceHelper;
|
||||
import org.apache.ivy.plugins.namespace.Namespace;
|
||||
import org.apache.ivy.plugins.namespace.NamespaceTransformer;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
|
@ -31,17 +31,20 @@ import java.util.LinkedHashSet;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.matcher.MatcherHelper;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.namespace.NameSpaceHelper;
|
||||
import org.apache.ivy.namespace.Namespace;
|
||||
import org.apache.ivy.namespace.NamespaceTransformer;
|
||||
import org.apache.ivy.parser.ModuleDescriptorParser;
|
||||
import org.apache.ivy.repository.Resource;
|
||||
import org.apache.ivy.status.StatusManager;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.status.StatusManager;
|
||||
import org.apache.ivy.plugins.conflict.ConflictManager;
|
||||
import org.apache.ivy.plugins.matcher.MatcherHelper;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.ivy.plugins.namespace.NameSpaceHelper;
|
||||
import org.apache.ivy.plugins.namespace.Namespace;
|
||||
import org.apache.ivy.plugins.namespace.NamespaceTransformer;
|
||||
import org.apache.ivy.plugins.parser.ModuleDescriptorParser;
|
||||
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
|
||||
import org.apache.ivy.plugins.repository.Resource;
|
||||
import org.apache.ivy.plugins.version.VersionMatcher;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.version.VersionMatcher;
|
||||
import org.apache.ivy.xml.XmlModuleDescriptorWriter;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,11 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.core.module.id.ArtifactId;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,10 +15,13 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import org.apache.ivy.extendable.ExtendableItem;
|
||||
import org.apache.ivy.namespace.Namespace;
|
||||
import org.apache.ivy.core.module.id.ArtifactId;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.namespace.Namespace;
|
||||
import org.apache.ivy.util.extendable.ExtendableItem;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
public class License {
|
||||
private String _name;
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -23,6 +23,9 @@ import java.util.Date;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.core.module.id.ArtifactRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
*
|
||||
|
|
@ -15,17 +15,20 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.descriptor;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.ivy.extendable.ExtendableItem;
|
||||
import org.apache.ivy.parser.ModuleDescriptorParser;
|
||||
import org.apache.ivy.repository.Resource;
|
||||
import org.apache.ivy.version.VersionMatcher;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.conflict.ConflictManager;
|
||||
import org.apache.ivy.plugins.parser.ModuleDescriptorParser;
|
||||
import org.apache.ivy.plugins.repository.Resource;
|
||||
import org.apache.ivy.plugins.version.VersionMatcher;
|
||||
import org.apache.ivy.util.extendable.ExtendableItem;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.id;
|
||||
|
||||
/**
|
||||
* Identifies an artifact in a module, without revision information
|
||||
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.id;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.extendable.UnmodifiableExtendableItem;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.util.extendable.UnmodifiableExtendableItem;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.id;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,14 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.module.id;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.extendable.UnmodifiableExtendableItem;
|
||||
import org.apache.ivy.util.IvyPatternHelper;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.IvyPatternHelper;
|
||||
import org.apache.ivy.util.extendable.UnmodifiableExtendableItem;
|
||||
|
||||
|
||||
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.status;
|
||||
package org.apache.ivy.core.module.status;
|
||||
|
||||
public class Status {
|
||||
private String _name;
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.status;
|
||||
package org.apache.ivy.core.module.status;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.report;
|
||||
package org.apache.ivy.core.report;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.ArtifactOrigin;
|
||||
import org.apache.ivy.core.cache.ArtifactOrigin;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.report;
|
||||
package org.apache.ivy.core.report;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -32,14 +32,15 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.IvyNode;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
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;
|
||||
import org.apache.ivy.core.resolve.IvyNode;
|
||||
import org.apache.ivy.plugins.report.XmlReportOutputter;
|
||||
import org.apache.ivy.plugins.report.XmlReportParser;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.xml.XmlReportParser;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.report;
|
||||
package org.apache.ivy.core.report;
|
||||
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -24,7 +24,7 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.Artifact;
|
||||
import org.apache.ivy.core.module.descriptor.Artifact;
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.report;
|
||||
package org.apache.ivy.core.report;
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.report;
|
||||
package org.apache.ivy.core.report;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -27,10 +27,11 @@ import java.util.LinkedHashMap;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.IvyNode;
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.resolve.IvyNode;
|
||||
import org.apache.ivy.plugins.report.ReportOutputter;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,11 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.resolve;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.resolve;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -33,12 +33,26 @@ import java.util.Stack;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.apache.ivy.event.resolve.EndResolveDependencyEvent;
|
||||
import org.apache.ivy.event.resolve.StartResolveDependencyEvent;
|
||||
import org.apache.ivy.filter.Filter;
|
||||
import org.apache.ivy.filter.FilterHelper;
|
||||
import org.apache.ivy.matcher.MatcherHelper;
|
||||
import org.apache.ivy.core.IvyContext;
|
||||
import org.apache.ivy.core.event.resolve.EndResolveDependencyEvent;
|
||||
import org.apache.ivy.core.event.resolve.StartResolveDependencyEvent;
|
||||
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.DependencyArtifactDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.MDArtifact;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.Configuration.Visibility;
|
||||
import org.apache.ivy.core.module.id.ArtifactId;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.conflict.ConflictManager;
|
||||
import org.apache.ivy.plugins.matcher.MatcherHelper;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.filter.Filter;
|
||||
import org.apache.ivy.util.filter.FilterHelper;
|
||||
|
||||
|
||||
public class IvyNode {
|
||||
|
|
@ -1513,7 +1527,7 @@ public class IvyNode {
|
|||
* @return true if current node is transitive and the parent configuration is
|
||||
* transitive.
|
||||
*/
|
||||
protected boolean isTransitive() {
|
||||
public boolean isTransitive() {
|
||||
return (_data.isTransitive() &&
|
||||
getDependencyDescriptor(getParent()).isTransitive() &&
|
||||
isParentConfTransitive() );
|
||||
|
|
@ -15,14 +15,16 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.resolve;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.ivy.report.ConfigurationResolveReport;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.core.report.ConfigurationResolveReport;
|
||||
|
||||
|
||||
public class ResolveData {
|
||||
|
|
@ -15,11 +15,15 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.resolve;
|
||||
|
||||
import java.net.URL;
|
||||
import java.util.Date;
|
||||
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
*
|
||||
|
|
@ -15,9 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.resolver;
|
||||
package org.apache.ivy.core.search;
|
||||
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
|
||||
|
||||
public class ModuleEntry {
|
||||
|
|
@ -15,9 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.resolver;
|
||||
package org.apache.ivy.core.search;
|
||||
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
|
||||
public class OrganisationEntry {
|
||||
private DependencyResolver _resolver;
|
||||
|
|
@ -15,9 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.resolver;
|
||||
package org.apache.ivy.core.search;
|
||||
|
||||
import org.apache.ivy.plugins.resolver.DependencyResolver;
|
||||
|
||||
import org.apache.ivy.DependencyResolver;
|
||||
|
||||
|
||||
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.util;
|
||||
package org.apache.ivy.core.settings;
|
||||
|
||||
/**
|
||||
* @author x.hanin
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.xml;
|
||||
package org.apache.ivy.core.settings;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
|
@ -30,16 +30,16 @@ import java.util.Map;
|
|||
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
|
||||
import org.apache.ivy.ConflictManager;
|
||||
import org.apache.ivy.Ivy;
|
||||
import org.apache.ivy.LatestStrategy;
|
||||
import org.apache.ivy.ModuleId;
|
||||
import org.apache.ivy.circular.CircularDependencyStrategy;
|
||||
import org.apache.ivy.matcher.PatternMatcher;
|
||||
import org.apache.ivy.status.StatusManager;
|
||||
import org.apache.ivy.url.URLHandlerRegistry;
|
||||
import org.apache.ivy.core.module.id.ModuleId;
|
||||
import org.apache.ivy.core.module.status.StatusManager;
|
||||
import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
|
||||
import org.apache.ivy.plugins.conflict.ConflictManager;
|
||||
import org.apache.ivy.plugins.latest.LatestStrategy;
|
||||
import org.apache.ivy.plugins.matcher.PatternMatcher;
|
||||
import org.apache.ivy.util.Configurator;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.util.url.URLHandlerRegistry;
|
||||
import org.xml.sax.Attributes;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
|
@ -49,7 +49,7 @@ import org.xml.sax.helpers.DefaultHandler;
|
|||
* @author Hanin
|
||||
*
|
||||
*/
|
||||
public class XmlIvyConfigurationParser extends DefaultHandler {
|
||||
public class XmlSettingsParser extends DefaultHandler {
|
||||
private Configurator _configurator;
|
||||
private List _configuratorTags = Arrays.asList(new String[] {"resolvers", "namespaces", "parsers", "latest-strategies", "conflict-managers", "outputters", "version-matchers", "statuses", "circular-dependency-strategies", "triggers"});
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ public class XmlIvyConfigurationParser extends DefaultHandler {
|
|||
private String _defaultCircular;
|
||||
private String _currentConfiguratorTag;
|
||||
|
||||
public XmlIvyConfigurationParser(Ivy ivy) {
|
||||
public XmlSettingsParser(Ivy ivy) {
|
||||
_ivy = ivy;
|
||||
}
|
||||
|
||||
|
|
@ -227,7 +227,7 @@ public class XmlIvyConfigurationParser extends DefaultHandler {
|
|||
ivyconfURL = incFile.toURL();
|
||||
}
|
||||
}
|
||||
new XmlIvyConfigurationParser(_ivy).parse(_configurator, ivyconfURL);
|
||||
new XmlSettingsParser(_ivy).parse(_configurator, ivyconfURL);
|
||||
} finally {
|
||||
_ivy.setVariables(variables);
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver
|
||||
chain = org.apache.ivy.plugins.resolver.ChainResolver
|
||||
ibiblio = org.apache.ivy.plugins.resolver.IBiblioResolver
|
||||
url = org.apache.ivy.plugins.resolver.URLResolver
|
||||
dual = org.apache.ivy.plugins.resolver.DualResolver
|
||||
ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver
|
||||
ssh = org.apache.ivy.plugins.resolver.SshResolver
|
||||
sftp = org.apache.ivy.plugins.resolver.SFTPResolver
|
||||
vsftp = org.apache.ivy.plugins.resolver.VsftpResolver
|
||||
vfs = org.apache.ivy.plugins.resolver.VfsResolver
|
||||
cache = org.apache.ivy.plugins.resolver.CacheResolver
|
||||
|
||||
latest-revision = org.apache.ivy.plugins.latest.LatestRevisionStrategy
|
||||
latest-lexico = org.apache.ivy.plugins.latest.LatestLexicographicStrategy
|
||||
latest-time = org.apache.ivy.plugins.latest.LatestTimeStrategy
|
||||
|
||||
fixed-cm = org.apache.ivy.plugins.conflict.FixedConflictManager
|
||||
latest-cm = org.apache.ivy.plugins.conflict.LatestConflictManager
|
||||
no-cm = org.apache.ivy.plugins.conflict.NoConflictManager
|
||||
strict-cm = org.apache.ivy.plugins.conflict.StrictConflictManager
|
||||
regexp-cm = org.apache.ivy.plugins.conflict.RegexpConflictManager
|
||||
|
||||
|
||||
namespace = org.apache.ivy.plugins.namespace.Namespace
|
||||
|
||||
exact-vm = org.apache.ivy.plugins.version.ExactVersionMatcher
|
||||
chain-vm = org.apache.ivy.plugins.version.ChainVersionMatcher
|
||||
latest-vm = org.apache.ivy.plugins.version.LatestVersionMatcher
|
||||
sub-vm = org.apache.ivy.plugins.version.SubVersionMatcher
|
||||
range-vm = org.apache.ivy.plugins.version.VersionRangeMatcher
|
||||
|
||||
ant-build = org.apache.ivy.ant.AntBuildTrigger
|
||||
ant-call = org.apache.ivy.ant.AntCallTrigger
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.core.sort;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
|
|
@ -26,10 +26,13 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Stack;
|
||||
|
||||
import org.apache.ivy.circular.CircularDependencyException;
|
||||
import org.apache.ivy.circular.CircularDependencyHelper;
|
||||
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.resolve.IvyNode;
|
||||
import org.apache.ivy.plugins.circular.CircularDependencyException;
|
||||
import org.apache.ivy.plugins.circular.CircularDependencyHelper;
|
||||
import org.apache.ivy.plugins.version.VersionMatcher;
|
||||
import org.apache.ivy.util.Message;
|
||||
import org.apache.ivy.version.VersionMatcher;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -38,7 +41,7 @@ import org.apache.ivy.version.VersionMatcher;
|
|||
* @author xavier hanin (for the sorting of nodes based upon sort of modules)
|
||||
*
|
||||
*/
|
||||
class ModuleDescriptorSorter {
|
||||
public class ModuleDescriptorSorter {
|
||||
public static List sortNodes(VersionMatcher matcher, Collection nodes) {
|
||||
/* here we want to use the sort algorithm which work on module descriptors :
|
||||
* so we first put dependencies on a map from descriptors to dependency, then we
|
||||
|
|
@ -15,7 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy;
|
||||
package org.apache.ivy.plugins;
|
||||
|
||||
import org.apache.ivy.Ivy;
|
||||
|
||||
public interface IvyAware {
|
||||
void setIvy(Ivy ivy);
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.circular;
|
||||
package org.apache.ivy.plugins.circular;
|
||||
|
||||
public abstract class AbstractCircularDependencyStrategy implements CircularDependencyStrategy {
|
||||
private String _name;
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.circular;
|
||||
package org.apache.ivy.plugins.circular;
|
||||
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -15,10 +15,10 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.circular;
|
||||
package org.apache.ivy.plugins.circular;
|
||||
|
||||
import org.apache.ivy.ModuleDescriptor;
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
public class CircularDependencyHelper {
|
||||
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.circular;
|
||||
package org.apache.ivy.plugins.circular;
|
||||
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
public interface CircularDependencyStrategy {
|
||||
String getName();
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.circular;
|
||||
package org.apache.ivy.plugins.circular;
|
||||
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
|
||||
public class ErrorCircularDependencyStrategy extends AbstractCircularDependencyStrategy {
|
||||
|
||||
|
|
@ -15,9 +15,9 @@
|
|||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
package org.apache.ivy.circular;
|
||||
package org.apache.ivy.plugins.circular;
|
||||
|
||||
import org.apache.ivy.ModuleRevisionId;
|
||||
import org.apache.ivy.core.module.id.ModuleRevisionId;
|
||||
import org.apache.ivy.util.Message;
|
||||
|
||||
public class IgnoreCircularDependencyStrategy extends AbstractCircularDependencyStrategy {
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue