Author: xavier
Date: Sat Mar 17 09:17:43 2007
New Revision: 519361
URL: http://svn.apache.org/viewvc?view=rev&rev=519361
Log:
IVY-438 work in progress: ivyconf=>ivysettings refactored in main code, still
need to modify ivyconf=>ivysettings in tests, and update the doc
Added:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml
- copied, changed from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-default-chain.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-local.xml
- copied, changed from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-local.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml
- copied, changed from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-main-chain.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-public.xml
- copied, changed from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-public.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml
- copied, changed from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-shared.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings.xml
- copied, changed from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf.xml
Removed:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-default-chain.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-local.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-main-chain.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-public.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-shared.xml
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf.xml
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DualResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConfigure.java Sat
Mar 17 09:17:43 2007
@@ -138,21 +138,34 @@
IvySettings settings = ivy.getSettings();
settings.addAllVariables(getProject().getProperties());
if (_file == null && _url == null) {
- _file = new File(getProject().getBaseDir(),
getProject().getProperty("ivy.conf.file"));
- Message.verbose("searching ivyconf file: trying "+_file);
+ String settingsFileName =
getProject().getProperty("ivy.conf.file");
+ if (settingsFileName != null) {
+ Message.deprecated("'ivy.conf.file' is deprecated, use
'ivy.settings.file' instead");
+ } else {
+ settingsFileName =
getProject().getProperty("ivy.settings.file");
+ }
+ File[] settingsLocations = new File[] {
+ new File(getProject().getBaseDir(),
settingsFileName),
+ new File(getProject().getBaseDir(),
"ivyconf.xml"),
+ new File(settingsFileName),
+ new File("ivyconf.xml"),
+ };
+ for (int i = 0; i < settingsLocations.length; i++) {
+ _file = settingsLocations[i];
+ Message.verbose("searching settings
file: trying "+_file);
+ if (_file.exists()) {
+ break;
+ }
+ }
if (!_file.exists()) {
- _file = new
File(getProject().getProperty("ivy.conf.file"));
- Message.verbose("searching ivyconf file: trying "+_file);
- if (!_file.exists()) {
- Message.info("no configuration file found, using
default...");
- _file = null;
- _url = IvySettings.getDefaultConfigurationURL();
- }
+ Message.info("no settings file found, using default...");
+ _file = null;
+ _url = IvySettings.getDefaultSettingsURL();
}
}
if (_file != null) {
if (!_file.exists()) {
- throw new BuildException("configuration file does not
exist: "+_file);
+ throw new BuildException("settings file does not exist:
"+_file);
} else {
ivy.configure(_file);
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Sat Mar 17 09:17:43 2007
@@ -79,7 +79,7 @@
private String _defaultBranch = null;
private boolean _checkUpToDate = true;
- private Map _moduleConfigurations = new LinkedHashMap(); // Map
(ModuleIdMatcher -> ModuleSettings)
+ private Map _moduleSettings = new LinkedHashMap(); // Map (ModuleIdMatcher
-> ModuleSettings)
private Map _conflictsManager = new HashMap(); // Map (String
conflictManagerName -> ConflictManager)
private Map _latestStrategies = new HashMap(); // Map (String
latestStrategyName -> LatestStrategy)
@@ -124,7 +124,8 @@
private StatusManager _statusManager;
public IvySettings() {
- setVariable("ivy.default.conf.dir", getDefaultConfigurationDir(),
true);
+ setVariable("ivy.default.settings.dir", getDefaultSettingsDir(), true);
+ setDeprecatedVariable("ivy.default.conf.dir",
"ivy.default.settings.dir");
String ivyTypeDefs = System.getProperty("ivy.typedef.files");
if (ivyTypeDefs != null) {
@@ -239,10 +240,10 @@
}
- public void load(File configurationFile) throws ParseException,
IOException {
- Message.info(":: configuring :: file = "+configurationFile);
+ public void load(File settingsFile) throws ParseException, IOException {
+ Message.info(":: loading settings :: file = "+settingsFile);
long start = System.currentTimeMillis();
- setConfigurationVariables(configurationFile);
+ setSettingsVariables(settingsFile);
if (getVariable("ivy.default.ivy.user.dir") != null) {
setDefaultIvyUserDir(new
File(getVariable("ivy.default.ivy.user.dir")));
} else {
@@ -252,21 +253,21 @@
loadDefaultProperties();
try {
- new XmlSettingsParser(this).parse(configurationFile.toURL());
+ new XmlSettingsParser(this).parse(settingsFile.toURL());
} catch (MalformedURLException e) {
- IllegalArgumentException iae = new IllegalArgumentException("given
file cannot be transformed to url: "+configurationFile);
+ IllegalArgumentException iae = new IllegalArgumentException("given
file cannot be transformed to url: "+settingsFile);
iae.initCause(e);
throw iae;
}
setVariable("ivy.default.ivy.user.dir",
getDefaultIvyUserDir().getAbsolutePath(), false);
- Message.verbose("configuration done
("+(System.currentTimeMillis()-start)+"ms)");
- dumpConfig();
+ Message.verbose("settings loaded
("+(System.currentTimeMillis()-start)+"ms)");
+ dumpSettings();
}
- public void load(URL configurationURL) throws ParseException, IOException {
- Message.info(":: configuring :: url = "+configurationURL);
+ public void load(URL settingsURL) throws ParseException, IOException {
+ Message.info(":: loading settings :: url = "+settingsURL);
long start = System.currentTimeMillis();
- setConfigurationVariables(configurationURL);
+ setSettingsVariables(settingsURL);
if (getVariable("ivy.default.ivy.user.dir") != null) {
setDefaultIvyUserDir(new
File(getVariable("ivy.default.ivy.user.dir")));
} else {
@@ -275,14 +276,14 @@
getDefaultCache();
loadDefaultProperties();
- new XmlSettingsParser(this).parse(configurationURL);
+ new XmlSettingsParser(this).parse(settingsURL);
setVariable("ivy.default.ivy.user.dir",
getDefaultIvyUserDir().getAbsolutePath(), false);
- Message.verbose("configuration done
("+(System.currentTimeMillis()-start)+"ms)");
- dumpConfig();
+ Message.verbose("settings loaded
("+(System.currentTimeMillis()-start)+"ms)");
+ dumpSettings();
}
public void loadDefault() throws ParseException, IOException {
- load(getDefaultConfigurationURL());
+ load(getDefaultSettingsURL());
}
private void loadDefaultProperties() throws IOException {
@@ -293,43 +294,57 @@
return getSettingsURL("ivy.properties");
}
- public static URL getDefaultConfigurationURL() {
- return getSettingsURL("ivyconf.xml");
+ public static URL getDefaultSettingsURL() {
+ return getSettingsURL("ivysettings.xml");
}
- private String getDefaultConfigurationDir() {
- String ivyconfLocation =
getDefaultConfigurationURL().toExternalForm();
- return ivyconfLocation.substring(0, ivyconfLocation.length() -
"ivyconf.xml".length() - 1);
+ private String getDefaultSettingsDir() {
+ String ivyconfLocation =
getDefaultSettingsURL().toExternalForm();
+ return ivyconfLocation.substring(0, ivyconfLocation.length() -
"ivysettings.xml".length() - 1);
}
private static URL getSettingsURL(String file) {
return XmlSettingsParser.class.getResource(file);
}
- public void setConfigurationVariables(File configurationFile) {
+ public void setSettingsVariables(File settingsFile) {
try {
- setVariable("ivy.conf.dir", new
File(configurationFile.getAbsolutePath()).getParent());
- setVariable("ivy.conf.file", configurationFile.getAbsolutePath());
- setVariable("ivy.conf.url",
configurationFile.toURL().toExternalForm());
+ setVariable("ivy.settings.dir", new
File(settingsFile.getAbsolutePath()).getParent());
+ setDeprecatedVariable("ivy.conf.dir", "ivy.settings.dir");
+ setVariable("ivy.settings.file", settingsFile.getAbsolutePath());
+ setDeprecatedVariable("ivy.conf.file", "ivy.settings.file");
+ setVariable("ivy.settings.url",
settingsFile.toURL().toExternalForm());
+ setDeprecatedVariable("ivy.conf.url", "ivy.settings.url");
} catch (MalformedURLException e) {
- IllegalArgumentException iae = new IllegalArgumentException("given
file cannot be transformed to url: "+configurationFile);
+ IllegalArgumentException iae = new IllegalArgumentException("given
file cannot be transformed to url: "+settingsFile);
iae.initCause(e);
throw iae;
}
}
- public void setConfigurationVariables(URL configurationURL) {
- String confURL = configurationURL.toExternalForm();
- setVariable("ivy.conf.url", confURL);
- int slashIndex = confURL.lastIndexOf('/');
+ /**
+ * Sets a deprecated variable with the value of the new variable
+ * @param deprecatedKey the deprecated variable name
+ * @param newKey the new variable name
+ */
+ private void setDeprecatedVariable(String deprecatedKey, String newKey) {
+ setVariable(deprecatedKey, getVariable(newKey));
+ }
+
+ public void setSettingsVariables(URL settingsURL) {
+ String settingsURLStr = settingsURL.toExternalForm();
+ setVariable("ivy.settings.url", settingsURLStr);
+ setDeprecatedVariable("ivy.conf.url", "ivy.settings.url");
+ int slashIndex = settingsURLStr.lastIndexOf('/');
if (slashIndex != -1) {
- setVariable("ivy.conf.dir", confURL.substring(0, slashIndex));
+ setVariable("ivy.settings.dir", settingsURLStr.substring(0,
slashIndex));
+ setDeprecatedVariable("ivy.conf.dir", "ivy.settings.dir");
} else {
- Message.warn("configuration url does not contain any slash (/):
ivy.conf.dir variable not set");
+ Message.warn("settings url does not contain any slash (/):
ivy.settings.dir variable not set");
}
}
- private void dumpConfig() {
+ private void dumpSettings() {
Message.verbose("\tdefault cache: "+getDefaultCache());
Message.verbose("\tdefault resolver: "+getDefaultResolver());
Message.debug("\tdefault latest strategy:
"+getDefaultLatestStrategy());
@@ -349,13 +364,13 @@
Message.verbose("\t-- "+_resolversMap.size()+" resolvers:");
for (Iterator iter = _resolversMap.values().iterator();
iter.hasNext();) {
DependencyResolver resolver = (DependencyResolver)iter.next();
- resolver.dumpConfig();
+ resolver.dumpSettings();
}
- if (!_moduleConfigurations.isEmpty()) {
- Message.debug("\tmodule configurations:");
- for (Iterator iter = _moduleConfigurations.keySet().iterator();
iter.hasNext();) {
+ if (!_moduleSettings.isEmpty()) {
+ Message.debug("\tmodule settings:");
+ for (Iterator iter = _moduleSettings.keySet().iterator();
iter.hasNext();) {
ModuleIdMatcher midm = (ModuleIdMatcher)iter.next();
- ModuleSettings s =
(ModuleSettings)_moduleConfigurations.get(midm);
+ ModuleSettings s = (ModuleSettings)_moduleSettings.get(midm);
Message.debug("\t\t"+midm+" -> "+s);
}
}
@@ -531,7 +546,7 @@
private void checkResolverName(String resolverName) {
if (resolverName != null && !_resolversMap.containsKey(resolverName)) {
- throw new IllegalArgumentException("no resolver found called
"+resolverName+": check your configuration");
+ throw new IllegalArgumentException("no resolver found called
"+resolverName+": check your settings");
}
}
@@ -545,7 +560,7 @@
*/
public void addModuleConfiguration(ModuleId mid, PatternMatcher matcher,
String resolverName, String branch, String conflictManager) {
checkResolverName(resolverName);
- _moduleConfigurations.put(new ModuleIdMatcher(mid, matcher), new
ModuleSettings(resolverName, branch, conflictManager));
+ _moduleSettings.put(new ModuleIdMatcher(mid, matcher), new
ModuleSettings(resolverName, branch, conflictManager));
}
public File getDefaultIvyUserDir() {
@@ -605,10 +620,10 @@
}
public String getResolverName(ModuleId moduleId) {
- for (Iterator iter = _moduleConfigurations.keySet().iterator();
iter.hasNext();) {
+ for (Iterator iter = _moduleSettings.keySet().iterator();
iter.hasNext();) {
ModuleIdMatcher midm = (ModuleIdMatcher)iter.next();
if (midm.matches(moduleId)) {
- ModuleSettings ms =
(ModuleSettings)_moduleConfigurations.get(midm);
+ ModuleSettings ms = (ModuleSettings)_moduleSettings.get(midm);
if (ms.getResolverName() != null) {
return ms.getResolverName();
}
@@ -618,10 +633,10 @@
}
public String getDefaultBranch(ModuleId moduleId) {
- for (Iterator iter = _moduleConfigurations.keySet().iterator();
iter.hasNext();) {
+ for (Iterator iter = _moduleSettings.keySet().iterator();
iter.hasNext();) {
ModuleIdMatcher midm = (ModuleIdMatcher)iter.next();
if (midm.matches(moduleId)) {
- ModuleSettings ms =
(ModuleSettings)_moduleConfigurations.get(midm);
+ ModuleSettings ms = (ModuleSettings)_moduleSettings.get(midm);
if (ms.getBranch() != null) {
return ms.getBranch();
}
@@ -638,10 +653,10 @@
}
public ConflictManager getConflictManager(ModuleId moduleId) {
- for (Iterator iter = _moduleConfigurations.keySet().iterator();
iter.hasNext();) {
+ for (Iterator iter = _moduleSettings.keySet().iterator();
iter.hasNext();) {
ModuleIdMatcher midm = (ModuleIdMatcher)iter.next();
if (midm.matches(moduleId)) {
- ModuleSettings ms =
(ModuleSettings)_moduleConfigurations.get(midm);
+ ModuleSettings ms = (ModuleSettings)_moduleSettings.get(midm);
if (ms.getConflictManager() != null) {
ConflictManager cm =
getConflictManager(ms.getConflictManager());
if (cm == null) {
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
Sat Mar 17 09:17:43 2007
@@ -45,8 +45,7 @@
/**
- * @author Hanin
- *
+ * @author Xavier Hanin
*/
public class XmlSettingsParser extends DefaultHandler {
private Configurator _configurator;
@@ -59,12 +58,13 @@
private String _defaultLatest;
private String _defaultCircular;
private String _currentConfiguratorTag;
+ private URL _settings;
public XmlSettingsParser(IvySettings ivy) {
_ivy = ivy;
}
- public void parse(URL configuration) throws ParseException, IOException {
+ public void parse(URL settings) throws ParseException, IOException {
_configurator = new Configurator();
// put every type definition from ivy to configurator
Map typeDefs = _ivy.getTypeDefs();
@@ -73,20 +73,21 @@
_configurator.typeDef(name, (Class)typeDefs.get(name));
}
- doParse(configuration);
+ doParse(settings);
}
- private void doParse(URL configuration) throws IOException, ParseException
{
+ private void doParse(URL settings) throws IOException, ParseException {
+ _settings = settings;
InputStream stream = null;
try {
- stream = URLHandlerRegistry.getDefault().openStream(configuration);
+ stream = URLHandlerRegistry.getDefault().openStream(settings);
SAXParserFactory.newInstance().newSAXParser().parse(
stream,
this);
} catch (IOException e) {
throw e;
} catch (Exception e) {
- ParseException pe = new ParseException("failed to configure with
"+configuration+": "+e.getMessage(), 0);
+ ParseException pe = new ParseException("failed to load settings
from "+settings+": "+e.getMessage(), 0);
pe.initCause(e);
throw pe;
} finally {
@@ -112,6 +113,9 @@
}
try {
+ if ("ivyconf".equals(qName)) {
+ Message.deprecated("'ivyconf' element is deprecated,
use 'ivysettings' instead ("+_settings+")");
+ }
if (_configurator.getCurrent() != null) {
if ("macrodef".equals(_currentConfiguratorTag) &&
_configurator.getTypeDef(qName) != null) {
String name = (String)attributes.get("name");
@@ -204,7 +208,7 @@
Map variables = new HashMap(_ivy.getVariables());
try {
String propFilePath =
_ivy.substitute((String)attributes.get("file"));
- URL ivyconfURL = null;
+ URL settingsURL = null;
if (propFilePath == null) {
propFilePath =
_ivy.substitute((String)attributes.get("url"));
if (propFilePath == null) {
@@ -212,8 +216,8 @@
return;
} else {
Message.verbose("including url: "+propFilePath);
- ivyconfURL = new URL(propFilePath);
- _ivy.setConfigurationVariables(ivyconfURL);
+ settingsURL = new URL(propFilePath);
+ _ivy.setSettingsVariables(settingsURL);
}
} else {
File incFile = new File(propFilePath);
@@ -222,15 +226,18 @@
return;
} else {
Message.verbose("including file: "+propFilePath);
- _ivy.setConfigurationVariables(incFile);
- ivyconfURL = incFile.toURL();
+ _ivy.setSettingsVariables(incFile);
+ settingsURL = incFile.toURL();
}
}
- new XmlSettingsParser(_ivy).parse(_configurator,
ivyconfURL);
+ new XmlSettingsParser(_ivy).parse(_configurator,
settingsURL);
} finally {
_ivy.setVariables(variables);
}
- } else if ("conf".equals(qName)) {
+ } else if ("settings".equals(qName) || "conf".equals(qName)) {
+ if ("conf".equals(qName)) {
+ Message.deprecated("'conf' is deprecated, use
'settings' instead ("+_settings+")");
+ }
String cache = (String)attributes.get("defaultCache");
if (cache != null) {
_ivy.setDefaultCache(new File(_ivy.substitute(cache)));
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivy.properties
Sat Mar 17 09:17:43 2007
@@ -10,7 +10,7 @@
ivy.resolve.default.type.filter = *
ivy.status = integration
ivy.dep.file = ivy.xml
-ivy.conf.file = ivyconf.xml
+ivy.settings.file = ivysettings.xml
ivy.retrieve.pattern = ${ivy.lib.dir}/[artifact]-[revision].[ext]
ivy.deliver.ivy.pattern =
${ivy.distrib.dir}/[type]s/[artifact]-[revision].[ext]
ivy.publish.src.artifacts.pattern =
${ivy.distrib.dir}/[type]s/[artifact]-[revision].[ext]
Copied:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml
(from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-default-chain.xml)
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml?view=diff&rev=519361&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-default-chain.xml&r1=515950&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-default-chain.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml
Sat Mar 17 09:17:43 2007
@@ -1,8 +1,8 @@
-<ivyconf>
+<ivysettings>
<resolvers>
<chain name="default" returnFirst="true">
<resolver ref="local"/>
<resolver ref="main"/>
</chain>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivysettings>
\ No newline at end of file
Copied:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-local.xml
(from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-local.xml)
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-local.xml?view=diff&rev=519361&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-local.xml&r1=515950&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-local.xml&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-local.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-local.xml
Sat Mar 17 09:17:43 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<property name="ivy.local.default.root"
value="${ivy.default.ivy.user.dir}/local" override="false"/>
<property name="ivy.local.default.ivy.pattern"
value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
override="false"/>
<property name="ivy.local.default.artifact.pattern"
value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
override="false"/>
@@ -8,4 +8,4 @@
<artifact
pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
</filesystem>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivysettings>
\ No newline at end of file
Copied:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml
(from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-main-chain.xml)
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml?view=diff&rev=519361&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-main-chain.xml&r1=515950&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-main-chain.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml
Sat Mar 17 09:17:43 2007
@@ -1,8 +1,8 @@
-<ivyconf>
+<ivysettings>
<resolvers>
<chain name="main" dual="true">
<resolver ref="shared"/>
<resolver ref="public"/>
</chain>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivysettings>
\ No newline at end of file
Copied:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-public.xml
(from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-public.xml)
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-public.xml?view=diff&rev=519361&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-public.xml&r1=515950&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-public.xml&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-public.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-public.xml
Sat Mar 17 09:17:43 2007
@@ -1,5 +1,5 @@
-<ivyconf>
+<ivysettings>
<resolvers>
<ivyrep name="public"/>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivysettings>
\ No newline at end of file
Copied:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml
(from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-shared.xml)
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml?view=diff&rev=519361&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-shared.xml&r1=515950&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf-shared.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings-shared.xml
Sat Mar 17 09:17:43 2007
@@ -1,4 +1,4 @@
-<ivyconf>
+<ivysettings>
<property name="ivy.shared.default.root"
value="${ivy.default.ivy.user.dir}/shared" override="false"/>
<property name="ivy.shared.default.ivy.pattern"
value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
override="false"/>
<property name="ivy.shared.default.artifact.pattern"
value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
override="false"/>
@@ -8,4 +8,4 @@
<artifact
pattern="${ivy.shared.default.root}/${ivy.shared.default.artifact.pattern}" />
</filesystem>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivysettings>
\ No newline at end of file
Copied:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings.xml
(from r515950,
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf.xml)
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings.xml?view=diff&rev=519361&p1=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf.xml&r1=515950&p2=incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings.xml&r2=519361
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivyconf.xml
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/ivysettings.xml
Sat Mar 17 09:17:43 2007
@@ -1,8 +1,8 @@
-<ivyconf>
- <conf defaultResolver="default"/>
- <include url="${ivy.default.conf.dir}/ivyconf-public.xml"/>
- <include url="${ivy.default.conf.dir}/ivyconf-shared.xml"/>
- <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
- <include url="${ivy.default.conf.dir}/ivyconf-main-chain.xml"/>
- <include url="${ivy.default.conf.dir}/ivyconf-default-chain.xml"/>
-</ivyconf>
\ No newline at end of file
+<ivysettings>
+ <settings defaultResolver="default"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+ <include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+ <include
url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+</ivysettings>
\ No newline at end of file
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java
Sat Mar 17 09:17:43 2007
@@ -149,7 +149,7 @@
public String toString() {
return getName();
}
- public void dumpConfig() {
+ public void dumpSettings() {
Message.verbose("\t"+getName()+" ["+getTypeName()+"]");
Message.debug("\t\tchangingPattern: "+getChangingPattern());
Message.debug("\t\tchangingMatcher: "+getChangingMatcherName());
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractResourceResolver.java
Sat Mar 17 09:17:43 2007
@@ -218,8 +218,8 @@
_artifactPatterns.add(p.getPattern());
}
- public void dumpConfig() {
- super.dumpConfig();
+ public void dumpSettings() {
+ super.dumpSettings();
Message.debug("\t\tm2compatible: "+isM2compatible());
Message.debug("\t\tivy patterns:");
for (ListIterator iter = getIvyPatterns().listIterator();
iter.hasNext();) {
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java
Sat Mar 17 09:17:43 2007
@@ -138,7 +138,7 @@
ensureConfigured();
return super.listRevisions(module);
}
- public void dumpConfig() {
+ public void dumpSettings() {
Message.verbose("\t"+getName()+" [cache]");
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
Sat Mar 17 09:17:43 2007
@@ -231,7 +231,7 @@
_returnFirst = returnFirst;
}
- public void dumpConfig() {
+ public void dumpSettings() {
Message.verbose("\t"+getName()+" [chain] "+_chain);
Message.debug("\t\treturn first: "+isReturnFirst());
Message.debug("\t\tdual: "+isDual());
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java
Sat Mar 17 09:17:43 2007
@@ -88,5 +88,5 @@
ModuleEntry[] listModules(OrganisationEntry org);
RevisionEntry[] listRevisions(ModuleEntry module);
- void dumpConfig();
+ void dumpSettings();
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DualResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DualResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DualResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/DualResolver.java
Sat Mar 17 09:17:43 2007
@@ -116,7 +116,7 @@
}
}
- public void dumpConfig() {
+ public void dumpSettings() {
if (_ivyResolver == null || _artifactResolver == null) {
throw new IllegalStateException("exactly two resolvers must be
added: ivy(1) and artifact(2) one");
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
Sat Mar 17 09:17:43 2007
@@ -220,9 +220,9 @@
updateWholePattern();
}
- public void dumpConfig() {
+ public void dumpSettings() {
ensureConfigured(getSettings());
- super.dumpConfig();
+ super.dumpSettings();
Message.debug("\t\troot: "+getRoot());
Message.debug("\t\tpattern: "+getPattern());
Message.debug("\t\tusepoms: "+_usepoms);
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java
Sat Mar 17 09:17:43 2007
@@ -241,8 +241,8 @@
public String getTypeName() {
return "repository";
}
- public void dumpConfig() {
- super.dumpConfig();
+ public void dumpSettings() {
+ super.dumpSettings();
Message.debug("\t\trepository: "+getRepository());
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java?view=diff&rev=519361&r1=519360&r2=519361
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java
(original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/util/Message.java Sat Mar
17 09:17:43 2007
@@ -129,6 +129,15 @@
System.err.println(msg);
}
}
+
+ public static void deprecated(String msg) {
+ MessageImpl messageImpl = IvyContext.getContext().getMessageImpl();
+ if (messageImpl != null) {
+ messageImpl.log("DEPRECATED: "+msg, MSG_WARN);
+ } else {
+ System.err.println(msg);
+ }
+ }
public static void warn(String msg) {
MessageImpl messageImpl = IvyContext.getContext().getMessageImpl();
if (messageImpl != null) {
