You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/25 02:17:33 UTC

svn commit: r425260 [2/7] - in /incubator/adffaces/branches/matzew-repackaging-trinidad/plugins: maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/io/ maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin...

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ConverterBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ConverterBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ConverterBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ConverterBean.java Mon Jul 24 19:17:31 2006
@@ -13,333 +13,333 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-import java.lang.reflect.Modifier;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.xml.namespace.QName;
-
-/**
- * ConverterBean is a Java representation of the faces-config converter
- * XML element.
- */
-public class ConverterBean extends ObjectBean
-{
-  /**
-   * Creates a new ConverterBean.
-   */
-  public ConverterBean()
-  {
-    _properties = new LinkedHashMap();
-  }
-
-  /**
-   * Sets the converter identifer for this component.
-   *
-   * @param converterId  converter identifer
-   */
-  public void setConverterId(
-    String converterId)
-  {
-    _converterId = converterId;
-  }
-
-  /**
-   * Returns true if the converter identifier is specified, otherwise false.
-   *
-   * @return  true if the converter identifier is specified,
-   *          otherwise false.
-   */
-  public boolean hasConverterId()
-  {
-    return (_converterId != null);
-  }
-
-  /**
-   * Returns the converter identifier for this component.
-   *
-   * @return  the converter identifier
-   */
-  public String getConverterId()
-  {
-    return _converterId;
-  }
-
-  /**
-   * Sets the converter class for this component.
-   *
-   * @param converterClass  the converter class
-   */
-  public void setConverterClass(
-    String converterClass)
-  {
-    _converterClass = converterClass;
-  }
-
-  /**
-   * Returns the converter class for this component.
-   *
-   * @return  the converter class
-   */
-  public String getConverterClass()
-  {
-    return _converterClass;
-  }
-
-  /**
-   * Sets the description of this property.
-   *
-   * @param description  the property description
-   */
-  public void setDescription(
-    String description)
-  {
-    _description = description;
-  }
-
-  /**
-   * Returns the description of this property.
-   *
-   * @return  the property description
-   */
-  public String getDescription()
-  {
-    return _description;
-  }
-
-  /**
-   * Sets the long description of this property.
-   *
-   * @param longDescription  the long property description
-   */
-  public void setLongDescription(
-    String longDescription)
-  {
-    _longDescription = longDescription;
-  }
-
-  /**
-   * Returns the long description of this property.
-   *
-   * @return  the long property description
-   */
-  public String getLongDescription()
-  {
-    return _longDescription;
-  }
-
-  /**
-   * Sets the JSP tag handler class for this component.
-   *
-   * @param tagClass  the JSP tag handler class
-   */
-  public void setTagClass(
-    String tagClass)
-  {
-    _tagClass = tagClass;
-  }
-
-  /**
-   * Returns the JSP tag handler class for this component.
-   *
-   * @return  the JSP tag handler class
-   */
-  public String getTagClass()
-  {
-    return _tagClass;
-  }
-
-  /**
-   * Returns the JSP tag name for this component.
-   *
-   * @return  the JSP tag name
-   */
-  public QName getTagName()
-  {
-    return _tagName;
-  }
-
-  /**
-   * Sets the JSP tag name for this component.
-   *
-   * @param tagClass  the JSP tag name
-   */
-  public void setTagName(
-    QName tagName)
-  {
-    _tagName = tagName;
-  }
-
-  /**
-   * Sets the converter super class for this component.
-   *
-   * @param converterSuperClass  the converter super class
-   */
-  public void setConverterSuperClass(
-    String converterSuperClass)
-  {
-    _converterSuperClass = converterSuperClass;
-  }
-
-  /**
-   * Returns the converter super class for this component.
-   *
-   * @return  the converter super class
-   */
-  public String getConverterSuperClass()
-  {
-    return _converterSuperClass;
-  }
-
-  /**
-   * Adds a property to this component.
-   *
-   * @param property  the property to add
-   */
-  public void addProperty(
-    PropertyBean property)
-  {
-    _properties.put(property.getPropertyName(), property);
-  }
-
-  /**
-   * Returns the property for this property name.
-   *
-   * @param propertyName  the property name to find
-   */
-  public PropertyBean findProperty(
-    String propertyName)
-  {
-    return (PropertyBean)_properties.get(propertyName);
-  }
-
-  /**
-   * Returns true if this component has any properties.
-   *
-   * @return  true   if this component has any properties,
-   *          false  otherwise
-   */
-  public boolean hasProperties()
-  {
-    return !_properties.isEmpty();
-  }
-
-  /**
-   * Returns an iterator for all properties on this component only.
-   *
-   * @return  the property iterator
-   */
-  public Iterator properties()
-  {
-    return _properties.values().iterator();
-  }
-
-  /**
-   * Adds a Java Language class modifier to the converter class.
-   *
-   * @param modifier  the modifier to be added
-   */
-  public void addConverterClassModifier(
-    int modifier)
-  {
-    _converterClassModifiers |= modifier;
-  }
-
-  /**
-   * Returns the Java Language class modifiers for the converter class.
-   * By default, these modifiers include Modifier.PUBLIC.
-   *
-   * @return  the Java Language class modifiers for the converter class
-   */
-  public int getConverterClassModifiers()
-  {
-    int modifiers = _converterClassModifiers;
-
-    if (!Modifier.isPrivate(modifiers) &&
-        !Modifier.isProtected(modifiers) &&
-        !Modifier.isPublic(modifiers))
-    {
-      modifiers |= Modifier.PUBLIC;
-    }
-
-    return modifiers;
-  }
-
-  public void parseConverterClassModifier(
-    String modifier)
-  {
-    addConverterClassModifier(_parseModifier(modifier));
-  }
-
-  public void parseTagClassModifier(
-    String modifier)
-  {
-    addTagClassModifier(_parseModifier(modifier));
-  }
-
-  private int _parseModifier(
-    String text)
-  {
-    if ("public".equals(text))
-      return Modifier.PUBLIC;
-    else if ("protected".equals(text))
-      return Modifier.PROTECTED;
-    else if ("private".equals(text))
-      return Modifier.PRIVATE;
-    else if ("abstract".equals(text))
-      return Modifier.ABSTRACT;
-    else if ("final".equals(text))
-      return Modifier.FINAL;
-
-    throw new IllegalArgumentException("Unrecognized modifier: " + text);
-  }
-
-  /**
-   * Adds a Java Language class modifier to the tag class.
-   *
-   * @param modifier  the modifier to be added
-   */
-  public void addTagClassModifier(
-    int modifier)
-  {
-    _tagClassModifiers |= modifier;
-  }
-
-  /**
-   * Returns the Java Language class modifiers for the tag class.
-   * By default, these modifiers include Modifier.PUBLIC.
-   *
-   * @return  the Java Language class modifiers for the tag class
-   */
-  public int getTagClassModifiers()
-  {
-    int modifiers = _tagClassModifiers;
-
-    if (!Modifier.isPrivate(modifiers) &&
-        !Modifier.isProtected(modifiers) &&
-        !Modifier.isPublic(modifiers))
-    {
-      modifiers |= Modifier.PUBLIC;
-    }
-
-    return modifiers;
-  }
-
-  private String  _description;
-  private String  _longDescription;
-  private String  _converterId;
-  private String  _converterClass;
-  private String  _converterSuperClass;
-  private QName   _tagName;
-  private String  _tagClass;
-  private Map     _properties;
-  private int     _converterClassModifiers;
-  private int     _tagClassModifiers;
-
-
-  static private final Logger _LOG = Logger.getLogger(ConverterBean.class.getName());
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+import java.lang.reflect.Modifier;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+
+/**
+ * ConverterBean is a Java representation of the faces-config converter
+ * XML element.
+ */
+public class ConverterBean extends ObjectBean
+{
+  /**
+   * Creates a new ConverterBean.
+   */
+  public ConverterBean()
+  {
+    _properties = new LinkedHashMap();
+  }
+
+  /**
+   * Sets the converter identifer for this component.
+   *
+   * @param converterId  converter identifer
+   */
+  public void setConverterId(
+    String converterId)
+  {
+    _converterId = converterId;
+  }
+
+  /**
+   * Returns true if the converter identifier is specified, otherwise false.
+   *
+   * @return  true if the converter identifier is specified,
+   *          otherwise false.
+   */
+  public boolean hasConverterId()
+  {
+    return (_converterId != null);
+  }
+
+  /**
+   * Returns the converter identifier for this component.
+   *
+   * @return  the converter identifier
+   */
+  public String getConverterId()
+  {
+    return _converterId;
+  }
+
+  /**
+   * Sets the converter class for this component.
+   *
+   * @param converterClass  the converter class
+   */
+  public void setConverterClass(
+    String converterClass)
+  {
+    _converterClass = converterClass;
+  }
+
+  /**
+   * Returns the converter class for this component.
+   *
+   * @return  the converter class
+   */
+  public String getConverterClass()
+  {
+    return _converterClass;
+  }
+
+  /**
+   * Sets the description of this property.
+   *
+   * @param description  the property description
+   */
+  public void setDescription(
+    String description)
+  {
+    _description = description;
+  }
+
+  /**
+   * Returns the description of this property.
+   *
+   * @return  the property description
+   */
+  public String getDescription()
+  {
+    return _description;
+  }
+
+  /**
+   * Sets the long description of this property.
+   *
+   * @param longDescription  the long property description
+   */
+  public void setLongDescription(
+    String longDescription)
+  {
+    _longDescription = longDescription;
+  }
+
+  /**
+   * Returns the long description of this property.
+   *
+   * @return  the long property description
+   */
+  public String getLongDescription()
+  {
+    return _longDescription;
+  }
+
+  /**
+   * Sets the JSP tag handler class for this component.
+   *
+   * @param tagClass  the JSP tag handler class
+   */
+  public void setTagClass(
+    String tagClass)
+  {
+    _tagClass = tagClass;
+  }
+
+  /**
+   * Returns the JSP tag handler class for this component.
+   *
+   * @return  the JSP tag handler class
+   */
+  public String getTagClass()
+  {
+    return _tagClass;
+  }
+
+  /**
+   * Returns the JSP tag name for this component.
+   *
+   * @return  the JSP tag name
+   */
+  public QName getTagName()
+  {
+    return _tagName;
+  }
+
+  /**
+   * Sets the JSP tag name for this component.
+   *
+   * @param tagClass  the JSP tag name
+   */
+  public void setTagName(
+    QName tagName)
+  {
+    _tagName = tagName;
+  }
+
+  /**
+   * Sets the converter super class for this component.
+   *
+   * @param converterSuperClass  the converter super class
+   */
+  public void setConverterSuperClass(
+    String converterSuperClass)
+  {
+    _converterSuperClass = converterSuperClass;
+  }
+
+  /**
+   * Returns the converter super class for this component.
+   *
+   * @return  the converter super class
+   */
+  public String getConverterSuperClass()
+  {
+    return _converterSuperClass;
+  }
+
+  /**
+   * Adds a property to this component.
+   *
+   * @param property  the property to add
+   */
+  public void addProperty(
+    PropertyBean property)
+  {
+    _properties.put(property.getPropertyName(), property);
+  }
+
+  /**
+   * Returns the property for this property name.
+   *
+   * @param propertyName  the property name to find
+   */
+  public PropertyBean findProperty(
+    String propertyName)
+  {
+    return (PropertyBean)_properties.get(propertyName);
+  }
+
+  /**
+   * Returns true if this component has any properties.
+   *
+   * @return  true   if this component has any properties,
+   *          false  otherwise
+   */
+  public boolean hasProperties()
+  {
+    return !_properties.isEmpty();
+  }
+
+  /**
+   * Returns an iterator for all properties on this component only.
+   *
+   * @return  the property iterator
+   */
+  public Iterator properties()
+  {
+    return _properties.values().iterator();
+  }
+
+  /**
+   * Adds a Java Language class modifier to the converter class.
+   *
+   * @param modifier  the modifier to be added
+   */
+  public void addConverterClassModifier(
+    int modifier)
+  {
+    _converterClassModifiers |= modifier;
+  }
+
+  /**
+   * Returns the Java Language class modifiers for the converter class.
+   * By default, these modifiers include Modifier.PUBLIC.
+   *
+   * @return  the Java Language class modifiers for the converter class
+   */
+  public int getConverterClassModifiers()
+  {
+    int modifiers = _converterClassModifiers;
+
+    if (!Modifier.isPrivate(modifiers) &&
+        !Modifier.isProtected(modifiers) &&
+        !Modifier.isPublic(modifiers))
+    {
+      modifiers |= Modifier.PUBLIC;
+    }
+
+    return modifiers;
+  }
+
+  public void parseConverterClassModifier(
+    String modifier)
+  {
+    addConverterClassModifier(_parseModifier(modifier));
+  }
+
+  public void parseTagClassModifier(
+    String modifier)
+  {
+    addTagClassModifier(_parseModifier(modifier));
+  }
+
+  private int _parseModifier(
+    String text)
+  {
+    if ("public".equals(text))
+      return Modifier.PUBLIC;
+    else if ("protected".equals(text))
+      return Modifier.PROTECTED;
+    else if ("private".equals(text))
+      return Modifier.PRIVATE;
+    else if ("abstract".equals(text))
+      return Modifier.ABSTRACT;
+    else if ("final".equals(text))
+      return Modifier.FINAL;
+
+    throw new IllegalArgumentException("Unrecognized modifier: " + text);
+  }
+
+  /**
+   * Adds a Java Language class modifier to the tag class.
+   *
+   * @param modifier  the modifier to be added
+   */
+  public void addTagClassModifier(
+    int modifier)
+  {
+    _tagClassModifiers |= modifier;
+  }
+
+  /**
+   * Returns the Java Language class modifiers for the tag class.
+   * By default, these modifiers include Modifier.PUBLIC.
+   *
+   * @return  the Java Language class modifiers for the tag class
+   */
+  public int getTagClassModifiers()
+  {
+    int modifiers = _tagClassModifiers;
+
+    if (!Modifier.isPrivate(modifiers) &&
+        !Modifier.isProtected(modifiers) &&
+        !Modifier.isPublic(modifiers))
+    {
+      modifiers |= Modifier.PUBLIC;
+    }
+
+    return modifiers;
+  }
+
+  private String  _description;
+  private String  _longDescription;
+  private String  _converterId;
+  private String  _converterClass;
+  private String  _converterSuperClass;
+  private QName   _tagName;
+  private String  _tagClass;
+  private Map     _properties;
+  private int     _converterClassModifiers;
+  private int     _tagClassModifiers;
+
+
+  static private final Logger _LOG = Logger.getLogger(ConverterBean.class.getName());
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ConverterBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventBean.java Mon Jul 24 19:17:31 2006
@@ -13,128 +13,128 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
 import org.apache.myfaces.trinidadbuild.plugin.faces.util.Util;
-
-/**
- * EventBean is a Java representation of the faces-config-extension
- * event XML element.
- */
-public class EventBean extends ObjectBean
-{
-  public String getEventName()
-  {
-    return Util.getEventNameFromEventType(_eventType);
-  }
-
-  /**
-   * Sets the description of this property.
-   *
-   * @param description  the property description
-   */
-  public void setDescription(
-    String description)
-  {
-    _description = description;
-  }
-
-  /**
-   * Returns the description of this property.
-   *
-   * @return  the property description
-   */
-  public String getDescription()
-  {
-    return _description;
-  }
-
-  /**
-   * Sets the event type for this event.
-   *
-   * @param eventType  the event type
-   */
-  public void setEventType(
-    String eventType)
-  {
-    _eventType = eventType;
-  }
-
-  /**
-   * Returns the event type for this event.
-   *
-   * @return  the event type
-   */
-  public String getEventType()
-  {
-    return _eventType;
-  }
-
-  /**
-   * Sets the event class for this event.
-   *
-   * @param eventName  the event class
-   */
-  public void setEventClass(
-    String eventClass)
-  {
-    _eventClass = eventClass;
-  }
-
-  /**
-   * Returns the event class for this event.
-   *
-   * @return  the event class
-   */
-  public String getEventClass()
-  {
-    return _eventClass;
-  }
-
-  /**
-   * Sets the event listener class for this event.
-   *
-   * @param eventListenerClass  the event listener class
-   */
-  public void setEventListenerClass(
-    String eventListenerClass)
-  {
-    _eventListenerClass = eventListenerClass;
-  }
-
-  /**
-   * Returns the event listener class for this event.
-   *
-   * @return  the event listener class
-   */
-  public String getEventListenerClass()
-  {
-    return _eventListenerClass;
-  }
-
-  /**
-   * Sets the event source interface for this event.
-   *
-   * @param eventSourceInterface  the event source interface
-   */
-  public void setEventSourceInterface(
-    String eventSourceInterface)
-  {
-    _eventSourceInterface = eventSourceInterface;
-  }
-
-  /**
-   * Returns the event source interface for this event.
-   *
-   * @return  the event source interface
-   */
-  public String getEventSourceInterface()
-  {
-    return _eventSourceInterface;
-  }
-
-  private String _description;
-  private String _eventType;
-  private String _eventClass;
-  private String _eventListenerClass;
-  private String _eventSourceInterface;
+
+/**
+ * EventBean is a Java representation of the faces-config-extension
+ * event XML element.
+ */
+public class EventBean extends ObjectBean
+{
+  public String getEventName()
+  {
+    return Util.getEventNameFromEventType(_eventType);
+  }
+
+  /**
+   * Sets the description of this property.
+   *
+   * @param description  the property description
+   */
+  public void setDescription(
+    String description)
+  {
+    _description = description;
+  }
+
+  /**
+   * Returns the description of this property.
+   *
+   * @return  the property description
+   */
+  public String getDescription()
+  {
+    return _description;
+  }
+
+  /**
+   * Sets the event type for this event.
+   *
+   * @param eventType  the event type
+   */
+  public void setEventType(
+    String eventType)
+  {
+    _eventType = eventType;
+  }
+
+  /**
+   * Returns the event type for this event.
+   *
+   * @return  the event type
+   */
+  public String getEventType()
+  {
+    return _eventType;
+  }
+
+  /**
+   * Sets the event class for this event.
+   *
+   * @param eventName  the event class
+   */
+  public void setEventClass(
+    String eventClass)
+  {
+    _eventClass = eventClass;
+  }
+
+  /**
+   * Returns the event class for this event.
+   *
+   * @return  the event class
+   */
+  public String getEventClass()
+  {
+    return _eventClass;
+  }
+
+  /**
+   * Sets the event listener class for this event.
+   *
+   * @param eventListenerClass  the event listener class
+   */
+  public void setEventListenerClass(
+    String eventListenerClass)
+  {
+    _eventListenerClass = eventListenerClass;
+  }
+
+  /**
+   * Returns the event listener class for this event.
+   *
+   * @return  the event listener class
+   */
+  public String getEventListenerClass()
+  {
+    return _eventListenerClass;
+  }
+
+  /**
+   * Sets the event source interface for this event.
+   *
+   * @param eventSourceInterface  the event source interface
+   */
+  public void setEventSourceInterface(
+    String eventSourceInterface)
+  {
+    _eventSourceInterface = eventSourceInterface;
+  }
+
+  /**
+   * Returns the event source interface for this event.
+   *
+   * @return  the event source interface
+   */
+  public String getEventSourceInterface()
+  {
+    return _eventSourceInterface;
+  }
+
+  private String _description;
+  private String _eventType;
+  private String _eventClass;
+  private String _eventListenerClass;
+  private String _eventSourceInterface;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java Mon Jul 24 19:17:31 2006
@@ -13,99 +13,99 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
 import org.apache.myfaces.trinidadbuild.plugin.faces.util.Util;
-
-/**
- * EventBean is a Java representation of the faces-config component-extension
- * event XML element.
- */
-public class EventRefBean extends ObjectBean
-{
-  public String getEventName()
-  {
-    return Util.getEventNameFromEventType(_eventType);
-  }
-
-  /**
-   * Sets the event type for this event reference.
-   *
-   * @param eventType  the event type
-   */
-  public void setEventType(
-    String eventType)
-  {
-    _eventType = eventType;
-  }
-
-  /**
-   * Returns the event type for this event.
-   *
-   * @return  the event type
-   */
-  public String getEventType()
-  {
-    return _eventType;
-  }
-
-  /**
-   * Sets the delivery phases for this event.
-   *
-   * @param deliveryPhases  the event delivery phases
-   */
-  public void setEventDeliveryPhases(
-    String[] deliveryPhases)
-  {
-    _deliveryPhases = deliveryPhases;
-  }
-
-  /**
-   * Returns the delivery phases for this event.
-   *
-   * @return  the event delivery phases
-   */
-  public String[] getEventDeliveryPhases()
-  {
-    return _deliveryPhases;
-  }
-
-  /**
-   * Sets a flag indicating whether or not to automatically implement
-   * the event source interface on the generated component source.
-   *
-   * @param ignoreSourceInterface  true,  to ignore the event source interface;
-   *                               false, otherwise
-   */
-  public void setIgnoreSourceInterface(
-    boolean ignoreSourceInterface)
-  {
-    _ignoreSourceInterface = ignoreSourceInterface;
-  }
-
-  /**
-   * Returns a flag indicating whether or not to automatically implement
-   * the event source interface on the generated component source.
-   *
-   * @return  true,  to ignore the event source interface;
-   *          false, otherwise
-   */
-  public boolean isIgnoreSourceInterface()
-  {
-    return _ignoreSourceInterface;
-  }
-
-  /**
-   * Resolves the event type.
-   *
-   * @return  the event with the referencing event type,
-   *          or null if not found
-   */
-  public EventBean resolveEventType()
-  {
-    return getOwner().findEvent(_eventType);
-  }
-
-  private String   _eventType;
-  private String[] _deliveryPhases;
-  private boolean  _ignoreSourceInterface;
+
+/**
+ * EventBean is a Java representation of the faces-config component-extension
+ * event XML element.
+ */
+public class EventRefBean extends ObjectBean
+{
+  public String getEventName()
+  {
+    return Util.getEventNameFromEventType(_eventType);
+  }
+
+  /**
+   * Sets the event type for this event reference.
+   *
+   * @param eventType  the event type
+   */
+  public void setEventType(
+    String eventType)
+  {
+    _eventType = eventType;
+  }
+
+  /**
+   * Returns the event type for this event.
+   *
+   * @return  the event type
+   */
+  public String getEventType()
+  {
+    return _eventType;
+  }
+
+  /**
+   * Sets the delivery phases for this event.
+   *
+   * @param deliveryPhases  the event delivery phases
+   */
+  public void setEventDeliveryPhases(
+    String[] deliveryPhases)
+  {
+    _deliveryPhases = deliveryPhases;
+  }
+
+  /**
+   * Returns the delivery phases for this event.
+   *
+   * @return  the event delivery phases
+   */
+  public String[] getEventDeliveryPhases()
+  {
+    return _deliveryPhases;
+  }
+
+  /**
+   * Sets a flag indicating whether or not to automatically implement
+   * the event source interface on the generated component source.
+   *
+   * @param ignoreSourceInterface  true,  to ignore the event source interface;
+   *                               false, otherwise
+   */
+  public void setIgnoreSourceInterface(
+    boolean ignoreSourceInterface)
+  {
+    _ignoreSourceInterface = ignoreSourceInterface;
+  }
+
+  /**
+   * Returns a flag indicating whether or not to automatically implement
+   * the event source interface on the generated component source.
+   *
+   * @return  true,  to ignore the event source interface;
+   *          false, otherwise
+   */
+  public boolean isIgnoreSourceInterface()
+  {
+    return _ignoreSourceInterface;
+  }
+
+  /**
+   * Resolves the event type.
+   *
+   * @return  the event with the referencing event type,
+   *          or null if not found
+   */
+  public EventBean resolveEventType()
+  {
+    return getOwner().findEvent(_eventType);
+  }
+
+  private String   _eventType;
+  private String[] _deliveryPhases;
+  private boolean  _ignoreSourceInterface;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java Mon Jul 24 19:17:31 2006
@@ -13,300 +13,300 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.logging.Logger;
-
-/**
- * FacesConfigBean is a Java representation of the faces-config XML element.
- */
-public class FacesConfigBean extends ObjectBean
-{
-  /**
-   * Adds a converter to this faces config document.
-   *
-   * @param converter  the converter to add
-   */
-  public void addConverter(
-    ConverterBean converter)
-  {
-    converter.attach(this);
-    if (converter.hasConverterId())
-      _converters.put(converter.getConverterId(), converter);
-  }
-
-  /**
-   * Returns the converter for this converter type.
-   *
-   * @param converterId  the converter type to find
-   */
-  public ConverterBean findConverter(
-    String converterId)
-  {
-    return (ConverterBean)_converters.get(converterId);
-  }
-
-  /**
-   * Returns true if this faces config has any converters.
-   *
-   * @return true  if this faces config has any converters,
-   *         otherwise false
-   */
-  public boolean hasConverters()
-  {
-    return !_converters.isEmpty();
-  }
-
-  /**
-   * Returns an iterator for all converters in this faces
-   * config.
-   *
-   * @return  the converter iterator
-   */
-  public Iterator converters()
-  {
-    return _converters.values().iterator();
-  }
-
-  /**
-   * Adds a validator to this faces config document.
-   *
-   * @param validator  the validator to add
-   */
-  public void addValidator(
-    ValidatorBean validator)
-  {
-    validator.attach(this);
-    if (validator.hasValidatorId())
-      _validators.put(validator.getValidatorId(), validator);
-  }
-
-  /**
-   * Returns the validator for this validator type.
-   *
-   * @param validatorId  the validator type to find
-   */
-  public ValidatorBean findValidator(
-    String validatorId)
-  {
-    return (ValidatorBean)_validators.get(validatorId);
-  }
-
-  /**
-   * Returns true if this faces config has any validators.
-   *
-   * @return true  if this faces config has any validators,
-   *         otherwise false
-   */
-  public boolean hasValidators()
-  {
-    return !_validators.isEmpty();
-  }
-
-  /**
-   * Returns an iterator for all validators in this faces
-   * config.
-   *
-   * @return  the validator iterator
-   */
-  public Iterator validators()
-  {
-    return _validators.values().iterator();
-  }
-
-  /**
-   * Adds a component to this faces config document.
-   *
-   * @param component  the component to add
-   */
-  public void addComponent(
-    ComponentBean component)
-  {
-    // Generic "includes" will not have a component type
-    if (component.getComponentType() != null)
-    {
-      component.attach(this);
-      _components.put(component.getComponentType(), component);
-    }
-  }
-
-  /**
-   * Returns the component for this component type.
-   *
-   * @param componentType  the component type to find
-   */
-  public ComponentBean findComponent(
-    String componentType)
-  {
-    return (ComponentBean)_components.get(componentType);
-  }
-
-  /**
-   * Returns true if this faces config has any components.
-   *
-   * @return true  if this faces config has any components,
-   *         otherwise false
-   */
-  public boolean hasComponents()
-  {
-    return !_components.isEmpty();
-  }
-
-  /**
-   * Returns an iterator for all components in this faces
-   * config.
-   *
-   * @return  the component iterator
-   */
-  public Iterator components()
-  {
-    return _components.values().iterator();
-  }
-
-  /**
-   * Adds an event to this faces config document.
-   *
-   * @param event  the event to add
-   */
-  public void addEvent(
-    EventBean event)
-  {
-    if (event.getEventType() == null)
-    {
-      _warning("Missing event type");
-    }
-    else if (event.getEventListenerClass() == null)
-    {
-      _warning("Event \"" + event.getEventType() + "\" " +
-                   "has no listener class");
-    }
-    else if (event.getEventClass() == null)
-    {
-      _warning("Event \"" + event.getEventType() + "\" " +
-                   "has no event class");
-    }
-    else
-    {
-      event.attach(this);
-      _events.put(event.getEventType(), event);
-    }
-  }
-
-  private void _warning(String s)
-  {
-    _LOG.warning(s+"\n  parsing resource:"+getCurrentResource());
-  }
-
-  /**
-   * Returns the event for this event type.
-   *
-   * @param eventType  the event type to find
-   */
-  public EventBean findEvent(
-    String eventType)
-  {
-    return (EventBean)_events.get(eventType);
-  }
-
-  /**
-   * Returns true if this faces config has any events.
-   *
-   * @return true  if this faces config has any events,
-   *         otherwise false
-   */
-  public boolean hasEvents()
-  {
-    return !_events.isEmpty();
-  }
-
-  /**
-   * Returns an iterator for all events in this faces
-   * config.
-   *
-   * @return  the event iterator
-   */
-  public Iterator events()
-  {
-    return _events.values().iterator();
-  }
-
-  /**
-   * Adds a render kit to this faces config document.
-   *
-   * @param renderKit  the render kit to add
-   */
-  public void addRenderKit(
-    RenderKitBean renderKit)
-  {
-    String renderKitId = renderKit.getRenderKitId();
-    RenderKitBean existing = findRenderKit(renderKitId);
-
-    if (existing == null)
-    {
-      renderKit.attach(this);
-      _renderKits.put(renderKitId, renderKit);
-    }
-    else
-    {
-      existing.addAllRenderers(renderKit);
-    }
-  }
-
-  /**
-   * Returns the render kit for this render kit id.
-   *
-   * @param renderKitId  the render kit id to find
-   */
-  public RenderKitBean findRenderKit(
-    String renderKitId)
-  {
-    return (RenderKitBean)_renderKits.get(renderKitId);
-  }
-
-  /**
-   * Returns true if this faces config has any render kits.
-   *
-   * @return true  if this faces config has any render kits,
-   *         otherwise false
-   */
-  public boolean hasRenderKits()
-  {
-    return !_renderKits.isEmpty();
-  }
-
-  /**
-   * Returns an iterator for all render kits in this faces
-   * config.
-   *
-   * @return  the render kit iterator
-   */
-  public Iterator renderKits()
-  {
-    return _renderKits.values().iterator();
-  }
-
-  public URL getCurrentResource()
-  {
-    return _currentResource;
-  }
-  
-  public URL setCurrentResource(URL resource)
-  {
-    URL _cur = _currentResource;
-    _currentResource = resource;
-    return _cur;
-  }
-
-  private Map _converters = new TreeMap();
-  private Map _validators = new TreeMap();
-  private Map _components = new TreeMap();
-  private Map _events = new TreeMap();
-  private Map _renderKits = new TreeMap();
-  private URL _currentResource = null;
-
-  static private final Logger _LOG = Logger.getLogger(FacesConfigBean.class.getName());
-}
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Logger;
+
+/**
+ * FacesConfigBean is a Java representation of the faces-config XML element.
+ */
+public class FacesConfigBean extends ObjectBean
+{
+  /**
+   * Adds a converter to this faces config document.
+   *
+   * @param converter  the converter to add
+   */
+  public void addConverter(
+    ConverterBean converter)
+  {
+    converter.attach(this);
+    if (converter.hasConverterId())
+      _converters.put(converter.getConverterId(), converter);
+  }
+
+  /**
+   * Returns the converter for this converter type.
+   *
+   * @param converterId  the converter type to find
+   */
+  public ConverterBean findConverter(
+    String converterId)
+  {
+    return (ConverterBean)_converters.get(converterId);
+  }
+
+  /**
+   * Returns true if this faces config has any converters.
+   *
+   * @return true  if this faces config has any converters,
+   *         otherwise false
+   */
+  public boolean hasConverters()
+  {
+    return !_converters.isEmpty();
+  }
+
+  /**
+   * Returns an iterator for all converters in this faces
+   * config.
+   *
+   * @return  the converter iterator
+   */
+  public Iterator converters()
+  {
+    return _converters.values().iterator();
+  }
+
+  /**
+   * Adds a validator to this faces config document.
+   *
+   * @param validator  the validator to add
+   */
+  public void addValidator(
+    ValidatorBean validator)
+  {
+    validator.attach(this);
+    if (validator.hasValidatorId())
+      _validators.put(validator.getValidatorId(), validator);
+  }
+
+  /**
+   * Returns the validator for this validator type.
+   *
+   * @param validatorId  the validator type to find
+   */
+  public ValidatorBean findValidator(
+    String validatorId)
+  {
+    return (ValidatorBean)_validators.get(validatorId);
+  }
+
+  /**
+   * Returns true if this faces config has any validators.
+   *
+   * @return true  if this faces config has any validators,
+   *         otherwise false
+   */
+  public boolean hasValidators()
+  {
+    return !_validators.isEmpty();
+  }
+
+  /**
+   * Returns an iterator for all validators in this faces
+   * config.
+   *
+   * @return  the validator iterator
+   */
+  public Iterator validators()
+  {
+    return _validators.values().iterator();
+  }
+
+  /**
+   * Adds a component to this faces config document.
+   *
+   * @param component  the component to add
+   */
+  public void addComponent(
+    ComponentBean component)
+  {
+    // Generic "includes" will not have a component type
+    if (component.getComponentType() != null)
+    {
+      component.attach(this);
+      _components.put(component.getComponentType(), component);
+    }
+  }
+
+  /**
+   * Returns the component for this component type.
+   *
+   * @param componentType  the component type to find
+   */
+  public ComponentBean findComponent(
+    String componentType)
+  {
+    return (ComponentBean)_components.get(componentType);
+  }
+
+  /**
+   * Returns true if this faces config has any components.
+   *
+   * @return true  if this faces config has any components,
+   *         otherwise false
+   */
+  public boolean hasComponents()
+  {
+    return !_components.isEmpty();
+  }
+
+  /**
+   * Returns an iterator for all components in this faces
+   * config.
+   *
+   * @return  the component iterator
+   */
+  public Iterator components()
+  {
+    return _components.values().iterator();
+  }
+
+  /**
+   * Adds an event to this faces config document.
+   *
+   * @param event  the event to add
+   */
+  public void addEvent(
+    EventBean event)
+  {
+    if (event.getEventType() == null)
+    {
+      _warning("Missing event type");
+    }
+    else if (event.getEventListenerClass() == null)
+    {
+      _warning("Event \"" + event.getEventType() + "\" " +
+                   "has no listener class");
+    }
+    else if (event.getEventClass() == null)
+    {
+      _warning("Event \"" + event.getEventType() + "\" " +
+                   "has no event class");
+    }
+    else
+    {
+      event.attach(this);
+      _events.put(event.getEventType(), event);
+    }
+  }
+
+  private void _warning(String s)
+  {
+    _LOG.warning(s+"\n  parsing resource:"+getCurrentResource());
+  }
+
+  /**
+   * Returns the event for this event type.
+   *
+   * @param eventType  the event type to find
+   */
+  public EventBean findEvent(
+    String eventType)
+  {
+    return (EventBean)_events.get(eventType);
+  }
+
+  /**
+   * Returns true if this faces config has any events.
+   *
+   * @return true  if this faces config has any events,
+   *         otherwise false
+   */
+  public boolean hasEvents()
+  {
+    return !_events.isEmpty();
+  }
+
+  /**
+   * Returns an iterator for all events in this faces
+   * config.
+   *
+   * @return  the event iterator
+   */
+  public Iterator events()
+  {
+    return _events.values().iterator();
+  }
+
+  /**
+   * Adds a render kit to this faces config document.
+   *
+   * @param renderKit  the render kit to add
+   */
+  public void addRenderKit(
+    RenderKitBean renderKit)
+  {
+    String renderKitId = renderKit.getRenderKitId();
+    RenderKitBean existing = findRenderKit(renderKitId);
+
+    if (existing == null)
+    {
+      renderKit.attach(this);
+      _renderKits.put(renderKitId, renderKit);
+    }
+    else
+    {
+      existing.addAllRenderers(renderKit);
+    }
+  }
+
+  /**
+   * Returns the render kit for this render kit id.
+   *
+   * @param renderKitId  the render kit id to find
+   */
+  public RenderKitBean findRenderKit(
+    String renderKitId)
+  {
+    return (RenderKitBean)_renderKits.get(renderKitId);
+  }
+
+  /**
+   * Returns true if this faces config has any render kits.
+   *
+   * @return true  if this faces config has any render kits,
+   *         otherwise false
+   */
+  public boolean hasRenderKits()
+  {
+    return !_renderKits.isEmpty();
+  }
+
+  /**
+   * Returns an iterator for all render kits in this faces
+   * config.
+   *
+   * @return  the render kit iterator
+   */
+  public Iterator renderKits()
+  {
+    return _renderKits.values().iterator();
+  }
+
+  public URL getCurrentResource()
+  {
+    return _currentResource;
+  }
+  
+  public URL setCurrentResource(URL resource)
+  {
+    URL _cur = _currentResource;
+    _currentResource = resource;
+    return _cur;
+  }
+
+  private Map _converters = new TreeMap();
+  private Map _validators = new TreeMap();
+  private Map _components = new TreeMap();
+  private Map _events = new TreeMap();
+  private Map _renderKits = new TreeMap();
+  private URL _currentResource = null;
+
+  static private final Logger _LOG = Logger.getLogger(FacesConfigBean.class.getName());
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java Mon Jul 24 19:17:31 2006
@@ -13,368 +13,368 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.net.URL;
-import java.net.URLConnection;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.AbstractObjectCreationFactory;
-
-import org.apache.maven.plugin.MojoExecutionException;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.AbstractObjectCreationFactory;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+
 import org.apache.myfaces.trinidadbuild.plugin.faces.parse.rules.BeanPropertySetterRule;
 import org.apache.myfaces.trinidadbuild.plugin.faces.util.XIncludeFilter;
-
-public class FacesConfigParser
-{
-  public void merge(
-    FacesConfigBean owner,
-    URL             url) throws MojoExecutionException
-  {
-    try
-    {
-      URLConnection conn = url.openConnection();
-      long lastModified = conn.getLastModified();
-      InputStream is = conn.getInputStream();
-
-      if (is != null)
-      {
-        // Establish the current last-modified value
-        // As new components are added, they will remember
-        // this current value as their own last-modified
-        owner.touch(lastModified);
-
-        Digester digester = createDigester();
-        digester.push(url);
-        digester.push(owner);
-        digester.parse(is);
-        is.close();
-      }
-    }
-    catch (IOException e)
-    {
-      throw new MojoExecutionException("Failed to parse " + url, e);
-    }
-    catch (SAXException e)
-    {
-      throw new MojoExecutionException("Failed to parse " + url, e);
-    }
-    catch (ParserConfigurationException e)
-    {
-      throw new MojoExecutionException("Failed to parse " + url, e);
-    }
-  }
-
-
-  static protected Digester createEmptyDigester()
-    throws ParserConfigurationException, SAXException
-  {
-    SAXParserFactory spf = SAXParserFactory.newInstance();
-    spf.setNamespaceAware(true);
-    // requires JAXP 1.3, in JavaSE 5.0
-    // spf.setXIncludeAware(true);
-    Digester digester = new Digester(spf.newSAXParser());
-    digester.setNamespaceAware(true);
-    
-    return digester;
-  }
-
-  static protected void addComponentDigesterRules(Digester digester, boolean withCreate)
-  {
-    digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
-
-    // faces-config/component
-    // Only use if we're creating the component;  turn this off
-    // when we're simply including content
-    if (withCreate)
-    {
-      // faces-config/component
-      digester.addObjectCreate("faces-config/component", ComponentBean.class);
-      digester.addBeanPropertySetter("faces-config/component/component-type",
-                                     "componentType");
-      digester.addBeanPropertySetter("faces-config/component/component-class",
-                                     "componentClass");
-      digester.addBeanPropertySetter("faces-config/component/description");
-      digester.addSetNext("faces-config/component", "addComponent",
-                          ComponentBean.class.getName());
-    }
-
-    // faces-config/component/property
-    digester.addObjectCreate("faces-config/component/property", PropertyBean.class);
-    digester.addBeanPropertySetter("faces-config/component/property/property-name",
-                                   "propertyName");
-    digester.addBeanPropertySetter("faces-config/component/property/property-class",
-                                   "propertyClass");
-    digester.addBeanPropertySetter("faces-config/component/property/description");
-    digester.addBeanPropertySetter("faces-config/component/property/default-value",
-                                   "defaultValue");
-    digester.addSetNext("faces-config/component/property", "addProperty",
-                        PropertyBean.class.getName());
-
-    // faces-config/component/facet
-    digester.addObjectCreate("faces-config/component/facet", FacetBean.class);
-    digester.addBeanPropertySetter("faces-config/component/facet/facet-name",
-                                   "facetName");
-    digester.addBeanPropertySetter("faces-config/component/facet/description");
-    digester.addSetNext("faces-config/component/facet", "addFacet",
-                        FacetBean.class.getName());
-
-    // Maven Faces Plugin
-    digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
-
-    // faces-config/component/component-extension
-    digester.addBeanPropertySetter("faces-config/component/component-extension/long-description",
-                                   "longDescription");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/component-family",
-                                   "componentFamily");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/component-supertype",
-                                   "componentSupertype");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/component-superclass",
-                                   "componentSuperclass");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/renderer-type",
-                                   "rendererType");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/peer-type",
-                                   "peerType");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/naming-container",
-                                   "namingContainer");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/accepts-child-components",
-                                   "children");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/tag-class",
-                                   "tagClass");
-    digester.addCallMethod("faces-config/component/component-extension/tag-class-modifier",
-                           "parseTagClassModifier", 1);
-    digester.addCallParam("faces-config/component/component-extension/tag-class-modifier", 0);
-    digester.addCallMethod("faces-config/component/component-extension/component-class-modifier",
-                           "parseComponentClassModifier", 1);
-    digester.addCallParam("faces-config/component/component-extension/component-class-modifier", 0);
-    digester.addRule("faces-config/component/component-extension/tag-name",
-                     new BeanPropertySetterRule("tagName"));
-    digester.addBeanPropertySetter("faces-config/component/component-extension/uix2-local-name",
-                                   "localName");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/uix2-node-class",
-                                   "nodeClass");
-
-    // faces-config/component/component-extension/event
-    digester.addObjectCreate("faces-config/component/component-extension/event", EventRefBean.class);
-    digester.addBeanPropertySetter("faces-config/component/component-extension/event/event-type",
-                                   "eventType");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/event/event-delivery-phase",
-                                   "eventDeliveryPhases");
-    digester.addBeanPropertySetter("faces-config/component/component-extension/event/ignore-source-interface",
-                                   "ignoreSourceInterface");
-    digester.addSetNext("faces-config/component/component-extension/event", "addEvent",
-                        EventRefBean.class.getName());
-
-    // faces-config/component/property/property-extension
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/state-holder",
-                                   "stateHolder");
-    // faces-config/component/property/property-extension
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/list",
-                                   "list");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/required");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/alias-of",
-                                   "aliasOf");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/virtual");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/transient");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/literal-only",
-                                   "literalOnly");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/alternate-class",
-                                   "alternateClass");
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/tag-attribute-excluded",
-                                   "tagAttributeExcluded");
-    digester.addCallMethod("faces-config/component/property/property-extension/property-values",
-                           "parsePropertyValues", 1);
-    digester.addCallParam("faces-config/component/property/property-extension/property-values", 0);
-    digester.addCallMethod("faces-config/component/property/property-extension/unsupported-agents",
-                           "parseUnsupportedAgents", 1);
-    digester.addCallParam("faces-config/component/property/property-extension/unsupported-agents", 0);
-    digester.addObjectCreate("faces-config/component/property/property-extension/method-binding-signature",
-                             MethodSignatureBean.class);
-    digester.addBeanPropertySetter("faces-config/component/property/property-extension/method-binding-signature/return-type",
-                                   "returnType");
-    digester.addCallMethod("faces-config/component/property/property-extension/method-binding-signature/parameter-type",
-                           "addParameterType", 1);
-    digester.addCallParam("faces-config/component/property/property-extension/method-binding-signature/parameter-type", 0);
-    digester.addSetNext("faces-config/component/property/property-extension/method-binding-signature",
-                        "setMethodBindingSignature",
-                        MethodSignatureBean.class.getName());
-
-
-    // XInclude rules
-    digester.setRuleNamespaceURI(XIncludeFilter.XINCLUDE_NAMESPACE);
-    digester.addFactoryCreate("faces-config/component/include",
-                              ComponentIncludeFactory.class);
-  }
-
-  protected Digester createDigester() throws ParserConfigurationException, SAXException
-  {
-    Digester digester = createEmptyDigester();
-
-    addComponentDigesterRules(digester, true);
-    
-    // Java Enterprise 5.0
-    digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
-    //digester.addObjectCreate("faces-config", FacesConfigBean.class);
-
-    // faces-config/converter
-    digester.addObjectCreate("faces-config/converter", ConverterBean.class);
-    digester.addBeanPropertySetter("faces-config/converter/converter-id",
-                                   "converterId");
-    digester.addBeanPropertySetter("faces-config/converter/converter-class",
-                                   "converterClass");
-    digester.addBeanPropertySetter("faces-config/converter/description");
-    digester.addSetNext("faces-config/converter", "addConverter",
-                        ConverterBean.class.getName());
-
-    // faces-config/converter/property
-    digester.addObjectCreate("faces-config/converter/property", PropertyBean.class);
-    digester.addBeanPropertySetter("faces-config/converter/property/property-name",
-                                   "propertyName");
-    digester.addBeanPropertySetter("faces-config/converter/property/property-class",
-                                   "propertyClass");
-    digester.addBeanPropertySetter("faces-config/converter/property/description");
-    digester.addBeanPropertySetter("faces-config/converter/property/default-value",
-                                   "defaultValue");
-    digester.addSetNext("faces-config/converter/property", "addProperty",
-                        PropertyBean.class.getName());
-
-    // faces-config/validator
-    digester.addObjectCreate("faces-config/validator", ValidatorBean.class);
-    digester.addBeanPropertySetter("faces-config/validator/validator-id",
-                                   "validatorId");
-    digester.addBeanPropertySetter("faces-config/validator/validator-class",
-                                   "validatorClass");
-    digester.addBeanPropertySetter("faces-config/validator/description");
-    digester.addSetNext("faces-config/validator", "addValidator",
-                        ValidatorBean.class.getName());
-
-    // faces-config/validator/property
-    digester.addObjectCreate("faces-config/validator/property", PropertyBean.class);
-    digester.addBeanPropertySetter("faces-config/validator/property/property-name",
-                                   "propertyName");
-    digester.addBeanPropertySetter("faces-config/validator/property/property-class",
-                                   "propertyClass");
-    digester.addBeanPropertySetter("faces-config/validator/property/description");
-    digester.addBeanPropertySetter("faces-config/validator/property/default-value",
-                                   "defaultValue");
-    digester.addSetNext("faces-config/validator/property", "addProperty",
-                        PropertyBean.class.getName());
-
-
-    // faces-config/render-kit
-    digester.addObjectCreate("faces-config/render-kit", RenderKitBean.class);
-    digester.addBeanPropertySetter("faces-config/render-kit/render-kit-id",
-                                   "renderKitId");
-    digester.addSetNext("faces-config/render-kit", "addRenderKit",
-                        RenderKitBean.class.getName());
-
-    // faces-config/render-kit/renderer
-    digester.addObjectCreate("faces-config/render-kit/renderer", RendererBean.class);
-    digester.addBeanPropertySetter("faces-config/render-kit/renderer/description");
-    digester.addBeanPropertySetter("faces-config/render-kit/renderer/component-family",
-                                   "componentFamily");
-    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-type",
-                                   "rendererType");
-    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-class",
-                                   "rendererClass");
-    digester.addSetNext("faces-config/render-kit/renderer", "addRenderer",
-                        RendererBean.class.getName());
-
-
-    // TBD: JSR-276 metadata (ask Jeff Stephenson)
-
-
-    // Maven Faces Plugin
-    digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
-
-    // faces-config/faces-config-extension/event
-    digester.addObjectCreate("faces-config/faces-config-extension/event", EventBean.class);
-    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/description");
-    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-type",
-                                   "eventType");
-    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-class",
-                                   "eventClass");
-    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-listener-class",
-                                   "eventListenerClass");
-    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-source-interface",
-                                   "eventSourceInterface");
-    digester.addSetNext("faces-config/faces-config-extension/event", "addEvent",
-                        EventBean.class.getName());
-
-    // faces-config/converter/converter-extension
-    digester.addBeanPropertySetter("faces-config/converter/converter-extension/long-description",
-                                   "longDescription");
-    digester.addBeanPropertySetter("faces-config/converter/converter-extension/tag-class",
-                                   "tagClass");
-    digester.addRule("faces-config/converter/converter-extension/tag-name",
-                     new BeanPropertySetterRule("tagName"));
-    digester.addCallMethod("faces-config/converter/converter-extension/tag-class-modifier",
-                           "parseTagClassModifier", 1);
-    digester.addCallParam("faces-config/converter/converter-extension/tag-class-modifier", 0);
-
-    // faces-config/converter/property/property-extension
-    digester.addBeanPropertySetter("faces-config/converter/property/property-extension/tag-attribute-excluded",
-                                   "tagAttributeExcluded");
-
-    // faces-config/validator/validator-extension
-    digester.addBeanPropertySetter("faces-config/validator/validator-extension/long-description",
-                                   "longDescription");
-    digester.addBeanPropertySetter("faces-config/validator/validator-extension/tag-class",
-                                   "tagClass");
-    digester.addRule("faces-config/validator/validator-extension/tag-name",
-                     new BeanPropertySetterRule("tagName"));
-    digester.addCallMethod("faces-config/validator/validator-extension/tag-class-modifier",
-                           "parseTagClassModifier", 1);
-    digester.addCallParam("faces-config/validator/validator-extension/tag-class-modifier", 0);
-
-    // faces-config/validator/property/property-extension
-    digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
-                                   "tagAttributeExcluded");
-
-    // faces-config/render-kit/renderer/renderer-extension
-    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/component-type",
-                                   "componentType");
-    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/renderer-superclass",
-                                   "rendererSuperclass");
-
-    return digester;
-  }
-
-  static public class ComponentIncludeFactory extends AbstractObjectCreationFactory
-  {
-    public Object createObject(
-      Attributes attributes) throws Exception
-    {
-      String href = attributes.getValue("href");
-      if (href == null)
-        throw new IllegalStateException("Missing href attribute");
-
-      URL master = (URL)digester.getRoot();
-      URL included = new URL(master, href);
-
-      Digester includedDigester = createEmptyDigester();
-      addComponentDigesterRules(includedDigester, false);
-      includedDigester.push(included);
-      includedDigester.push(digester.peek());
-
-      URLConnection conn = included.openConnection();
-      InputStream is = conn.getInputStream();
-      includedDigester.parse(is);
-      is.close();
-
-      // We don't really want the included object - but return it anyway
-      return included;
-    }
-  }
-}
+
+public class FacesConfigParser
+{
+  public void merge(
+    FacesConfigBean owner,
+    URL             url) throws MojoExecutionException
+  {
+    try
+    {
+      URLConnection conn = url.openConnection();
+      long lastModified = conn.getLastModified();
+      InputStream is = conn.getInputStream();
+
+      if (is != null)
+      {
+        // Establish the current last-modified value
+        // As new components are added, they will remember
+        // this current value as their own last-modified
+        owner.touch(lastModified);
+
+        Digester digester = createDigester();
+        digester.push(url);
+        digester.push(owner);
+        digester.parse(is);
+        is.close();
+      }
+    }
+    catch (IOException e)
+    {
+      throw new MojoExecutionException("Failed to parse " + url, e);
+    }
+    catch (SAXException e)
+    {
+      throw new MojoExecutionException("Failed to parse " + url, e);
+    }
+    catch (ParserConfigurationException e)
+    {
+      throw new MojoExecutionException("Failed to parse " + url, e);
+    }
+  }
+
+
+  static protected Digester createEmptyDigester()
+    throws ParserConfigurationException, SAXException
+  {
+    SAXParserFactory spf = SAXParserFactory.newInstance();
+    spf.setNamespaceAware(true);
+    // requires JAXP 1.3, in JavaSE 5.0
+    // spf.setXIncludeAware(true);
+    Digester digester = new Digester(spf.newSAXParser());
+    digester.setNamespaceAware(true);
+    
+    return digester;
+  }
+
+  static protected void addComponentDigesterRules(Digester digester, boolean withCreate)
+  {
+    digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
+
+    // faces-config/component
+    // Only use if we're creating the component;  turn this off
+    // when we're simply including content
+    if (withCreate)
+    {
+      // faces-config/component
+      digester.addObjectCreate("faces-config/component", ComponentBean.class);
+      digester.addBeanPropertySetter("faces-config/component/component-type",
+                                     "componentType");
+      digester.addBeanPropertySetter("faces-config/component/component-class",
+                                     "componentClass");
+      digester.addBeanPropertySetter("faces-config/component/description");
+      digester.addSetNext("faces-config/component", "addComponent",
+                          ComponentBean.class.getName());
+    }
+
+    // faces-config/component/property
+    digester.addObjectCreate("faces-config/component/property", PropertyBean.class);
+    digester.addBeanPropertySetter("faces-config/component/property/property-name",
+                                   "propertyName");
+    digester.addBeanPropertySetter("faces-config/component/property/property-class",
+                                   "propertyClass");
+    digester.addBeanPropertySetter("faces-config/component/property/description");
+    digester.addBeanPropertySetter("faces-config/component/property/default-value",
+                                   "defaultValue");
+    digester.addSetNext("faces-config/component/property", "addProperty",
+                        PropertyBean.class.getName());
+
+    // faces-config/component/facet
+    digester.addObjectCreate("faces-config/component/facet", FacetBean.class);
+    digester.addBeanPropertySetter("faces-config/component/facet/facet-name",
+                                   "facetName");
+    digester.addBeanPropertySetter("faces-config/component/facet/description");
+    digester.addSetNext("faces-config/component/facet", "addFacet",
+                        FacetBean.class.getName());
+
+    // Maven Faces Plugin
+    digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
+
+    // faces-config/component/component-extension
+    digester.addBeanPropertySetter("faces-config/component/component-extension/long-description",
+                                   "longDescription");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/component-family",
+                                   "componentFamily");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/component-supertype",
+                                   "componentSupertype");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/component-superclass",
+                                   "componentSuperclass");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/renderer-type",
+                                   "rendererType");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/peer-type",
+                                   "peerType");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/naming-container",
+                                   "namingContainer");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/accepts-child-components",
+                                   "children");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/tag-class",
+                                   "tagClass");
+    digester.addCallMethod("faces-config/component/component-extension/tag-class-modifier",
+                           "parseTagClassModifier", 1);
+    digester.addCallParam("faces-config/component/component-extension/tag-class-modifier", 0);
+    digester.addCallMethod("faces-config/component/component-extension/component-class-modifier",
+                           "parseComponentClassModifier", 1);
+    digester.addCallParam("faces-config/component/component-extension/component-class-modifier", 0);
+    digester.addRule("faces-config/component/component-extension/tag-name",
+                     new BeanPropertySetterRule("tagName"));
+    digester.addBeanPropertySetter("faces-config/component/component-extension/uix2-local-name",
+                                   "localName");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/uix2-node-class",
+                                   "nodeClass");
+
+    // faces-config/component/component-extension/event
+    digester.addObjectCreate("faces-config/component/component-extension/event", EventRefBean.class);
+    digester.addBeanPropertySetter("faces-config/component/component-extension/event/event-type",
+                                   "eventType");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/event/event-delivery-phase",
+                                   "eventDeliveryPhases");
+    digester.addBeanPropertySetter("faces-config/component/component-extension/event/ignore-source-interface",
+                                   "ignoreSourceInterface");
+    digester.addSetNext("faces-config/component/component-extension/event", "addEvent",
+                        EventRefBean.class.getName());
+
+    // faces-config/component/property/property-extension
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/state-holder",
+                                   "stateHolder");
+    // faces-config/component/property/property-extension
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/list",
+                                   "list");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/required");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/alias-of",
+                                   "aliasOf");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/virtual");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/transient");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/literal-only",
+                                   "literalOnly");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/alternate-class",
+                                   "alternateClass");
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/tag-attribute-excluded",
+                                   "tagAttributeExcluded");
+    digester.addCallMethod("faces-config/component/property/property-extension/property-values",
+                           "parsePropertyValues", 1);
+    digester.addCallParam("faces-config/component/property/property-extension/property-values", 0);
+    digester.addCallMethod("faces-config/component/property/property-extension/unsupported-agents",
+                           "parseUnsupportedAgents", 1);
+    digester.addCallParam("faces-config/component/property/property-extension/unsupported-agents", 0);
+    digester.addObjectCreate("faces-config/component/property/property-extension/method-binding-signature",
+                             MethodSignatureBean.class);
+    digester.addBeanPropertySetter("faces-config/component/property/property-extension/method-binding-signature/return-type",
+                                   "returnType");
+    digester.addCallMethod("faces-config/component/property/property-extension/method-binding-signature/parameter-type",
+                           "addParameterType", 1);
+    digester.addCallParam("faces-config/component/property/property-extension/method-binding-signature/parameter-type", 0);
+    digester.addSetNext("faces-config/component/property/property-extension/method-binding-signature",
+                        "setMethodBindingSignature",
+                        MethodSignatureBean.class.getName());
+
+
+    // XInclude rules
+    digester.setRuleNamespaceURI(XIncludeFilter.XINCLUDE_NAMESPACE);
+    digester.addFactoryCreate("faces-config/component/include",
+                              ComponentIncludeFactory.class);
+  }
+
+  protected Digester createDigester() throws ParserConfigurationException, SAXException
+  {
+    Digester digester = createEmptyDigester();
+
+    addComponentDigesterRules(digester, true);
+    
+    // Java Enterprise 5.0
+    digester.setRuleNamespaceURI("http://java.sun.com/xml/ns/javaee");
+    //digester.addObjectCreate("faces-config", FacesConfigBean.class);
+
+    // faces-config/converter
+    digester.addObjectCreate("faces-config/converter", ConverterBean.class);
+    digester.addBeanPropertySetter("faces-config/converter/converter-id",
+                                   "converterId");
+    digester.addBeanPropertySetter("faces-config/converter/converter-class",
+                                   "converterClass");
+    digester.addBeanPropertySetter("faces-config/converter/description");
+    digester.addSetNext("faces-config/converter", "addConverter",
+                        ConverterBean.class.getName());
+
+    // faces-config/converter/property
+    digester.addObjectCreate("faces-config/converter/property", PropertyBean.class);
+    digester.addBeanPropertySetter("faces-config/converter/property/property-name",
+                                   "propertyName");
+    digester.addBeanPropertySetter("faces-config/converter/property/property-class",
+                                   "propertyClass");
+    digester.addBeanPropertySetter("faces-config/converter/property/description");
+    digester.addBeanPropertySetter("faces-config/converter/property/default-value",
+                                   "defaultValue");
+    digester.addSetNext("faces-config/converter/property", "addProperty",
+                        PropertyBean.class.getName());
+
+    // faces-config/validator
+    digester.addObjectCreate("faces-config/validator", ValidatorBean.class);
+    digester.addBeanPropertySetter("faces-config/validator/validator-id",
+                                   "validatorId");
+    digester.addBeanPropertySetter("faces-config/validator/validator-class",
+                                   "validatorClass");
+    digester.addBeanPropertySetter("faces-config/validator/description");
+    digester.addSetNext("faces-config/validator", "addValidator",
+                        ValidatorBean.class.getName());
+
+    // faces-config/validator/property
+    digester.addObjectCreate("faces-config/validator/property", PropertyBean.class);
+    digester.addBeanPropertySetter("faces-config/validator/property/property-name",
+                                   "propertyName");
+    digester.addBeanPropertySetter("faces-config/validator/property/property-class",
+                                   "propertyClass");
+    digester.addBeanPropertySetter("faces-config/validator/property/description");
+    digester.addBeanPropertySetter("faces-config/validator/property/default-value",
+                                   "defaultValue");
+    digester.addSetNext("faces-config/validator/property", "addProperty",
+                        PropertyBean.class.getName());
+
+
+    // faces-config/render-kit
+    digester.addObjectCreate("faces-config/render-kit", RenderKitBean.class);
+    digester.addBeanPropertySetter("faces-config/render-kit/render-kit-id",
+                                   "renderKitId");
+    digester.addSetNext("faces-config/render-kit", "addRenderKit",
+                        RenderKitBean.class.getName());
+
+    // faces-config/render-kit/renderer
+    digester.addObjectCreate("faces-config/render-kit/renderer", RendererBean.class);
+    digester.addBeanPropertySetter("faces-config/render-kit/renderer/description");
+    digester.addBeanPropertySetter("faces-config/render-kit/renderer/component-family",
+                                   "componentFamily");
+    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-type",
+                                   "rendererType");
+    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-class",
+                                   "rendererClass");
+    digester.addSetNext("faces-config/render-kit/renderer", "addRenderer",
+                        RendererBean.class.getName());
+
+
+    // TBD: JSR-276 metadata (ask Jeff Stephenson)
+
+
+    // Maven Faces Plugin
+    digester.setRuleNamespaceURI("http://myfaces.apache.org/maven-faces-plugin");
+
+    // faces-config/faces-config-extension/event
+    digester.addObjectCreate("faces-config/faces-config-extension/event", EventBean.class);
+    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/description");
+    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-type",
+                                   "eventType");
+    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-class",
+                                   "eventClass");
+    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-listener-class",
+                                   "eventListenerClass");
+    digester.addBeanPropertySetter("faces-config/faces-config-extension/event/event-source-interface",
+                                   "eventSourceInterface");
+    digester.addSetNext("faces-config/faces-config-extension/event", "addEvent",
+                        EventBean.class.getName());
+
+    // faces-config/converter/converter-extension
+    digester.addBeanPropertySetter("faces-config/converter/converter-extension/long-description",
+                                   "longDescription");
+    digester.addBeanPropertySetter("faces-config/converter/converter-extension/tag-class",
+                                   "tagClass");
+    digester.addRule("faces-config/converter/converter-extension/tag-name",
+                     new BeanPropertySetterRule("tagName"));
+    digester.addCallMethod("faces-config/converter/converter-extension/tag-class-modifier",
+                           "parseTagClassModifier", 1);
+    digester.addCallParam("faces-config/converter/converter-extension/tag-class-modifier", 0);
+
+    // faces-config/converter/property/property-extension
+    digester.addBeanPropertySetter("faces-config/converter/property/property-extension/tag-attribute-excluded",
+                                   "tagAttributeExcluded");
+
+    // faces-config/validator/validator-extension
+    digester.addBeanPropertySetter("faces-config/validator/validator-extension/long-description",
+                                   "longDescription");
+    digester.addBeanPropertySetter("faces-config/validator/validator-extension/tag-class",
+                                   "tagClass");
+    digester.addRule("faces-config/validator/validator-extension/tag-name",
+                     new BeanPropertySetterRule("tagName"));
+    digester.addCallMethod("faces-config/validator/validator-extension/tag-class-modifier",
+                           "parseTagClassModifier", 1);
+    digester.addCallParam("faces-config/validator/validator-extension/tag-class-modifier", 0);
+
+    // faces-config/validator/property/property-extension
+    digester.addBeanPropertySetter("faces-config/validator/property/property-extension/tag-attribute-excluded",
+                                   "tagAttributeExcluded");
+
+    // faces-config/render-kit/renderer/renderer-extension
+    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/component-type",
+                                   "componentType");
+    digester.addBeanPropertySetter("faces-config/render-kit/renderer/renderer-extension/renderer-superclass",
+                                   "rendererSuperclass");
+
+    return digester;
+  }
+
+  static public class ComponentIncludeFactory extends AbstractObjectCreationFactory
+  {
+    public Object createObject(
+      Attributes attributes) throws Exception
+    {
+      String href = attributes.getValue("href");
+      if (href == null)
+        throw new IllegalStateException("Missing href attribute");
+
+      URL master = (URL)digester.getRoot();
+      URL included = new URL(master, href);
+
+      Digester includedDigester = createEmptyDigester();
+      addComponentDigesterRules(includedDigester, false);
+      includedDigester.push(included);
+      includedDigester.push(digester.peek());
+
+      URLConnection conn = included.openConnection();
+      InputStream is = conn.getInputStream();
+      includedDigester.parse(is);
+      is.close();
+
+      // We don't really want the included object - but return it anyway
+      return included;
+    }
+  }
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacesConfigParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java?rev=425260&r1=425259&r2=425260&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java Mon Jul 24 19:17:31 2006
@@ -13,78 +13,78 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
-
-/**
- * FacetBean is a Java representation of the faces-config component or
- * renderer facet XML element.
- */
-public class FacetBean extends ObjectBean
-{
-  /**
-   * Sets the facet name for this facet.
-   *
-   * @param facetName  the facet name
-   */
-  public void setFacetName(
-    String facetName)
-  {
-    _facetName = facetName;
-  }
-
-  /**
-   * Returns the facet name for this facet.
-   *
-   * @return  the facet name
-   */
-  public String getFacetName()
-  {
-    return _facetName;
-  }
-
-  /**
-   * Sets the description of this property.
-   *
-   * @param description  the property description
-   */
-  public void setDescription(
-    String description)
-  {
-    _description = description;
-  }
-
-  /**
-   * Returns the description of this property.
-   *
-   * @return  the property description
-   */
-  public String getDescription()
-  {
-    return _description;
-  }
-
-  /**
-   * Sets the required flag of this facet.
-   *
-   * @param required  the facet required flag
-   */
-  public void setRequired(
-    boolean required)
-  {
-    _required = required;
-  }
-
-  /**
-   * Returns required flag of this facet.
-   *
-   * @return  the facet required flag
-   */
-  public boolean isRequired()
-  {
-    return _required;
-  }
-
-  private String  _description;
-  private String  _facetName;
-  private boolean _required;
+package org.apache.myfaces.trinidadbuild.plugin.faces.parse;
+
+/**
+ * FacetBean is a Java representation of the faces-config component or
+ * renderer facet XML element.
+ */
+public class FacetBean extends ObjectBean
+{
+  /**
+   * Sets the facet name for this facet.
+   *
+   * @param facetName  the facet name
+   */
+  public void setFacetName(
+    String facetName)
+  {
+    _facetName = facetName;
+  }
+
+  /**
+   * Returns the facet name for this facet.
+   *
+   * @return  the facet name
+   */
+  public String getFacetName()
+  {
+    return _facetName;
+  }
+
+  /**
+   * Sets the description of this property.
+   *
+   * @param description  the property description
+   */
+  public void setDescription(
+    String description)
+  {
+    _description = description;
+  }
+
+  /**
+   * Returns the description of this property.
+   *
+   * @return  the property description
+   */
+  public String getDescription()
+  {
+    return _description;
+  }
+
+  /**
+   * Sets the required flag of this facet.
+   *
+   * @param required  the facet required flag
+   */
+  public void setRequired(
+    boolean required)
+  {
+    _required = required;
+  }
+
+  /**
+   * Returns required flag of this facet.
+   *
+   * @return  the facet required flag
+   */
+  public boolean isRequired()
+  {
+    return _required;
+  }
+
+  private String  _description;
+  private String  _facetName;
+  private boolean _required;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/FacetBean.java
------------------------------------------------------------------------------
    svn:eol-style = native