You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2014/01/14 09:27:43 UTC
svn commit: r1557968 [3/26] - in /ant/ivy/core/trunk:
src/java/org/apache/ivy/ src/java/org/apache/ivy/ant/
src/java/org/apache/ivy/core/ src/java/org/apache/ivy/core/cache/
src/java/org/apache/ivy/core/check/ src/java/org/apache/ivy/core/deliver/
src/...
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDeliver.java Tue Jan 14 08:27:37 2014
@@ -199,7 +199,7 @@ public class IvyDeliver extends IvyTask
private File deliveryList;
private boolean replacedynamicrev = true;
-
+
private boolean replaceForcedRev = false;
private String resolveId;
@@ -207,9 +207,9 @@ public class IvyDeliver extends IvyTask
private String conf;
private String pubBranch;
-
+
private boolean generateRevConstraint = true;
-
+
private boolean merge = true;
public void setCache(File cache) {
@@ -259,7 +259,7 @@ public class IvyDeliver extends IvyTask
public String getPubbranch() {
return pubBranch;
}
-
+
public void setPubbranch(String pubBranch) {
this.pubBranch = pubBranch;
}
@@ -295,11 +295,11 @@ public class IvyDeliver extends IvyTask
public void setReplacedynamicrev(boolean replacedynamicrev) {
this.replacedynamicrev = replacedynamicrev;
}
-
+
public boolean isReplaceForcedRev() {
return replaceForcedRev;
}
-
+
public void setReplaceForcedRev(boolean replaceForcedRev) {
this.replaceForcedRev = replaceForcedRev;
}
@@ -358,15 +358,13 @@ public class IvyDeliver extends IvyTask
}
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' "
+ 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/>");
}
if (module == null) {
- throw new BuildException(
- "no module name provided for ivy deliver task: "
- + "It can either be set explicitely via the attribute 'module' "
+ 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/>");
}
}
@@ -384,12 +382,12 @@ public class IvyDeliver extends IvyTask
if (deliverpattern == null) {
throw new BuildException(
"deliver ivy pattern is missing: either provide it as parameters "
- + "or through ivy.deliver.ivy.pattern properties");
+ + "or through ivy.deliver.ivy.pattern properties");
}
if (status == null) {
throw new BuildException(
"no status provided: either provide it as parameter or through "
- + "the ivy.status.default property");
+ + "the ivy.status.default property");
}
ModuleRevisionId mrid = null;
@@ -411,13 +409,11 @@ public class IvyDeliver extends IvyTask
drResolver = new DefaultPublishingDRResolver();
}
- DeliverOptions options = new DeliverOptions(status, pubdate,
- drResolver, doValidate(settings), replacedynamicrev, splitConfs(conf))
- .setResolveId(resolveId)
- .setReplaceForcedRevisions(isReplaceForcedRev())
- .setGenerateRevConstraint(generateRevConstraint)
- .setMerge(merge)
- .setPubBranch(pubBranch);
+ DeliverOptions options = new DeliverOptions(status, pubdate, drResolver,
+ doValidate(settings), replacedynamicrev, splitConfs(conf))
+ .setResolveId(resolveId).setReplaceForcedRevisions(isReplaceForcedRev())
+ .setGenerateRevConstraint(generateRevConstraint).setMerge(merge)
+ .setPubBranch(pubBranch);
if (mrid == null) {
ivy.deliver(pubRevision, deliverpattern, options);
} else {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDependency.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDependency.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDependency.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyDependency.java Tue Jan 14 08:27:37 2014
@@ -49,11 +49,11 @@ public class IvyDependency {
private String branch;
private String conf;
-
+
private boolean changing;
-
+
private boolean force;
-
+
private boolean transitive = true;
public IvyDependencyConf createConf() {
@@ -119,32 +119,33 @@ public class IvyDependency {
public void setConf(String conf) {
this.conf = conf;
}
-
+
public boolean isChanging() {
return changing;
}
-
+
public void setChanging(boolean changing) {
this.changing = changing;
}
-
+
public boolean isForce() {
return force;
}
-
+
public void setForce(boolean force) {
this.force = force;
}
-
+
public boolean isTransitive() {
return transitive;
}
-
+
public void setTransitive(boolean transitive) {
this.transitive = transitive;
}
- DependencyDescriptor asDependencyDescriptor(ModuleDescriptor md, String masterConf, IvySettings settings) {
+ DependencyDescriptor asDependencyDescriptor(ModuleDescriptor md, String masterConf,
+ IvySettings settings) {
if (org == null) {
throw new BuildException("'org' is required on ");
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInfo.java Tue Jan 14 08:27:37 2014
@@ -139,8 +139,8 @@ public class IvyInfo extends IvyTask {
setProperties(md, mrid);
}
} catch (MalformedURLException e) {
- throw new BuildException(
- "unable to convert given ivy file to url: " + file + ": " + e, e);
+ throw new BuildException("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);
@@ -159,18 +159,18 @@ public class IvyInfo extends IvyTask {
getProject().setProperty(property + ".status", md.getStatus());
if (md.getPublicationDate() != null) {
getProject().setProperty(property + ".publication",
- Long.toString(md.getPublicationDate().getTime()));
+ Long.toString(md.getPublicationDate().getTime()));
}
Map extra = mrid.getExtraAttributes();
for (Iterator iter = extra.entrySet().iterator(); iter.hasNext();) {
Entry entry = (Entry) iter.next();
- getProject().setProperty(
- property + ".extra." + entry.getKey(), (String) entry.getValue());
+ getProject().setProperty(property + ".extra." + entry.getKey(),
+ (String) entry.getValue());
}
- getProject().setProperty(
- property + ".configurations", mergeConfs(md.getConfigurationsNames()));
+ getProject().setProperty(property + ".configurations",
+ mergeConfs(md.getConfigurationsNames()));
// store the public configurations in a separate property
Configuration[] configs = md.getConfigurations();
@@ -183,27 +183,29 @@ public class IvyInfo extends IvyTask {
if (configs[i].getDescription() != null) {
getProject().setProperty(property + ".configuration." + name + ".desc",
- configs[i].getDescription());
+ configs[i].getDescription());
}
}
- String[] publicConfigs =
- (String[]) publicConfigsList.toArray(new String[publicConfigsList.size()]);
+ String[] publicConfigs = (String[]) publicConfigsList.toArray(new String[publicConfigsList
+ .size()]);
getProject().setProperty(property + ".public.configurations", mergeConfs(publicConfigs));
Artifact[] artifacts = md.getAllArtifacts();
for (int i = 0; i < artifacts.length; i++) {
int id = i + 1;
- getProject().setProperty(property + ".artifact." + id + ".name", artifacts[i].getName());
- getProject().setProperty(property + ".artifact." + id + ".type", artifacts[i].getType());
+ getProject()
+ .setProperty(property + ".artifact." + id + ".name", artifacts[i].getName());
+ getProject()
+ .setProperty(property + ".artifact." + id + ".type", artifacts[i].getType());
getProject().setProperty(property + ".artifact." + id + ".ext", artifacts[i].getExt());
getProject().setProperty(property + ".artifact." + id + ".conf",
- mergeConfs(artifacts[i].getConfigurations()));
+ mergeConfs(artifacts[i].getConfigurations()));
Map artiExtra = artifacts[i].getExtraAttributes();
for (Iterator iter = artiExtra.entrySet().iterator(); iter.hasNext();) {
Entry entry = (Entry) iter.next();
getProject().setProperty(property + ".artifact." + id + ".extra." + entry.getKey(),
- (String) entry.getValue());
+ (String) entry.getValue());
}
}
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyInstall.java Tue Jan 14 08:27:37 2014
@@ -40,7 +40,7 @@ public class IvyInstall extends IvyTask
private String revision;
private String branch;
-
+
private String conf = "*";
private boolean overwrite = false;
@@ -50,7 +50,7 @@ public class IvyInstall extends IvyTask
private String to;
private boolean transitive;
-
+
private String type;
private String matcher = PatternMatcher.EXACT;
@@ -63,32 +63,29 @@ public class IvyInstall extends IvyTask
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
if (organisation == null) {
- throw new BuildException(
- "no organisation provided for ivy publish task: "
+ 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/>");
}
if (module == null && PatternMatcher.EXACT.equals(matcher)) {
- throw new BuildException(
- "no module name provided for ivy publish task: "
+ 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;
}
if (revision == null && PatternMatcher.EXACT.equals(matcher)) {
- throw new BuildException(
- "no module revision provided for ivy publish task: "
+ 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;
}
- if (branch == null && PatternMatcher.EXACT.equals(matcher)) {
- branch = settings.getDefaultBranch(ModuleId.newInstance(organisation, module));
- } else if (branch == null && !PatternMatcher.EXACT.equals(matcher)) {
- branch = PatternMatcher.ANY_EXPRESSION;
- }
+ if (branch == null && PatternMatcher.EXACT.equals(matcher)) {
+ branch = settings.getDefaultBranch(ModuleId.newInstance(organisation, module));
+ } else if (branch == null && !PatternMatcher.EXACT.equals(matcher)) {
+ branch = PatternMatcher.ANY_EXPRESSION;
+ }
if (from == null) {
throw new BuildException(
"no from resolver name: please provide it through parameter 'from'");
@@ -97,20 +94,20 @@ public class IvyInstall extends IvyTask
throw new BuildException(
"no to resolver name: please provide it through parameter 'to'");
}
- ModuleRevisionId mrid =
- ModuleRevisionId.newInstance(organisation, module, branch, revision);
-
+ ModuleRevisionId mrid = ModuleRevisionId
+ .newInstance(organisation, module, branch, revision);
+
ResolveReport report;
try {
- report = ivy.install(mrid, from, to,
- new InstallOptions()
- .setTransitive(transitive)
- .setValidate(doValidate(settings))
- .setOverwrite(overwrite)
- .setConfs(conf.split(","))
- .setArtifactFilter(FilterHelper.getArtifactTypeFilter(type))
- .setMatcherName(matcher)
- .setInstallOriginalMetadata(installOriginalMetadata));
+ report = ivy.install(
+ mrid,
+ from,
+ to,
+ new InstallOptions().setTransitive(transitive).setValidate(doValidate(settings))
+ .setOverwrite(overwrite).setConfs(conf.split(","))
+ .setArtifactFilter(FilterHelper.getArtifactTypeFilter(type))
+ .setMatcherName(matcher)
+ .setInstallOriginalMetadata(installOriginalMetadata));
} catch (Exception e) {
throw new BuildException("impossible to install " + mrid + ": " + e, e);
}
@@ -141,13 +138,13 @@ public class IvyInstall extends IvyTask
this.module = module;
}
- public String getBranch() {
- return branch;
- }
-
- public void setBranch(String branch) {
- this.branch = branch;
- }
+ public String getBranch() {
+ return branch;
+ }
+
+ public void setBranch(String branch) {
+ this.branch = branch;
+ }
public String getOrganisation() {
return organisation;
@@ -212,11 +209,11 @@ public class IvyInstall extends IvyTask
public void setMatcher(String matcher) {
this.matcher = matcher;
}
-
+
public String getConf() {
return conf;
}
-
+
public void setConf(String conf) {
this.conf = conf;
}
@@ -224,7 +221,7 @@ public class IvyInstall extends IvyTask
public boolean isInstallOriginalMetadata() {
return installOriginalMetadata;
}
-
+
public void setInstallOriginalMetadata(boolean installOriginalMetadata) {
this.installOriginalMetadata = installOriginalMetadata;
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyListModules.java Tue Jan 14 08:27:37 2014
@@ -44,7 +44,7 @@ public class IvyListModules extends IvyT
private String property;
private String value;
-
+
private String resolver;
public String getMatcher() {
@@ -102,11 +102,11 @@ public class IvyListModules extends IvyT
public void setBranch(String branch) {
this.branch = branch;
}
-
+
public void setResolver(String resolver) {
this.resolver = resolver;
}
-
+
public String getResolver() {
return resolver;
}
@@ -130,23 +130,25 @@ public class IvyListModules extends IvyT
Ivy ivy = getIvyInstance();
IvySettings settings = ivy.getSettings();
-
+
SearchEngine searcher = new SearchEngine(settings);
PatternMatcher patternMatcher = settings.getMatcher(matcher);
-
+
ModuleRevisionId[] mrids;
if (resolver == null) {
- mrids = searcher.listModules(ModuleRevisionId.newInstance(organisation,
- module, branch, revision), patternMatcher);
+ mrids = searcher.listModules(
+ ModuleRevisionId.newInstance(organisation, module, branch, revision),
+ patternMatcher);
} else {
DependencyResolver depResolver = settings.getResolver(resolver);
if (depResolver == null) {
throw new BuildException("Unknown resolver: " + resolver);
}
- mrids = searcher.listModules(depResolver, ModuleRevisionId.newInstance(organisation,
- module, branch, revision), patternMatcher);
+ mrids = searcher.listModules(depResolver,
+ ModuleRevisionId.newInstance(organisation, module, branch, revision),
+ patternMatcher);
}
-
+
for (int i = 0; i < mrids.length; i++) {
String name = IvyPatternHelper.substitute(settings.substitute(property), mrids[i]);
String value = IvyPatternHelper.substitute(settings.substitute(this.value), mrids[i]);
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyMakePom.java Tue Jan 14 08:27:37 2014
@@ -42,17 +42,21 @@ import org.apache.tools.ant.Project;
public class IvyMakePom extends IvyTask {
public class Mapping {
private String conf;
+
private String scope;
-
+
public String getConf() {
return conf;
}
+
public void setConf(String conf) {
this.conf = conf;
}
+
public String getScope() {
return scope;
}
+
public void setScope(String scope) {
this.scope = scope;
}
@@ -60,77 +64,96 @@ public class IvyMakePom extends IvyTask
public class Dependency {
private String group = null;
+
private String artifact = null;
+
private String version = null;
+
private String scope = null;
+
private String type = null;
+
private String classifier = null;
+
private boolean optional = false;
-
+
public String getGroup() {
return group;
}
+
public void setGroup(String group) {
this.group = group;
}
+
public String getArtifact() {
return artifact;
}
+
public void setArtifact(String artifact) {
this.artifact = artifact;
}
+
public String getVersion() {
return version;
}
+
public void setVersion(String version) {
this.version = version;
}
+
public String getScope() {
return scope;
}
+
public void setScope(String scope) {
this.scope = scope;
}
+
public String getType() {
return type;
}
+
public void setType(String type) {
this.type = type;
}
+
public String getClassifier() {
return classifier;
}
+
public void setClassifier(String classifier) {
this.classifier = classifier;
}
+
public boolean getOptional() {
return optional;
}
+
public void setOptional(boolean optional) {
this.optional = optional;
- }
+ }
}
-
+
private String artifactName;
-
+
private String artifactPackaging;
private File pomFile = null;
private File headerFile = null;
-
+
private File templateFile = null;
-
+
private boolean printIvyInfo = true;
private String conf;
-
+
private File ivyFile = null;
-
+
private String description;
private Collection mappings = new ArrayList();
-
+
private Collection dependencies = new ArrayList();
public File getPomFile() {
@@ -156,15 +179,15 @@ public class IvyMakePom extends IvyTask
public void setHeaderFile(File headerFile) {
this.headerFile = headerFile;
}
-
+
public File getTemplateFile() {
return templateFile;
}
-
+
public void setTemplateFile(File templateFile) {
this.templateFile = templateFile;
}
-
+
public String getDescription() {
return description;
}
@@ -184,11 +207,11 @@ public class IvyMakePom extends IvyTask
public String getConf() {
return conf;
}
-
+
public void setConf(String conf) {
this.conf = conf;
}
-
+
public String getArtifactName() {
return artifactName;
}
@@ -210,13 +233,13 @@ public class IvyMakePom extends IvyTask
this.mappings.add(mapping);
return mapping;
}
-
+
public Dependency createDependency() {
Dependency dependency = new Dependency();
this.dependencies.add(dependency);
return dependency;
}
-
+
public void doExecute() throws BuildException {
try {
if (ivyFile == null) {
@@ -239,25 +262,22 @@ public class IvyMakePom extends IvyTask
+ " from=" + ivyFile + " to=" + pomFile, e);
}
}
-
+
private PomWriterOptions getPomWriterOptions() throws IOException {
PomWriterOptions options = new PomWriterOptions();
- options.setConfs(splitConfs(conf))
- .setArtifactName(getArtifactName())
- .setArtifactPackaging(getArtifactPackaging())
- .setPrintIvyInfo(isPrintIvyInfo())
- .setDescription(getDescription())
- .setExtraDependencies(getDependencies())
- .setTemplate(getTemplateFile());
-
+ options.setConfs(splitConfs(conf)).setArtifactName(getArtifactName())
+ .setArtifactPackaging(getArtifactPackaging()).setPrintIvyInfo(isPrintIvyInfo())
+ .setDescription(getDescription()).setExtraDependencies(getDependencies())
+ .setTemplate(getTemplateFile());
+
if (!mappings.isEmpty()) {
options.setMapping(new PomWriterOptions.ConfigurationScopeMapping(getMappingsMap()));
}
-
+
if (headerFile != null) {
options.setLicenseHeader(FileUtil.readEntirely(getHeaderFile()));
}
-
+
return options;
}
@@ -274,14 +294,14 @@ public class IvyMakePom extends IvyTask
}
return mappingsMap;
}
-
+
private List getDependencies() {
List result = new ArrayList();
for (Iterator iter = dependencies.iterator(); iter.hasNext();) {
Dependency dependency = (Dependency) iter.next();
- result.add(new PomWriterOptions.ExtraDependency(dependency.getGroup(),
- dependency.getArtifact(), dependency.getVersion(), dependency.getScope(),
- dependency.getType(), dependency.getClassifier(), dependency.getOptional()));
+ result.add(new PomWriterOptions.ExtraDependency(dependency.getGroup(), dependency
+ .getArtifact(), dependency.getVersion(), dependency.getScope(), dependency
+ .getType(), dependency.getClassifier(), dependency.getOptional()));
}
return result;
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Tue Jan 14 08:27:37 2014
@@ -49,7 +49,7 @@ public abstract class IvyPostResolveTask
private boolean inline = false;
private String organisation;
-
+
private String branch = null;
private String module;
@@ -57,7 +57,7 @@ public abstract class IvyPostResolveTask
private String revision = "latest.integration";
private String resolveId;
-
+
private String type;
private File file;
@@ -67,13 +67,13 @@ public abstract class IvyPostResolveTask
private boolean useOrigin = false;
private Boolean keep = null;
-
+
private boolean refresh = false;
-
+
private String resolveMode = null;
private String log = ResolveOptions.LOG_DEFAULT;
-
+
private boolean changing = false;
private IvyResolve resolve = new IvyResolve();
@@ -85,7 +85,7 @@ public abstract class IvyPostResolveTask
public void setUseOrigin(boolean useOrigin) {
this.useOrigin = useOrigin;
}
-
+
public String getLog() {
return log;
}
@@ -127,18 +127,18 @@ public abstract class IvyPostResolveTask
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");
+ + "It can either be set explicitely via the attribute 'organisation' "
+ + "or via 'ivy.organisation' property");
}
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");
+ + "It can either be set explicitely via the attribute 'module' "
+ + "or via 'ivy.module' property");
}
String[] toResolve = getConfsToResolve(getOrganisation(), getModule() + "-caller",
conf, true);
- //When we make an inline resolution, we can not resolve private confs.
+ // When we make an inline resolution, we can not resolve private confs.
for (int i = 0; i < toResolve.length; i++) {
if ("*".equals(toResolve[i])) {
toResolve[i] = "*(public)";
@@ -164,8 +164,9 @@ public abstract class IvyPostResolveTask
+ getModule() + " " + getRevision() + " (" + conf + ")");
}
if ("*".equals(conf)) {
- conf = StringUtils.join(getResolvedConfigurations(getOrganisation(), getModule()
- + "-caller", true), ", ");
+ conf = StringUtils.join(
+ getResolvedConfigurations(getOrganisation(), getModule() + "-caller", true),
+ ", ");
}
} else {
Message.debug("using standard ensure resolved");
@@ -182,8 +183,7 @@ public abstract class IvyPostResolveTask
if ("*".equals(conf)) {
conf = getProperty(settings, "ivy.resolved.configurations");
if (conf == null) {
- throw new BuildException(
- "bad conf provided for ivy cache task: "
+ throw new BuildException("bad conf provided for ivy cache task: "
+ "'*' can only be used with a prior call to <resolve/>");
}
}
@@ -191,20 +191,17 @@ public abstract class IvyPostResolveTask
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: "
+ 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/>");
}
if (module == null) {
- throw new BuildException(
- "no module name provided for ivy cache task: "
+ 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/>");
}
if (conf == null) {
- throw new BuildException(
- "no conf provided for ivy cache task: "
+ 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/>");
}
@@ -272,9 +269,9 @@ public abstract class IvyPostResolveTask
} else {
confs = splitConfs(conf);
}
-
+
HashSet rconfsSet = new HashSet(Arrays.asList(rconfs));
-
+
// for each resolved configuration, check if the report still exists
ResolutionCacheManager cache = getSettings().getResolutionCacheManager();
for (Iterator it = rconfsSet.iterator(); it.hasNext();) {
@@ -289,7 +286,7 @@ public abstract class IvyPostResolveTask
it.remove();
}
}
-
+
HashSet confsSet = new HashSet(Arrays.asList(confs));
Message.debug("resolved configurations: " + rconfsSet);
Message.debug("asked configurations: " + confsSet);
@@ -319,8 +316,8 @@ public abstract class IvyPostResolveTask
}
protected ModuleRevisionId getResolvedMrid() {
- return new ModuleRevisionId(getResolvedModuleId(), getRevision() == null ? Ivy
- .getWorkingRevision() : getRevision());
+ return new ModuleRevisionId(getResolvedModuleId(),
+ getRevision() == null ? Ivy.getWorkingRevision() : getRevision());
}
protected ModuleId getResolvedModuleId() {
@@ -436,11 +433,11 @@ public abstract class IvyPostResolveTask
public boolean isKeep() {
return this.keep == null ? !isInline() : this.keep.booleanValue();
}
-
+
public void setChanging(boolean changing) {
this.changing = changing;
}
-
+
public boolean isChanging() {
return this.changing;
}
@@ -452,7 +449,7 @@ public abstract class IvyPostResolveTask
public boolean isRefresh() {
return refresh;
}
-
+
public String getResolveMode() {
return resolveMode;
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPublish.java Tue Jan 14 08:27:37 2014
@@ -74,7 +74,7 @@ public class IvyPublish extends IvyTask
private boolean overwrite = false;
private boolean update = false;
-
+
private boolean merge = true;
private boolean replacedynamicrev = true;
@@ -146,7 +146,7 @@ public class IvyPublish extends IvyTask
public String getPubbranch() {
return pubBranch;
}
-
+
public void setPubbranch(String pubBranch) {
this.pubBranch = pubBranch;
}
@@ -240,27 +240,24 @@ public class IvyPublish extends IvyTask
}
status = getProperty(status, settings, "ivy.status");
if (organisation == null) {
- throw new BuildException(
- "no organisation provided for ivy publish task: "
+ 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/>");
}
if (module == null) {
- throw new BuildException(
- "no module name provided for ivy publish task: "
+ 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/>");
}
if (revision == null) {
- throw new BuildException(
- "no module revision provided for ivy publish task: "
+ 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/>");
}
if (artifactspattern.isEmpty()) {
throw new BuildException(
"no artifacts pattern: either provide it through parameter or "
- + "through ivy.publish.src.artifacts.pattern property");
+ + "through ivy.publish.src.artifacts.pattern property");
}
if (publishResolverName == null) {
throw new BuildException(
@@ -278,14 +275,14 @@ public class IvyPublish extends IvyTask
}
}
if (status == null) {
- throw new BuildException(
- "no status provided: either provide it as parameter "
+ throw new BuildException("no status provided: either provide it as parameter "
+ "or through the ivy.status.default property");
}
ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation, module, revision);
try {
- File ivyFile = getProject().resolveFile(IvyPatternHelper.substitute(
- srcivypattern, organisation, module, pubRevision, "ivy", "ivy", "xml"));
+ File ivyFile = getProject().resolveFile(
+ IvyPatternHelper.substitute(srcivypattern, organisation, module, pubRevision,
+ "ivy", "ivy", "xml"));
if (publishivy && (!ivyFile.exists() || forcedeliver)) {
IvyDeliver deliver = new IvyDeliver();
deliver.setSettingsRef(getSettingsRef());
@@ -309,22 +306,21 @@ public class IvyPublish extends IvyTask
deliver.execute();
}
- ivy.publish(mrid, artifactspattern, publishResolverName,
+ ivy.publish(
+ mrid,
+ artifactspattern,
+ publishResolverName,
new PublishOptions()
- .setPubrevision(getPubrevision())
- .setPubbranch(getPubbranch())
- .setSrcIvyPattern(publishivy ? srcivypattern : null)
- .setStatus(getStatus())
- .setPubdate(pubdate)
- .setExtraArtifacts(
- (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]))
- .setValidate(doValidate(settings))
- .setOverwrite(overwrite)
- .setUpdate(update)
- .setMerge(merge)
- .setWarnOnMissing(warnonmissing)
- .setHaltOnMissing(haltonmissing)
- .setConfs(splitConfs(conf)));
+ .setPubrevision(getPubrevision())
+ .setPubbranch(getPubbranch())
+ .setSrcIvyPattern(publishivy ? srcivypattern : null)
+ .setStatus(getStatus())
+ .setPubdate(pubdate)
+ .setExtraArtifacts(
+ (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()]))
+ .setValidate(doValidate(settings)).setOverwrite(overwrite)
+ .setUpdate(update).setMerge(merge).setWarnOnMissing(warnonmissing)
+ .setHaltOnMissing(haltonmissing).setConfs(splitConfs(conf)));
} catch (Exception e) {
if (e instanceof BuildException) {
throw (BuildException) e;
@@ -393,7 +389,7 @@ public class IvyPublish extends IvyTask
private String name;
private String type;
-
+
private Map extra = new HashMap();
public String[] getConfigurations() {
@@ -455,7 +451,7 @@ public class IvyPublish extends IvyTask
public Map getExtraAttributes() {
return extra;
}
-
+
public Map getQualifiedExtraAttributes() {
return extra;
}
@@ -463,7 +459,7 @@ public class IvyPublish extends IvyTask
public boolean isMetadata() {
return false;
}
-
+
public void setDynamicAttribute(String name, String value) {
extra.put(name, value);
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyReport.java Tue Jan 14 08:27:37 2014
@@ -82,7 +82,7 @@ public class IvyReport extends IvyTask {
private List params = new ArrayList();
private String resolveId;
-
+
private ModuleRevisionId mRevId;
public File getTodir() {
@@ -120,7 +120,7 @@ public class IvyReport extends IvyTask {
public void setOrganisation(String organisation) {
this.organisation = organisation;
}
-
+
public boolean isGraph() {
return graph;
}
@@ -162,8 +162,7 @@ public class IvyReport extends IvyTask {
conf = getProperty(settings, "ivy.resolved.configurations", resolveId);
}
if (conf == null) {
- throw new BuildException(
- "no conf provided for ivy report task: "
+ throw new BuildException("no conf provided for ivy report task: "
+ "It can either be set explicitely via the attribute 'conf' or "
+ "via 'ivy.resolved.configurations' property or a prior call to <resolve/>");
}
@@ -184,24 +183,22 @@ public class IvyReport extends IvyTask {
if (todir != null && todir.exists() && !todir.isDirectory()) {
throw new BuildException("destination directory should be a directory !");
}
-
+
if (resolveId == null) {
organisation = getProperty(organisation, settings, "ivy.organisation", resolveId);
module = getProperty(module, settings, "ivy.module", resolveId);
if (organisation == null) {
- throw new BuildException(
- "no organisation provided for ivy report task: "
+ throw new BuildException("no organisation provided for ivy report 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) {
- throw new BuildException(
- "no module name provided for ivy report task: "
+ throw new BuildException("no module name provided for ivy report task: "
+ "It can either be set explicitely via the attribute 'module' or "
+ "via 'ivy.module' property or a prior call to <resolve/>");
}
-
+
resolveId = ResolveOptions.getDefaultResolveId(new ModuleId(organisation, module));
}
@@ -214,20 +211,17 @@ public class IvyReport extends IvyTask {
genxml(confs);
}
if (graph) {
- genStyled(confs,
- getStylePath("ivy-report-graph.xsl"), "graphml");
+ genStyled(confs, getStylePath("ivy-report-graph.xsl"), "graphml");
}
if (dot) {
- genStyled(confs,
- getStylePath("ivy-report-dot.xsl"), "dot");
+ genStyled(confs, getStylePath("ivy-report-dot.xsl"), "dot");
}
} catch (IOException e) {
throw new BuildException("impossible to generate report: " + e, e);
}
}
- private void genxml(String[] confs)
- throws IOException {
+ private void genxml(String[] confs) throws IOException {
ResolutionCacheManager cacheMgr = getIvyInstance().getResolutionCacheManager();
for (int i = 0; i < confs.length; i++) {
File xml = cacheMgr.getConfigurationResolveReportInCache(resolveId, confs[i]);
@@ -243,8 +237,7 @@ public class IvyReport extends IvyTask {
}
}
- private void genreport(String[] confs)
- throws IOException {
+ private void genreport(String[] confs) throws IOException {
genStyled(confs, getReportStylePath(), xslext);
// copy the css if required
@@ -255,7 +248,7 @@ public class IvyReport extends IvyTask {
} else {
css = getProject().resolveFile("ivy-report.css");
}
-
+
if (!css.exists()) {
Message.debug("copying report css to " + css.getAbsolutePath());
FileUtil.copy(XmlReportOutputter.class.getResourceAsStream("ivy-report.css"), css,
@@ -274,33 +267,33 @@ public class IvyReport extends IvyTask {
File style = new File(cacheMgr.getResolutionCacheRoot(), "ivy-report.xsl");
if (!style.exists()) {
Message.debug("copying ivy-report.xsl to " + style.getAbsolutePath());
- FileUtil.copy(XmlReportOutputter.class.getResourceAsStream("ivy-report.xsl"), style, null);
+ FileUtil.copy(XmlReportOutputter.class.getResourceAsStream("ivy-report.xsl"), style,
+ null);
}
return style;
}
-
+
private String getOutputPattern(String conf, String ext) {
if (mRevId == null) {
ResolutionCacheManager cacheMgr = getIvyInstance().getResolutionCacheManager();
-
+
XmlReportParser parser = new XmlReportParser();
- File reportFile = cacheMgr.getConfigurationResolveReportInCache (resolveId, conf);
-
+ File reportFile = cacheMgr.getConfigurationResolveReportInCache(resolveId, conf);
+
try {
parser.parse(reportFile);
} catch (ParseException e) {
- throw new BuildException(
- "Error occurred while parsing reportfile '"
- + reportFile.getAbsolutePath() + "'", e);
+ throw new BuildException("Error occurred while parsing reportfile '"
+ + reportFile.getAbsolutePath() + "'", e);
}
-
+
// get the resolve module
mRevId = parser.getResolvedModule();
}
-
- return IvyPatternHelper.substitute(
- outputpattern, mRevId.getOrganisation(), mRevId.getName(),
- mRevId.getRevision(), "", "", ext, conf, mRevId.getQualifiedExtraAttributes(), null);
+
+ return IvyPatternHelper.substitute(outputpattern, mRevId.getOrganisation(),
+ mRevId.getName(), mRevId.getRevision(), "", "", ext, conf,
+ mRevId.getQualifiedExtraAttributes(), null);
}
private void genStyled(String[] confs, File style, String ext) throws IOException {
@@ -313,45 +306,44 @@ public class IvyReport extends IvyTask {
} else {
out = getProject().getBaseDir();
}
-
+
InputStream xsltStream = null;
try {
// create stream to stylesheet
xsltStream = new BufferedInputStream(new FileInputStream(style));
Source xsltSource = new StreamSource(xsltStream, JAXPUtils.getSystemId(style));
-
+
// create transformer
TransformerFactory tFactory = TransformerFactory.newInstance();
Transformer transformer = tFactory.newTransformer(xsltSource);
-
+
// add standard parameters
transformer.setParameter("confs", conf);
transformer.setParameter("extension", xslext);
-
+
// add the provided XSLT parameters
for (Iterator it = params.iterator(); it.hasNext();) {
XSLTProcess.Param param = (XSLTProcess.Param) it.next();
transformer.setParameter(param.getName(), param.getExpression());
}
-
+
// create the report
for (int i = 0; i < confs.length; i++) {
- File reportFile =
- cacheMgr.getConfigurationResolveReportInCache (resolveId, confs[i]);
- File outFile =
- new File(out, getOutputPattern(confs[i], ext));
-
+ File reportFile = cacheMgr
+ .getConfigurationResolveReportInCache(resolveId, confs[i]);
+ File outFile = new File(out, getOutputPattern(confs[i], ext));
+
log("Processing " + reportFile + " to " + outFile);
-
+
// make sure the output directory exist
File outFileDir = outFile.getParentFile();
if (!outFileDir.exists()) {
if (!outFileDir.mkdirs()) {
throw new BuildException("Unable to create directory: "
- + outFileDir.getAbsolutePath());
+ + outFileDir.getAbsolutePath());
}
}
-
+
InputStream inStream = null;
OutputStream outStream = null;
try {
@@ -369,7 +361,7 @@ public class IvyReport extends IvyTask {
} catch (IOException e) {
// ignore
}
- }
+ }
if (outStream != null) {
try {
outStream.close();
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRepositoryReport.java Tue Jan 14 08:27:37 2014
@@ -80,8 +80,7 @@ public class IvyRepositoryReport extends
throw new BuildException("xsl file is mandatory when using xsl generation");
}
if (module == null && PatternMatcher.EXACT.equals(matcher)) {
- throw new BuildException(
- "no module name provided for ivy repository graph task: "
+ throw new BuildException("no module name provided for ivy repository graph 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)) {
@@ -91,28 +90,26 @@ public class IvyRepositoryReport extends
try {
ModuleRevisionId criteria = null;
-
+
if ((revision == null) || settings.getVersionMatcher().isDynamic(mrid)) {
criteria = new ModuleRevisionId(new ModuleId(organisation, module), branch, "*");
} else {
- criteria = new ModuleRevisionId(
- new ModuleId(organisation, module), branch, revision);
+ criteria = new ModuleRevisionId(new ModuleId(organisation, module), branch,
+ revision);
}
-
+
ModuleRevisionId[] mrids = ivy.listModules(criteria, settings.getMatcher(matcher));
-
+
// replace all found revisions with the original requested revision
Set modules = new HashSet();
for (int i = 0; i < mrids.length; i++) {
modules.add(ModuleRevisionId.newInstance(mrids[i], revision));
}
-
+
mrids = (ModuleRevisionId[]) modules.toArray(new ModuleRevisionId[modules.size()]);
ModuleDescriptor md = DefaultModuleDescriptor.newCallerInstance(mrids, true, false);
String resolveId = ResolveOptions.getDefaultResolveId(md);
- ResolveReport report = ivy.resolve(md,
- new ResolveOptions()
- .setResolveId(resolveId)
+ ResolveReport report = ivy.resolve(md, new ResolveOptions().setResolveId(resolveId)
.setValidate(doValidate(settings)));
ResolutionCacheManager cacheMgr = getIvyInstance().getResolutionCacheManager();
@@ -170,8 +167,8 @@ public class IvyRepositoryReport extends
private void gengraph(ResolutionCacheManager cache, String organisation, String module)
throws IOException {
- gen(cache, organisation, module,
- getGraphStylePath(cache.getResolutionCacheRoot()), "graphml");
+ gen(cache, organisation, module, getGraphStylePath(cache.getResolutionCacheRoot()),
+ "graphml");
}
private String getGraphStylePath(File cache) throws IOException {
@@ -183,8 +180,8 @@ public class IvyRepositoryReport extends
return style.getAbsolutePath();
}
- private void gendot(
- ResolutionCacheManager cache, String organisation, String module) throws IOException {
+ private void gendot(ResolutionCacheManager cache, String organisation, String module)
+ throws IOException {
gen(cache, organisation, module, getDotStylePath(cache.getResolutionCacheRoot()), "dot");
}
@@ -197,8 +194,8 @@ public class IvyRepositoryReport extends
return style.getAbsolutePath();
}
- private void gen(ResolutionCacheManager cache, String organisation, String module, String style,
- String ext) throws IOException {
+ private void gen(ResolutionCacheManager cache, String organisation, String module,
+ String style, String ext) throws IOException {
XSLTProcess xslt = new XSLTProcess();
xslt.setTaskName(getTaskName());
xslt.setProject(getProject());
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java Tue Jan 14 08:27:37 2014
@@ -54,7 +54,7 @@ public class IvyResolve extends IvyTask
private String organisation = null;
private String module = null;
-
+
private String branch = null;
private String revision = null;
@@ -82,14 +82,14 @@ public class IvyResolve extends IvyTask
private String failureProperty = null;
private boolean useOrigin = false;
-
+
private String resolveMode = null;
private String resolveId = null;
-
+
private String log = ResolveOptions.LOG_DEFAULT;
- private boolean checkIfChanged = true; //for backward compatibility
+ private boolean checkIfChanged = true; // for backward compatibility
private List/* <IvyDependency> */dependencies = new ArrayList();
@@ -120,7 +120,7 @@ public class IvyResolve extends IvyTask
public void setRevision(String revision) {
this.revision = revision;
}
-
+
public String getBranch() {
return branch;
}
@@ -176,7 +176,7 @@ public class IvyResolve extends IvyTask
public void setType(String type) {
this.type = type;
}
-
+
public boolean isRefresh() {
return refresh;
}
@@ -184,7 +184,7 @@ public class IvyResolve extends IvyTask
public void setRefresh(boolean refresh) {
this.refresh = refresh;
}
-
+
public String getLog() {
return log;
}
@@ -258,11 +258,12 @@ public class IvyResolve extends IvyTask
throw new BuildException("'file' not allowed with child elements");
}
if (!getAllowedLogOptions().contains(log)) {
- throw new BuildException("invalid option for 'log': " + log
- + ". Available options are " + getAllowedLogOptions());
+ throw new BuildException("invalid option for 'log': " + log
+ + ". Available options are " + getAllowedLogOptions());
}
- ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "", Ivy.getWorkingRevision());
+ ModuleRevisionId mrid = ModuleRevisionId.newInstance("", "",
+ Ivy.getWorkingRevision());
DefaultModuleDescriptor md = DefaultModuleDescriptor.newBasicInstance(mrid, null);
Iterator itDeps = dependencies.iterator();
@@ -286,7 +287,8 @@ public class IvyResolve extends IvyTask
conflict.addConflict(md, settings);
}
- report = ivy.resolve(md, getResolveOptions(ivy, new String[] {"default"}, settings));
+ report = ivy
+ .resolve(md, getResolveOptions(ivy, new String[] {"default"}, settings));
} else if (isInline()) {
if (organisation == null) {
throw new BuildException("'organisation' is required when using inline mode");
@@ -298,8 +300,8 @@ public class IvyResolve extends IvyTask
throw new BuildException("'file' not allowed when using inline mode");
}
if (!getAllowedLogOptions().contains(log)) {
- throw new BuildException("invalid option for 'log': " + log
- + ". Available options are " + getAllowedLogOptions());
+ throw new BuildException("invalid option for 'log': " + log
+ + ". Available options are " + getAllowedLogOptions());
}
for (int i = 0; i < confs.length; i++) {
if ("*".equals(confs[i])) {
@@ -309,10 +311,10 @@ public class IvyResolve extends IvyTask
if (revision == null) {
revision = "latest.integration";
}
- report = ivy.resolve(ModuleRevisionId
- .newInstance(organisation, module, branch, revision),
- getResolveOptions(ivy, confs, settings), changing);
-
+ report = ivy.resolve(
+ ModuleRevisionId.newInstance(organisation, module, branch, revision),
+ getResolveOptions(ivy, confs, settings), changing);
+
} else {
if (organisation != null) {
throw new BuildException(
@@ -393,11 +395,10 @@ public class IvyResolve extends IvyTask
getProject().setProperty("ivy.revision." + resolveId, mdRev);
settings.setVariable("ivy.revision." + resolveId, mdRev);
if (getCheckIfChanged()) {
- //hasChanged has already been set earlier
+ // hasChanged has already been set earlier
getProject().setProperty("ivy.deps.changed." + resolveId,
hasChanged.toString());
- settings.setVariable("ivy.deps.changed." + resolveId,
- hasChanged.toString());
+ settings.setVariable("ivy.deps.changed." + resolveId, hasChanged.toString());
}
getProject().setProperty("ivy.resolved.configurations." + resolveId,
mergeConfs(confs));
@@ -406,14 +407,14 @@ public class IvyResolve extends IvyTask
if (file != null) {
getProject().setProperty("ivy.resolved.file." + resolveId,
file.getAbsolutePath());
- settings.setVariable(
- "ivy.resolved.file." + resolveId, file.getAbsolutePath());
+ settings.setVariable("ivy.resolved.file." + resolveId,
+ file.getAbsolutePath());
}
}
}
} catch (MalformedURLException e) {
- throw new BuildException(
- "unable to convert given ivy file to url: " + file + ": " + e, e);
+ throw new BuildException("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);
@@ -424,28 +425,21 @@ public class IvyResolve extends IvyTask
}
}
- protected Collection/*<String>*/ getAllowedLogOptions() {
- return Arrays.asList(new String [] {
- LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY, LogOptions.LOG_QUIET});
+ protected Collection/* <String> */getAllowedLogOptions() {
+ return Arrays.asList(new String[] {LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY,
+ LogOptions.LOG_QUIET});
}
private ResolveOptions getResolveOptions(Ivy ivy, String[] confs, IvySettings settings) {
if (useOrigin) {
settings.useDeprecatedUseOrigin();
}
- return ((ResolveOptions) new ResolveOptions()
- .setLog(log))
- .setConfs(confs)
+ return ((ResolveOptions) new ResolveOptions().setLog(log)).setConfs(confs)
.setValidate(doValidate(settings))
- .setArtifactFilter(FilterHelper.getArtifactTypeFilter(type))
- .setRevision(revision)
- .setDate(getPubDate(pubdate, null))
- .setUseCacheOnly(useCacheOnly)
- .setRefresh(refresh)
- .setTransitive(transitive)
- .setResolveMode(resolveMode)
- .setResolveId(resolveId)
- .setCheckIfChanged(checkIfChanged);
+ .setArtifactFilter(FilterHelper.getArtifactTypeFilter(type)).setRevision(revision)
+ .setDate(getPubDate(pubdate, null)).setUseCacheOnly(useCacheOnly)
+ .setRefresh(refresh).setTransitive(transitive).setResolveMode(resolveMode)
+ .setResolveId(resolveId).setCheckIfChanged(checkIfChanged);
}
public String getModule() {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyRetrieve.java Tue Jan 14 08:27:37 2014
@@ -37,11 +37,10 @@ import org.apache.tools.ant.util.FileNam
* This task allow to retrieve dependencies from the cache to a local directory like a lib dir.
*/
public class IvyRetrieve extends IvyPostResolveTask {
-
+
private static final Collection OVERWRITEMODE_VALUES = Arrays.asList(new String[] {
RetrieveOptions.OVERWRITEMODE_ALWAYS, RetrieveOptions.OVERWRITEMODE_NEVER,
- RetrieveOptions.OVERWRITEMODE_NEWER, RetrieveOptions.OVERWRITEMODE_DIFFERENT
- });
+ RetrieveOptions.OVERWRITEMODE_NEWER, RetrieveOptions.OVERWRITEMODE_DIFFERENT});
private String pattern;
@@ -52,13 +51,13 @@ public class IvyRetrieve extends IvyPost
private boolean symlink = false;
private boolean symlinkmass = false;
-
+
private String overwriteMode = RetrieveOptions.OVERWRITEMODE_NEWER;
private String pathId = null;
private String setId = null;
-
+
private Mapper mapper = null;
public String getPattern() {
@@ -89,28 +88,22 @@ public class IvyRetrieve extends IvyPost
prepareAndCheck();
if (!getAllowedLogOptions().contains(getLog())) {
- throw new BuildException("invalid option for 'log': " + getLog()
- + ". Available options are " + getAllowedLogOptions());
+ throw new BuildException("invalid option for 'log': " + getLog()
+ + ". Available options are " + getAllowedLogOptions());
}
pattern = getProperty(pattern, getSettings(), "ivy.retrieve.pattern");
try {
Filter artifactFilter = getArtifactFilter();
RetrieveReport report = getIvyInstance().retrieve(
- getResolvedMrid(),
- ((RetrieveOptions) new RetrieveOptions()
- .setLog(getLog()))
- .setConfs(splitConfs(getConf()))
- .setDestArtifactPattern(pattern)
- .setDestIvyPattern(ivypattern)
- .setArtifactFilter(artifactFilter)
- .setSync(sync)
- .setOverwriteMode(getOverwriteMode())
- .setUseOrigin(isUseOrigin())
- .setMakeSymlinks(symlink)
- .setMakeSymlinksInMass(symlinkmass)
- .setResolveId(getResolveId())
- .setMapper(mapper == null ? null : new MapperAdapter(mapper)));
+ getResolvedMrid(),
+ ((RetrieveOptions) new RetrieveOptions().setLog(getLog()))
+ .setConfs(splitConfs(getConf())).setDestArtifactPattern(pattern)
+ .setDestIvyPattern(ivypattern).setArtifactFilter(artifactFilter)
+ .setSync(sync).setOverwriteMode(getOverwriteMode())
+ .setUseOrigin(isUseOrigin()).setMakeSymlinks(symlink)
+ .setMakeSymlinksInMass(symlinkmass).setResolveId(getResolveId())
+ .setMapper(mapper == null ? null : new MapperAdapter(mapper)));
int targetsCopied = report.getNbrArtifactsCopied();
boolean haveTargetsBeenCopied = targetsCopied > 0;
@@ -121,7 +114,7 @@ public class IvyRetrieve extends IvyPost
Path path = new Path(getProject());
getProject().addReference(getPathId(), path);
- for (Iterator iter = report.getRetrievedFiles().iterator(); iter.hasNext(); ) {
+ for (Iterator iter = report.getRetrievedFiles().iterator(); iter.hasNext();) {
path.createPathElement().setLocation((File) iter.next());
}
}
@@ -133,7 +126,7 @@ public class IvyRetrieve extends IvyPost
fileset.setDir(report.getRetrieveRoot());
- for (Iterator iter = report.getRetrievedFiles().iterator(); iter.hasNext(); ) {
+ for (Iterator iter = report.getRetrievedFiles().iterator(); iter.hasNext();) {
PatternSet.NameEntry ne = fileset.createInclude();
ne.setName(getPath(report.getRetrieveRoot(), (File) iter.next()));
}
@@ -143,9 +136,9 @@ public class IvyRetrieve extends IvyPost
}
}
- protected Collection/*<String>*/ getAllowedLogOptions() {
- return Arrays.asList(new String [] {
- LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY, LogOptions.LOG_QUIET});
+ protected Collection/* <String> */getAllowedLogOptions() {
+ return Arrays.asList(new String[] {LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY,
+ LogOptions.LOG_QUIET});
}
public String getIvypattern() {
@@ -180,8 +173,8 @@ public class IvyRetrieve extends IvyPost
public void setOverwriteMode(String overwriteMode) {
if (!OVERWRITEMODE_VALUES.contains(overwriteMode)) {
- throw new IllegalArgumentException("invalid overwriteMode value '" + overwriteMode + "'. "
- + "Valid values are " + OVERWRITEMODE_VALUES);
+ throw new IllegalArgumentException("invalid overwriteMode value '" + overwriteMode
+ + "'. " + "Valid values are " + OVERWRITEMODE_VALUES);
}
this.overwriteMode = overwriteMode;
}
@@ -192,8 +185,9 @@ public class IvyRetrieve extends IvyPost
/**
* Add a mapper to convert the file names.
- *
- * @param mapper a <code>Mapper</code> value.
+ *
+ * @param mapper
+ * a <code>Mapper</code> value.
*/
public void addMapper(Mapper mapper) {
if (this.mapper != null) {
@@ -204,7 +198,9 @@ public class IvyRetrieve extends IvyPost
/**
* Add a nested filenamemapper.
- * @param fileNameMapper the mapper to add.
+ *
+ * @param fileNameMapper
+ * the mapper to add.
*/
public void add(FileNameMapper fileNameMapper) {
Mapper m = new Mapper(getProject());
@@ -214,9 +210,11 @@ public class IvyRetrieve extends IvyPost
/**
* Returns the path of the file relative to the given base directory.
- *
- * @param base the parent directory to which the file must be evaluated.
- * @param file the file for which the path should be returned
+ *
+ * @param base
+ * the parent directory to which the file must be evaluated.
+ * @param file
+ * the file for which the path should be returned
* @return the path of the file relative to the given base directory.
*/
private String getPath(File base, File file) {
@@ -232,5 +230,5 @@ public class IvyRetrieve extends IvyPost
return file.getAbsolutePath().substring(beginIndex);
}
-
+
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyTask.java Tue Jan 14 08:27:37 2014
@@ -78,12 +78,10 @@ public abstract class IvyTask extends Ta
+ " doesn't reference an ivy:settings", getLocation());
}
if (!(antIvyEngine instanceof IvyAntSettings)) {
- throw new BuildException(
- antIvyEngineRef.getRefId()
- + " has been defined in a different classloader. "
- + "Please use the same loader when defining your task, or "
- + "redeclare your ivy:settings in this classloader",
- getLocation());
+ throw new BuildException(antIvyEngineRef.getRefId()
+ + " has been defined in a different classloader. "
+ + "Please use the same loader when defining your task, or "
+ + "redeclare your ivy:settings in this classloader", getLocation());
}
} else {
antIvyEngine = IvyAntSettings.getDefaultInstance(this);
@@ -191,8 +189,8 @@ public abstract class IvyTask extends Ta
try {
return DateUtil.parse(date);
} catch (Exception ex) {
- throw new BuildException("Publication date provided in bad format. Should be '"
- + DateUtil.DATE_FORMAT_PATTERN + "' and not '" + date + "'!");
+ throw new BuildException("Publication date provided in bad format. Should be '"
+ + DateUtil.DATE_FORMAT_PATTERN + "' and not '" + date + "'!");
}
} else {
return def;
@@ -246,7 +244,7 @@ public abstract class IvyTask extends Ta
*/
protected void prepareTask() {
getProject().setProperty("ivy.version", Ivy.getIvyVersion());
-
+
// push current project and Ivy on the stack in context
IvyContext.pushNewCopyContext();
IvyContext.getContext().setIvy(getIvyInstance());
@@ -287,14 +285,13 @@ public abstract class IvyTask extends Ta
public String toString() {
return getClass().getName() + ":" + getTaskName();
}
-
/**
* Informs the user that the cache attribute is not supported any more.
*/
protected void cacheAttributeNotSupported() {
throw new BuildException(
- "cache attribute is not supported any more. See IVY-685 for details.");
+ "cache attribute is not supported any more. See IVY-685 for details.");
}
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyVar.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyVar.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyVar.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyVar.java Tue Jan 14 08:27:37 2014
@@ -106,7 +106,7 @@ public class IvyVar extends IvyTask {
try {
is.close();
} catch (Exception e) {
- //ignore
+ // ignore
}
}
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/MapperAdapter.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/MapperAdapter.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/MapperAdapter.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/MapperAdapter.java Tue Jan 14 08:27:37 2014
@@ -21,11 +21,11 @@ import org.apache.ivy.core.retrieve.File
import org.apache.tools.ant.types.Mapper;
class MapperAdapter implements FileNameMapper {
-
+
private static final String[] EMPTY = new String[0];
-
+
private Mapper mapper;
-
+
MapperAdapter(Mapper mapper) {
this.mapper = mapper;
}
@@ -35,7 +35,7 @@ class MapperAdapter implements FileNameM
if (result == null) {
result = EMPTY;
}
-
+
return result;
}
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/ExecutionRelativeUrlResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/ExecutionRelativeUrlResolver.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/ExecutionRelativeUrlResolver.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/ExecutionRelativeUrlResolver.java Tue Jan 14 08:27:37 2014
@@ -21,10 +21,9 @@ import java.net.MalformedURLException;
import java.net.URL;
/**
- * Resolve relative url relatively to the current execution directory instead
- * of relatively to the context.
- * This is was actually done prior 2.0. This class allow thus to work
- * in a backward compatible mode.
+ * Resolve relative url relatively to the current execution directory instead of relatively to the
+ * context. This is was actually done prior 2.0. This class allow thus to work in a backward
+ * compatible mode.
*/
public class ExecutionRelativeUrlResolver extends RelativeUrlResolver {
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java?rev=1557968&r1=1557967&r2=1557968&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/IvyContext.java Tue Jan 14 08:27:37 2014
@@ -41,11 +41,11 @@ import org.apache.ivy.util.MessageLogger
*/
public class IvyContext {
- private static ThreadLocal/*<Stack<IvyContext>>*/ current = new ThreadLocal();
+ private static ThreadLocal/* <Stack<IvyContext>> */current = new ThreadLocal();
private Ivy defaultIvy;
- private WeakReference/*<Ivy>*/ ivy = new WeakReference(null);
+ private WeakReference/* <Ivy> */ivy = new WeakReference(null);
private Map contextMap = new HashMap();
@@ -54,7 +54,7 @@ public class IvyContext {
private ResolveData resolveData;
private DependencyDescriptor dd;
-
+
public IvyContext() {
}
@@ -74,8 +74,8 @@ public class IvyContext {
}
return (IvyContext) cur.peek();
}
-
- private static Stack/*<IvyContext>*/ getCurrentStack() {
+
+ private static Stack/* <IvyContext> */getCurrentStack() {
Stack cur = (Stack) current.get();
if (cur == null) {
cur = new Stack();
@@ -90,6 +90,7 @@ public class IvyContext {
* {@link #popContext()} should usually be called when the job for which this context has been
* pushed is finished.
* </p>
+ *
* @return the newly pushed context
*/
public static IvyContext pushNewContext() {
@@ -103,12 +104,13 @@ public class IvyContext {
* {@link #popContext()} should usually be called when the job for which this context has been
* pushed is finished.
* </p>
- * @return the newly pushed context
+ *
+ * @return the newly pushed context
*/
public static IvyContext pushNewCopyContext() {
return pushContext(new IvyContext(getContext()));
}
-
+
/**
* Changes the context associated with this thread. This is especially useful when launching a
* new thread, to associate it with the same context as the initial one. Do not forget to call
@@ -116,13 +118,13 @@ public class IvyContext {
*
* @param context
* the new context to use in this thread.
- * @return the pushed context
+ * @return the pushed context
*/
public static IvyContext pushContext(IvyContext context) {
getCurrentStack().push(context);
return context;
}
-
+
/**
* Pops one context used with this thread. This is usually called after having finished a task
* for which a call to {@link #pushNewContext()} or {@link #pushContext(IvyContext)} was done
@@ -134,7 +136,6 @@ public class IvyContext {
return (IvyContext) getCurrentStack().pop();
}
-
/**
* Reads the first object from the list saved under given key in the first context from the
* context stack in which this key is defined. If value under key in any of the contexts form
@@ -201,7 +202,7 @@ public class IvyContext {
defaultIvy.configureDefault();
} catch (Exception e) {
Message.debug(e);
- //???
+ // ???
}
}
return defaultIvy;
@@ -255,7 +256,6 @@ public class IvyContext {
}
}
-
/**
* Removes and returns first object from the list saved under given key in the context. If value
* under key represents non List object then a RuntimeException is thrown.
@@ -342,7 +342,6 @@ public class IvyContext {
return operatingThread;
}
-
public MessageLogger getMessageLogger() {
// calling getIvy() instead of peekIvy() is not possible here: it will initialize a default
// Ivy instance, with default settings, but settings themselves may log messages and lead to
@@ -363,7 +362,7 @@ public class IvyContext {
public EventManager getEventManager() {
return getIvy().getEventManager();
}
-
+
public void checkInterrupted() {
getIvy().checkInterrupted();
}
@@ -371,7 +370,7 @@ public class IvyContext {
public void setResolveData(ResolveData data) {
this.resolveData = data;
}
-
+
public ResolveData getResolveData() {
return resolveData;
}
@@ -379,7 +378,7 @@ public class IvyContext {
public void setDependencyDescriptor(DependencyDescriptor dd) {
this.dd = dd;
}
-
+
public DependencyDescriptor getDependencyDescriptor() {
return dd;
}