Move the event-names and default-event-name under the fmd:component-metadata to be consistent with the JSR and fix the code for the default event name so that the generated code will compile if there is no default event name given
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
index 5941918..01d0947 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/component/AbstractComponentGenerator.java
@@ -1024,19 +1024,23 @@
) throws IOException
{
String defaultEventName = component.getDefaultEventName();
+ out.println();
+ out.println("@Override");
+ out.println("public String getDefaultEventName()");
+ out.println("{");
+ out.indent();
if (defaultEventName != null)
{
- out.println();
- out.println("@Override");
- out.println("public String getDefaultEventName()");
- out.println("{");
- out.indent();
out.print("return \"");
out.print(defaultEventName);
out.println("\";");
- out.unindent();
- out.println("}");
}
+ else
+ {
+ out.println("return super.getDefaultEventName();");
+ }
+ out.unindent();
+ out.println("}");
out.println();
out.println("@Override"); // JDK 1.6 is a requirement for JSF2 so this is okay
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
index 26f2f40..a3884a2 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
@@ -217,11 +217,11 @@
digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee/faces/design-time-metadata");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/required");
digester.addBeanPropertySetter("faces-config/component/property/property-extension/property-metadata/value-expression", "valueExpression");
- digester.addBeanPropertySetter("faces-config/component/component-extension/default-event-name",
+ digester.addBeanPropertySetter("faces-config/component/component-extension/component-metadata/default-event-name",
"defaultEventName");
- digester.addCallMethod("faces-config/component/component-extension/event-names",
+ digester.addCallMethod("faces-config/component/component-extension/component-metadata/event-names",
"parseEventNames", 1);
- digester.addCallParam("faces-config/component/component-extension/event-names", 0);
+ digester.addCallParam("faces-config/component/component-extension/component-metadata/event-names", 0);
// XInclude rules
digester.setRuleNamespaceURI(XIncludeFilter.XINCLUDE_NAMESPACE);
