You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by mb...@apache.org on 2010/02/12 22:16:33 UTC
svn commit: r909606 -
/ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
Author: mbenson
Date: Fri Feb 12 21:16:29 2010
New Revision: 909606
URL: http://svn.apache.org/viewvc?rev=909606&view=rev
Log:
[IVY-1171] handle configuration wildcards for artifact publishing
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java?rev=909606&r1=909605&r2=909606&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java Fri Feb 12 21:16:29 2010
@@ -176,10 +176,7 @@
DependencyResolver resolver, PublishOptions options) throws IOException {
Collection missing = new ArrayList();
Set artifactsSet = new LinkedHashSet();
- String[] confs = options.getConfs();
- if (confs == null || (confs.length == 1 && "*".equals(confs[0]))) {
- confs = md.getConfigurationsNames();
- }
+ String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md);
for (int i = 0; i < confs.length; i++) {
Artifact[] artifacts = md.getArtifacts(confs[i]);
Re: svn commit: r909606 - /ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/PublishEngine.java
Posted by Matt Benson <gu...@gmail.com>.
Can you Ivy guys make sure I'm not on crack with this? Tests pass
and this seems to do the right thing. I suppose a test might be in
order as well, though I'm not really sure how to navigate the
structure of Ivy's tests... :|
On Feb 12, 2010, at 3:16 PM, mbenson@apache.org wrote:
> Author: mbenson
> Date: Fri Feb 12 21:16:29 2010
> New Revision: 909606
>
> URL: http://svn.apache.org/viewvc?rev=909606&view=rev
> Log:
> [IVY-1171] handle configuration wildcards for artifact publishing
>
> Modified:
> ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/
> PublishEngine.java
>
> Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/
> PublishEngine.java
> URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/
> apache/ivy/core/publish/PublishEngine.java?
> rev=909606&r1=909605&r2=909606&view=diff
> ======================================================================
> ========
> --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/
> PublishEngine.java (original)
> +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/publish/
> PublishEngine.java Fri Feb 12 21:16:29 2010
> @@ -176,10 +176,7 @@
> DependencyResolver resolver, PublishOptions options)
> throws IOException {
> Collection missing = new ArrayList();
> Set artifactsSet = new LinkedHashSet();
> - String[] confs = options.getConfs();
> - if (confs == null || (confs.length == 1 && "*".equals(confs
> [0]))) {
> - confs = md.getConfigurationsNames();
> - }
> + String[] confs = ConfigurationUtils.replaceWildcards
> (options.getConfs(), md);
>
> for (int i = 0; i < confs.length; i++) {
> Artifact[] artifacts = md.getArtifacts(confs[i]);
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org