struts git commit: WW-4721 Enables rounding mode
Repository: struts
Updated Branches:
refs/heads/master 9cde17b22 -> 99bb67143
WW-4721 Enables rounding mode
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/99bb6714
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/99bb6714
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/99bb6714
Branch: refs/heads/master
Commit: 99bb6714373a4b6f877a53dec1f52b1ac26b75b9
Parents: 9cde17b
Author: Lukasz Lenart
Authored: Mon Nov 28 17:03:48 2016 +0100
Committer: Lukasz Lenart
Committed: Mon Nov 28 17:03:48 2016 +0100
--
.../org/apache/struts2/components/Number.java | 34 +++-
1 file changed, 12 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/99bb6714/core/src/main/java/org/apache/struts2/components/Number.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/Number.java
b/core/src/main/java/org/apache/struts2/components/Number.java
index a52bff2..7ca45b1 100644
--- a/core/src/main/java/org/apache/struts2/components/Number.java
+++ b/core/src/main/java/org/apache/struts2/components/Number.java
@@ -1,11 +1,4 @@
-/**
- *
- */
-package org.apache.struts2.components;
-
/*
- * $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
@@ -23,6 +16,7 @@ package org.apache.struts2.components;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.struts2.components;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.ValueStack;
@@ -33,6 +27,7 @@ import
org.apache.struts2.views.annotations.StrutsTagAttribute;
import java.io.IOException;
import java.io.Writer;
+import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.Currency;
@@ -154,16 +149,14 @@ public class Number extends ContextBean {
setRoundingMode(format);
String msg = format.format(number);
-if (msg != null) {
-try {
-if (getVar() == null) {
-writer.write(msg);
-} else {
-putInContext(msg);
-}
-} catch (IOException e) {
-LOG.error("Could not write out Number tag", e);
+try {
+if (getVar() == null) {
+writer.write(msg);
+} else {
+putInContext(msg);
}
+} catch (IOException e) {
+LOG.error("Could not write out Number tag", e);
}
}
return super.end(writer, "");
@@ -221,8 +214,6 @@ public class Number extends ContextBean {
}
private void setRoundingMode(NumberFormat format) {
-/*
-TODO lukaszlenart: enable when switched to Java 1.6
if (roundingMode != null) {
roundingMode = findString(roundingMode);
if ("ceiling".equals(roundingMode)) {
@@ -245,7 +236,6 @@ public class Number extends ContextBean {
LOG.error("Could not recognise a roundingMode of [" +
roundingMode + "]");
}
}
-*/
}
private NumberFormat getNumberFormat() {
@@ -275,12 +265,12 @@ public class Number extends ContextBean {
return format;
}
-@StrutsTagAttribute(description = "Type of number formatter (currency,
integer, number or percent, default is number)", rtexprvalue = false)
+@StrutsTagAttribute(description = "Type of number formatter (currency,
integer, number or percent, default is number)")
public void setType(String type) {
this.type = type;
}
-@StrutsTagAttribute(description = "The currency to use for a currency
format", type = "String", defaultValue = "")
+@StrutsTagAttribute(description = "The currency to use for a currency
format")
public void setCurrency(String currency) {
this.currency = currency;
}
@@ -408,7 +398,7 @@ public class Number extends ContextBean {
/**
* @param roundingMode the roundingMode to set
*/
-@StrutsTagAttribute(description = "The rounding mode to use - not
implemented yet as this required Java 1.6", type = "String")
+@StrutsTagAttribute(description = "The rounding mode to use, possible
values: ceiling, down, floor, half-down, half-even, half-up, unnecessary, up")
public void setRoundingMode(String roundingMode) {
this.roundingMode = roundingMode;
}
struts git commit: WW-4721 Enables test
Repository: struts
Updated Branches:
refs/heads/master 99bb67143 -> 0014f8935
WW-4721 Enables test
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0014f893
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0014f893
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0014f893
Branch: refs/heads/master
Commit: 0014f8935acde640eaeeca100be641178bcc5cc2
Parents: 99bb671
Author: Lukasz Lenart
Authored: Mon Nov 28 17:12:34 2016 +0100
Committer: Lukasz Lenart
Committed: Mon Nov 28 17:12:34 2016 +0100
--
core/src/site/resources/tags/number.html | 2 +-
.../java/org/apache/struts2/views/jsp/NumberTagTest.java | 11 +++
2 files changed, 4 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/0014f893/core/src/site/resources/tags/number.html
--
diff --git a/core/src/site/resources/tags/number.html
b/core/src/site/resources/tags/number.html
index eabc6fa..744a72f 100644
--- a/core/src/site/resources/tags/number.html
+++ b/core/src/site/resources/tags/number.html
@@ -103,7 +103,7 @@ Please do not edit it directly.
false
String
- The
rounding mode to use - not implemented yet as this required Java 1.6
+ The
rounding mode to use, possible values: ceiling, down, floor, half-down,
half-even, half-up, unnecessary, up
type
http://git-wip-us.apache.org/repos/asf/struts/blob/0014f893/core/src/test/java/org/apache/struts2/views/jsp/NumberTagTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/NumberTagTest.java
b/core/src/test/java/org/apache/struts2/views/jsp/NumberTagTest.java
index 525e54a..f215cf2 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/NumberTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/NumberTagTest.java
@@ -3,6 +3,7 @@ package org.apache.struts2.views.jsp;
import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.TestAction;
+import java.math.RoundingMode;
import java.text.NumberFormat;
import java.util.Locale;
@@ -65,10 +66,7 @@ public class NumberTagTest extends AbstractTagTest {
// then
NumberFormat format = NumberFormat.getCurrencyInstance((Locale)
context.get(ActionContext.LOCALE));
-/*
-TODO lukaszlenart: enable when switched to Java 1.6
format.setRoundingMode(RoundingMode.CEILING);
-*/
String expected = format.format(120.0f);
assertEquals(expected, writer.toString());
@@ -84,7 +82,7 @@ public class NumberTagTest extends AbstractTagTest {
NumberTag tag = new NumberTag();
tag.setPageContext(pageContext);
tag.setName("floatNumber");
-tag.setRoundingMode("ceiling");
+tag.setRoundingMode("down");
// when
tag.doStartTag();
@@ -92,10 +90,7 @@ public class NumberTagTest extends AbstractTagTest {
// then
NumberFormat format = NumberFormat.getInstance((Locale)
context.get(ActionContext.LOCALE));
-/*
-TODO lukaszlenart: enable when switched to Java 1.6
-format.setRoundingMode(RoundingMode.CEILING);
-*/
+format.setRoundingMode(RoundingMode.DOWN);
String expected = format.format(120.45f);
assertEquals(expected, writer.toString());
struts git commit: [maven-release-plugin] prepare release STRUTS_2_5_6
Repository: struts Updated Branches: refs/heads/master 0014f8935 -> 31a0768da [maven-release-plugin] prepare release STRUTS_2_5_6 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/31a0768d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/31a0768d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/31a0768d Branch: refs/heads/master Commit: 31a0768da35bb762db93e7931cadb8552f206a56 Parents: 0014f89 Author: Lukasz Lenart Authored: Mon Nov 28 21:15:29 2016 +0100 Committer: Lukasz Lenart Committed: Mon Nov 28 21:15:29 2016 +0100 -- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 4 ++-- 35 files changed, 42 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/31a0768d/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index 99d42b3..0e65a04 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.5.6-SNAPSHOT +2.5.6 struts2-apps pom http://git-wip-us.apache.org/repos/asf/struts/blob/31a0768d/apps/rest-showcase/pom.xml -- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index f668825..959aa96 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps -2.5.6-SNAPSHOT +2.5.6 struts2-rest-showcase war -2.5.6-SNAPSHOT +2.5.6 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/31a0768d/apps/showcase/pom.xml -- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 156c65f..d7c07d4 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.5.6-SNAPSHOT +2.5.6 struts2-showcase http://git-wip-us.apache.org/repos/asf/struts/blob/31a0768d/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index d32b1a0..fdec0b6 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent -2.5.6-SNAPSHOT +2.5.6 struts2-assembly http://git-wip-us.apache.org/repos/asf/struts/blob/31a0768d/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index 30b2c08..6aa0862 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom -2.5.6-SNAPSHOT +2.5.6 pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ -2.5.6-SNAPSHOT +2.5.6 @@ -170,4 +170,8 @@ + + +STRUTS_2_5_6 + http://git-wip-us.apache.org/repos/asf/struts/blob/31a0768d/bundles/admin/pom.xml -- diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index ecbbb88..578a477 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles -2.5.6-S
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_5_6 [created] 1037b5263
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/master 31a0768da -> ad3a697d9 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ad3a697d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ad3a697d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ad3a697d Branch: refs/heads/master Commit: ad3a697d93349180f53749688bb7f8a4a6d7b216 Parents: 31a0768 Author: Lukasz Lenart Authored: Mon Nov 28 21:15:56 2016 +0100 Committer: Lukasz Lenart Committed: Mon Nov 28 21:15:56 2016 +0100 -- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 ++-- bundles/admin/pom.xml | 2 +- bundles/demo/pom.xml| 2 +- bundles/pom.xml | 2 +- core/pom.xml| 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/dwr/pom.xml | 2 +- plugins/embeddedjsp/pom.xml | 2 +- plugins/gxp/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/osgi/pom.xml| 2 +- plugins/oval/pom.xml| 2 +- plugins/pell-multipart/pom.xml | 2 +- plugins/plexus/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/portlet-tiles/pom.xml | 2 +- plugins/portlet/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitegraph/pom.xml | 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- pom.xml | 4 ++-- 35 files changed, 38 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/ad3a697d/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index 0e65a04..ac553b7 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.5.6 +2.5.7-SNAPSHOT struts2-apps pom http://git-wip-us.apache.org/repos/asf/struts/blob/ad3a697d/apps/rest-showcase/pom.xml -- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 959aa96..13d2aa5 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps -2.5.6 +2.5.7-SNAPSHOT struts2-rest-showcase war -2.5.6 +2.5.7-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/ad3a697d/apps/showcase/pom.xml -- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index d7c07d4..65aad9b 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.5.6 +2.5.7-SNAPSHOT struts2-showcase http://git-wip-us.apache.org/repos/asf/struts/blob/ad3a697d/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index fdec0b6..872888b 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent -2.5.6 +2.5.7-SNAPSHOT struts2-assembly http://git-wip-us.apache.org/repos/asf/struts/blob/ad3a697d/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index 6aa0862..74e6a36 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom -2.5.6 +2.5.7-SNAPSHOT pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ -2.5.6 +2.5.7-SNAPSHOT @@ -170,8 +170,4 @@ - - -STRUTS_2_5_6 - http://git-wip-us.apache.org/repos/asf/struts/blob/ad3a697d/bundles/admin/pom.xml -- diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 578a477..ad5a6bb 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles -
svn commit: r17180 - /dev/struts/2.5.6/
Author: lukaszlenart Date: Mon Nov 28 20:50:06 2016 New Revision: 17180 Log: Updates test release 2.5.6 Added: dev/struts/2.5.6/ dev/struts/2.5.6/struts-2.5.6-all.zip (with props) dev/struts/2.5.6/struts-2.5.6-all.zip.asc (with props) dev/struts/2.5.6/struts-2.5.6-all.zip.md5 dev/struts/2.5.6/struts-2.5.6-all.zip.sha1 dev/struts/2.5.6/struts-2.5.6-apps.zip (with props) dev/struts/2.5.6/struts-2.5.6-apps.zip.asc (with props) dev/struts/2.5.6/struts-2.5.6-apps.zip.md5 dev/struts/2.5.6/struts-2.5.6-apps.zip.sha1 dev/struts/2.5.6/struts-2.5.6-docs.zip (with props) dev/struts/2.5.6/struts-2.5.6-docs.zip.asc (with props) dev/struts/2.5.6/struts-2.5.6-docs.zip.md5 dev/struts/2.5.6/struts-2.5.6-docs.zip.sha1 dev/struts/2.5.6/struts-2.5.6-lib.zip (with props) dev/struts/2.5.6/struts-2.5.6-lib.zip.asc (with props) dev/struts/2.5.6/struts-2.5.6-lib.zip.md5 dev/struts/2.5.6/struts-2.5.6-lib.zip.sha1 dev/struts/2.5.6/struts-2.5.6-min-lib.zip (with props) dev/struts/2.5.6/struts-2.5.6-min-lib.zip.asc (with props) dev/struts/2.5.6/struts-2.5.6-min-lib.zip.md5 dev/struts/2.5.6/struts-2.5.6-min-lib.zip.sha1 dev/struts/2.5.6/struts-2.5.6-src.zip (with props) dev/struts/2.5.6/struts-2.5.6-src.zip.asc (with props) dev/struts/2.5.6/struts-2.5.6-src.zip.md5 dev/struts/2.5.6/struts-2.5.6-src.zip.sha1 Added: dev/struts/2.5.6/struts-2.5.6-all.zip == Binary file - no diff available. Propchange: dev/struts/2.5.6/struts-2.5.6-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.6/struts-2.5.6-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.6/struts-2.5.6-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.6/struts-2.5.6-all.zip.md5 == --- dev/struts/2.5.6/struts-2.5.6-all.zip.md5 (added) +++ dev/struts/2.5.6/struts-2.5.6-all.zip.md5 Mon Nov 28 20:50:06 2016 @@ -0,0 +1 @@ +2e1651a6d8e5ff315cca930dfa055601 \ No newline at end of file Added: dev/struts/2.5.6/struts-2.5.6-all.zip.sha1 == --- dev/struts/2.5.6/struts-2.5.6-all.zip.sha1 (added) +++ dev/struts/2.5.6/struts-2.5.6-all.zip.sha1 Mon Nov 28 20:50:06 2016 @@ -0,0 +1 @@ +0c07f7c78e3d23ac0010608a4aaa5b1afab82db5 \ No newline at end of file Added: dev/struts/2.5.6/struts-2.5.6-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.5.6/struts-2.5.6-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.6/struts-2.5.6-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.6/struts-2.5.6-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.6/struts-2.5.6-apps.zip.md5 == --- dev/struts/2.5.6/struts-2.5.6-apps.zip.md5 (added) +++ dev/struts/2.5.6/struts-2.5.6-apps.zip.md5 Mon Nov 28 20:50:06 2016 @@ -0,0 +1 @@ +6247067019c9c4953aff0228d11726f1 \ No newline at end of file Added: dev/struts/2.5.6/struts-2.5.6-apps.zip.sha1 == --- dev/struts/2.5.6/struts-2.5.6-apps.zip.sha1 (added) +++ dev/struts/2.5.6/struts-2.5.6-apps.zip.sha1 Mon Nov 28 20:50:06 2016 @@ -0,0 +1 @@ +5921c75cd5c3e33079156f3bb73be189bc980de7 \ No newline at end of file Added: dev/struts/2.5.6/struts-2.5.6-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.5.6/struts-2.5.6-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.6/struts-2.5.6-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.6/struts-2.5.6-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.6/struts-2.5.6-docs.zip.md5 == --- dev/struts/2.5.6/struts-2.5.6-docs.zip.md5 (added) +++ dev/struts/2.5.6/struts-2.5.6-d
