[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa | |-Pages Added or Edited in This Space |-- OpenJPA Up Close and Personal was last edited by pcl (07:07 PM). | http://cwiki.apache.org/confluence/display/openjpa/OpenJPA+Up+Close+and+Personal Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- How do I develop a client? was last edited by jeff.yu (09:35 PM). | http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=59871 Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- SNAPSHOT dependencies that need to be released for Geronimo 2.0 was last edited by pkashyap (08:46 AM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/SNAPSHOT+dependencies+that+need+to+be+released+for+Geronimo+2.0 Apache MINA (MINA) http://cwiki.apache.org/confluence/display/MINA | |-Pages Added or Edited in This Space |-- Site Template was last edited by trustin (08:38 AM). | http://cwiki.apache.org/confluence/display/MINA/Site+Template |-- Quick Start Guide was last edited by trustin (08:15 AM). | http://cwiki.apache.org/confluence/display/MINA/Quick+Start+Guide |-- Contact was last edited by trustin (08:14 AM). | http://cwiki.apache.org/confluence/display/MINA/Contact |-- Mailing Lists was last edited by trustin (04:50 AM). | http://cwiki.apache.org/confluence/display/MINA/Mailing+Lists |-- Navigation was last edited by trustin (04:45 AM). | http://cwiki.apache.org/confluence/display/MINA/Navigation |-- Downloads was last edited by trustin (01:38 AM). | http://cwiki.apache.org/confluence/display/MINA/Downloads UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA | |-Pages Added or Edited in This Space |-- TestPlan2.2 was last edited by mbaessler (10:10 AM). | http://cwiki.apache.org/confluence/display/UIMA/TestPlan2.2 Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI | |-Pages Added or Edited in This Space |-- Companies that provide Struts 2 support was last edited by florinmarcus (01:14 PM). | http://cwiki.apache.org/confluence/display/S2WIKI/Companies+that+provide+Struts+2+support Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SDO Overview was last edited by haleh (02:53 PM). | http://cwiki.apache.org/confluence/display/TUSCANY/SDO+Overview - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r558289 - in /struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main: resources/struts-tiles.xml webapp/WEB-INF/tiles.xml webapp/WEB-INF/web.xml webapp/tiles/body.jsp webapp/tiles/lay
Author: apetrelli Date: Sat Jul 21 03:41:12 2007 New Revision: 558289 URL: http://svn.apache.org/viewvc?view=rev&rev=558289 Log: WW-1724 Merge from trunk to STRUTS_2_0_X branch. Added code to Struts 2 showcase to show that the content type is present even with a FreeMarker result, i.e. with a FreeMarker layout page. Added: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl (contents, props changed) - copied, changed from r558101, struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml?view=diff&rev=558289&r1=558288&r2=558289 == --- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/resources/struts-tiles.xml Sat Jul 21 03:41:12 2007 @@ -17,6 +17,10 @@ showcase.freemarker + +showcase.freemarkerLayout + + /tiles/layout.jsp /tiles/layout.jsp Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml?view=diff&rev=558289&r1=558288&r2=558289 == --- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/tiles.xml Sat Jul 21 03:41:12 2007 @@ -39,4 +39,10 @@ + + + + + + Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558289&r1=558288&r2=558289 == --- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/WEB-INF/web.xml Sat Jul 21 03:41:12 2007 @@ -80,6 +80,12 @@ javax.faces.webapp.FacesServlet 1 + + JspSupportServlet + org.apache.struts2.views.JspSupportServlet + 1 + + Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp?view=diff&rev=558289&r1=558288&r2=558289 == --- struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp (original) +++ struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/body.jsp Sat Jul 21 03:41:12 2007 @@ -10,6 +10,9 @@ View FreeMarker Example + +View Example with a FreeMarker Layout + Copied: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl (from r558101, struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl) URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl?view=diff&rev=558289&p1=struts/struts2/trunk/apps/showcase/src/main/webapp/tiles/layout.ftl&r1=558101&p2=struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl&r2=558289 == (empty) Propchange: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl -- svn:eol-style = native Propchange: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.ftl -- svn:keywords = Id Author Date Rev Modified: struts/struts2/branches/STRUTS_2_0_X/apps/showcase/src/main/webapp/tiles/layout.jsp URL: http://svn.apache
svn commit: r558457 - in /struts/struts1/trunk/core/src/main: java/org/apache/struts/action/ActionServlet.java java/org/apache/struts/config/ActionConfig.java resources/org/apache/struts/resources/str
Author: pbenedict Date: Sat Jul 21 20:33:53 2007 New Revision: 558457 URL: http://svn.apache.org/viewvc?view=rev&rev=558457 Log: STR-3078: action configs to also extend by actionId Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java?view=diff&rev=558457&r1=558456&r2=558457 == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java Sat Jul 21 20:33:53 2007 @@ -1468,7 +1468,10 @@ // Make sure that this config is of the right class ActionConfig baseConfig = moduleConfig.findActionConfig(ancestor); - +if (baseConfig == null) { +baseConfig = moduleConfig.findActionConfigId(ancestor); +} + if (baseConfig == null) { throw new UnavailableException("Unable to find " + "action config for '" + ancestor + "' to extend."); Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java?view=diff&rev=558457&r1=558456&r2=558457 == --- struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java (original) +++ struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java Sat Jul 21 20:33:53 2007 @@ -385,22 +385,24 @@ } /** - * Returns the path of the ActionConfig that this object should inherit - * properties from. + * Returns the path or actionId of the + * ActionConfig that this object should inherit properties + * from. * - * @return the path of the ActionConfig that this object should inherit - * properties from. + * @return the path or action id of the action mapping that this object + * should inherit properties from. */ public String getExtends() { return (this.inherit); } /** - * Set the path of the ActionConfig that this object should inherit - * properties from. + * Set the path or actionId of the + * ActionConfig that this object should inherit properties + * from. * - * @param inherit the path of the ActionConfig that this object should - *inherit properties from. + * @param inherit the path or action id of the action mapping that this + *object should inherit properties from. */ public void setExtends(String inherit) { if (configured) { @@ -882,21 +884,24 @@ * @return true if circular inheritance was detected. */ protected boolean checkCircularInheritance(ModuleConfig moduleConfig) { -String ancestorPath = getExtends(); +String ancestor = getExtends(); -while (ancestorPath != null) { -// check if we have the same path as an ancestor -if (getPath().equals(ancestorPath)) { +while (ancestor != null) { +// check if we have the same path or id as an ancestor +if (getPath().equals(ancestor) || ancestor.equals(getActionId())) { return true; } -// get our ancestor's ancestor -ActionConfig ancestor = moduleConfig.findActionConfig(ancestorPath); +// get our ancestor's config +ActionConfig baseConfig = moduleConfig.findActionConfig(ancestor); +if (baseConfig == null) { +baseConfig = moduleConfig.findActionConfigId(ancestor); +} -if (ancestor != null) { -ancestorPath = ancestor.getExtends(); +if (baseConfig != null) { +ancestor = baseConfig.getExtends(); } else { -ancestorPath = null; +ancestor = null; } } @@ -1249,15 +1254,18 @@ throw new IllegalStateException("Configuration is frozen"); } -String ancestorPath = getExtends(); +String ancestor = getExtends(); -if ((!extensionProcessed) && (ancestorPath != null)) { +if ((!extensionProcessed) && (ancestor != null)) { ActionConfig baseConfig = -moduleConfig.findActionConfig(ancestorPath); - +moduleConfig.findActionConfig(a
svn commit: r558459 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ main/resources/template/simple/ site/resources/tags/ test/j
Author: jholmes Date: Sat Jul 21 21:13:50 2007 New Revision: 558459 URL: http://svn.apache.org/viewvc?view=rev&rev=558459 Log: WW-2051 add additional javascript hooks for optiontransferselect Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl struts/struts2/trunk/core/src/site/resources/tags/optiontransferselect.html struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java?view=diff&rev=558459&r1=558458&r2=558459 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java Sat Jul 21 21:13:50 2007 @@ -123,6 +123,14 @@ protected String rightUpLabel; protected String rightDownLabel; +protected String addToLeftOnclick; +protected String addToRightOnclick; +protected String addAllToLeftOnclick; +protected String addAllToRightOnclick; +protected String selectAllOnclick; +protected String upDownOnLeftOnclick; +protected String upDownOnRightOnclick; + public OptionTransferSelect(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -252,6 +260,35 @@ rightDownLabel != null ? findValue(rightDownLabel, String.class) : "v"); +// selectAllOnclick +addParameter("selectAllOnclick", +selectAllOnclick != null ? findValue(selectAllOnclick, String.class) : ""); + +// addToLeftOnclick +addParameter("addToLeftOnclick", +addToLeftOnclick != null ? findValue(addToLeftOnclick, String.class) : ""); + +// addToRightOnclick +addParameter("addToRightOnclick", +addToRightOnclick != null ? findValue(addToRightOnclick, String.class) : ""); + +// addAllToLeftOnclick +addParameter("addAllToLeftOnclick", +addAllToLeftOnclick != null ? findValue(addAllToLeftOnclick, String.class) : ""); + +// addAllToRightOnclick +addParameter("addAllToRightOnclick", +addAllToRightOnclick != null ? findValue(addAllToRightOnclick, String.class) : ""); + +// upDownOnLeftOnclick +addParameter("upDownOnLeftOnclick", +upDownOnLeftOnclick != null ? findValue(upDownOnLeftOnclick, String.class) : ""); + +// upDownOnRightOnclick +addParameter("upDownOnRightOnclick", +upDownOnRightOnclick != null ? findValue(upDownOnRightOnclick, String.class) : ""); + + // inform the form component our select tag infos, so they know how to select // its elements upon onsubmit @@ -476,5 +513,67 @@ return rightDownLabel; } +public String getAddAllToLeftOnclick() { +return addAllToLeftOnclick; +} + +@StrutsTagAttribute(description="Javascript to run after Add All To Left button pressed") +public void setAddAllToLeftOnclick(String addAllToLeftOnclick) { +this.addAllToLeftOnclick = addAllToLeftOnclick; +} + +public String getAddAllToRightOnclick() { +return addAllToRightOnclick; +} + +@StrutsTagAttribute(description="Javascript to run after Add All To Right button pressed") +public void setAddAllToRightOnclick(String addAllToRightOnclick) { +this.addAllToRightOnclick = addAllToRightOnclick; +} + +public String getAddToLeftOnclick() { +return addToLeftOnclick; +} + +@StrutsTagAttribute(description="Javascript to run after Add To Left button pressed") +public void setAddT
svn commit: r558460 - in /struts/struts2/branches/STRUTS_2_0_X/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ main/resources/template/simple/ site/resour
Author: jholmes Date: Sat Jul 21 21:16:29 2007 New Revision: 558460 URL: http://svn.apache.org/viewvc?view=rev&rev=558460 Log: WW-2051 add additional javascript hooks for optiontransferselect Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTag.java struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl struts/struts2/branches/STRUTS_2_0_X/core/src/site/resources/tags/optiontransferselect.html struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java?view=diff&rev=558460&r1=558459&r2=558460 == --- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java (original) +++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/OptionTransferSelect.java Sat Jul 21 21:16:29 2007 @@ -123,6 +123,14 @@ protected String rightUpLabel; protected String rightDownLabel; +protected String addToLeftOnclick; +protected String addToRightOnclick; +protected String addAllToLeftOnclick; +protected String addAllToRightOnclick; +protected String selectAllOnclick; +protected String upDownOnLeftOnclick; +protected String upDownOnRightOnclick; + public OptionTransferSelect(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -252,6 +260,34 @@ rightDownLabel != null ? findValue(rightDownLabel, String.class) : "v"); +// selectAllOnclick +addParameter("selectAllOnclick", +selectAllOnclick != null ? findValue(selectAllOnclick, String.class) : ""); + +// addToLeftOnclick +addParameter("addToLeftOnclick", +addToLeftOnclick != null ? findValue(addToLeftOnclick, String.class) : ""); + +// addToRightOnclick +addParameter("addToRightOnclick", +addToRightOnclick != null ? findValue(addToRightOnclick, String.class) : ""); + +// addAllToLeftOnclick +addParameter("addAllToLeftOnclick", +addAllToLeftOnclick != null ? findValue(addAllToLeftOnclick, String.class) : ""); + +// addAllToRightOnclick +addParameter("addAllToRightOnclick", +addAllToRightOnclick != null ? findValue(addAllToRightOnclick, String.class) : ""); + +// upDownOnLeftOnclick +addParameter("upDownOnLeftOnclick", +upDownOnLeftOnclick != null ? findValue(upDownOnLeftOnclick, String.class) : ""); + +// upDownOnRightOnclick +addParameter("upDownOnRightOnclick", +upDownOnRightOnclick != null ? findValue(upDownOnRightOnclick, String.class) : ""); + // inform the form component our select tag infos, so they know how to select // its elements upon onsubmit @@ -476,5 +512,66 @@ return rightDownLabel; } +public String getAddAllToLeftOnclick() { +return addAllToLeftOnclick; +} + +@StrutsTagAttribute(description="Javascript to run after Add All To Left button pressed") +public void setAddAllToLeftOnclick(String addAllToLeftOnclick) { +this.addAllToLeftOnclick = addAllToLeftOnclick; +} + +public String getAddAllToRightOnclick() { +return addAllToRightOnclick; +} + +@StrutsTagAttribute(description="Javascript to run after Add All To Right button pressed") +public void setAddAllToRightOnclick(String addAllToRightOnclick) { +this.a