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 aw...@apache.org on 2006/10/26 20:33:09 UTC

svn commit: r468121 - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/ trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/javax/faces/ trinidad-build/src/main/resources...

Author: awiner
Date: Thu Oct 26 13:33:08 2006
New Revision: 468121

URL: http://svn.apache.org/viewvc?view=rev&rev=468121
Log:
Move ReturnEvent into Invoke Application phase (for non-immediate command components): ADFFACES-262:  Active input text box not populated on dialog return.   Patch from Olivier Lafontaine.  Also, fix up whitespace in the event metadata files, and document the new phase delivery of ReturnEvent.

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/AttributeChange.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Disclosure.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Focus.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Launch.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Poll.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Return.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/RowDisclosure.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Selection.xml
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Sort.xml

Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java Thu Oct 26 13:33:08 2006
@@ -51,7 +51,7 @@
   @Override
   public void queueEvent(FacesEvent e)
   {
-    if (e instanceof ActionEvent)
+    if ((e instanceof ActionEvent) || (e instanceof ReturnEvent))
     {
       if (isImmediate())
       {

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,22 +14,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:description>
-        Event delivered when the "action" of the component has been
-invoked;  for example, by clicking on a button.  The action may result
-in page navigation.
-      </mfp:description>
-      <mfp:event-type>javax.faces.Action</mfp:event-type>
-      <mfp:event-class>javax.faces.event.ActionEvent</mfp:event-class>
-      <mfp:event-listener-class>javax.faces.event.ActionListener</mfp:event-listener-class>
-      <mfp:event-source-interface>javax.faces.component.ActionSource</mfp:event-source-interface>
-      <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
-    </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:description>
+        Event delivered when the "action" of the component has been
+invoked;  for example, by clicking on a button.  The action may result
+in page navigation.
+      </mfp:description>
+      <mfp:event-type>javax.faces.Action</mfp:event-type>
+      <mfp:event-class>javax.faces.event.ActionEvent</mfp:event-class>
+      <mfp:event-listener-class>javax.faces.event.ActionListener</mfp:event-listener-class>
+      <mfp:event-source-interface>javax.faces.component.ActionSource</mfp:event-source-interface>
+      <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
+    </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/AttributeChange.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/AttributeChange.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/AttributeChange.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/AttributeChange.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,17 +14,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:description>Event delivered to describe an attribute change.</mfp:description>
-      <mfp:event-type>org.apache.myfaces.trinidad.AttributeChange</mfp:event-type>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.AttributeChangeEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.AttributeChangeListener</mfp:event-listener-class>
-      <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
-    </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:description>Event delivered to describe an attribute change.</mfp:description>
+      <mfp:event-type>org.apache.myfaces.trinidad.AttributeChange</mfp:event-type>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.AttributeChangeEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.AttributeChangeListener</mfp:event-listener-class>
+      <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
+    </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Disclosure.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Disclosure.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Disclosure.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Disclosure.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,18 +14,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:event-type>org.apache.myfaces.trinidad.Disclosure</mfp:event-type>
-      <mfp:description>The disclosure event is delivered when a node is
-                       disclosed.</mfp:description>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.DisclosureEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.DisclosureListener</mfp:event-listener-class>
-    </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:event-type>org.apache.myfaces.trinidad.Disclosure</mfp:event-type>
+      <mfp:description>The disclosure event is delivered when a node is
+                       disclosed.</mfp:description>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.DisclosureEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.DisclosureListener</mfp:event-listener-class>
+    </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Focus.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Focus.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Focus.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Focus.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,19 +14,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:event-type>org.apache.myfaces.trinidad.Focus</mfp:event-type>
-      <mfp:description>Event delivered when user clicks to focus on (or zoom into) a particular element's subtree of children.
-      	        The TreeTable responds to this event by modifying the "focusPath" property appropriately.
-      	        Subsequently, any registered FocusListener instances are called.
-        </mfp:description>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.FocusEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.FocusListener</mfp:event-listener-class>
-    </mfp:event>
-  </faces-config-extension>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:event-type>org.apache.myfaces.trinidad.Focus</mfp:event-type>
+      <mfp:description>Event delivered when user clicks to focus on (or zoom into) a particular element's subtree of children.
+      	        The TreeTable responds to this event by modifying the "focusPath" property appropriately.
+      	        Subsequently, any registered FocusListener instances are called.
+        </mfp:description>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.FocusEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.FocusListener</mfp:event-listener-class>
+    </mfp:event>
+  </faces-config-extension>
 </faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Launch.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Launch.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Launch.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Launch.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,20 +14,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-      <mfp:event>
-        <mfp:description>
-          Event delivered to prompt the command to launch a dialog.
-        </mfp:description>
-        <mfp:event-type>org.apache.myfaces.trinidad.Launch</mfp:event-type>
-        <mfp:event-class>org.apache.myfaces.trinidad.event.LaunchEvent</mfp:event-class>
-        <mfp:event-listener-class>org.apache.myfaces.trinidad.event.LaunchListener</mfp:event-listener-class>
-        <mfp:event-source-interface>org.apache.myfaces.trinidad.component.DialogSource</mfp:event-source-interface>
-        <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
-      </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+      <mfp:event>
+        <mfp:description>
+          Event delivered to prompt the command to launch a dialog.
+        </mfp:description>
+        <mfp:event-type>org.apache.myfaces.trinidad.Launch</mfp:event-type>
+        <mfp:event-class>org.apache.myfaces.trinidad.event.LaunchEvent</mfp:event-class>
+        <mfp:event-listener-class>org.apache.myfaces.trinidad.event.LaunchListener</mfp:event-listener-class>
+        <mfp:event-source-interface>org.apache.myfaces.trinidad.component.DialogSource</mfp:event-source-interface>
+        <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
+      </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Poll.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Poll.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Poll.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Poll.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,17 +14,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:description>Event delivered when the poll component polls the server.</mfp:description>
-      <mfp:event-type>org.apache.myfaces.trinidad.Poll</mfp:event-type>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.PollEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.PollListener</mfp:event-listener-class>
-    </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:description>Event delivered when the poll component polls the server.</mfp:description>
+      <mfp:event-type>org.apache.myfaces.trinidad.Poll</mfp:event-type>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.PollEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.PollListener</mfp:event-listener-class>
+      <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
+    </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Return.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Return.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Return.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Return.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,21 +14,21 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-      <mfp:event>
-        <mfp:description>
-          Event delivered when the dialog has completed successfully.
-        </mfp:description>
-        <mfp:event-type>org.apache.myfaces.trinidad.Return</mfp:event-type>
-        <mfp:event-class>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:event-class>
-        <mfp:event-listener-class>org.apache.myfaces.trinidad.event.ReturnListener</mfp:event-listener-class>
-        <mfp:event-source-interface>org.apache.myfaces.trinidad.component.DialogSource</mfp:event-source-interface>
-        <mfp:event-delivery-phases>Apply Request Values</mfp:event-delivery-phases>
-      </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+      <mfp:event>
+        <mfp:description>
+          Event delivered when the dialog has completed successfully.
+        </mfp:description>
+        <mfp:event-type>org.apache.myfaces.trinidad.Return</mfp:event-type>
+        <mfp:event-class>org.apache.myfaces.trinidad.event.ReturnEvent</mfp:event-class>
+        <mfp:event-listener-class>org.apache.myfaces.trinidad.event.ReturnListener</mfp:event-listener-class>
+        <mfp:event-source-interface>org.apache.myfaces.trinidad.component.DialogSource</mfp:event-source-interface>
+      <mfp:event-delivery-phases>Invoke Application,Apply Request Values</mfp:event-delivery-phases>
+      </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/RowDisclosure.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/RowDisclosure.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/RowDisclosure.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/RowDisclosure.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,16 +14,16 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:event-type>org.apache.myfaces.trinidad.RowDisclosure</mfp:event-type>
-      <mfp:description>The Expansion event is generated when tree nodes are expanded or collapsed.</mfp:description>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.RowDisclosureEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.RowDisclosureListener</mfp:event-listener-class>
-    </mfp:event>
-  </faces-config-extension>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:event-type>org.apache.myfaces.trinidad.RowDisclosure</mfp:event-type>
+      <mfp:description>The Expansion event is generated when tree nodes are expanded or collapsed.</mfp:description>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.RowDisclosureEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.RowDisclosureListener</mfp:event-listener-class>
+    </mfp:event>
+  </faces-config-extension>
 </faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Selection.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Selection.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Selection.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Selection.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,18 +14,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:description>The selection event is delivered when the table selection
-                       changes.</mfp:description>
-      <mfp:event-type>org.apache.myfaces.trinidad.Selection</mfp:event-type>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.SelectionEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.SelectionListener</mfp:event-listener-class>
-    </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:description>The selection event is delivered when the table selection
+                       changes.</mfp:description>
+      <mfp:event-type>org.apache.myfaces.trinidad.Selection</mfp:event-type>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.SelectionEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.SelectionListener</mfp:event-listener-class>
+    </mfp:event>
+  </faces-config-extension>
+</faces-config>

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Sort.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Sort.xml?view=diff&rev=468121&r1=468120&r2=468121
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Sort.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/events/trinidad/Sort.xml Thu Oct 26 13:33:08 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright 2006 The Apache Software Foundation.
 
@@ -14,18 +14,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
-              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
-              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
-              xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  <faces-config-extension>
-    <mfp:event>
-      <mfp:description>The sort event is delivered when the table column sort
-                       criteria is changed.</mfp:description>
-      <mfp:event-type>org.apache.myfaces.trinidad.Sort</mfp:event-type>
-      <mfp:event-class>org.apache.myfaces.trinidad.event.SortEvent</mfp:event-class>
-      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.SortListener</mfp:event-listener-class>
-    </mfp:event>
-  </faces-config-extension>
-</faces-config>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin"
+              xmlns:mafp="http://myfaces.apache.org/maven-trinidad-plugin"
+              xmlns:xhtml="http://www.w3.org/1999/xhtml">
+  <faces-config-extension>
+    <mfp:event>
+      <mfp:description>The sort event is delivered when the table column sort
+                       criteria is changed.</mfp:description>
+      <mfp:event-type>org.apache.myfaces.trinidad.Sort</mfp:event-type>
+      <mfp:event-class>org.apache.myfaces.trinidad.event.SortEvent</mfp:event-class>
+      <mfp:event-listener-class>org.apache.myfaces.trinidad.event.SortListener</mfp:event-listener-class>
+    </mfp:event>
+  </faces-config-extension>
+</faces-config>