svn commit: r1554615 - in /ant/easyant/core/trunk/src: main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java test/java/org/apache/easyant/tasks/RegisterArtifactTest.java

[jlboudart]

Author: jlboudart
Date: Wed Jan  1 12:31:04 2014
New Revision: 1554615

URL: http://svn.apache.org/r1554615
Log:
Fix registerArtifact bug at publish time.
RegisterArtifact can sometimes invoke XmlModuleDescriptorWriter, unfortunatly 
XmlModuleDescriptorWritter doesn't support fully extra infos elements (see 
IVY-1457)

This makes commit makes our ivy parser more permissive while parsing property 
attributes elements when ivyfile is parsed after invocation of 
XmlModuleDescriptorWriter (at publish time for example)

Modified:
    
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
    
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/RegisterArtifactTest.java

Modified: 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
URL: 
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java?rev=1554615&r1=1554614&r2=1554615&view=diff
==============================================================================
--- 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
 (original)
+++ 
ant/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
 Wed Jan  1 12:31:04 2014
@@ -542,10 +542,7 @@ public class DefaultEasyAntXmlModuleDesc
 
                     easyAntModuleDescriptor.getProperties().put(key, property);
                 }
-            } else {
-                if (attributes.getValue("name") == null) {
-                    throw new SAXException("Can't set a null property!");
-                }
+            } else if (attributes.getValue("name") != null) {
                 String propertyName = 
getSettings().substitute(attributes.getValue("name"));
                 String value = 
getSettings().substitute(attributes.getValue("value"));
 

Modified: 
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/RegisterArtifactTest.java
URL: 
http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/RegisterArtifactTest.java?rev=1554615&r1=1554614&r2=1554615&view=diff
==============================================================================
--- 
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/RegisterArtifactTest.java
 (original)
+++ 
ant/easyant/core/trunk/src/test/java/org/apache/easyant/tasks/RegisterArtifactTest.java
 Wed Jan  1 12:31:04 2014
@@ -38,7 +38,6 @@ import org.apache.ivy.plugins.parser.Mod
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.Reference;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -101,7 +100,6 @@ public class RegisterArtifactTest extend
     }
 
     @Test
-    @Ignore("Fails with a can't set a null property from 
DefaultEasyAntXmlModuleDescriptorParser")
     public void shouldRegisterArtifactAndPublish() throws IOException {
         configureParserAndCacheManagers();