SEC-1094: Simplified WebXml attribute mapping. Removed generic jaxen-based implementation on which it was based in favour of simple DOM model traversal. Updated sample.

core/pom.xml

@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -81,12 +81,6 @@
             <artifactId>hsqldb</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>annotations-api</artifactId>
@@ -98,7 +92,7 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>

core/src/test/java/org/springframework/security/core/authority/mapping/XmlMappableRolesRetrieverTests.java

@@ -1,103 +0,0 @@
-package org.springframework.security.core.authority.mapping;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
-
-import org.springframework.security.core.authority.mapping.XmlMappableAttributesRetriever;
-
-import junit.framework.TestCase;
-
-/**
- *
- * @author TSARDD
- * @since 18-okt-2007
- */
-@SuppressWarnings("unchecked")
-public class XmlMappableRolesRetrieverTests extends TestCase {
-    private static final String DEFAULT_XML = "<roles><role>Role1</role><role>Role2</role></roles>";
-
-    private static final String DEFAULT_XPATH = "/roles/role/text()";
-
-    private static final String[] DEFAULT_EXPECTED_ROLES = new String[] { "Role1", "Role2" };
-
-    public final void testAfterPropertiesSetException() {
-        TestXmlMappableAttributesRetriever t = new TestXmlMappableAttributesRetriever();
-        try {
-            t.afterPropertiesSet();
-            fail("AfterPropertiesSet didn't throw expected exception");
-        } catch (IllegalArgumentException expected) {
-        } catch (Exception unexpected) {
-            fail("AfterPropertiesSet throws unexpected exception");
-        }
-    }
-
-    public void testGetMappableRoles() {
-        XmlMappableAttributesRetriever r = getXmlMappableRolesRetriever(true, getDefaultInputStream(), DEFAULT_XPATH);
-        Set<String> resultRoles = r.getMappableAttributes();
-        assertNotNull("Result roles should not be null", resultRoles);
-        assertEquals("Number of result roles doesn't match expected number of roles", DEFAULT_EXPECTED_ROLES.length, resultRoles.size());
-        Collection expectedRolesColl = Arrays.asList(DEFAULT_EXPECTED_ROLES);
-        assertTrue("Role collections do not match", expectedRolesColl.containsAll(resultRoles)
-                && resultRoles.containsAll(expectedRolesColl));
-    }
-
-    public void testCloseInputStream() {
-        testCloseInputStream(true);
-    }
-
-    public void testDontCloseInputStream() {
-        testCloseInputStream(false);
-    }
-
-    private void testCloseInputStream(boolean closeAfterRead) {
-        CloseableByteArrayInputStream is = getDefaultInputStream();
-        XmlMappableAttributesRetriever r = getXmlMappableRolesRetriever(closeAfterRead, is, DEFAULT_XPATH);
-        r.getMappableAttributes();
-        assertEquals(is.isClosed(), closeAfterRead);
-    }
-
-    private XmlMappableAttributesRetriever getXmlMappableRolesRetriever(boolean closeInputStream, InputStream is, String xpath) {
-        XmlMappableAttributesRetriever result = new TestXmlMappableAttributesRetriever();
-        result.setCloseInputStream(closeInputStream);
-        result.setXmlInputStream(is);
-        result.setXpathExpression(xpath);
-        try {
-            result.afterPropertiesSet();
-        } catch (Exception e) {
-            fail("Unexpected exception" + e.toString());
-        }
-        return result;
-    }
-
-    private CloseableByteArrayInputStream getDefaultInputStream() {
-        return getInputStream(DEFAULT_XML);
-    }
-
-    private CloseableByteArrayInputStream getInputStream(String data) {
-        return new CloseableByteArrayInputStream(data.getBytes());
-    }
-
-    private static final class TestXmlMappableAttributesRetriever extends XmlMappableAttributesRetriever {
-    }
-
-    private static final class CloseableByteArrayInputStream extends ByteArrayInputStream {
-        private boolean closed = false;
-
-        public CloseableByteArrayInputStream(byte[] buf) {
-            super(buf);
-        }
-
-        public void close() throws IOException {
-            super.close();
-            closed = true;
-        }
-
-        public boolean isClosed() {
-            return closed;
-        }
-    }
-}

core/template.mf

@@ -23,10 +23,7 @@ Import-Template:
  org.springframework.transaction.*;version="[3.0.0, 3.1.0)";resolution:=optional,
  org.springframework.util;version="[3.0.0, 3.1.0)",
  net.sf.ehcache.*;version="[1.4.1, 2.0.0)";resolution:=optional, 
- org.w3c.dom;version="0";resolution:=optional,
- org.xml.sax;version="0";resolution:=optional, 
  javax.annotation.security.*;version="0";resolution:=optional,
  javax.crypto.*;version="0";resolution:=optional,
- javax.xml.*;version="0";resolution:=optional,
  javax.security.auth.*;version="0";resolution:=optional