IVY-1658: merge ivy-module namespaces

[eric-milles]

https://issues.apache.org/jira/browse/IVY-1658

[bodewig]

I'm not familiar enough with Ivy's code so I want request changes.

[eric-milles]

So where are we with this one? This PR is about as minimal as a change can be made. The loop you mention was replaced by a new structure, so there is no way to avoid a diff on the old non-ivy-module loop. If any part of the issue or change is unclear, I can add to the issue ticket or tests to help improve clarity.

[bodewig]

The conversation about not handling XML namespaces properly is not resolved at all IMHO.

[bodewig]

    @Test
    public void testDeliver1658B() throws Exception {
        String ivyFile
            = "<ivy-module version='2.0'\n"
            + " xmlns:m='http://ant.apache.org/ivy/maven'\n"
            + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
            + " xsi:noNamespaceSchemaLocation='http://ant.apache.org/ivy/schemas/ivy.xsd'>\n"
            + "  <info module='xxx' organisation='zzz'/>\n"
            + "  <dependencies>\n"
            + "    <dependency name='groovy' org='org.codehaus.groovy' rev='3.0.25' transitive='false'>\n"
            + "      <artifact name='groovy' m:classifier='indy'/>\n"
            + "    </dependency>\n"
            + "  </dependencies>\n"
            + "</ivy-module>\n";

        ivyFile
            = "<ivy-module version='2.0'\n"
            + " xmlns:m='http://exmaple.org/some-m'\n"
            + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
            + " xsi:noNamespaceSchemaLocation='http://ant.apache.org/ivy/schemas/ivy.xsd'>\n"
            + "  <info module='yyy' organisation='zzz' revision='1.0'>\n"
            + "    <extends module='xxx' organisation='zzz' extendType='dependencies'\n"
            + "     location='" + writeFile(ivyFile).getName() + "' revision='latest'/>\n"
            + "  </info>\n"
            + "  <dependencies>\n"
            + "  </dependencies>\n"
            + "</ivy-module>\n";

        resolve(writeFile(ivyFile));

        ivyDeliver.doExecute();

        ivyFile = readFile(deliverDir.getAbsolutePath() + "/ivys/ivy-1.0.xml");

        assertTrue(ivyFile.contains(" version=\"2.0\""));
        assertTrue(ivyFile.contains(" xmlns:m=\"http://ant.apache.org/ivy/maven\""));
        assertTrue(ivyFile.contains(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""));
        assertTrue(ivyFile.contains(" xsi:noNamespaceSchemaLocation=\"http://ant.apache.org/ivy/schemas/ivy.xsd\""));
    }

this fails (because m already means something different).