This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 165b3d7534ca1b1bf182a8fe3f8b53b88aec37ca Author: Tichov Zoltán <[email protected]> AuthorDate: Tue May 10 20:52:05 2022 +0200 TOMEE-3824 --- .../java/org/apache/openejb/jee/ObjectFactory.java | 9 ++++++++ .../test/java/org/apache/openejb/jee/JeeTest.java | 27 ++++++++++++---------- .../src/test/resources/web-fragment-example.xml | 14 +++++++++++ 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java index 1bd33398ac..d7a82ae5a0 100644 --- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java +++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java @@ -55,6 +55,7 @@ public class ObjectFactory { private final static QName _JavaWsdlMapping_QNAME = new QName("http://java.sun.com/xml/ns/j2ee";, "java-wsdl-mapping"); private final static QName _Webservices_QNAME = new QName("http://java.sun.com/xml/ns/javaee";, "webservices"); private final static QName _FacesConfig_QNAME = new QName("http://java.sun.com/xml/ns/javaee";, "faces-config"); + private final static QName _WebFragment_QNAME = new QName("http://java.sun.com/xml/ns/javaee";, "web-fragment"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.openejb.jee2 @@ -166,4 +167,12 @@ public class ObjectFactory { public JAXBElement<FacesConfig> createFacesConfig(final FacesConfig value) { return new JAXBElement<FacesConfig>(_FacesConfig_QNAME, FacesConfig.class, null, value); } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link WebFragment }{@code >}} + */ + @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/javaee";, name = "web-fragment") + public JAXBElement<WebFragment> createWebFragment(final WebFragment value) { + return new JAXBElement<WebFragment>(_WebFragment_QNAME, WebFragment.class, null, value); + } } diff --git a/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java b/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java index 54bffd1bc3..6219b844c3 100644 --- a/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java +++ b/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java @@ -18,6 +18,15 @@ package org.apache.openejb.jee; +import jakarta.xml.bind.*; +import java.io.*; +import java.util.List; +import java.util.Properties; +import javax.xml.XMLConstants; +import javax.xml.namespace.QName; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.sax.SAXSource; import junit.framework.TestCase; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -25,16 +34,6 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLFilterImpl; -import javax.xml.XMLConstants; -import jakarta.xml.bind.*; -import javax.xml.namespace.QName; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.sax.SAXSource; -import java.io.*; -import java.util.List; -import java.util.Properties; - /** * @version $Revision$ $Date$ */ @@ -224,7 +223,7 @@ public class JeeTest extends TestCase { public void testTld() throws Exception { marshalAndUnmarshal(TldTaglib.class, "tld-example.xml", null); } - + public void testRar10() throws Exception { final Connector10 c10 = marshalAndUnmarshal(Connector10.class, "connector-1.0-example.xml", null); final Connector c = Connector.newConnector(c10); @@ -277,6 +276,10 @@ public class JeeTest extends TestCase { System.out.println(JaxbJavaee.marshal(HandlerChains.class, handlerChains)); } } + + public void testWebFragment() throws Exception { + marshalAndUnmarshal(WebFragment.class, "web-fragment-example.xml", null); + } public static <T> T marshalAndUnmarshal(final Class<T> type, final String sourceXmlFile, final String expectedXmlFile) throws Exception { final InputStream in = JeeTest.class.getClassLoader().getResourceAsStream(sourceXmlFile); @@ -306,7 +309,7 @@ public class JeeTest extends TestCase { try { StaxCompare.compare(expected, actual); } catch (final Exception e) { -// System.out.append(actual); + System.out.append(actual); writeToTmpFile(bytes, sourceXmlFile); throw e; } diff --git a/container/openejb-jee/src/test/resources/web-fragment-example.xml b/container/openejb-jee/src/test/resources/web-fragment-example.xml new file mode 100644 index 0000000000..7c18326fa3 --- /dev/null +++ b/container/openejb-jee/src/test/resources/web-fragment-example.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-fragment + xmlns="https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"; + version="5.0"> + <distributable /> + <ordering> + <after> + <others /> + </after> + </ordering> + <name>example</name> +</web-fragment>
