svn commit: r414772 - /struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java

2006-06-16 Thread tmjee 
Author: tmjee
Date: Fri Jun 16 00:53:20 2006
New Revision: 414772

URL: http://svn.apache.org/viewvc?rev=414772&view=rev
Log:
WW-1340
- updated javadoc to correct ambiguities pointed out by Jennifer (see
  http://forums.opensymphony.com/thread.jspa?threadID=33869&tstart=0)
- updated javadoc to separate out Freemarker and JSP
  usage.


Modified:

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java

Modified: 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java?rev=414772&r1=414771&r2=414772&view=diff
==
--- 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
 (original)
+++ 
struts/action2/trunk/core/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
 Fri Jun 16 00:53:20 2006
@@ -25,12 +25,26 @@
 
 /**
  * 
+ * 
  * Renders an custom UI widget using the specified templates. Additional 
objects can be passed in to the template
- * using the param tags. Objects provided can be retrieve from within the 
template via $parameters._paramname_.
+ * using the param tags.
+ * 
+ * Freemarker:
+ * Objects provided can be retrieve from within the template via 
$parameters._paramname_.
+ * 
+ * Jsp:
+ * Objects provided can be retrieve from within the template via 

+ *
  *
  * In the bottom JSP and Velocity samples, two parameters are being passed in 
to the component. From within the
- * component, they can be accessed as $parameters.get('key1') and 
$parameters.get('key2'). Velocity also allows
- * you reference them as $parameters.key1 and $parameters.key2.
+ * component, they can be accessed as:- 
+ * 
+ * Freemarker:
+ * $parameters.get('key1') and $parameters.get('key2') or $parameters.key1 and 
$parameters.key2
+ * 
+ * Jsp:
+ *  and  or
+ *  and 

  *
  * Currently, your custom UI components can be written in Velocity, JSP, or 
Freemarker, and the correct rendering
  * engine will be found based on file extension.
@@ -39,6 +53,7 @@
  * string literal to your component, make sure to wrap it in quotes i.e. 
value="'value1'" otherwise, the the value
  * stack will search for an Object on the stack with a method of getValue1(). 
(now that i've written this, i'm not
  * entirely sure this is the case. i should verify this manana)
+ * 
  * 
  *
  *  Examples
@@ -71,8 +86,8 @@
  *  or
  *  
  *<@saf.component template="/my/custom/component.ftl">
- *   <@saf.param name="key1" value="value1" />
- *   <@saf.param name="key2" value="value2" />
+ *   <@saf.param name="key1" value="%{'value1'}" />
+ *   <@saf.param name="key2" value="%{'value2'}" />
  *
  * 
  *

svn commit: r414803 - in /struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader: ApplicationListener.java BaseViewController.java

2006-06-16 Thread jmitchell 
Author: jmitchell
Date: Fri Jun 16 04:06:03 2006
New Revision: 414803

URL: http://svn.apache.org/viewvc?rev=414803&view=rev
Log:
Remove unused imports

Modified:

struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/ApplicationListener.java

struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/BaseViewController.java

Modified: 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/ApplicationListener.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/ApplicationListener.java?rev=414803&r1=414802&r2=414803&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/ApplicationListener.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/ApplicationListener.java
 Fri Jun 16 04:06:03 2006
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.util.ArrayList;
 
 import javax.faces.model.SelectItem;
 
@@ -35,7 +34,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.struts.apps.mailreader.dao.UserDatabase;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUserDatabase;
 
 /**

Modified: 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/BaseViewController.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/BaseViewController.java?rev=414803&r1=414802&r2=414803&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/BaseViewController.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/BaseViewController.java
 Fri Jun 16 04:06:03 2006
@@ -18,8 +18,6 @@
 
 package org.apache.shale.examples.mailreader;
 
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
 import org.apache.shale.view.AbstractViewController;
 import org.apache.struts.apps.mailreader.dao.UserDatabase;;

svn commit: r414804 - /struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Subscription.java

2006-06-16 Thread jmitchell 
Author: jmitchell
Date: Fri Jun 16 04:06:24 2006
New Revision: 414804

URL: http://svn.apache.org/viewvc?rev=414804&view=rev
Log:
Remove unused var

Modified:

struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Subscription.java

Modified: 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Subscription.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Subscription.java?rev=414804&r1=414803&r2=414804&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Subscription.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Subscription.java
 Fri Jun 16 04:06:24 2006
@@ -169,7 +169,6 @@
 State state = getState();
 UserDatabase database = getUserDatabase();
 String mode = state.getMode();
-boolean ok = true;
 User user = state.getUser();
 org.apache.struts.apps.mailreader.dao.Subscription subscription =
 user.findSubscription(state.getHost());

svn commit: r414807 - in /struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main: java/org/apache/shale/examples/mailreader/Registration.java webapp/registration.jsp

2006-06-16 Thread jmitchell 
Author: jmitchell
Date: Fri Jun 16 04:44:29 2006
New Revision: 414807

URL: http://svn.apache.org/viewvc?rev=414807&view=rev
Log:
* rename iteration to something that makes sense
* remove call on destroy() -- this is causing the subscriptions to disappear 
before the page displays
(not sure, but this might have been a bug that resulted from a scope change 
(session -> request) with the associated backing bean)


Modified:

struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Registration.java

struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/webapp/registration.jsp

Modified: 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Registration.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Registration.java?rev=414807&r1=414806&r2=414807&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Registration.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/java/org/apache/shale/examples/mailreader/Registration.java
 Fri Jun 16 04:44:29 2006
@@ -410,8 +410,8 @@
  * would go.
  */
 public void destroy() {
-
-setSubscriptions(null);
+   // TODO this is causing the page not to display the subscriptions
+//setSubscriptions(null);
 
 }
 

Modified: 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/webapp/registration.jsp
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/webapp/registration.jsp?rev=414807&r1=414806&r2=414807&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/webapp/registration.jsp
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/main/webapp/registration.jsp
 Fri Jun 16 04:44:29 2006
@@ -163,7 +163,7 @@
   
+  var="subscription">
 
 
   
@@ -171,7 +171,7 @@
 value="#{messages['heading.host']}"/>
   
   
+value="#{subscription.host}"/>
 
 
 
@@ -180,7 +180,7 @@
 value="#{messages['heading.user']}"/>
   
   
+value="#{subscription.username}"/>
 
 
 
@@ -189,7 +189,7 @@
 value="#{messages['heading.type']}"/>
   
   
+value="#{subscription.type}"/>
 
 
 
@@ -198,7 +198,7 @@
 value="#{messages['heading.autoConnect']}"/>
   
   
+value="#{subscription.autoConnect}"/>

[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted

2006-06-16 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/StrutsActionRelease200

The comment on the change is:
Add field focus ticket

--
  [http://issues.apache.org/struts/browse/WW-1347 JIRA issue] 
  
   * Wildcard Action Mappings 
-  * Dyna``Form as Model Object 
+  * Dyna``Form as Model Object (including 
[http://forums.opensymphony.com/thread.jspa?messageID=67350𐜖 
LazyDynaForms])
   * Extends for action mappings (See Tim, NTH #2.)
   * Change the default submit method for the form tag from GET to POST (See 
Ted, #2.)
+  * [http://issues.apache.org/struts/browse/WW-1350 Set field focus]

[Struts Wiki] Update of "StrutsActionRelease200" by TedHusted

2006-06-16 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Struts Wiki" for change 
notification.

The following page has been changed by TedHusted:
http://wiki.apache.org/struts/StrutsActionRelease200

The comment on the change is:
Mark wildcard as done

--
  
  [http://issues.apache.org/struts/browse/WW-1347 JIRA issue] 
  
-  * Wildcard Action Mappings 
+  * Wildcard Action Mappings (Done in XWork 2)
   * Dyna``Form as Model Object (including 
[http://forums.opensymphony.com/thread.jspa?messageID=67350𐜖 
LazyDynaForms])
   * Extends for action mappings (See Tim, NTH #2.)
   * Change the default submit method for the form tag from GET to POST (See 
Ted, #2.)

svn commit: r414953 - in /struts/shale/branches/mvn_reorg/shale-clay/src: main/java/org/apache/shale/clay/config/beans/ test/java/org/apache/shale/clay/config/

2006-06-16 Thread gvanmatre 
Author: gvanmatre
Date: Fri Jun 16 16:15:06 2006
New Revision: 414953

URL: http://svn.apache.org/viewvc?rev=414953&view=rev
Log:
Fix for issues SHALE-187 and SHALE-179

Removed:

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/TestActionListener.java

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/TestValueChangeListener.java

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address-config.xml

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address-fullxml.xml

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address.xml

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address1.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address2.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address3.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address4.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/address5.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/comment.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/duplicate1.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/duplicate2.html

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/layout.html
Modified:

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AbstractBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ActionListenerBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AttributeBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ElementBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/InnerComponentBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ValidatorBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ValueChangeListenerBean.java

struts/shale/branches/mvn_reorg/shale-clay/src/test/java/org/apache/shale/clay/config/DesigntimeTestCase.java

Modified: 
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AbstractBean.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AbstractBean.java?rev=414953&r1=414952&r2=414953&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AbstractBean.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/AbstractBean.java
 Fri Jun 16 16:15:06 2006
@@ -19,13 +19,15 @@
 
 package org.apache.shale.clay.config.beans;
 
+import java.io.Serializable;
+
 /**
  * Abstract class that provides a description property 
  * that is populated from the clay configuration file 
  * when design time tool support is enabled. 
  *
  */
-public abstract class AbstractBean {
+public abstract class AbstractBean implements Serializable {
 /**
  * Metadata description provided in the clay configuration.
  */

Modified: 
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ActionListenerBean.java
URL: 
http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ActionListenerBean.java?rev=414953&r1=414952&r2=414953&view=diff
==
--- 
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ActionListenerBean.java
 (original)
+++ 
struts/shale/branches/mvn_reorg/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ActionListenerBean.java
 Fri Jun 16 16:15:06 2006
@@ -18,11 +18,13 @@
 
 package org.apache.shale.clay.config.beans;
 
+import java.io.Serializable;
+
 /**
  * This meta component will be used to construct a JSF 
ActionListener.  It is
  * a subclass of [EMAIL PROTECTED] ComponentBean} where this class acts like 
an enumerated type.
  */
-public class ActionListenerBean extends InnerComponentBean {
+public class ActionListenerBean extends InnerComponentBean implements 
Serializable {
 
 private static final long serialVersionUID = 3256723996136716338L;
 

Modified: 
struts/shale/branches/mvn_reorg/shale-

svn commit: r414969 - in /struts/action2/trunk/core/src/main/resources/template: ajax/submit-ajax.ftl xhtml/controlheader.ftl

2006-06-16 Thread tmjee 
Author: tmjee
Date: Fri Jun 16 17:24:41 2006
New Revision: 414969

URL: http://svn.apache.org/viewvc?rev=414969&view=rev
Log:
WW-1304
 - refactor some of the bits in ajax theme (submit-ajax.ftl) that uses
   ..  etc to xhtml's controlheader.ftl where it should really
be as xhtml uses ... to arrange its components


Modified:
struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl

struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl

Modified: 
struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl?rev=414969&r1=414968&r2=414969&view=diff
==
--- struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl 
(original)
+++ struts/action2/trunk/core/src/main/resources/template/ajax/submit-ajax.ftl 
Fri Jun 16 17:24:41 2006
@@ -3,10 +3,6 @@
 
 -->
 <#include 
"/${parameters.templateDir}/${themeProperties.parent}/controlheader.ftl" />
-<#if parameters.align?exists>
-align="${parameters.align?html}"<#t/>
-
-><#t/>
 
 <#if parameters.form?exists && parameters.form.id?exists>
  formId="${parameters.form.id}"<#rt/>

Modified: 
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl?rev=414969&r1=414968&r2=414969&view=diff
==
--- 
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl 
(original)
+++ 
struts/action2/trunk/core/src/main/resources/template/xhtml/controlheader.ftl 
Fri Jun 16 17:24:41 2006
@@ -1,2 +1,6 @@
 <#include "/${parameters.templateDir}/xhtml/controlheader-core.ftl" />
-
+
+align="${parameters.align?html}"<#t/>
+
+><#t/>

svn commit: r414993 - in /struts/shale: branches/SHALE_PRE_MAVEN2/ trunk/

2006-06-16 Thread craigmcc 
Author: craigmcc
Date: Fri Jun 16 20:47:44 2006
New Revision: 414993

URL: http://svn.apache.org/viewvc?rev=414993&view=rev
Log:
Save a copy of the current (Ant-based) trunk of Shale.

Added:
struts/shale/branches/SHALE_PRE_MAVEN2/
  - copied from r414992, struts/shale/trunk/
Removed:
struts/shale/trunk/

svn commit: r414994 - in /struts/shale: branches/mvn_reorg/ trunk/

2006-06-16 Thread craigmcc 
Author: craigmcc
Date: Fri Jun 16 20:48:34 2006
New Revision: 414994

URL: http://svn.apache.org/viewvc?rev=414994&view=rev
Log:
Make the "mvn_reorg" branch the new trunk.

Added:
struts/shale/trunk/
  - copied from r414993, struts/shale/branches/mvn_reorg/
Removed:
struts/shale/branches/mvn_reorg/

svn commit: r414995 - in /struts/shale/trunk: shale-apps/shale-usecases/build.xml shale-clay/build.xml

2006-06-16 Thread craigmcc 
Author: craigmcc
Date: Fri Jun 16 21:00:41 2006
New Revision: 414995

URL: http://svn.apache.org/viewvc?rev=414995&view=rev
Log:
Remove a couple of straggling build.xml files.

Removed:
struts/shale/trunk/shale-apps/shale-usecases/build.xml
struts/shale/trunk/shale-clay/build.xml

svn commit: r414999 - in /struts/action2/trunk: apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/ apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/ apps/showcase

2006-06-16 Thread mrdon 
Author: mrdon
Date: Fri Jun 16 22:51:12 2006
New Revision: 414999

URL: http://svn.apache.org/viewvc?rev=414999&view=rev
Log:
Made JSF interceptors able to be included in non-jsf actions/apps;
improved JSF example in showcase to allow adding of employees, better
page layout, match other similar examples, add simple validation, add
jsf example link to main page

WW-1320
-

Added:

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EditEmployeeAction.java
  - copied, changed from r413546, 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EmployeeAction.java

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/ListEmployeesAction.java
  - copied, changed from r413546, 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/IndexAction.java
struts/action2/trunk/apps/showcase/src/main/webapp/jsf/editEmployee.jsp
  - copied, changed from r413546, 
struts/action2/trunk/apps/showcase/src/main/webapp/jsf/employee.jsp
struts/action2/trunk/apps/showcase/src/main/webapp/jsf/listEmployees.jsp
Removed:

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EmployeeAction.java

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/IndexAction.java
struts/action2/trunk/apps/showcase/src/main/webapp/jsf/employee.jsp
struts/action2/trunk/apps/showcase/src/main/webapp/jsf/index.jsp
Modified:

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java

struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EmployeeDao.java
struts/action2/trunk/apps/showcase/src/main/resources/xwork-jsf.xml
struts/action2/trunk/apps/showcase/src/main/webapp/showcase.jsp

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesInterceptor.java

struts/action2/trunk/core/src/main/java/org/apache/struts/action2/jsf/FacesSetupInterceptor.java

Modified: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java?rev=414999&r1=414998&r2=414999&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
 Fri Jun 16 22:51:12 2006
@@ -31,7 +31,7 @@
 import java.util.List;
 
 /**
- * EmployeeAction.
+ * EditEmployeeAction.
  */
 
 public class EmployeeAction extends AbstractCRUDAction implements Preparable {
@@ -83,7 +83,7 @@
 
 public void setEmployeeDao(EmployeeDao employeeDao) {
 if (log.isDebugEnabled()) {
-log.debug("EmployeeAction - [setEmployeeDao]: employeeDao 
injected.");
+log.debug("EditEmployeeAction - [setEmployeeDao]: employeeDao 
injected.");
 }
 this.employeeDao = employeeDao;
 }

Copied: 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EditEmployeeAction.java
 (from r413546, 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EmployeeAction.java)
URL: 
http://svn.apache.org/viewvc/struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EditEmployeeAction.java?p2=struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EditEmployeeAction.java&p1=struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EmployeeAction.java&r1=413546&r2=414999&rev=414999&view=diff
==
--- 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EmployeeAction.java
 (original)
+++ 
struts/action2/trunk/apps/showcase/src/main/java/org/apache/struts/action2/showcase/jsf/EditEmployeeAction.java
 Fri Jun 16 22:51:12 2006
@@ -21,38 +21,40 @@
 
 import com.opensymphony.xwork.ActionSupport;
 
-public class EmployeeAction extends ActionSupport {
-   
-   private static final long serialVersionUID = 1L;
-
-   private Employee employee;
-   private int id;
-   
-   public EmployeeAction() {
-   employee = new Employee();
-   }
-   
-   public Employee getEmployee() {
-   return employee;
-   }
-   
-   public String[] getAllSkills() {
-   return EmployeeDao.getSkills();
-   }
-   
-   public void setId(int id) {
-   this.id = id;
-   }
-   
+public class EditEmployeeAction extends Actio