git commit: Adds proper exception handling during calling action This will allow ExceptionHandler to work

2014-09-23 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/develop 4f4f52600 -> 3b9d58614


Adds proper exception handling during calling action
This will allow ExceptionHandler to work


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3b9d5861
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3b9d5861
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3b9d5861

Branch: refs/heads/develop
Commit: 3b9d58614f0ad192da8bffa657b820c28cdaa1ef
Parents: 4f4f526
Author: Lukasz Lenart 
Authored: Tue Sep 23 21:44:50 2014 +0200
Committer: Lukasz Lenart 
Committed: Tue Sep 23 21:44:50 2014 +0200

--
 .../xwork2/DefaultActionInvocation.java | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/3b9d5861/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java 
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index 4539e56..dd44b14 100644
--- 
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ 
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -28,6 +28,8 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.profiling.UtilTimerStack;
+import ognl.MethodFailedException;
+import ognl.NoSuchPropertyException;
 import ognl.OgnlException;
 
 import java.util.ArrayList;
@@ -439,17 +441,23 @@ public class DefaultActionInvocation implements 
ActionInvocation {
 }
 }
 return saveResult(actionConfig, methodResult);
-} catch (OgnlException e) {
+} catch (NoSuchPropertyException e) {
+throw new IllegalArgumentException("The " + methodName + "() is 
not defined in action " + getAction().getClass() + "");
+} catch (MethodFailedException e) {
 // We try to return the source exception.
-//Throwable t = e.getTargetException();
+Throwable t = e.getCause();
 
 if (actionEventListener != null) {
-String result = actionEventListener.handleException(e, 
getStack());
+String result = actionEventListener.handleException(t, 
getStack());
 if (result != null) {
 return result;
 }
 }
-throw e;
+if (t instanceof Exception) {
+throw (Exception) t;
+} else {
+throw e;
+}
 } finally {
 UtilTimerStack.pop(timerKey);
 }

git commit: Adds BeanInfo to allow define class attribute in JSPs

2014-09-23 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/develop 3b9d58614 -> 587e3a41b


Adds BeanInfo to allow define class attribute in JSPs


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/587e3a41
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/587e3a41
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/587e3a41

Branch: refs/heads/develop
Commit: 587e3a41b1d306eb246aa39d71dce469f4e50e9d
Parents: 3b9d586
Author: Lukasz Lenart 
Authored: Tue Sep 23 23:02:31 2014 +0200
Committer: Lukasz Lenart 
Committed: Tue Sep 23 23:02:31 2014 +0200

--
 .../webapp/WEB-INF/jsp/example/HelloWorld.jsp   |  2 +-
 .../struts2/views/jsp/ui/AbstractUITag.java |  7 +-
 .../views/jsp/ui/AbstractUITagBeanInfo.java | 70 
 .../apache/struts2/views/jsp/ui/AnchorTest.java | 10 +++
 .../struts2/views/jsp/ui/ComponentTest.java |  2 +-
 .../struts2/views/jsp/ui/Component-param.txt|  2 +-
 .../test/resources/template/test/Component.ftl  |  2 +-
 .../dojo/views/jsp/ui/TabbedPanelTag.java   |  2 +-
 8 files changed, 89 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/587e3a41/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
--
diff --git a/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp 
b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
index f10fc02..17b0963 100644
--- a/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
+++ b/apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
@@ -14,7 +14,7 @@
 
 en
 
-English
+English
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/587e3a41/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java 
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
index e57932a..65b80cf 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITag.java
@@ -44,7 +44,7 @@ public abstract class AbstractUITag extends 
ComponentTagSupport implements Dynam
 protected String disabled;
 protected String label;
 protected String labelSeparator;
-protected String labelPosition;
+protected String labelposition;
 protected String requiredPosition;
 protected String errorPosition;
 protected String name;
@@ -96,7 +96,7 @@ public abstract class AbstractUITag extends 
ComponentTagSupport implements Dynam
 uiBean.setDisabled(disabled);
 uiBean.setLabel(label);
 uiBean.setLabelSeparator(labelSeparator);
-uiBean.setLabelposition(labelPosition);
+uiBean.setLabelposition(labelposition);
 uiBean.setRequiredPosition(requiredPosition);
 uiBean.setErrorPosition(errorPosition);
 uiBean.setName(name);
@@ -148,6 +148,7 @@ public abstract class AbstractUITag extends 
ComponentTagSupport implements Dynam
 public void setCssStyle(String cssStyle) {
 this.cssStyle = cssStyle;
 }
+
 public void setStyle(String cssStyle) {
 this.cssStyle = cssStyle;
 }
@@ -173,7 +174,7 @@ public abstract class AbstractUITag extends 
ComponentTagSupport implements Dynam
 }
 
 public void setLabelposition(String labelPosition) {
-this.labelPosition = labelPosition;
+this.labelposition = labelPosition;
 }
 
 public void setRequiredPosition(String requiredPosition) {

http://git-wip-us.apache.org/repos/asf/struts/blob/587e3a41/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java 
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
new file mode 100644
index 000..87e4105
--- /dev/null
+++ 
b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractUITagBeanInfo.java
@@ -0,0 +1,70 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writi