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/26 19:34:09 UTC
svn commit: r550916 [1/2] -
/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/
Author: xavier
Date: Tue Jun 26 12:34:08 2007
New Revision: 550916
URL: http://svn.apache.org/viewvc?view=rev&rev=550916
Log:
clean code
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheFileset.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCheck.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConvertPom.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java Tue Jun 26 12:34:08 2007
@@ -29,96 +29,96 @@
* properties according to what was found.
*/
public class IvyBuildNumber extends IvyTask {
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _branch;
+ private String branch;
- private String _revision;
+ private String revision;
- private String _revSep = ".";
+ private String revSep = ".";
- private String _prefix = "ivy.";
+ private String prefix = "ivy.";
- private String _default = "0";
+ private String defaultValue = "0";
- private String _defaultBuildNumber = "0";
+ private String defaultBuildNumber = "0";
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public String getBranch() {
- return _branch;
+ return branch;
}
public void setBranch(String branch) {
- _branch = branch;
+ this.branch = branch;
}
public String getDefault() {
- return _default;
+ return defaultValue;
}
public void setDefault(String default1) {
- _default = default1;
+ defaultValue = default1;
}
public String getPrefix() {
- return _prefix;
+ return prefix;
}
public void setPrefix(String prefix) {
- _prefix = prefix;
+ this.prefix = prefix;
}
public void doExecute() throws BuildException {
- if (_organisation == null) {
+ if (organisation == null) {
throw new BuildException("no organisation provided for ivy findmodules");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException("no module name provided for ivy findmodules");
}
- if (_prefix == null) {
+ if (prefix == null) {
throw new BuildException("null prefix not allowed");
}
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- if (_branch == null) {
- settings.getDefaultBranch(new ModuleId(_organisation, _module));
+ if (branch == null) {
+ settings.getDefaultBranch(new ModuleId(organisation, module));
}
- if (_revision == null || _revision.length() == 0) {
- _revision = "latest.integration";
- } else if (!_revision.endsWith("+")) {
- _revision = _revision + "+";
+ if (revision == null || revision.length() == 0) {
+ revision = "latest.integration";
+ } else if (!revision.endsWith("+")) {
+ revision = revision + "+";
}
- if (!_prefix.endsWith(".") && _prefix.length() > 0) {
- _prefix = _prefix + ".";
+ if (!prefix.endsWith(".") && prefix.length() > 0) {
+ prefix = prefix + ".";
}
- ResolvedModuleRevision rmr = ivy.findModule(ModuleRevisionId.newInstance(_organisation,
- _module, _branch, _revision));
+ ResolvedModuleRevision rmr = ivy.findModule(ModuleRevisionId.newInstance(organisation,
+ module, branch, revision));
String revision = rmr == null ? null : rmr.getId().getRevision();
NewRevision newRevision = computeNewRevision(revision);
setProperty("revision", newRevision.revision);
@@ -129,13 +129,13 @@
private void setProperty(String propertyName, String value) {
if (value != null) {
- getProject().setProperty(_prefix + propertyName, value);
+ getProject().setProperty(prefix + propertyName, value);
}
}
private NewRevision computeNewRevision(String revision) {
- String revPrefix = "latest.integration".equals(_revision) ? "" : _revision.substring(0,
- _revision.length() - 1);
+ String revPrefix = "latest.integration".equals(revision) ? "" : revision.substring(0,
+ revision.length() - 1);
if (revision != null && !revision.startsWith(revPrefix)) {
throw new BuildException("invalid exception found in repository: '" + revision
+ "' for '" + revPrefix + "'");
@@ -143,15 +143,15 @@
if (revision == null) {
if (revPrefix.length() > 0) {
return new NewRevision(revision, revPrefix
- + (revPrefix.endsWith(_revSep) ? _defaultBuildNumber : _revSep
- + _defaultBuildNumber), null, _defaultBuildNumber);
+ + (revPrefix.endsWith(revSep) ? defaultBuildNumber : revSep
+ + defaultBuildNumber), null, defaultBuildNumber);
} else {
- Range r = findLastNumber(_default);
+ Range r = findLastNumber(defaultValue);
if (r == null) { // no number found
- return new NewRevision(revision, _default, null, null);
+ return new NewRevision(revision, defaultValue, null, null);
} else {
- long n = Long.parseLong(_default.substring(r.startIndex, r.endIndex));
- return new NewRevision(revision, _default, null, String.valueOf(n));
+ long n = Long.parseLong(defaultValue.substring(r.startIndex, r.endIndex));
+ return new NewRevision(revision, defaultValue, null, String.valueOf(n));
}
}
}
@@ -160,13 +160,13 @@
r = findLastNumber(revision);
if (r == null) {
return new NewRevision(revision, revision
- + (revision.endsWith(_revSep) ? "1" : _revSep + "1"), null, "1");
+ + (revision.endsWith(revSep) ? "1" : revSep + "1"), null, "1");
}
} else {
r = findFirstNumber(revision, revPrefix.length());
if (r == null) {
return new NewRevision(revision, revPrefix
- + (revPrefix.endsWith(_revSep) ? "1" : _revSep + "1"), null, "1");
+ + (revPrefix.endsWith(revSep) ? "1" : revSep + "1"), null, "1");
}
}
long n = Long.parseLong(revision.substring(r.startIndex, r.endIndex)) + 1;
@@ -177,7 +177,8 @@
private Range findFirstNumber(String str, int startIndex) {
// let's find the first digit in the string
int startNumberIndex = startIndex;
- while (startNumberIndex < str.length() && !Character.isDigit(str.charAt(startNumberIndex))) {
+ while (startNumberIndex < str.length()
+ && !Character.isDigit(str.charAt(startNumberIndex))) {
startNumberIndex++;
}
if (startNumberIndex == str.length()) {
@@ -239,18 +240,18 @@
}
public String getRevSep() {
- return _revSep;
+ return revSep;
}
public void setRevSep(String revSep) {
- _revSep = revSep;
+ this.revSep = revSep;
}
public String getDefaultBuildNumber() {
- return _defaultBuildNumber;
+ return defaultBuildNumber;
}
public void setDefaultBuildNumber(String defaultBuildNumber) {
- _defaultBuildNumber = defaultBuildNumber;
+ this.defaultBuildNumber = defaultBuildNumber;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheFileset.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheFileset.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheFileset.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCacheFileset.java Tue Jun 26 12:34:08 2007
@@ -31,32 +31,34 @@
* not compatible with the useOrigin mode.
*/
public class IvyCacheFileset extends IvyCacheTask {
- private String _setid;
+ private String setid;
public String getSetid() {
- return _setid;
+ return setid;
}
public void setSetid(String id) {
- _setid = id;
+ setid = id;
}
public void setUseOrigin(boolean useOrigin) {
if (useOrigin) {
throw new UnsupportedOperationException(
- "the cachefileset task does not support the useOrigin mode, since filesets require to have only one root directory. Please use the the cachepath task instead");
+ "the cachefileset task does not support the useOrigin mode, since filesets "
+ + "require to have only one root directory. Please use the the cachepath "
+ + "task instead");
}
}
public void doExecute() throws BuildException {
prepareAndCheck();
- if (_setid == null) {
+ if (setid == null) {
throw new BuildException("setid is required in ivy cachefileset");
}
try {
FileSet fileset = new FileSet();
fileset.setProject(getProject());
- getProject().addReference(_setid, fileset);
+ getProject().addReference(setid, fileset);
fileset.setDir(getCache());
List paths = getArtifacts();
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCachePath.java Tue Jun 26 12:34:08 2007
@@ -29,16 +29,16 @@
* Creates an ant path consisting in all artifacts found during a resolve.
*/
public class IvyCachePath extends IvyCacheTask {
- private String _pathid;
+ private String pathid;
- private String _id;
+ private String id;
public String getPathid() {
- return _pathid;
+ return pathid;
}
public void setPathid(String id) {
- _pathid = id;
+ pathid = id;
}
/**
@@ -46,14 +46,14 @@
* @param id
*/
public void setId(String id) {
- _id = id;
+ this.id = id;
}
public void doExecute() throws BuildException {
prepareAndCheck();
- if (_pathid == null) {
- if (_id != null) {
- _pathid = _id;
+ if (pathid == null) {
+ if (id != null) {
+ pathid = id;
log("ID IS DEPRECATED, PLEASE USE PATHID INSTEAD", Project.MSG_WARN);
} else {
throw new BuildException("pathid is required in ivy classpath");
@@ -61,7 +61,7 @@
}
try {
Path path = new Path(getProject());
- getProject().addReference(_pathid, path);
+ getProject().addReference(pathid, path);
CacheManager cache = getCacheManager();
for (Iterator iter = getArtifacts().iterator(); iter.hasNext();) {
Artifact a = (Artifact) iter.next();
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCheck.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCheck.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCheck.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyCheck.java Tue Jun 26 12:34:08 2007
@@ -36,18 +36,18 @@
* discover it.
*/
public class IvyCheck extends IvyTask {
- private File _file = null;
+ private File file = null;
- private List _filesets = new ArrayList();
+ private List filesets = new ArrayList();
- private String _resolvername;
+ private String resolvername;
public File getFile() {
- return _file;
+ return file;
}
public void setFile(File file) {
- _file = file;
+ this.file = file;
}
/**
@@ -57,27 +57,27 @@
* a set of files to check
*/
public void addFileset(FileSet set) {
- _filesets.add(set);
+ filesets.add(set);
}
public String getResolvername() {
- return _resolvername;
+ return resolvername;
}
public void setResolvername(String resolverName) {
- _resolvername = resolverName;
+ resolvername = resolverName;
}
public void doExecute() throws BuildException {
try {
Ivy ivy = getIvyInstance();
- if (_file != null) {
- if (ivy.check(_file.toURL(), _resolvername)) {
- Message.verbose("checked " + _file + ": OK");
+ if (file != null) {
+ if (ivy.check(file.toURL(), resolvername)) {
+ Message.verbose("checked " + file + ": OK");
}
}
- for (int i = 0; i < _filesets.size(); i++) {
- FileSet fs = (FileSet) _filesets.get(i);
+ for (int i = 0; i < filesets.size(); i++) {
+ FileSet fs = (FileSet) filesets.get(i);
DirectoryScanner ds = fs.getDirectoryScanner(getProject());
File fromDir = fs.getDir(getProject());
@@ -85,7 +85,7 @@
String[] srcFiles = ds.getIncludedFiles();
for (int j = 0; j < srcFiles.length; j++) {
File file = new File(fromDir, srcFiles[j]);
- if (ivy.check(file.toURL(), _resolvername)) {
+ if (ivy.check(file.toURL(), resolvername)) {
Message.verbose("checked " + file + ": OK");
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConvertPom.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConvertPom.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConvertPom.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyConvertPom.java Tue Jun 26 12:34:08 2007
@@ -32,47 +32,47 @@
* Convert a pom to an ivy file
*/
public class IvyConvertPom extends IvyTask {
- private File _pomFile = null;
+ private File pomFile = null;
- private File _ivyFile = null;
+ private File ivyFile = null;
public File getPomFile() {
- return _pomFile;
+ return pomFile;
}
public void setPomFile(File file) {
- _pomFile = file;
+ pomFile = file;
}
public File getIvyFile() {
- return _ivyFile;
+ return ivyFile;
}
public void setIvyFile(File ivyFile) {
- _ivyFile = ivyFile;
+ this.ivyFile = ivyFile;
}
public void doExecute() throws BuildException {
try {
- if (_pomFile == null) {
+ if (pomFile == null) {
throw new BuildException("source pom file is required for convertpom task");
}
- if (_ivyFile == null) {
+ if (ivyFile == null) {
throw new BuildException("destination ivy file is required for convertpom task");
}
ModuleDescriptor md = PomModuleDescriptorParser.getInstance().parseDescriptor(
- new IvySettings(), _pomFile.toURL(), false);
- PomModuleDescriptorParser.getInstance().toIvyFile(_pomFile.toURL().openStream(),
- new URLResource(_pomFile.toURL()), getIvyFile(), md);
+ new IvySettings(), pomFile.toURL(), false);
+ PomModuleDescriptorParser.getInstance().toIvyFile(pomFile.toURL().openStream(),
+ new URLResource(pomFile.toURL()), getIvyFile(), md);
} catch (MalformedURLException e) {
- throw new BuildException("unable to convert given pom file to url: " + _pomFile + ": "
+ throw new BuildException("unable to convert given pom file to url: " + pomFile + ": "
+ e, e);
} catch (ParseException e) {
log(e.getMessage(), Project.MSG_ERR);
- throw new BuildException("syntax errors in pom file " + _pomFile + ": " + e, e);
+ throw new BuildException("syntax errors in pom file " + pomFile + ": " + e, e);
} catch (Exception e) {
throw new BuildException("impossible convert given pom file to ivy file: " + e
- + " from=" + _pomFile + " to=" + _ivyFile, e);
+ + " from=" + pomFile + " to=" + ivyFile, e);
}
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java Tue Jun 26 12:34:08 2007
@@ -144,12 +144,12 @@
public void deliverDependency(ModuleRevisionId depMrid, String version, String status,
String depStatus) {
// call deliver target if any
- if (_deliverTarget != null && _deliverTarget.trim().length() > 0) {
+ if (deliverTarget != null && deliverTarget.trim().length() > 0) {
CallTarget ct = (CallTarget) getProject().createTask("antcall");
ct.setOwningTarget(getOwningTarget());
ct.init();
- ct.setTarget(_deliverTarget);
+ ct.setTarget(deliverTarget);
ct.setInheritAll(true);
ct.setInheritRefs(true);
Property param = ct.createParam();
@@ -188,214 +188,220 @@
}
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _revision;
+ private String revision;
- private String _pubRevision;
+ private String pubRevision;
- private File _cache;
+ private File cache;
- private String _deliverpattern;
+ private String deliverpattern;
- private String _status;
+ private String status;
- private String _pubdate;
+ private String pubdate;
- private String _deliverTarget;
+ private String deliverTarget;
- private File _deliveryList;
+ private File deliveryList;
- private boolean _replacedynamicrev = true;
+ private boolean replacedynamicrev = true;
- private String _resolveId;
+ private String resolveId;
- private String _conf;
+ private String conf;
public File getCache() {
- return _cache;
+ return cache;
}
public void setCache(File cache) {
- _cache = cache;
+ this.cache = cache;
}
public String getDeliverpattern() {
- return _deliverpattern;
+ return deliverpattern;
}
public void setDeliverpattern(String destivypattern) {
- _deliverpattern = destivypattern;
+ this.deliverpattern = destivypattern;
}
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getPubdate() {
- return _pubdate;
+ return pubdate;
}
public void setPubdate(String pubdate) {
- _pubdate = pubdate;
+ this.pubdate = pubdate;
}
public String getPubrevision() {
- return _pubRevision;
+ return pubRevision;
}
public void setPubrevision(String pubRevision) {
- _pubRevision = pubRevision;
+ this.pubRevision = pubRevision;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public String getStatus() {
- return _status;
+ return status;
}
public void setStatus(String status) {
- _status = status;
+ this.status = status;
}
public void setDelivertarget(String deliverTarget) {
- _deliverTarget = deliverTarget;
+ this.deliverTarget = deliverTarget;
}
public void setDeliveryList(File deliveryList) {
- _deliveryList = deliveryList;
+ this.deliveryList = deliveryList;
}
public boolean isReplacedynamicrev() {
- return _replacedynamicrev;
+ return replacedynamicrev;
}
public void setReplacedynamicrev(boolean replacedynamicrev) {
- _replacedynamicrev = replacedynamicrev;
+ this.replacedynamicrev = replacedynamicrev;
}
public String getResolveId() {
- return _resolveId;
+ return resolveId;
}
public void setResolveId(String resolveId) {
- _resolveId = resolveId;
+ this.resolveId = resolveId;
}
public String getConf() {
- return _conf;
+ return conf;
}
public void setConf(String confs) {
- _conf = confs;
+ conf = confs;
}
public void doExecute() throws BuildException {
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- _organisation = getProperty(_organisation, settings, "ivy.organisation", _resolveId);
- _module = getProperty(_module, settings, "ivy.module", _resolveId);
- _revision = getProperty(_revision, settings, "ivy.revision", _resolveId);
- _pubRevision = getProperty(_pubRevision, settings, "ivy.deliver.revision");
- if (_cache == null) {
- _cache = settings.getDefaultCache();
+ organisation = getProperty(organisation, settings, "ivy.organisation", resolveId);
+ module = getProperty(module, settings, "ivy.module", resolveId);
+ revision = getProperty(revision, settings, "ivy.revision", resolveId);
+ pubRevision = getProperty(pubRevision, settings, "ivy.deliver.revision");
+ if (cache == null) {
+ cache = settings.getDefaultCache();
}
- _deliverpattern = getProperty(_deliverpattern, settings, "ivy.deliver.ivy.pattern");
- _status = getProperty(_status, settings, "ivy.status");
- if (_deliveryList == null) {
+ deliverpattern = getProperty(deliverpattern, settings, "ivy.deliver.ivy.pattern");
+ status = getProperty(status, settings, "ivy.status");
+ if (deliveryList == null) {
String deliveryListPath = getProperty(settings, "ivy.delivery.list.file");
if (deliveryListPath == null) {
- _deliveryList = new File(System.getProperty("java.io.tmpdir")
+ deliveryList = new File(System.getProperty("java.io.tmpdir")
+ "/delivery.properties");
} else {
- _deliveryList = getProject().resolveFile(settings.substitute(deliveryListPath));
+ deliveryList = getProject().resolveFile(settings.substitute(deliveryListPath));
}
}
- if (_resolveId == null) {
- if (_organisation == null) {
+ if (resolveId == null) {
+ if (organisation == null) {
throw new BuildException(
- "no organisation provided for ivy deliver task: It can either be set explicitely via the attribute 'organisation' or via 'ivy.organisation' property or a prior call to <resolve/>");
+ "no organisation provided for ivy deliver task: "
+ + "It can either be set explicitely via the attribute 'organisation' "
+ + "or via 'ivy.organisation' property or a prior call to <resolve/>");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException(
- "no module name provided for ivy deliver task: It can either be set explicitely via the attribute 'module' or via 'ivy.module' property or a prior call to <resolve/>");
+ "no module name provided for ivy deliver task: "
+ + "It can either be set explicitely via the attribute 'module' "
+ + "or via 'ivy.module' property or a prior call to <resolve/>");
}
}
- if (_revision == null) {
- _revision = Ivy.getWorkingRevision();
+ if (revision == null) {
+ revision = Ivy.getWorkingRevision();
}
- Date pubdate = getPubDate(_pubdate, new Date());
- if (_pubRevision == null) {
- if (_revision.startsWith("working@")) {
- _pubRevision = Ivy.DATE_FORMAT.format(pubdate);
+ Date pubdate = getPubDate(this.pubdate, new Date());
+ if (pubRevision == null) {
+ if (revision.startsWith("working@")) {
+ pubRevision = Ivy.DATE_FORMAT.format(pubdate);
} else {
- _pubRevision = _revision;
+ pubRevision = revision;
}
}
- if (_deliverpattern == null) {
+ if (deliverpattern == null) {
throw new BuildException(
- "deliver ivy pattern is missing: either provide it as parameters or through ivy.deliver.ivy.pattern properties");
+ "deliver ivy pattern is missing: either provide it as parameters "
+ + "or through ivy.deliver.ivy.pattern properties");
}
- if (_status == null) {
+ if (status == null) {
throw new BuildException(
- "no status provided: either provide it as parameter or through the ivy.status.default property");
+ "no status provided: either provide it as parameter or through "
+ + "the ivy.status.default property");
}
ModuleRevisionId mrid = null;
- if (_resolveId == null) {
- mrid = ModuleRevisionId.newInstance(_organisation, _module, _revision);
+ if (resolveId == null) {
+ mrid = ModuleRevisionId.newInstance(organisation, module, revision);
}
boolean isLeading = false;
try {
- if (!_deliveryList.exists()) {
+ if (!deliveryList.exists()) {
isLeading = true;
}
loadDeliveryList();
PublishingDependencyRevisionResolver drResolver;
- if (_deliverTarget != null && _deliverTarget.trim().length() > 0) {
+ if (deliverTarget != null && deliverTarget.trim().length() > 0) {
drResolver = new DeliverDRResolver();
} else {
drResolver = new DefaultPublishingDRResolver();
}
- DeliverOptions options = new DeliverOptions(_status, pubdate, CacheManager.getInstance(
- settings, _cache), drResolver, doValidate(settings), _replacedynamicrev,
- splitConfs(_conf)).setResolveId(_resolveId);
+ DeliverOptions options = new DeliverOptions(status, pubdate, CacheManager.getInstance(
+ settings, cache), drResolver, doValidate(settings), replacedynamicrev,
+ splitConfs(conf)).setResolveId(resolveId);
if (mrid == null) {
- ivy.deliver(_pubRevision, _deliverpattern, options);
+ ivy.deliver(pubRevision, deliverpattern, options);
} else {
- ivy.deliver(mrid, _pubRevision, _deliverpattern, options);
+ ivy.deliver(mrid, pubRevision, deliverpattern, options);
}
} catch (Exception e) {
- throw new BuildException("impossible to deliver " + mrid == null ? _resolveId : mrid
+ throw new BuildException("impossible to deliver " + mrid == null ? resolveId : mrid
+ ": " + e, e);
} finally {
if (isLeading) {
- if (_deliveryList.exists()) {
- _deliveryList.delete();
+ if (deliveryList.exists()) {
+ deliveryList.delete();
}
}
}
@@ -405,7 +411,7 @@
Property property = (Property) getProject().createTask("property");
property.setOwningTarget(getOwningTarget());
property.init();
- property.setFile(_deliveryList);
+ property.setFile(deliveryList);
property.perform();
}
@@ -413,7 +419,7 @@
Echo echo = (Echo) getProject().createTask("echo");
echo.setOwningTarget(getOwningTarget());
echo.init();
- echo.setFile(_deliveryList);
+ echo.setFile(deliveryList);
echo.setMessage(msg + "\n");
echo.setAppend(true);
echo.perform();
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyExtractFromSources.java Tue Jun 26 12:34:08 2007
@@ -47,90 +47,90 @@
*/
public class IvyExtractFromSources extends IvyTask {
public static class Ignore {
- String _package;
+ private String packageName;
public String getPackage() {
- return _package;
+ return packageName;
}
public void setPackage(String package1) {
- _package = package1;
+ packageName = package1;
}
}
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _revision;
+ private String revision;
- private String _status;
+ private String status;
- private List _ignoredPackaged = new ArrayList(); // List (String package)
+ private List ignoredPackaged = new ArrayList(); // List (String package)
- private Map _mapping = new HashMap(); // Map (String package -> ModuleRevisionId)
+ private Map mapping = new HashMap(); // Map (String package -> ModuleRevisionId)
- private Concat _concat = new Concat();
+ private Concat concat = new Concat();
- private File _to;
+ private File to;
public void addConfiguredIgnore(Ignore ignore) {
- _ignoredPackaged.add(ignore.getPackage());
+ ignoredPackaged.add(ignore.getPackage());
}
public File getTo() {
- return _to;
+ return to;
}
public void setTo(File to) {
- _to = to;
+ this.to = to;
}
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public String getStatus() {
- return _status;
+ return status;
}
public void setStatus(String status) {
- _status = status;
+ this.status = status;
}
public void addConfiguredMapping(PackageMapping mapping) {
- _mapping.put(mapping.getPackage(), mapping.getModuleRevisionId());
+ this.mapping.put(mapping.getPackage(), mapping.getModuleRevisionId());
}
public void addFileSet(FileSet fileSet) {
- _concat.addFileset(fileSet);
+ concat.addFileset(fileSet);
}
public void doExecute() throws BuildException {
configureConcat();
Writer out = new StringWriter();
- _concat.setWriter(out);
- _concat.execute();
+ concat.setWriter(out);
+ concat.execute();
Set importsSet = new HashSet(Arrays.asList(out.toString().split("\n")));
Set dependencies = new HashSet();
for (Iterator iter = importsSet.iterator(); iter.hasNext();) {
@@ -141,15 +141,15 @@
}
}
try {
- PrintWriter writer = new PrintWriter(new FileOutputStream(_to));
+ PrintWriter writer = new PrintWriter(new FileOutputStream(to));
writer.println("<ivy-module version=\"1.0\">");
- writer.println("\t<info organisation=\"" + _organisation + "\"");
- writer.println("\t module=\"" + _module + "\"");
- if (_revision != null) {
- writer.println("\t revision=\"" + _revision + "\"");
+ writer.println("\t<info organisation=\"" + organisation + "\"");
+ writer.println("\t module=\"" + module + "\"");
+ if (revision != null) {
+ writer.println("\t revision=\"" + revision + "\"");
}
- if (_status != null) {
- writer.println("\t status=\"" + _status + "\"");
+ if (status != null) {
+ writer.println("\t status=\"" + status + "\"");
} else {
writer.println("\t status=\"integration\"");
}
@@ -165,9 +165,9 @@
}
writer.println("</ivy-module>");
writer.close();
- log(dependencies.size() + " dependencies put in " + _to);
+ log(dependencies.size() + " dependencies put in " + to);
} catch (FileNotFoundException e) {
- throw new BuildException("impossible to create file " + _to + ": " + e, e);
+ throw new BuildException("impossible to create file " + to + ": " + e, e);
}
}
@@ -179,10 +179,10 @@
String askedPack = pack;
ModuleRevisionId ret = null;
while (ret == null && pack.length() > 0) {
- if (_ignoredPackaged.contains(pack)) {
+ if (ignoredPackaged.contains(pack)) {
return null;
}
- ret = (ModuleRevisionId) _mapping.get(pack);
+ ret = (ModuleRevisionId) mapping.get(pack);
int lastDotIndex = pack.lastIndexOf('.');
if (lastDotIndex != -1) {
pack = pack.substring(0, lastDotIndex);
@@ -197,8 +197,8 @@
}
private void configureConcat() {
- _concat.setProject(getProject());
- _concat.setTaskName(getTaskName());
+ concat.setProject(getProject());
+ concat.setTaskName(getTaskName());
FilterChain filterChain = new FilterChain();
LineContainsRegExp lcre = new LineContainsRegExp();
RegularExpression regexp = new RegularExpression();
@@ -211,6 +211,6 @@
rre.setReplace("\\1");
tf.add(rre);
filterChain.add(tf);
- _concat.addFilterChain(filterChain);
+ concat.addFilterChain(filterChain);
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java Tue Jun 26 12:34:08 2007
@@ -29,76 +29,76 @@
* properties according to what was found.
*/
public class IvyFindRevision extends IvyTask {
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _branch;
+ private String branch;
- private String _revision;
+ private String revision;
- private String _property = "ivy.revision";
+ private String property = "ivy.revision";
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public String getBranch() {
- return _branch;
+ return branch;
}
public void setBranch(String branch) {
- _branch = branch;
+ this.branch = branch;
}
public String getProperty() {
- return _property;
+ return property;
}
public void setProperty(String prefix) {
- _property = prefix;
+ this.property = prefix;
}
public void doExecute() throws BuildException {
- if (_organisation == null) {
+ if (organisation == null) {
throw new BuildException("no organisation provided for ivy findmodules");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException("no module name provided for ivy findmodules");
}
- if (_revision == null) {
+ if (revision == null) {
throw new BuildException("no revision provided for ivy findmodules");
}
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- if (_branch == null) {
- settings.getDefaultBranch(new ModuleId(_organisation, _module));
+ if (branch == null) {
+ settings.getDefaultBranch(new ModuleId(organisation, module));
}
- ResolvedModuleRevision rmr = ivy.findModule(ModuleRevisionId.newInstance(_organisation,
- _module, _branch, _revision));
+ ResolvedModuleRevision rmr = ivy.findModule(ModuleRevisionId.newInstance(organisation,
+ module, branch, revision));
if (rmr != null) {
- getProject().setProperty(_property, rmr.getId().getRevision());
+ getProject().setProperty(property, rmr.getId().getRevision());
}
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java Tue Jun 26 12:34:08 2007
@@ -36,26 +36,26 @@
* Parses information about an ivy file and make them available in ant.
*/
public class IvyInfo extends IvyTask {
- private File _file = null;
+ private File file = null;
public File getFile() {
- return _file;
+ return file;
}
public void setFile(File file) {
- _file = file;
+ this.file = file;
}
public void doExecute() throws BuildException {
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- if (_file == null) {
- _file = getProject().resolveFile(getProperty(settings, "ivy.dep.file"));
+ if (file == null) {
+ file = getProject().resolveFile(getProperty(settings, "ivy.dep.file"));
}
try {
ModuleDescriptor md = ModuleDescriptorParserRegistry.getInstance().parseDescriptor(
- settings, _file.toURL(), doValidate(settings));
+ settings, file.toURL(), doValidate(settings));
getProject()
.setProperty("ivy.organisation", md.getModuleRevisionId().getOrganisation());
getProject().setProperty("ivy.module", md.getModuleRevisionId().getName());
@@ -75,7 +75,7 @@
getProject().setProperty("ivy.public.configurations", mergeConfs(publicConfigs));
} catch (MalformedURLException e) {
throw new BuildException(
- "unable to convert given ivy file to url: " + _file + ": " + e, e);
+ "unable to convert given ivy file to url: " + file + ": " + e, e);
} catch (ParseException e) {
log(e.getMessage(), Project.MSG_ERR);
throw new BuildException("syntax errors in ivy file: " + e, e);
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java Tue Jun 26 12:34:08 2007
@@ -31,63 +31,69 @@
* Allow to install a module or a set of module from repository to another one.
*/
public class IvyInstall extends IvyTask {
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _revision;
+ private String revision;
- private File _cache;
+ private File cache;
- private boolean _overwrite = false;
+ private boolean overwrite = false;
- private String _from;
+ private String from;
- private String _to;
+ private String to;
- private boolean _transitive;
+ private boolean transitive;
- private String _type;
+ private String type;
- private String _matcher = PatternMatcher.EXACT;
+ private String matcher = PatternMatcher.EXACT;
- private boolean _haltOnFailure = true;
+ private boolean haltOnFailure = true;
public void doExecute() throws BuildException {
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- if (_cache == null) {
- _cache = settings.getDefaultCache();
+ if (cache == null) {
+ cache = settings.getDefaultCache();
}
- if (_organisation == null) {
+ if (organisation == null) {
throw new BuildException(
- "no organisation provided for ivy publish task: It can either be set explicitely via the attribute 'organisation' or via 'ivy.organisation' property or a prior call to <resolve/>");
+ "no organisation provided for ivy publish task: "
+ + "It can either be set explicitely via the attribute 'organisation' "
+ + "or via 'ivy.organisation' property or a prior call to <resolve/>");
}
- if (_module == null && PatternMatcher.EXACT.equals(_matcher)) {
+ if (module == null && PatternMatcher.EXACT.equals(matcher)) {
throw new BuildException(
- "no module name provided for ivy publish task: It can either be set explicitely via the attribute 'module' or via 'ivy.module' property or a prior call to <resolve/>");
- } else if (_module == null && !PatternMatcher.EXACT.equals(_matcher)) {
- _module = PatternMatcher.ANY_EXPRESSION;
+ "no module name provided for ivy publish task: "
+ + "It can either be set explicitely via the attribute 'module' "
+ + "or via 'ivy.module' property or a prior call to <resolve/>");
+ } else if (module == null && !PatternMatcher.EXACT.equals(matcher)) {
+ module = PatternMatcher.ANY_EXPRESSION;
}
- if (_revision == null && PatternMatcher.EXACT.equals(_matcher)) {
+ if (revision == null && PatternMatcher.EXACT.equals(matcher)) {
throw new BuildException(
- "no module revision provided for ivy publish task: It can either be set explicitely via the attribute 'revision' or via 'ivy.revision' property or a prior call to <resolve/>");
- } else if (_revision == null && !PatternMatcher.EXACT.equals(_matcher)) {
- _revision = PatternMatcher.ANY_EXPRESSION;
+ "no module revision provided for ivy publish task: "
+ + "It can either be set explicitely via the attribute 'revision' "
+ + "or via 'ivy.revision' property or a prior call to <resolve/>");
+ } else if (revision == null && !PatternMatcher.EXACT.equals(matcher)) {
+ revision = PatternMatcher.ANY_EXPRESSION;
}
- if (_from == null) {
+ if (from == null) {
throw new BuildException(
"no from resolver name: please provide it through parameter 'from'");
}
- if (_to == null) {
+ if (to == null) {
throw new BuildException(
"no to resolver name: please provide it through parameter 'to'");
}
- ModuleRevisionId mrid = ModuleRevisionId.newInstance(_organisation, _module, _revision);
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation, module, revision);
ResolveReport report;
try {
- report = ivy.install(mrid, _from, _to, _transitive, doValidate(settings), _overwrite,
- FilterHelper.getArtifactTypeFilter(_type), _cache, _matcher);
+ report = ivy.install(mrid, from, to, transitive, doValidate(settings), overwrite,
+ FilterHelper.getArtifactTypeFilter(type), cache, matcher);
} catch (Exception e) {
throw new BuildException("impossible to install " + mrid + ": " + e, e);
}
@@ -99,90 +105,90 @@
}
public boolean isHaltonfailure() {
- return _haltOnFailure;
+ return haltOnFailure;
}
public void setHaltonfailure(boolean haltOnFailure) {
- _haltOnFailure = haltOnFailure;
+ this.haltOnFailure = haltOnFailure;
}
public File getCache() {
- return _cache;
+ return cache;
}
public void setCache(File cache) {
- _cache = cache;
+ this.cache = cache;
}
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public boolean isOverwrite() {
- return _overwrite;
+ return overwrite;
}
public void setOverwrite(boolean overwrite) {
- _overwrite = overwrite;
+ this.overwrite = overwrite;
}
public String getFrom() {
- return _from;
+ return from;
}
public void setFrom(String from) {
- _from = from;
+ this.from = from;
}
public String getTo() {
- return _to;
+ return to;
}
public void setTo(String to) {
- _to = to;
+ this.to = to;
}
public boolean isTransitive() {
- return _transitive;
+ return transitive;
}
public void setTransitive(boolean transitive) {
- _transitive = transitive;
+ this.transitive = transitive;
}
public String getType() {
- return _type;
+ return type;
}
public void setType(String type) {
- _type = type;
+ this.type = type;
}
public String getMatcher() {
- return _matcher;
+ return matcher;
}
public void setMatcher(String matcher) {
- _matcher = matcher;
+ this.matcher = matcher;
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java Tue Jun 26 12:34:08 2007
@@ -29,99 +29,99 @@
* according to what was found.
*/
public class IvyListModules extends IvyTask {
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _branch = PatternMatcher.ANY_EXPRESSION;
+ private String branch = PatternMatcher.ANY_EXPRESSION;
- private String _revision;
+ private String revision;
- private String _matcher = PatternMatcher.EXACT_OR_REGEXP;
+ private String matcher = PatternMatcher.EXACT_OR_REGEXP;
- private String _property;
+ private String property;
- private String _value;
+ private String value;
public String getMatcher() {
- return _matcher;
+ return matcher;
}
public void setMatcher(String matcher) {
- _matcher = matcher;
+ this.matcher = matcher;
}
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getProperty() {
- return _property;
+ return property;
}
public void setProperty(String name) {
- _property = name;
+ this.property = name;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public String getValue() {
- return _value;
+ return value;
}
public void setValue(String value) {
- _value = value;
+ this.value = value;
}
public String getBranch() {
- return _branch;
+ return branch;
}
public void setBranch(String branch) {
- _branch = branch;
+ this.branch = branch;
}
public void doExecute() throws BuildException {
- if (_organisation == null) {
+ if (organisation == null) {
throw new BuildException("no organisation provided for ivy findmodules");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException("no module name provided for ivy findmodules");
}
- if (_revision == null) {
+ if (revision == null) {
throw new BuildException("no revision provided for ivy findmodules");
}
- if (_property == null) {
+ if (property == null) {
throw new BuildException("no property provided for ivy findmodules");
}
- if (_value == null) {
+ if (value == null) {
throw new BuildException("no value provided for ivy findmodules");
}
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- ModuleRevisionId[] mrids = ivy.listModules(ModuleRevisionId.newInstance(_organisation,
- _module, _branch, _revision), settings.getMatcher(_matcher));
+ ModuleRevisionId[] mrids = ivy.listModules(ModuleRevisionId.newInstance(organisation,
+ module, branch, revision), settings.getMatcher(matcher));
for (int i = 0; i < mrids.length; i++) {
- String name = IvyPatternHelper.substitute(settings.substitute(_property), mrids[i]);
- String value = IvyPatternHelper.substitute(settings.substitute(_value), mrids[i]);
+ String name = IvyPatternHelper.substitute(settings.substitute(property), mrids[i]);
+ String value = IvyPatternHelper.substitute(settings.substitute(this.value), mrids[i]);
getProject().setProperty(name, value);
}
}
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Tue Jun 26 12:34:08 2007
@@ -37,29 +37,29 @@
* Base class for tasks needing to be performed after a resolve.
*/
public abstract class IvyPostResolveTask extends IvyTask {
- private String _conf;
+ private String conf;
- private boolean _haltOnFailure = true;
+ private boolean haltOnFailure = true;
- private boolean _transitive = true;
+ private boolean transitive = true;
- private boolean _inline = false;
+ private boolean inline = false;
- private File _cache;
+ private File cache;
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _revision = "latest.integration";
+ private String revision = "latest.integration";
- private String _resolveId;
+ private String resolveId;
- private String _type;
+ private String type;
- private File _file;
+ private File file;
- private Filter _artifactFilter = null;
+ private Filter artifactFilter = null;
private boolean useOrigin = false;
@@ -77,34 +77,38 @@
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- boolean orgAndModSetManually = (_organisation != null) && (_module != null);
+ boolean orgAndModSetManually = (organisation != null) && (module != null);
- _organisation = getProperty(_organisation, settings, "ivy.organisation");
- _module = getProperty(_module, settings, "ivy.module");
+ organisation = getProperty(organisation, settings, "ivy.organisation");
+ module = getProperty(module, settings, "ivy.module");
- if (_cache == null) {
- _cache = settings.getDefaultCache();
+ if (cache == null) {
+ cache = settings.getDefaultCache();
}
- if (_file == null) {
- String fileName = getProperty(settings, "ivy.resolved.file", _resolveId);
+ if (file == null) {
+ String fileName = getProperty(settings, "ivy.resolved.file", resolveId);
if (fileName != null) {
- _file = new File(fileName);
+ file = new File(fileName);
}
}
if (isInline()) {
- _conf = _conf == null ? "*" : _conf;
- if (_organisation == null) {
+ conf = conf == null ? "*" : conf;
+ if (organisation == null) {
throw new BuildException(
- "no organisation provided for ivy cache task in inline mode: It can either be set explicitely via the attribute 'organisation' or via 'ivy.organisation' property");
+ "no organisation provided for ivy cache task in inline mode: "
+ + "It can either be set explicitely via the attribute 'organisation' "
+ + "or via 'ivy.organisation' property");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException(
- "no module name provided for ivy cache task in inline mode: It can either be set explicitely via the attribute 'module' or via 'ivy.module' property");
+ "no module name provided for ivy cache task in inline mode: "
+ + "It can either be set explicitely via the attribute 'module' "
+ + "or via 'ivy.module' property");
}
String[] toResolve = getConfsToResolve(getOrganisation(), getModule() + "-caller",
- _conf, true);
+ conf, true);
if (toResolve.length > 0) {
Message.verbose("using inline mode to resolve " + getOrganisation() + " "
+ getModule() + " " + getRevision() + " ("
@@ -114,16 +118,16 @@
resolve.setModule(getModule());
resolve.setRevision(getRevision());
resolve.setInline(true);
- resolve.setConf(_conf);
- resolve.setCache(_cache);
- resolve.setResolveId(_resolveId);
+ resolve.setConf(conf);
+ resolve.setCache(cache);
+ resolve.setResolveId(resolveId);
resolve.execute();
} else {
Message.verbose("inline resolve already done for " + getOrganisation() + " "
- + getModule() + " " + getRevision() + " (" + _conf + ")");
+ + getModule() + " " + getRevision() + " (" + conf + ")");
}
- if ("*".equals(_conf)) {
- _conf = StringUtils.join(getResolvedConfigurations(getOrganisation(), getModule()
+ if ("*".equals(conf)) {
+ conf = StringUtils.join(getResolvedConfigurations(getOrganisation(), getModule()
+ "-caller", true), ", ");
}
} else {
@@ -135,35 +139,42 @@
// from these report names?)
if (!orgAndModSetManually) {
ensureResolved(isHaltonfailure(), isUseOrigin(), isTransitive(), getOrganisation(),
- getModule(), getProperty(_conf, settings, "ivy.resolved.configurations"),
- _resolveId, _cache);
+ getModule(), getProperty(conf, settings, "ivy.resolved.configurations"),
+ resolveId, cache);
}
- _conf = getProperty(_conf, settings, "ivy.resolved.configurations");
- if ("*".equals(_conf)) {
- _conf = getProperty(settings, "ivy.resolved.configurations");
- if (_conf == null) {
+ conf = getProperty(conf, settings, "ivy.resolved.configurations");
+ if ("*".equals(conf)) {
+ conf = getProperty(settings, "ivy.resolved.configurations");
+ if (conf == null) {
throw new BuildException(
- "bad conf provided for ivy cache task: * can only be used with a prior call to <resolve/>");
+ "bad conf provided for ivy cache task: "
+ + "'*' can only be used with a prior call to <resolve/>");
}
}
}
- _organisation = getProperty(_organisation, settings, "ivy.organisation");
- _module = getProperty(_module, settings, "ivy.module");
- if (_organisation == null) {
+ organisation = getProperty(organisation, settings, "ivy.organisation");
+ module = getProperty(module, settings, "ivy.module");
+ if (organisation == null) {
throw new BuildException(
- "no organisation provided for ivy cache task: It can either be set explicitely via the attribute 'organisation' or via 'ivy.organisation' property or a prior call to <resolve/>");
+ "no organisation provided for ivy cache task: "
+ + "It can either be set explicitely via the attribute 'organisation' "
+ + "or via 'ivy.organisation' property or a prior call to <resolve/>");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException(
- "no module name provided for ivy cache task: It can either be set explicitely via the attribute 'module' or via 'ivy.module' property or a prior call to <resolve/>");
+ "no module name provided for ivy cache task: "
+ + "It can either be set explicitely via the attribute 'module' "
+ + "or via 'ivy.module' property or a prior call to <resolve/>");
}
- if (_conf == null) {
+ if (conf == null) {
throw new BuildException(
- "no conf provided for ivy cache task: It can either be set explicitely via the attribute 'conf' or via 'ivy.resolved.configurations' property or a prior call to <resolve/>");
+ "no conf provided for ivy cache task: "
+ + "It can either be set explicitely via the attribute 'conf' or "
+ + "via 'ivy.resolved.configurations' property or a prior call to <resolve/>");
}
- _artifactFilter = FilterHelper.getArtifactTypeFilter(_type);
+ artifactFilter = FilterHelper.getArtifactTypeFilter(type);
}
protected void ensureResolved(boolean haltOnFailure, boolean useOrigin, boolean transitive,
@@ -179,7 +190,7 @@
if (confs.length > 0) {
IvyResolve resolve = createResolve(haltOnFailure, useOrigin);
- resolve.setFile(_file);
+ resolve.setFile(file);
resolve.setCache(cache);
resolve.setTransitive(transitive);
resolve.setConf(StringUtils.join(confs, ", "));
@@ -265,99 +276,99 @@
protected ResolveReport getResolvedReport() {
return getResolvedReport(getOrganisation(), isInline() ? getModule() + "-caller"
- : getModule(), _resolveId);
+ : getModule(), resolveId);
}
public String getType() {
- return _type;
+ return type;
}
public void setType(String type) {
- _type = type;
+ this.type = type;
}
public String getConf() {
- return _conf;
+ return conf;
}
public void setConf(String conf) {
- _conf = conf;
+ this.conf = conf;
}
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public boolean isHaltonfailure() {
- return _haltOnFailure;
+ return haltOnFailure;
}
public void setHaltonfailure(boolean haltOnFailure) {
- _haltOnFailure = haltOnFailure;
+ this.haltOnFailure = haltOnFailure;
}
public File getCache() {
- return _cache;
+ return cache;
}
public void setCache(File cache) {
- _cache = cache;
+ this.cache = cache;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String rev) {
- _revision = rev;
+ revision = rev;
}
public Filter getArtifactFilter() {
- return _artifactFilter;
+ return artifactFilter;
}
public boolean isTransitive() {
- return _transitive;
+ return transitive;
}
public void setTransitive(boolean transitive) {
- _transitive = transitive;
+ this.transitive = transitive;
}
public boolean isInline() {
- return _inline;
+ return inline;
}
public void setInline(boolean inline) {
- _inline = inline;
+ this.inline = inline;
}
public void setResolveId(String resolveId) {
- _resolveId = resolveId;
+ this.resolveId = resolveId;
}
public String getResolveId() {
- return _resolveId;
+ return resolveId;
}
public void setFile(File file) {
- _file = file;
+ this.file = file;
}
public File getFile() {
- return _file;
+ return file;
}
public void setKeep(boolean keep) {
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java?view=diff&rev=550916&r1=550915&r2=550916
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java Tue Jun 26 12:34:08 2007
@@ -42,62 +42,62 @@
* This task allow to publish a module revision to an Ivy repository.
*/
public class IvyPublish extends IvyTask {
- private String _organisation;
+ private String organisation;
- private String _module;
+ private String module;
- private String _revision;
+ private String revision;
- private String _pubRevision;
+ private String pubRevision;
- private File _cache;
+ private File cache;
- private String _srcivypattern;
+ private String srcivypattern;
- private String _status;
+ private String status;
- private String _conf = null;
+ private String conf = null;
- private String _pubdate;
+ private String pubdate;
- private String _deliverTarget;
+ private String deliverTarget;
- private String _publishResolverName = null;
+ private String publishResolverName = null;
- private List _artifactspattern = new ArrayList();
+ private List artifactspattern = new ArrayList();
- private File _deliveryList;
+ private File deliveryList;
- private boolean _publishivy = true;
+ private boolean publishivy = true;
- private boolean _warnonmissing = true;
+ private boolean warnonmissing = true;
- private boolean _haltonmissing = true;
+ private boolean haltonmissing = true;
- private boolean _overwrite = false;
+ private boolean overwrite = false;
- private boolean _update = false;
+ private boolean update = false;
- private boolean _replacedynamicrev = true;
+ private boolean replacedynamicrev = true;
- private boolean _forcedeliver;
+ private boolean forcedeliver;
- private Collection _artifacts = new ArrayList();
+ private Collection artifacts = new ArrayList();
public File getCache() {
- return _cache;
+ return cache;
}
public void setCache(File cache) {
- _cache = cache;
+ this.cache = cache;
}
public String getSrcivypattern() {
- return _srcivypattern;
+ return srcivypattern;
}
public void setSrcivypattern(String destivypattern) {
- _srcivypattern = destivypattern;
+ srcivypattern = destivypattern;
}
/**
@@ -105,7 +105,7 @@
* @return
*/
public String getDeliverivypattern() {
- return _srcivypattern;
+ return srcivypattern;
}
/**
@@ -113,170 +113,178 @@
* @return
*/
public void setDeliverivypattern(String destivypattern) {
- _srcivypattern = destivypattern;
+ srcivypattern = destivypattern;
}
public String getModule() {
- return _module;
+ return module;
}
public void setModule(String module) {
- _module = module;
+ this.module = module;
}
public String getOrganisation() {
- return _organisation;
+ return organisation;
}
public void setOrganisation(String organisation) {
- _organisation = organisation;
+ this.organisation = organisation;
}
public String getPubdate() {
- return _pubdate;
+ return pubdate;
}
public void setPubdate(String pubdate) {
- _pubdate = pubdate;
+ this.pubdate = pubdate;
}
public String getPubrevision() {
- return _pubRevision;
+ return pubRevision;
}
public void setPubrevision(String pubRevision) {
- _pubRevision = pubRevision;
+ this.pubRevision = pubRevision;
}
public String getRevision() {
- return _revision;
+ return revision;
}
public void setRevision(String revision) {
- _revision = revision;
+ this.revision = revision;
}
public String getStatus() {
- return _status;
+ return status;
}
public void setStatus(String status) {
- _status = status;
+ this.status = status;
}
public void setConf(String conf) {
- _conf = conf;
+ this.conf = conf;
}
public void setDelivertarget(String deliverTarget) {
- _deliverTarget = deliverTarget;
+ this.deliverTarget = deliverTarget;
}
public void setDeliveryList(File deliveryList) {
- _deliveryList = deliveryList;
+ this.deliveryList = deliveryList;
}
public String getResolver() {
- return _publishResolverName;
+ return publishResolverName;
}
public void setResolver(String publishResolverName) {
- _publishResolverName = publishResolverName;
+ this.publishResolverName = publishResolverName;
}
public String getArtifactspattern() {
- return (String) (_artifactspattern.isEmpty() ? null : _artifactspattern.get(0));
+ return (String) (artifactspattern.isEmpty() ? null : artifactspattern.get(0));
}
public void setArtifactspattern(String artifactsPattern) {
- _artifactspattern.clear();
- _artifactspattern.add(artifactsPattern);
+ artifactspattern.clear();
+ artifactspattern.add(artifactsPattern);
}
public void addArtifactspattern(String artifactsPattern) {
- _artifactspattern.add(artifactsPattern);
+ artifactspattern.add(artifactsPattern);
}
public void addConfiguredArtifacts(ArtifactsPattern p) {
- _artifactspattern.add(p.getPattern());
+ artifactspattern.add(p.getPattern());
}
public boolean isReplacedynamicrev() {
- return _replacedynamicrev;
+ return replacedynamicrev;
}
public void setReplacedynamicrev(boolean replacedynamicrev) {
- _replacedynamicrev = replacedynamicrev;
+ this.replacedynamicrev = replacedynamicrev;
}
public void doExecute() throws BuildException {
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
- _organisation = getProperty(_organisation, settings, "ivy.organisation");
- _module = getProperty(_module, settings, "ivy.module");
- _revision = getProperty(_revision, settings, "ivy.revision");
- _pubRevision = getProperty(_pubRevision, settings, "ivy.deliver.revision");
- if (_cache == null) {
- _cache = settings.getDefaultCache();
+ organisation = getProperty(organisation, settings, "ivy.organisation");
+ module = getProperty(module, settings, "ivy.module");
+ revision = getProperty(revision, settings, "ivy.revision");
+ pubRevision = getProperty(pubRevision, settings, "ivy.deliver.revision");
+ if (cache == null) {
+ cache = settings.getDefaultCache();
}
- if (_artifactspattern.isEmpty()) {
+ if (artifactspattern.isEmpty()) {
String p = getProperty(null, settings, "ivy.publish.src.artifacts.pattern");
if (p != null) {
- _artifactspattern.add(p);
+ artifactspattern.add(p);
}
}
- if (_srcivypattern == null) {
- _srcivypattern = getArtifactspattern();
+ if (srcivypattern == null) {
+ srcivypattern = getArtifactspattern();
}
- _status = getProperty(_status, settings, "ivy.status");
- if (_organisation == null) {
+ status = getProperty(status, settings, "ivy.status");
+ if (organisation == null) {
throw new BuildException(
- "no organisation provided for ivy publish task: It can either be set explicitely via the attribute 'organisation' or via 'ivy.organisation' property or a prior call to <resolve/>");
+ "no organisation provided for ivy publish task: "
+ + "It can either be set explicitely via the attribute 'organisation' "
+ + "or via 'ivy.organisation' property or a prior call to <resolve/>");
}
- if (_module == null) {
+ if (module == null) {
throw new BuildException(
- "no module name provided for ivy publish task: It can either be set explicitely via the attribute 'module' or via 'ivy.module' property or a prior call to <resolve/>");
+ "no module name provided for ivy publish task: "
+ + "It can either be set explicitely via the attribute 'module' "
+ + "or via 'ivy.module' property or a prior call to <resolve/>");
}
- if (_revision == null) {
+ if (revision == null) {
throw new BuildException(
- "no module revision provided for ivy publish task: It can either be set explicitely via the attribute 'revision' or via 'ivy.revision' property or a prior call to <resolve/>");
+ "no module revision provided for ivy publish task: "
+ + "It can either be set explicitely via the attribute 'revision' "
+ + "or via 'ivy.revision' property or a prior call to <resolve/>");
}
- if (_artifactspattern.isEmpty()) {
+ if (artifactspattern.isEmpty()) {
throw new BuildException(
- "no artifacts pattern: either provide it through parameter or through ivy.publish.src.artifacts.pattern property");
+ "no artifacts pattern: either provide it through parameter or "
+ + "through ivy.publish.src.artifacts.pattern property");
}
- if (_publishResolverName == null) {
+ if (publishResolverName == null) {
throw new BuildException(
"no publish deliver name: please provide it through parameter 'resolver'");
}
- if ("working".equals(_revision)) {
- _revision = Ivy.getWorkingRevision();
+ if ("working".equals(revision)) {
+ revision = Ivy.getWorkingRevision();
}
- Date pubdate = getPubDate(_pubdate, new Date());
- if (_pubRevision == null) {
- if (_revision.startsWith("working@")) {
- _pubRevision = Ivy.DATE_FORMAT.format(pubdate);
+ Date pubdate = getPubDate(this.pubdate, new Date());
+ if (pubRevision == null) {
+ if (revision.startsWith("working@")) {
+ pubRevision = Ivy.DATE_FORMAT.format(pubdate);
} else {
- _pubRevision = _revision;
+ pubRevision = revision;
}
}
- if (_status == null) {
+ if (status == null) {
throw new BuildException(
- "no status provided: either provide it as parameter or through the ivy.status.default property");
+ "no status provided: either provide it as parameter "
+ + "or through the ivy.status.default property");
}
- ModuleRevisionId mrid = ModuleRevisionId.newInstance(_organisation, _module, _revision);
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation, module, revision);
try {
- File ivyFile = new File(IvyPatternHelper.substitute(_srcivypattern, _organisation,
- _module, _pubRevision, "ivy", "ivy", "xml"));
- if (_publishivy && (!ivyFile.exists() || _forcedeliver)) {
+ File ivyFile = new File(IvyPatternHelper.substitute(srcivypattern, organisation,
+ module, pubRevision, "ivy", "ivy", "xml"));
+ if (publishivy && (!ivyFile.exists() || forcedeliver)) {
IvyDeliver deliver = new IvyDeliver();
deliver.setSettingsRef(getSettingsRef());
deliver.setProject(getProject());
deliver.setCache(getCache());
deliver.setDeliverpattern(getSrcivypattern());
- deliver.setDelivertarget(_deliverTarget);
- deliver.setDeliveryList(_deliveryList);
+ deliver.setDelivertarget(deliverTarget);
+ deliver.setDeliveryList(deliveryList);
deliver.setModule(getModule());
deliver.setOrganisation(getOrganisation());
deliver.setPubdate(Ivy.DATE_FORMAT.format(pubdate));
@@ -285,27 +293,28 @@
deliver.setStatus(getStatus());
deliver.setValidate(doValidate(settings));
deliver.setReplacedynamicrev(isReplacedynamicrev());
- deliver.setConf(_conf);
+ deliver.setConf(conf);
deliver.execute();
}
- Collection missing = ivy.publish(mrid, _artifactspattern, _publishResolverName,
+ Collection missing = ivy.publish(mrid, artifactspattern, publishResolverName,
new PublishOptions().setPubrevision(getPubrevision()).setCache(
- CacheManager.getInstance(settings, _cache)).setSrcIvyPattern(
- _publishivy ? _srcivypattern : null).setStatus(getStatus()).setPubdate(pubdate)
+ CacheManager.getInstance(settings, cache)).setSrcIvyPattern(
+ publishivy ? srcivypattern : null).setStatus(getStatus()).setPubdate(pubdate)
.setExtraArtifacts(
- (Artifact[]) _artifacts.toArray(new Artifact[_artifacts.size()]))
- .setValidate(doValidate(settings)).setOverwrite(_overwrite).setUpdate(
- _update).setConfs(splitConfs(_conf)));
- if (_warnonmissing) {
+ (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]))
+ .setValidate(doValidate(settings)).setOverwrite(overwrite).setUpdate(
+ update).setConfs(splitConfs(conf)));
+ if (warnonmissing) {
for (Iterator iter = missing.iterator(); iter.hasNext();) {
Artifact artifact = (Artifact) iter.next();
Message.warn("missing artifact: " + artifact);
}
}
- if (_haltonmissing && !missing.isEmpty()) {
- throw new BuildException("missing published artifacts for " + mrid + ": " + missing);
+ if (haltonmissing && !missing.isEmpty()) {
+ throw new BuildException(
+ "missing published artifacts for " + mrid + ": " + missing);
}
} catch (Exception e) {
@@ -315,71 +324,71 @@
public PublishArtifact createArtifact() {
PublishArtifact art = new PublishArtifact();
- _artifacts.add(art);
+ artifacts.add(art);
return art;
}
public boolean isPublishivy() {
- return _publishivy;
+ return publishivy;
}
public void setPublishivy(boolean publishivy) {
- _publishivy = publishivy;
+ this.publishivy = publishivy;
}
public boolean isWarnonmissing() {
- return _warnonmissing;
+ return warnonmissing;
}
public void setWarnonmissing(boolean warnonmissing) {
- _warnonmissing = warnonmissing;
+ this.warnonmissing = warnonmissing;
}
public boolean isHaltonmissing() {
- return _haltonmissing;
+ return haltonmissing;
}
public void setHaltonmissing(boolean haltonmissing) {
- _haltonmissing = haltonmissing;
+ this.haltonmissing = haltonmissing;
}
public boolean isOverwrite() {
- return _overwrite;
+ return overwrite;
}
public void setOverwrite(boolean overwrite) {
- _overwrite = overwrite;
+ this.overwrite = overwrite;
}
public void setForcedeliver(boolean b) {
- _forcedeliver = b;
+ forcedeliver = b;
}
public boolean isForcedeliver() {
- return _forcedeliver;
+ return forcedeliver;
}
public boolean isUpdate() {
- return _update;
+ return update;
}
public void setUpdate(boolean update) {
- _update = update;
+ this.update = update;
}
public class PublishArtifact implements Artifact {
- private String _ext;
+ private String ext;
- private String _name;
+ private String name;
- private String _type;
+ private String type;
public String[] getConfigurations() {
return null;
}
public String getExt() {
- return _ext == null ? _type : _ext;
+ return ext == null ? type : ext;
}
public ArtifactRevisionId getId() {
@@ -391,7 +400,7 @@
}
public String getName() {
- return _name;
+ return name;
}
public Date getPublicationDate() {
@@ -399,7 +408,7 @@
}
public String getType() {
- return _type;
+ return type;
}
public URL getUrl() {
@@ -407,15 +416,15 @@
}
public void setExt(String ext) {
- _ext = ext;
+ this.ext = ext;
}
public void setName(String name) {
- _name = name;
+ this.name = name;
}
public void setType(String type) {
- _type = type;
+ this.type = type;
}
public String getAttribute(String attName) {
@@ -444,14 +453,14 @@
}
public static class ArtifactsPattern {
- private String _pattern;
+ private String pattern;
public String getPattern() {
- return _pattern;
+ return pattern;
}
public void setPattern(String pattern) {
- _pattern = pattern;
+ this.pattern = pattern;
}
}
}