git commit: WW-4166 Adds class and style aliases
Repository: struts
Updated Branches:
refs/heads/develop e7a414fea -> 6fbd1bef3
WW-4166 Adds class and style aliases
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6fbd1bef
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6fbd1bef
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6fbd1bef
Branch: refs/heads/develop
Commit: 6fbd1bef3a91eb6992507086b75f6d22bcb95fb2
Parents: e7a414f
Author: Lukasz Lenart
Authored: Mon Jul 28 20:56:10 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 20:56:10 2014 +0200
--
.../main/java/org/apache/struts2/components/UIBean.java | 10 ++
.../org/apache/struts2/views/jsp/ui/AbstractUITag.java| 7 +++
core/src/site/resources/tags/a.html | 8
core/src/site/resources/tags/actionerror.html | 8
core/src/site/resources/tags/actionmessage.html | 8
core/src/site/resources/tags/checkbox.html| 8
core/src/site/resources/tags/checkboxlist.html| 8
core/src/site/resources/tags/combobox.html| 8
core/src/site/resources/tags/component.html | 8
core/src/site/resources/tags/datetextfield.html | 8
core/src/site/resources/tags/debug.html | 8
core/src/site/resources/tags/div.html | 8
core/src/site/resources/tags/doubleselect.html| 8
core/src/site/resources/tags/fielderror.html | 8
core/src/site/resources/tags/file.html| 8
core/src/site/resources/tags/form.html| 8
core/src/site/resources/tags/head.html| 8
core/src/site/resources/tags/hidden.html | 8
core/src/site/resources/tags/inputtransferselect.html | 8
core/src/site/resources/tags/label.html | 8
core/src/site/resources/tags/optiontransferselect.html| 8
core/src/site/resources/tags/password.html| 8
core/src/site/resources/tags/radio.html | 8
core/src/site/resources/tags/reset.html | 8
core/src/site/resources/tags/select.html | 8
core/src/site/resources/tags/submit.html | 8
core/src/site/resources/tags/textarea.html| 8
core/src/site/resources/tags/textfield.html | 8
core/src/site/resources/tags/token.html | 8
core/src/site/resources/tags/updownselect.html| 8
30 files changed, 241 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/6fbd1bef/core/src/main/java/org/apache/struts2/components/UIBean.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/UIBean.java
b/core/src/main/java/org/apache/struts2/components/UIBean.java
index 51b7e79..e2d84bf 100644
--- a/core/src/main/java/org/apache/struts2/components/UIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/UIBean.java
@@ -1072,11 +1072,21 @@ public abstract class UIBean extends Component {
this.cssClass = cssClass;
}
+@StrutsTagAttribute(description="The css class to use for element - it's
an alias of cssClass attribute.")
+public void setClass(String cssClass) {
+this.cssClass = cssClass;
+}
+
@StrutsTagAttribute(description="The css style definitions for element to
use")
public void setCssStyle(String cssStyle) {
this.cssStyle = cssStyle;
}
+@StrutsTagAttribute(description="The css style definitions for element to
use - it's an alias of cssStyle attribute.")
+public void setStyle(String cssStyle) {
+this.cssStyle = cssStyle;
+}
+
@StrutsTagAttribute(description="The css error class to use for element")
public void setCssErrorClass(String cssErrorClass) {
this.cssErrorClass = cssErrorClass;
http://git-wip-us.apache.org/repos/asf/struts/blob/6fbd1bef/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 517e514..e57932a 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
@@ -141,9 +141,16 @@ public abstract class AbstractUITag extends
ComponentTagSupport im
git commit: WW-4318 Uses ErrorMessageBuilder to proper log fail of setting expression
Repository: struts
Updated Branches:
refs/heads/develop 6fbd1bef3 -> 5c4874c60
WW-4318 Uses ErrorMessageBuilder to proper log fail of setting expression
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5c4874c6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5c4874c6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5c4874c6
Branch: refs/heads/develop
Commit: 5c4874c60bb5331258e4a415af8604afaf1242b5
Parents: 6fbd1be
Author: Lukasz Lenart
Authored: Mon Jul 28 21:01:45 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 21:01:45 2014 +0200
--
.../main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/5c4874c6/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index acf54c4..90b1a54 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -208,7 +208,9 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
boolean shouldLog = shouldLogMissingPropertyWarning(e);
String msg = null;
if (throwExceptionOnFailure || shouldLog) {
- msg = "Error setting expression '" + expr + "' with value '" +
value + "'";
+ msg = ErrorMessageBuilder.create()
+.errorSettingExpressionWithValue(expr, value)
+.build();
}
if (shouldLog) {
LOG.warn(msg, e);
[1/2] git commit: WW-4166 Adds autogenerated files
Repository: struts Updated Branches: refs/heads/develop 5c4874c60 -> 73da38e9d WW-4166 Adds autogenerated files Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fc6a2c87 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fc6a2c87 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fc6a2c87 Branch: refs/heads/develop Commit: fc6a2c8777ba4bfd35dd9b2d3042beafd9d21278 Parents: 5c4874c Author: Lukasz Lenart Authored: Mon Jul 28 21:10:08 2014 +0200 Committer: Lukasz Lenart Committed: Mon Jul 28 21:10:08 2014 +0200 -- core/src/site/resources/tags/a.html| 8 core/src/site/resources/tags/actionerror.html | 8 core/src/site/resources/tags/actionmessage.html| 8 core/src/site/resources/tags/ajax/a.html | 8 core/src/site/resources/tags/ajax/autocompleter.html | 8 core/src/site/resources/tags/ajax/datetimepicker.html | 8 core/src/site/resources/tags/ajax/div.html | 8 core/src/site/resources/tags/ajax/submit.html | 8 core/src/site/resources/tags/ajax/tabbedpanel.html | 8 core/src/site/resources/tags/ajax/textarea.html| 8 core/src/site/resources/tags/ajax/tree.html| 8 core/src/site/resources/tags/ajax/treenode.html| 8 core/src/site/resources/tags/checkbox.html | 8 core/src/site/resources/tags/checkboxlist.html | 8 core/src/site/resources/tags/combobox.html | 8 core/src/site/resources/tags/component.html| 8 core/src/site/resources/tags/datetextfield.html| 8 core/src/site/resources/tags/debug.html| 8 core/src/site/resources/tags/div.html | 8 core/src/site/resources/tags/doubleselect.html | 8 core/src/site/resources/tags/fielderror.html | 8 core/src/site/resources/tags/file.html | 8 core/src/site/resources/tags/form.html | 8 core/src/site/resources/tags/head.html | 8 core/src/site/resources/tags/hidden.html | 8 core/src/site/resources/tags/inputtransferselect.html | 8 core/src/site/resources/tags/label.html| 8 core/src/site/resources/tags/optiontransferselect.html | 8 core/src/site/resources/tags/password.html | 8 core/src/site/resources/tags/radio.html| 8 core/src/site/resources/tags/reset.html| 8 core/src/site/resources/tags/select.html | 8 core/src/site/resources/tags/submit.html | 8 core/src/site/resources/tags/textarea.html | 8 core/src/site/resources/tags/textfield.html| 8 core/src/site/resources/tags/token.html| 8 core/src/site/resources/tags/updownselect.html | 8 37 files changed, 296 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/fc6a2c87/core/src/site/resources/tags/a.html -- diff --git a/core/src/site/resources/tags/a.html b/core/src/site/resources/tags/a.html index f18706e..dbaf26d 100644 --- a/core/src/site/resources/tags/a.html +++ b/core/src/site/resources/tags/a.html @@ -394,6 +394,14 @@ Please do not edit it directly. Set scheme attribute + style + false + + false + String + The css style definitions for element to use - it's an alias of cssStyle attribute. + + tabindex false http://git-wip-us.apache.org/repos/asf/struts/blob/fc6a2c87/core/src/site/resources/tags/actionerror.html -- diff --git a/core/src/site/resources/tags/actionerror.html b/core/src/site/resources/tags/actionerror.html index 4ac2030..d9c5336 100644 --- a/core/src/site/resources/tags/actionerror.html +++ b/core/src/site/resources/tags/actionerror.html @@ -290,6 +290,14 @@ Please do not edit it directly. Define required position of required form
[2/2] git commit: WW-4330 Adds support for parameters on absolute URLs closes #10
WW-4330 Adds support for parameters on absolute URLs closes #10
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/73da38e9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/73da38e9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/73da38e9
Branch: refs/heads/develop
Commit: 73da38e9defa0fdf3b9bba957488d72f6e1fc8d0
Parents: fc6a2c8
Author: Lukasz Lenart
Authored: Mon Jul 28 21:11:03 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 21:11:03 2014 +0200
--
.../dispatcher/ServletRedirectResult.java | 39 ++--
.../dispatcher/ServletRedirectResultTest.java | 1 +
2 files changed, 20 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/73da38e9/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
index ae25463..b6cd282 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
@@ -196,33 +196,32 @@ public class ServletRedirectResult extends
StrutsResultSupport implements Reflec
if (prependServletContext && (request.getContextPath() != null) &&
(request.getContextPath().length() > 0)) {
finalLocation = request.getContextPath() + finalLocation;
}
-
-ResultConfig resultConfig =
invocation.getProxy().getConfig().getResults().get(invocation.getResultCode());
-if (resultConfig != null) {
-Map resultConfigParams =
resultConfig.getParams();
-
-List prohibitedResultParams =
getProhibitedResultParams();
-for (Map.Entry e :
resultConfigParams.entrySet()) {
-if (!prohibitedResultParams.contains(e.getKey())) {
-Collection values =
conditionalParseCollection(e.getValue(), invocation, suppressEmptyParameters);
-if (!suppressEmptyParameters || !values.isEmpty()) {
-requestParameters.put(e.getKey(), values);
-}
+}
+ResultConfig resultConfig =
invocation.getProxy().getConfig().getResults().get(invocation.getResultCode());
+if (resultConfig != null) {
+Map resultConfigParams = resultConfig.getParams();
+
+List prohibitedResultParams = getProhibitedResultParams();
+for (Map.Entry e : resultConfigParams.entrySet()) {
+if (!prohibitedResultParams.contains(e.getKey())) {
+Collection values =
conditionalParseCollection(e.getValue(), invocation, suppressEmptyParameters);
+if (!suppressEmptyParameters || !values.isEmpty()) {
+requestParameters.put(e.getKey(), values);
}
}
}
+}
-StringBuilder tmpLocation = new StringBuilder(finalLocation);
-urlHelper.buildParametersString(requestParameters, tmpLocation,
"&");
-
-// add the anchor
-if (anchor != null) {
-tmpLocation.append('#').append(anchor);
-}
+StringBuilder tmpLocation = new StringBuilder(finalLocation);
+urlHelper.buildParametersString(requestParameters, tmpLocation, "&");
-finalLocation = response.encodeRedirectURL(tmpLocation.toString());
+// add the anchor
+if (anchor != null) {
+tmpLocation.append('#').append(anchor);
}
+finalLocation = response.encodeRedirectURL(tmpLocation.toString());
+
if (LOG.isDebugEnabled()) {
LOG.debug("Redirecting to finalLocation " + finalLocation);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/73da38e9/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
index 6a9e871..56cfe9d 100644
---
a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
+++
b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
@@ -87,6 +87,7 @@ public class ServletRedirectResultTest extends
StrutsInternalTestCase implements
public void testFullUrlRedirect() {
view.setLocation("http://localhost/bar/foo.jsp";);
+responseMock.expectAndReturn("encod
git commit: WW-4331 Returns null instead of throwing exception This allows other UnknownHandler to be called
Repository: struts
Updated Branches:
refs/heads/develop 73da38e9d -> ff100ce2d
WW-4331 Returns null instead of throwing exception
This allows other UnknownHandler to be called
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ff100ce2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ff100ce2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ff100ce2
Branch: refs/heads/develop
Commit: ff100ce2d9c939e9cf4867bc46966a7dfecb6770
Parents: 73da38e
Author: Lukasz Lenart
Authored: Mon Jul 28 21:17:13 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 21:17:13 2014 +0200
--
.../org/apache/struts2/convention/ConventionUnknownHandler.java | 2 +-
.../src/main/java/com/opensymphony/xwork2/UnknownHandler.java| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/ff100ce2/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
--
diff --git
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index 273fd3e..ed70858 100644
---
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -420,7 +420,7 @@ public class ConventionUnknownHandler implements
UnknownHandler {
* Not used
*/
public Object handleUnknownActionMethod(Object action, String methodName)
throws NoSuchMethodException {
-throw null;
+return null;
}
public static class Resource {
http://git-wip-us.apache.org/repos/asf/struts/blob/ff100ce2/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
index 033c0d6..8e9303a 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/UnknownHandler.java
@@ -53,8 +53,8 @@ public interface UnknownHandler {
* @since 2.1
* @param action The action object
* @param methodName The method name to call
- * @return The result returned from invoking the action method
- * @throws NoSuchMethodException If the method cannot be found
+ * @return The result returned from invoking the action method, can return
null
+ * @throws NoSuchMethodException If the method cannot be found
(deprecated) - should return nunll instead
*/
public Object handleUnknownActionMethod(Object action, String
methodName) throws NoSuchMethodException;
}
[2/2] git commit: WW-4360 Fixes potential NullPointerExceptions
WW-4360 Fixes potential NullPointerExceptions
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/413d67bd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/413d67bd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/413d67bd
Branch: refs/heads/develop
Commit: 413d67bd28ea414e586e596a50d68d9d2d0312a2
Parents: 2dd9cb5
Author: Lukasz Lenart
Authored: Mon Jul 28 21:35:17 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 21:35:17 2014 +0200
--
.../providers/XmlConfigurationProvider.java | 4 +++-
.../xwork2/conversion/impl/NumberConverter.java | 2 ++
.../util/NamedVariablePatternMatcher.java | 5 -
.../xwork2/util/finder/ResourceFinder.java | 7 ++-
.../xwork2/util/location/LocationUtils.java | 12 +--
.../util/NamedVariablePatternMatcherTest.java | 22 +---
6 files changed, 36 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/413d67bd/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 6f9508b..253048b 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -37,11 +37,13 @@ import com.opensymphony.xwork2.util.location.Location;
import com.opensymphony.xwork2.util.location.LocationUtils;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
@@ -426,7 +428,7 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
} else {
if (!verifyAction(className, name, location)) {
if (LOG.isErrorEnabled())
-LOG.error("Unable to verify action [#0] with class [#1],
from [#2]", name, className, location.toString());
+LOG.error("Unable to verify action [#0] with class [#1],
from [#2]", name, className, location);
return;
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/413d67bd/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
index dfa1e0e..ab6efc0 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java
@@ -95,6 +95,8 @@ public class NumberConverter extends DefaultTypeConverter {
bigValue = new BigInteger(stringValue);
lowerBound = BigInteger.valueOf(Long.MIN_VALUE);
upperBound = BigInteger.valueOf(Long.MAX_VALUE);
+} else {
+throw new IllegalArgumentException("Unexpected numeric type: "
+ toType.getName());
}
} catch (NumberFormatException e) {
//shoult it fail here? BigInteger doesnt seem to be so nice
parsing numbers as NumberFormat
http://git-wip-us.apache.org/repos/asf/struts/blob/413d67bd/xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
index a0bc652..1203a49 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/NamedVariablePatternMatcher.java
@@ -80,7 +80,10 @@ public class NamedVariablePatternMatcher implements
PatternMatcherhttp://git-wip-us.apache.org/repos/asf/struts/blob/413d67bd/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/ResourceFinder.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/
[1/2] git commit: Extends error() method to accept Objects as parameters
Repository: struts
Updated Branches:
refs/heads/develop ff100ce2d -> 413d67bd2
Extends error() method to accept Objects as parameters
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2dd9cb55
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2dd9cb55
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2dd9cb55
Branch: refs/heads/develop
Commit: 2dd9cb555a857f3b8da221193b28aa8c398fd186
Parents: ff100ce
Author: Lukasz Lenart
Authored: Mon Jul 28 21:29:54 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 21:29:54 2014 +0200
--
.../main/java/com/opensymphony/xwork2/util/logging/Logger.java | 2 ++
.../opensymphony/xwork2/util/logging/commons/CommonsLogger.java | 4
.../java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java | 4
.../com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java | 4
4 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/2dd9cb55/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
index f6fb355..408cb0a 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/Logger.java
@@ -52,6 +52,8 @@ public interface Logger {
void error(String msg, String... args);
+void error(String msg, Object... args);
+
void error(String msg, Throwable ex, String... args);
boolean isErrorEnabled();
http://git-wip-us.apache.org/repos/asf/struts/blob/2dd9cb55/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
index bf00fa9..a06f647 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java
@@ -34,6 +34,10 @@ public class CommonsLogger implements Logger {
log.error(LoggerUtils.format(msg, args));
}
+public void error(String msg, Object... args) {
+log.error(LoggerUtils.format(msg, args));
+}
+
public void error(String msg, Throwable ex, String... args) {
log.error(LoggerUtils.format(msg, args), ex);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/2dd9cb55/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
index 5d29213..38540ce 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/jdk/JdkLogger.java
@@ -35,6 +35,10 @@ public class JdkLogger implements Logger {
log.log(Level.SEVERE, LoggerUtils.format(msg, args));
}
+public void error(String msg, Object... args) {
+log.log(Level.SEVERE, LoggerUtils.format(msg, args));
+}
+
public void error(String msg, Throwable ex, String... args) {
log.log(Level.SEVERE, LoggerUtils.format(msg, args), ex);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/2dd9cb55/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
index fae4d2b..5374db3 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/slf4j/Slf4jLogger.java
@@ -33,6 +33,10 @@ public class Slf4jLogger implements Logger {
log.error(LoggerUtils.format(msg, args));
}
+public void error(String msg, Object... args) {
+log.error(LoggerUtils.format(msg, args));
+}
+
public void error(String msg, Throwable ex, String... args) {
log.error(LoggerUtils.format(msg, args), ex);
}
git commit: WW-4360 Fixes potential NullPointerExceptions
Repository: struts
Updated Branches:
refs/heads/develop 413d67bd2 -> 47d1fe04d
WW-4360 Fixes potential NullPointerExceptions
This closes #16
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47d1fe04
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47d1fe04
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47d1fe04
Branch: refs/heads/develop
Commit: 47d1fe04dc1790473e9bd464d84e65ca76368ba5
Parents: 413d67b
Author: Lukasz Lenart
Authored: Mon Jul 28 21:36:46 2014 +0200
Committer: Lukasz Lenart
Committed: Mon Jul 28 21:36:46 2014 +0200
--
.../xwork2/config/providers/XmlConfigurationProvider.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/47d1fe04/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index 253048b..a61d5e2 100644
---
a/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++
b/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -427,8 +427,9 @@ public class XmlConfigurationProvider implements
ConfigurationProvider {
} else {
if (!verifyAction(className, name, location)) {
-if (LOG.isErrorEnabled())
+if (LOG.isErrorEnabled()) {
LOG.error("Unable to verify action [#0] with class [#1],
from [#2]", name, className, location);
+}
return;
}
}
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Ambari Pages Page: Features + Roadmap edited by Jeff Sposetti [06:39 PM] (View Changes) Page: Views edited by Jeff Sposetti [03:06 PM] (View Changes) Apache Bigtop Pages Page: Deploying Bigtop's Apache Website edited by jay vyas [07:29 PM] (View Changes) Apache Camel Pages Page: Rest DSL edited by Claus Ibsen [01:52 PM] (View Changes) Apache Cloudstack Pages Page: Baremetal Advanced Networking Support edited by Animesh [09:06 PM] (View Changes) Apache CouchDB Pages Page: Project Bylaws (Candidate) created by Noah Slater [03:09 PM] Page: Errata created by Noah Slater [04:56 PM] Page: Project Bylaws edited by Joan Touzet [01:01 AM] (View Changes) Drill Wiki Pages Home page: Apache Drill Wiki edited by Bridget Bevens [11:55 PM] (View Changes) Page: Setting Up Your Development Environment edited by Bob Rumsby [10:22 PM] (View Changes) Page: Connecting to Data Sources edited by Bob Rumsby [10:10 PM] (View Changes) Apache Flex Pages Page: Progress info for Android 4.x skins edited by OmPrakash Muppirala [09:23 AM] (View Changes) Apache Flink Pages Page: Project Ideas created by Robert [11:31 AM] Home page: Apache Flink Home created by Gavin [10:39 AM] Apache Hive
