svn commit: r1060554 - /struts/site/src/site/xdoc/dev/volunteers.xml
Author: jafl Date: Tue Jan 18 20:13:58 2011 New Revision: 1060554 URL: http://svn.apache.org/viewvc?rev=1060554&view=rev Log: add myself to list of committers Modified: struts/site/src/site/xdoc/dev/volunteers.xml Modified: struts/site/src/site/xdoc/dev/volunteers.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/volunteers.xml?rev=1060554&r1=1060553&r2=1060554&view=diff == --- struts/site/src/site/xdoc/dev/volunteers.xml (original) +++ struts/site/src/site/xdoc/dev/volunteers.xml Tue Jan 18 20:13:58 2011 @@ -183,6 +183,10 @@ limitations under the License. Maurizio Cucchiara (mcucchiara at apache.org) + +John Lindal +(jafl at apache.org) +
svn commit: r1060591 - in /struts/struts2/trunk/core/src/main: java/org/apache/struts2/components/DoubleSelect.java resources/template/archive/simple/doubleselect.vm resources/template/simple/doublese
Author: mcucchiara Date: Tue Jan 18 21:47:21 2011 New Revision: 1060591 URL: http://svn.apache.org/viewvc?rev=1060591&view=rev Log: WW-3560 - DoubleSelect doesn't work in all browsers (BlackBerry Browser) Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java?rev=1060591&r1=1060590&r2=1060591&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DoubleSelect.java Tue Jan 18 21:47:21 2011 @@ -61,7 +61,7 @@ public class DoubleSelect extends Double public void evaluateExtraParams() { super.evaluateExtraParams(); StringBuilder onchangeParam = new StringBuilder(); - onchangeParam.append(getParameters().get("id")).append("Redirect(this.options.selectedIndex)"); + onchangeParam.append(getParameters().get("id")).append("Redirect(this.selectedIndex)"); if(StringUtils.isNotEmpty(this.onchange)) { onchangeParam.append(";").append(this.onchange); } Modified: struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm?rev=1060591&r1=1060590&r2=1060591&view=diff == --- struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm (original) +++ struts/struts2/trunk/core/src/main/resources/template/archive/simple/doubleselect.vm Tue Jan 18 21:47:21 2011 @@ -96,7 +96,7 @@ var $!struts.htmlEncode($parameters.name $!{struts.htmlEncode($parameters.name)}Redirect($redirectTo); function $!{struts.htmlEncode($parameters.name)}Redirect(x) { for (m = $!{struts.htmlEncode($parameters.name)}Temp.options.length - 1; m >= 0; m--) -$!{struts.htmlEncode($parameters.name)}Temp.options[m] = null; +$!{struts.htmlEncode($parameters.name)}Temp.remove(m); for (i = 0; i < $!{parameters.name}Group[x].length; i++) { $!{struts.htmlEncode($parameters.name)}Temp.options[i] = new Option($!{struts.htmlEncode($parameters.name)}Group[x][i].text, $!{struts.htmlEncode($parameters.name)}Group[x][i].value); Modified: struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl?rev=1060591&r1=1060590&r2=1060591&view=diff == --- struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/doubleselect.ftl Tue Jan 18 21:47:21 2011 @@ -126,7 +126,7 @@ function ${parameters.id}Redirect(x) { var selected = false; for (m = ${parameters.id}Temp.options.length - 1; m >= 0; m--) { -${parameters.id}Temp.options[m] = null; +${parameters.id}Temp.remove(m); } for (i = 0; i < ${parameters.id}Group[x].length; i++) {
svn commit: r1060603 - in /struts/struts2/trunk/xwork-core: ./ src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterc
Author: mcucchiara Date: Tue Jan 18 22:42:54 2011 New Revision: 1060603 URL: http://svn.apache.org/viewvc?rev=1060603&view=rev Log: WW-3559 - PrepareInterceptor is eating exceptions that occur in prepare{methodName} methods Modified: struts/struts2/trunk/xwork-core/ (props changed) struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java Propchange: struts/struts2/trunk/xwork-core/ -- --- svn:ignore (original) +++ svn:ignore Tue Jan 18 22:42:54 2011 @@ -1,11 +1,10 @@ +cobertura.ser *.ipr +.classpath *.iws -*.iml -build -dist .project -.classpath +target ivyrep.properties -cobertura.ser +build .settings -target +dist Modified: struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java?rev=1060603&r1=1060602&r2=1060603&view=diff == --- struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java (original) +++ struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/PrepareInterceptor.java Tue Jan 18 22:42:54 2011 @@ -1,4 +1,5 @@ /* + * $Id$ * Copyright 2002-2007,2009 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -99,8 +100,6 @@ public class PrepareInterceptor extends private static final long serialVersionUID = -5216969014510719786L; -private static final Logger LOG = LoggerFactory.getLogger(PrepareInterceptor.class); - private final static String PREPARE_PREFIX = "prepare"; private final static String ALT_PREPARE_PREFIX = "prepareDo"; @@ -144,18 +143,24 @@ public class PrepareInterceptor extends PrefixMethodInvocationUtil.invokePrefixMethod(invocation, prefixes); } catch (InvocationTargetException e) { -// just in case there's an exception while doing reflection, -// we still want prepare() to be able to get called. -LOG.warn("an exception occured while trying to execute prefixed method", e); -} -catch (IllegalAccessException e) { -// just in case there's an exception while doing reflection, -// we still want prepare() to be able to get called. -LOG.warn("an exception occured while trying to execute prefixed method", e); -} catch (Exception e) { -// just in case there's an exception while doing reflection, -// we still want prepare() to be able to get called. -LOG.warn("an exception occured while trying to execute prefixed method", e); +/* + * The invoked method threw an exception and reflection wrapped it + * in an InvocationTargetException. + * If possible re-throw the original exception so that normal + * exception handling will take place. + */ +Throwable cause = e.getCause(); +if (cause instanceof Exception) { +throw (Exception) cause; +} else if(cause instanceof Error) { +throw (Error) cause; +} else { +/* + * The cause is not an Exception or Error (must be Throwable) so + * just re-throw the wrapped exception. + */ +throw e; +} } if (alwaysInvokePrepare) { Modified: struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java?rev=1060603&r1=1060602&r2=1060603&view=diff == --- struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java (original) +++ struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/PrepareInterceptorTest.java Tue Jan 18 22:42:54 2011 @@ -1,4 +1,5 @@ /* + * $Id$ * Copyright 2002-2007,2009 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -175,7 +176,25 @@ public class PrepareInterceptorTest exte controlActionProxy.verify(); controlActionInvocation.verify(); } - + +public void testPrepareThrowException()
svn commit: r1060604 - /struts/struts2/trunk/xwork-core/
Author: mcucchiara Date: Tue Jan 18 22:49:37 2011 New Revision: 1060604 URL: http://svn.apache.org/viewvc?rev=1060604&view=rev Log: Restored xwork-core properties Modified: struts/struts2/trunk/xwork-core/ (props changed) Propchange: struts/struts2/trunk/xwork-core/ -- --- svn:ignore (original) +++ svn:ignore Tue Jan 18 22:49:37 2011 @@ -2,6 +2,7 @@ cobertura.ser *.ipr .classpath *.iws +*.iml .project target ivyrep.properties
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ACE (https://cwiki.apache.org/confluence/display/ACE) Pages - Deployment Admin extension - Multiple versions of same symbolic name edited by marrs (04:53 AM) https://cwiki.apache.org/confluence/display/ACE/Deployment+Admin+extension+-+Multiple+versions+of+same+symbolic+name Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Using ActiveMQ 5 edited by ericjohnson (09:21 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Using+ActiveMQ+5 Support edited by ericjohnson (09:18 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Support Books edited by ericjohnson (09:16 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Books How does ActiveMQ compare to Fuse Message Broker? edited by ericjohnson (09:09 PM) https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=24189939 Getting Started edited by ericjohnson (09:02 PM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Getting+Started Per Destination Policies edited by dejanb (08:14 AM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Per+Destination+Policies Delete Inactive Destinations created by dejanb (08:09 AM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Delete+Inactive+Destinations Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Documentation edited by ericjohnson (09:21 PM) https://cwiki.apache.org/confluence/display/CAMEL/Documentation Articles edited by ericjohnson (09:15 PM) https://cwiki.apache.org/confluence/display/CAMEL/Articles How does Camel compare to Fuse Mediation Router? edited by ericjohnson (09:10 PM) https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=24189933 Support edited by ericjohnson (08:52 PM) https://cwiki.apache.org/confluence/display/CAMEL/Support Books edited by ericjohnson (08:46 PM) https://cwiki.apache.org/confluence/display/CAMEL/Books User Guide edited by ericjohnson (08:45 PM) https://cwiki.apache.org/confluence/display/CAMEL/User+Guide Getting Started edited by ericjohnson (08:40 PM) https://cwiki.apache.org/confluence/display/CAMEL/Getting+Started Camel 2.6.0 Release edited by davsclaus (10:08 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.6.0+Release Idempotent Consumer edited by davsclaus (08:44 AM) https://cwiki.apache.org/confluence/display/CAMEL/Idempotent+Consumer Using getIn or getOut methods on Exchange edited by tar...@scanmine.com (06:19 AM) https://cwiki.apache.org/confluence/display/CAMEL/Using+getIn+or+getOut+methods+on+Exchange Apache Cayenne Documentation (https://cwiki.apache.org/confluence/display/CAYDOC) Pages - Executing a Stored Procedure edited by andrus (07:41 AM) https://cwiki.apache.org/confluence/display/CAYDOC/Executing+a+Stored+Procedure Apache Cayenne Documentation v3.0 (https://cwiki.apache.org/confluence/display/CAYDOC30) Pages - Executing a Stored Procedure edited by andrus (07:42 AM) https://cwiki.apache.org/confluence/display/CAYDOC30/Executing+a+Stored+Procedure Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - FAQ edited by dkulp (11:32 PM) https://cwiki.apache.org/confluence/display/CXF/FAQ Support edited by dkulp (11:23 PM) https://cwiki.apache.org/confluence/display/CXF/Support Release Management edited by dkulp (11:09 PM) https://cwiki.apache.org/confluence/display/CXF/Release+Management Banner edited by cohei...@apache.org (12:05 PM) https://cwiki.apache.org/confluence/display/CXF/Banner Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - Index edited by dkulp (11:36 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/Index Apache ESME (https://cwiki.apache.org/confluence/display/ESME) Pages - Ant Client edited by richardhirsch (05:35 AM) https://cwiki.apache.org/confluence/display/ESME/Ant+Client Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30) Pages - Documentation edited by xuhaihong (04:17 AM) https://cwiki.apache.org/confluence/display/GMOxDOC30/Documentation Installing Geronimo Eclipse Plugin edited by chirun...@gmail.com (04:11 AM) htt