Author: rmannibucau Date: Fri Oct 10 09:24:45 2014 New Revision: 1630742 URL: http://svn.apache.org/r1630742 Log: if we get new ee 7 namespace then switch back to ee 6 one to ensure xml parsing doesn't fail, surely something to enhance we we'll get all the ee 7 xsd
Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java?rev=1630742&r1=1630741&r2=1630742&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java (original) +++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JaxbJavaee.java Fri Oct 10 09:24:45 2014 @@ -324,6 +324,21 @@ public class JaxbJavaee { super(xmlReader); } + private static String eeUri(final String uri) { + // if ee 7 then switch back on ee 6 to not break compatibility - to rework surely when we'll be fully ee 7 + return "http://xmlns.jcp.org/xml/ns/javaee".equals(uri) ? "http://java.sun.com/xml/ns/javaee": uri; + } + + @Override + public void startElement(final String uri, final String localName, final String qName, final Attributes atts) throws SAXException { + super.startElement(eeUri(uri), localName, qName, atts); + } + + @Override + public void endElement(final String uri, final String localName, final String qName) throws SAXException { + super.endElement(eeUri(uri), localName, qName); + } + @Override public InputSource resolveEntity(final String publicId, final String systemId) throws SAXException, IOException { final Set<String> publicIds = currentPublicId.get();