You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/06/11 16:49:02 UTC
svn commit: r546194 - in
/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser:
AbstractModuleDescriptorParser.java xml/XmlModuleDescriptorParser.java
Author: xavier
Date: Mon Jun 11 09:49:01 2007
New Revision: 546194
URL: http://svn.apache.org/viewvc?view=rev&rev=546194
Log:
forgot to commit as part of Pom parser code cleanup
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java?view=diff&rev=546194&r1=546193&r2=546194
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java Mon Jun 11 09:49:01 2007
@@ -61,7 +61,7 @@
private List _errors = new ArrayList();
- protected DefaultModuleDescriptor _md;
+ protected DefaultModuleDescriptor md;
private ModuleDescriptorParser _parser;
@@ -81,8 +81,8 @@
protected void setResource(Resource res) {
_res = res; // used for log and date only
- _md = new DefaultModuleDescriptor(_parser, res);
- _md.setLastModified(getLastModified());
+ md = new DefaultModuleDescriptor(_parser, res);
+ md.setLastModified(getLastModified());
}
protected Resource getResource() {
@@ -123,7 +123,7 @@
protected void parseDepsConfs(String[] conf, DefaultDependencyDescriptor dd,
boolean useDefaultMappingToGuessRightOperande, boolean evaluateConditions) {
- replaceConfigurationWildcards(_md);
+ replaceConfigurationWildcards(md);
for (int i = 0; i < conf.length; i++) {
String[] ops = conf[i].split("->");
if (ops.length == 1) {
@@ -171,7 +171,7 @@
}
}
- if (_md.isMappingOverride()) {
+ if (md.isMappingOverride()) {
addExtendingConfigurations(conf, dd, useDefaultMappingToGuessRightOperande);
}
}
@@ -249,7 +249,7 @@
private void addExtendingConfigurations(String conf, DefaultDependencyDescriptor dd,
boolean useDefaultMappingToGuessRightOperande) {
Set configsToAdd = new HashSet();
- Configuration[] configs = _md.getConfigurations();
+ Configuration[] configs = md.getConfigurations();
for (int i = 0; i < configs.length; i++) {
String[] ext = configs[i].getExtends();
for (int j = 0; j < ext.length; j++) {
@@ -333,11 +333,11 @@
public ModuleDescriptor getModuleDescriptor() throws ParseException {
checkErrors();
- return _md;
+ return md;
}
protected Date getDefaultPubDate() {
- return new Date(_md.getLastModified());
+ return new Date(md.getLastModified());
}
protected long getLastModified() {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java?view=diff&rev=546194&r1=546193&r2=546194
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java Mon Jun 11 09:49:01 2007
@@ -189,13 +189,13 @@
checkConfigurations();
replaceConfigurationWildcards();
if (!_artifactsDeclared) {
- String[] confs = _md.getConfigurationsNames();
+ String[] confs = md.getConfigurationsNames();
for (int i = 0; i < confs.length; i++) {
- _md.addArtifact(confs[i], new MDArtifact(_md, _md.getModuleRevisionId()
+ md.addArtifact(confs[i], new MDArtifact(md, md.getModuleRevisionId()
.getName(), "jar", "jar"));
}
}
- _md.check();
+ md.check();
} catch (ParserConfigurationException ex) {
IllegalStateException ise = new IllegalStateException(ex.getMessage() + " in "
+ xmlURL);
@@ -218,13 +218,13 @@
checkConfigurations();
replaceConfigurationWildcards();
if (!_artifactsDeclared) {
- String[] confs = _md.getConfigurationsNames();
+ String[] confs = md.getConfigurationsNames();
for (int i = 0; i < confs.length; i++) {
- _md.addArtifact(confs[i], new MDArtifact(_md, _md.getModuleRevisionId()
+ md.addArtifact(confs[i], new MDArtifact(md, md.getModuleRevisionId()
.getName(), "jar", "jar"));
}
}
- _md.check();
+ md.check();
} catch (ParserConfigurationException ex) {
IllegalStateException ise = new IllegalStateException(ex.getMessage());
ise.initCause(ex);
@@ -262,7 +262,7 @@
String module = _ivy.substitute(attributes.getValue("module"));
String revision = _ivy.substitute(attributes.getValue("revision"));
String branch = _ivy.substitute(attributes.getValue("branch"));
- _md.setModuleRevisionId(ModuleRevisionId.newInstance(org, module, branch,
+ md.setModuleRevisionId(ModuleRevisionId.newInstance(org, module, branch,
revision, ExtendableItemHelper.getExtraAttributes(attributes, new String[] {
"organisation", "module", "revision", "status", "publication",
"namespace", "default", "resolver"})));
@@ -271,40 +271,40 @@
if (namespace != null) {
Namespace ns = _ivy.getNamespace(namespace);
if (ns == null) {
- Message.warn("namespace not found for " + _md.getModuleRevisionId()
+ Message.warn("namespace not found for " + md.getModuleRevisionId()
+ ": " + namespace);
} else {
- _md.setNamespace(ns);
+ md.setNamespace(ns);
}
}
String status = _ivy.substitute(attributes.getValue("status"));
- _md.setStatus(status == null ? _ivy.getStatusManager().getDefaultStatus()
+ md.setStatus(status == null ? _ivy.getStatusManager().getDefaultStatus()
: status);
- _md.setDefault(Boolean.valueOf(_ivy.substitute(attributes.getValue("default")))
+ md.setDefault(Boolean.valueOf(_ivy.substitute(attributes.getValue("default")))
.booleanValue());
String pubDate = _ivy.substitute(attributes.getValue("publication"));
if (pubDate != null && pubDate.length() > 0) {
try {
- _md.setPublicationDate(Ivy.DATE_FORMAT.parse(pubDate));
+ md.setPublicationDate(Ivy.DATE_FORMAT.parse(pubDate));
} catch (ParseException e) {
addError("invalid publication date format: " + pubDate);
- _md.setPublicationDate(getDefaultPubDate());
+ md.setPublicationDate(getDefaultPubDate());
}
} else {
- _md.setPublicationDate(getDefaultPubDate());
+ md.setPublicationDate(getDefaultPubDate());
}
} else if ("license".equals(qName)) {
- _md.addLicense(new License(_ivy.substitute(attributes.getValue("name")), _ivy
+ md.addLicense(new License(_ivy.substitute(attributes.getValue("name")), _ivy
.substitute(attributes.getValue("url"))));
} else if ("description".equals(qName)) {
- _md.setHomePage(_ivy.substitute(attributes.getValue("homepage")));
+ md.setHomePage(_ivy.substitute(attributes.getValue("homepage")));
} else if ("configurations".equals(qName)) {
_state = CONF;
setDefaultConfMapping(_ivy
.substitute(attributes.getValue("defaultconfmapping")));
- _md
+ md
.setMappingOverride(Boolean.valueOf(
_ivy.substitute(attributes.getValue("confmappingoverride")))
.booleanValue());
@@ -325,7 +325,7 @@
String confMappingOverride = _ivy.substitute(attributes
.getValue("confmappingoverride"));
if (confMappingOverride != null) {
- _md.setMappingOverride(Boolean.valueOf(confMappingOverride).booleanValue());
+ md.setMappingOverride(Boolean.valueOf(confMappingOverride).booleanValue());
}
checkConfigurations();
} else if ("conflicts".equals(qName)) {
@@ -338,13 +338,13 @@
if (_state == PUB) {
// this is a published artifact
String artName = _ivy.substitute(attributes.getValue("name"));
- artName = artName == null ? _md.getModuleRevisionId().getName() : artName;
+ artName = artName == null ? md.getModuleRevisionId().getName() : artName;
String type = _ivy.substitute(attributes.getValue("type"));
type = type == null ? "jar" : type;
String ext = _ivy.substitute(attributes.getValue("ext"));
ext = ext != null ? ext : type;
String url = _ivy.substitute(attributes.getValue("url"));
- _artifact = new MDArtifact(_md, artName, type, ext, url == null ? null
+ _artifact = new MDArtifact(md, artName, type, ext, url == null ? null
: new URL(url), ExtendableItemHelper.getExtraAttributes(attributes,
new String[] {"ext", "type", "name", "conf"}));
String confs = _ivy.substitute(attributes.getValue("conf"));
@@ -354,13 +354,13 @@
if (confs != null && confs.length() > 0) {
String[] conf;
if ("*".equals(confs)) {
- conf = _md.getConfigurationsNames();
+ conf = md.getConfigurationsNames();
} else {
conf = confs.split(",");
}
for (int i = 0; i < conf.length; i++) {
_artifact.addConfiguration(conf[i].trim());
- _md.addArtifact(conf[i].trim(), _artifact);
+ md.addArtifact(conf[i].trim(), _artifact);
}
}
} else if (_state == DEP) {
@@ -376,7 +376,7 @@
} else if ("dependency".equals(qName)) {
String org = _ivy.substitute(attributes.getValue("org"));
if (org == null) {
- org = _md.getModuleRevisionId().getOrganisation();
+ org = md.getModuleRevisionId().getOrganisation();
}
boolean force = Boolean.valueOf(_ivy.substitute(attributes.getValue("force")))
.booleanValue();
@@ -390,10 +390,10 @@
String name = _ivy.substitute(attributes.getValue("name"));
String branch = _ivy.substitute(attributes.getValue("branch"));
String rev = _ivy.substitute(attributes.getValue("rev"));
- _dd = new DefaultDependencyDescriptor(_md, ModuleRevisionId.newInstance(org,
+ _dd = new DefaultDependencyDescriptor(md, ModuleRevisionId.newInstance(org,
name, branch, rev, ExtendableItemHelper.getExtraAttributes(attributes,
DEPENDENCY_REGULAR_ATTRIBUTES)), force, changing, transitive);
- _md.addDependency(_dd);
+ md.addDependency(_dd);
String confs = _ivy.substitute(attributes.getValue("conf"));
if (confs != null && confs.length() > 0) {
parseDepsConfs(confs, _dd);
@@ -416,18 +416,18 @@
ExtendableItemHelper.fillExtraAttributes(configuration, attributes,
new String[] {"name", "visibility", "extends", "transitive",
"description"});
- _md.addConfiguration(configuration);
+ md.addConfiguration(configuration);
break;
case PUB:
if ("*".equals(conf)) {
- String[] confs = _md.getConfigurationsNames();
+ String[] confs = md.getConfigurationsNames();
for (int i = 0; i < confs.length; i++) {
_artifact.addConfiguration(confs[i]);
- _md.addArtifact(confs[i], _artifact);
+ md.addArtifact(confs[i], _artifact);
}
} else {
_artifact.addConfiguration(conf);
- _md.addArtifact(conf, _artifact);
+ md.addArtifact(conf, _artifact);
}
break;
case DEP:
@@ -485,10 +485,10 @@
addError("unknown matcher: " + matcherName);
return;
}
- _md.addConflictManager(new ModuleId(org, mod), matcher, cm);
+ md.addConflictManager(new ModuleId(org, mod), matcher, cm);
} else if ("rule".equals(qName) && _state == EXCLUDE) {
parseRule(qName, attributes);
- _md.addExcludeRule((ExcludeRule) _confAware);
+ md.addExcludeRule((ExcludeRule) _confAware);
} else if ("include".equals(qName) && _state == CONF) {
URL url;
String fileName = _ivy.substitute(attributes.getValue("file"));
@@ -502,24 +502,24 @@
// create a new temporary parser to read the configurations from
// the specified file.
Parser parser = new Parser(getModuleDescriptorParser(), _ivy, false);
- parser._md = new DefaultModuleDescriptor(getModuleDescriptorParser(),
+ parser.md = new DefaultModuleDescriptor(getModuleDescriptorParser(),
new URLResource(url));
XMLHelper.parse(url, null, parser);
// add the configurations from this temporary parser to this module descriptor
Configuration[] configs = parser.getModuleDescriptor().getConfigurations();
for (int i = 0; i < configs.length; i++) {
- _md.addConfiguration(configs[i]);
+ md.addConfiguration(configs[i]);
}
if (parser.getDefaultConfMapping() != null) {
Message.debug("setting default conf from imported configurations file: "
+ parser.getDefaultConfMapping());
setDefaultConfMapping(parser.getDefaultConfMapping());
}
- if (parser._md.isMappingOverride()) {
+ if (parser.md.isMappingOverride()) {
Message
.debug("enabling mapping-override from imported configurations file");
- _md.setMappingOverride(true);
+ md.setMappingOverride(true);
}
} else if (_validate && _state != INFO) {
addError("unknwon tag " + qName);
@@ -597,7 +597,7 @@
if (confs != null && confs.length() > 0) {
String[] conf;
if ("*".equals(confs)) {
- conf = _md.getConfigurationsNames();
+ conf = md.getConfigurationsNames();
} else {
conf = confs.split(",");
}
@@ -642,10 +642,10 @@
public void endElement(String uri, String localName, String qName) throws SAXException {
if (_state == PUB && "artifact".equals(qName)
&& _artifact.getConfigurations().length == 0) {
- String[] confs = _md.getConfigurationsNames();
+ String[] confs = md.getConfigurationsNames();
for (int i = 0; i < confs.length; i++) {
_artifact.addConfiguration(confs[i]);
- _md.addArtifact(confs[i], _artifact);
+ md.addArtifact(confs[i], _artifact);
}
} else if ("configurations".equals(qName)) {
checkConfigurations();
@@ -654,7 +654,7 @@
|| (_state == ARTIFACT_EXCLUDE && "exclude".equals(qName))) {
_state = DEP;
if (_confAware.getConfigurations().length == 0) {
- String[] confs = _md.getConfigurationsNames();
+ String[] confs = md.getConfigurationsNames();
for (int i = 0; i < confs.length; i++) {
addConfiguration(confs[i]);
}
@@ -662,7 +662,7 @@
_confAware = null;
} else if (_state == EXCLUDE && "rule".equals(qName)) {
if (_confAware.getConfigurations().length == 0) {
- String[] confs = _md.getConfigurationsNames();
+ String[] confs = md.getConfigurationsNames();
for (int i = 0; i < confs.length; i++) {
addConfiguration(confs[i]);
}
@@ -676,15 +676,15 @@
}
private void checkConfigurations() {
- if (_md.getConfigurations().length == 0) {
- _md.addConfiguration(new Configuration("default"));
+ if (md.getConfigurations().length == 0) {
+ md.addConfiguration(new Configuration("default"));
}
}
private void replaceConfigurationWildcards() {
- Configuration[] configs = _md.getConfigurations();
+ Configuration[] configs = md.getConfigurations();
for (int i = 0; i < configs.length; i++) {
- configs[i].replaceWildcards(_md);
+ configs[i].replaceWildcards(md);
}
}