Hi folks!
I've come down to just 18 failing tests in tck/cdi-embedded.Most of them are EE
related (missing privileges exceptions etc)
There is one left with the CDI integration: <trim/> support.This needs a change
in the beans.xml schema.I've added the changes and moved to
container/openejb-jee/src/main/resources/META-INF/schema/beans_2_0.xsd
But now I totally fail to generate the JAXB sources.I've found the maven
profile to start the generator, but it simply fails with an Exception.
Anyone able to help out?
The work is done in fb_tomee8
Btw, I also tried the attached patch to move to valid urls at least...
LieGrue,strub
diff --git a/container/openejb-jee/src/main/resources/META-INF/schema/javaee_web_services_metadata_handler_2_0.xsd b/container/openejb-jee/src/main/resources/META-INF/schema/javaee_web_services_metadata_handler_2_0.xsd
index 681bfa45c3..2cba089a93 100644
--- a/container/openejb-jee/src/main/resources/META-INF/schema/javaee_web_services_metadata_handler_2_0.xsd
+++ b/container/openejb-jee/src/main/resources/META-INF/schema/javaee_web_services_metadata_handler_2_0.xsd
@@ -20,10 +20,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:include schemaLocation="javaee_5.xsd"/>
+ <xsd:include schemaLocation="javaee_6.xsd"/>
<xsd:element name="handler-chains"
- type="javaee:service-ref_handler-chainsType">
+ type="javaee:handler-chainsType">
<xsd:annotation>
<xsd:documentation>
diff --git a/container/openejb-jee/src/main/xsdlist/xsdlist.txt b/container/openejb-jee/src/main/xsdlist/xsdlist.txt
index e37bc27b16..af7626b43b 100644
--- a/container/openejb-jee/src/main/xsdlist/xsdlist.txt
+++ b/container/openejb-jee/src/main/xsdlist/xsdlist.txt
@@ -1,17 +1,18 @@
-http://java.sun.com/xml/ns/javaee/application_6.xsd
-http://java.sun.com/xml/ns/javaee/application-client_6.xsd
-http://java.sun.com/xml/ns/javaee/beans_1_1.xsd
-http://java.sun.com/xml/ns/javaee/connector_1_6.xsd
-http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd
-http://java.sun.com/xml/ns/javaee/javaee_6.xsd
-http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd
-http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_3.xsd
-http://java.sun.com/xml/ns/javaee/jsp_2_2.xsd
-http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd
-http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd
-http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
-http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd
-http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd
-http://java.sun.com/xml/ns/javaee/web-partialresponse_2_0.xsd
-http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd
-http://java.sun.com/xml/ns/javaee/javaee_web_services_metadata_handler_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/application_6.xsd
+http://xmlns.jcp.org/xml/ns/javaee/application-client_6.xsd
+http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/connector_1_6.xsd
+http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_1.xsd
+http://xmlns.jcp.org/xml/ns/javaee/javaee_6.xsd
+http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_3.xsd
+http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_3.xsd
+http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_metadata_handler_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/jsp_2_2.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-app_3_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-common_3_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-partialresponse_2_0.xsd
+http://xmlns.jcp.org/xml/ns/javaee/web-jsptaglibrary_2_1.xsd
diff --git a/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java b/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
index 00c05e285c..ee08e82cd8 100644
--- a/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
+++ b/container/openejb-jee/src/test/java/org/apache/openejb/jee/cdi/BeansTest.java
@@ -34,9 +34,9 @@ import static org.junit.Assert.assertNull;
public class BeansTest {
@Test
public void readEmpty10() throws JAXBException, SAXException, ParserConfigurationException {
- final Beans b = read("<beans xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"; +
+ final Beans b = read("<beans xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\"\n"; +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
- " xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\"; />");
+ " xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd\"; />");
assertNotNull(b);
}
@@ -44,12 +44,12 @@ public class BeansTest {
public void read10() throws Exception {
final Beans b = read(
"<beans\n" +
- " xmlns=\"http://java.sun.com/xml/ns/javaee\"\n"; +
+ " xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\"\n"; +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
- " version=\"1.0\"\n" +
+ " version=\"2.0\"\n" +
" xsi:schemaLocation=\"\n" +
- " http://java.sun.com/xml/ns/javaee\n"; +
- " http://java.sun.com/xml/ns/javaee/beans_1_0.xsd\";>\n" +
+ " http://xmlns.jcp.org/xml/ns/javaee\n"; +
+ " http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd\";>\n" +
" <interceptors>\n" +
" <class>org.mycompany.myapp.TransactionInterceptor</class>\n" +
" </interceptors>\n" +
@@ -59,6 +59,7 @@ public class BeansTest {
" <decorators>\n" +
" <class>org.mycompany.myfwk.TimestampLogger</class>\n" +
" </decorators>" +
+ " <trim/>" +
"</beans>");
assertNotNull(b);
assertEquals(1, b.getInterceptors().size());
