Author: rmannibucau
Date: Wed Oct 23 06:27:57 2013
New Revision: 1534921
URL: http://svn.apache.org/r1534921
Log:
TOMEE-1021 swallowing errors reading faces-config.xml - Note: this is done
hacking the generating code while we don't upgrade to JSF 2.2
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesApplication$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesBehavior$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesComponent$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConverter$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesFactory$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesLifecycle$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesNavigationRule$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesOrdering$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesReferencedBean$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesRenderKit$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesValidator$JAXB.java
tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesAbsoluteOrdering$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -116,7 +116,9 @@ public class FacesAbsoluteOrdering$JAXB
}
nameOrOthers.add(nameOrOthersItem1);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "others"), new
QName("http://java.sun.com/xml/ns/javaee";, "name"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "others"), new
QName("http://java.sun.com/xml/ns/javaee";, "name"));
}
}
if (nameOrOthers != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesApplication$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesApplication%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesApplication$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesApplication$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -381,7 +381,9 @@ public class FacesApplication$JAXB
}
defaultValidators.add(defaultValidatorsItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "action-listener"), new
QName("http://java.sun.com/xml/ns/javaee";, "default-render-kit-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "message-bundle"), new
QName("http://java.sun.com/xml/ns/javaee";, "navigation-handler"), new
QName("http://java.sun.com/xml/ns/javaee";, "view-handler"), new
QName("http://java.sun.com/xml/ns/javaee";, "state-manager"), new
QName("http://java.sun.com/xml/ns/javaee";, "el-resolver"), new
QName("http://java.sun.com/xml/ns/javaee";, "property-resolver"), new
QName("http://java.sun.com/xml/ns/javaee";, "variable-resolver"), new
QName("http://java.sun.com/xml/ns/javaee";, "resource-handler"), new
QName("http://java.sun.com/xml/ns/javaee";, "system-event-listener"), new
QName("http://java.sun.com/xml/ns/javaee";, "locale-config"), new
QName("http://java.sun.com/xml/ns/javaee";, "resource-bundle"), new
QName("http://java.sun.com/xml/ns/javaee";, "application-e
xtension"), new QName("http://java.sun.com/xml/ns/javaee";,
"default-validators"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "action-listener"), new
QName("http://java.sun.com/xml/ns/javaee";, "default-render-kit-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "message-bundle"), new
QName("http://java.sun.com/xml/ns/javaee";, "navigation-handler"), new
QName("http://java.sun.com/xml/ns/javaee";, "view-handler"), new
QName("http://java.sun.com/xml/ns/javaee";, "state-manager"), new
QName("http://java.sun.com/xml/ns/javaee";, "el-resolver"), new
QName("http://java.sun.com/xml/ns/javaee";, "property-resolver"), new
QName("http://java.sun.com/xml/ns/javaee";, "variable-resolver"), new
QName("http://java.sun.com/xml/ns/javaee";, "resource-handler"), new
QName("http://java.sun.com/xml/ns/javaee";, "system-event-listener"), new
QName("http://java.sun.com/xml/ns/javaee";, "locale-config"), new
QName("http://java.sun.com/xml/ns/javaee";, "resource-bundle"), new
QName("http://java.sun.com/xml/ns/javaee";, "applicatio
n-extension"), new QName("http://java.sun.com/xml/ns/javaee";,
"default-validators"));
}
}
if (actionListener != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesBehavior$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesBehavior%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesBehavior$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesBehavior$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -194,7 +194,9 @@ public class FacesBehavior$JAXB
}
behaviorExtension.add(behaviorExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "behavior-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "behavior-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "behavior-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "behavior-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "behavior-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "behavior-extension"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesComponent$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesComponent%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesComponent$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesComponent$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -214,7 +214,9 @@ public class FacesComponent$JAXB
}
componentExtension.add(componentExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "component-type"), new
QName("http://java.sun.com/xml/ns/javaee";, "component-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "facet"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "component-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "component-type"), new
QName("http://java.sun.com/xml/ns/javaee";, "component-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "facet"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "component-extension"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConverter$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConverter%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConverter$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConverter$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -212,7 +212,9 @@ public class FacesConverter$JAXB
}
converterExtension.add(converterExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-for-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-for-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "converter-extension"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesFactory$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesFactory%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesFactory$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesFactory$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -330,7 +330,9 @@ public class FacesFactory$JAXB
}
factoryExtension.add(factoryExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "application-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "exception-handler-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "external-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "faces-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "partial-view-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "lifecycle-factory"), new
QName("http://java.sun.com/xml/ns/javaee";,
"view-declaration-language-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "tag-handler-delegate-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "visit-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "factory-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "application-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "exception-handler-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "external-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "faces-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "partial-view-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "lifecycle-factory"), new
QName("http://java.sun.com/xml/ns/javaee";,
"view-declaration-language-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "tag-handler-delegate-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "visit-context-factory"), new
QName("http://java.sun.com/xml/ns/javaee";, "factory-extension"));
}
}
if (applicationFactory != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesLifecycle$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesLifecycle%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesLifecycle$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesLifecycle$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -132,7 +132,9 @@ public class FacesLifecycle$JAXB
}
lifecycleExtension.add(lifecycleExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "phase-listener"), new
QName("http://java.sun.com/xml/ns/javaee";, "lifecycle-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "phase-listener"), new
QName("http://java.sun.com/xml/ns/javaee";, "lifecycle-extension"));
}
}
if (phaseListener != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesNavigationRule$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesNavigationRule%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesNavigationRule$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesNavigationRule$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -171,7 +171,9 @@ public class FacesNavigationRule$JAXB
}
navigationRuleExtension.add(navigationRuleExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "from-view-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "navigation-case"), new
QName("http://java.sun.com/xml/ns/javaee";, "navigation-rule-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "from-view-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "navigation-case"), new
QName("http://java.sun.com/xml/ns/javaee";, "navigation-rule-extension"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesOrdering$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesOrdering%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesOrdering$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesOrdering$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -97,7 +97,9 @@ public class FacesOrdering$JAXB
FacesOrderingOrdering before =
readFacesOrderingOrdering(elementReader, context);
facesOrdering.before = before;
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "after"), new
QName("http://java.sun.com/xml/ns/javaee";, "before"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "after"), new
QName("http://java.sun.com/xml/ns/javaee";, "before"));
}
}
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesReferencedBean$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesReferencedBean%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesReferencedBean$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesReferencedBean$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -153,7 +153,9 @@ public class FacesReferencedBean$JAXB
facesReferencedBean.referencedBeanClass = referencedBeanClass;
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "referenced-bean-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "referenced-bean-class"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "referenced-bean-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "referenced-bean-class"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesRenderKit$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesRenderKit%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesRenderKit$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesRenderKit$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -199,7 +199,9 @@ public class FacesRenderKit$JAXB
}
renderKitExtension.add(renderKitExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "renderer"), new
QName("http://java.sun.com/xml/ns/javaee";, "client-behavior-renderer"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "renderer"), new
QName("http://java.sun.com/xml/ns/javaee";, "client-behavior-renderer"), new
QName("http://java.sun.com/xml/ns/javaee";, "render-kit-extension"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesValidator$JAXB.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesValidator%24JAXB.java?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesValidator$JAXB.java
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesValidator$JAXB.java
Wed Oct 23 06:27:57 2013
@@ -199,7 +199,9 @@ public class FacesValidator$JAXB
}
validatorExtension.add(validatorExtensionItem);
} else {
- context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "validator-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "validator-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "validator-extension"));
+ // just here ATM to not prevent users to get JSF 2.2 feature
because we can't read it
+ // TODO: handle it properly
+ // context.unexpectedElement(elementReader, new
QName("http://java.sun.com/xml/ns/javaee";, "description"), new
QName("http://java.sun.com/xml/ns/javaee";, "display-name"), new
QName("http://java.sun.com/xml/ns/javaee";, "icon"), new
QName("http://java.sun.com/xml/ns/javaee";, "validator-id"), new
QName("http://java.sun.com/xml/ns/javaee";, "validator-class"), new
QName("http://java.sun.com/xml/ns/javaee";, "attribute"), new
QName("http://java.sun.com/xml/ns/javaee";, "property"), new
QName("http://java.sun.com/xml/ns/javaee";, "validator-extension"));
}
}
if (descriptions != null) {
Modified:
tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml?rev=1534921&r1=1534920&r2=1534921&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
(original)
+++
tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
Wed Oct 23 06:27:57 2013
@@ -21,6 +21,15 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd";>
+ <application>
+ <el-resolver>UnknownButSuperResolver</el-resolver>
+ <resource-library-contracts>
+ <contract-mapping>
+ <url-pattern>/blue/*</url-pattern>
+ <contracts>dabididabida</contracts>
+ </contract-mapping>
+ </resource-library-contracts>
+ </application>
<flow-definition id="flow">
<flow-return id="return">
<from-outcome>#{bean.out}</from-outcome>
