Repository: struts Updated Branches: refs/heads/master f85c60ea4 -> eb564a25e
http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java index d5433e0..b6bcf3c 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/SimpleActionValidationTest.java @@ -26,10 +26,6 @@ import java.util.*; /** - * SimpleActionValidationTest - * <p/> - * Created : Jan 20, 2003 11:04:25 PM - * * @author Jason Carreira */ public class SimpleActionValidationTest extends XWorkTestCase { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/components/AnotherActionComponentTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/components/AnotherActionComponentTest.java b/core/src/test/java/org/apache/struts2/components/AnotherActionComponentTest.java index 46fac30..ee255d4 100644 --- a/core/src/test/java/org/apache/struts2/components/AnotherActionComponentTest.java +++ b/core/src/test/java/org/apache/struts2/components/AnotherActionComponentTest.java @@ -4,13 +4,6 @@ import org.apache.struts2.views.jsp.AbstractTagTest; import org.apache.struts2.TestConfigurationProvider; import org.apache.struts2.StrutsException; -/** - * Describe your class here - * - * @author $Author$ - * <p/> - * $Id$ - */ public class AnotherActionComponentTest extends AbstractTagTest { public void testRethrowException() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java index 636d433..108731e 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java @@ -108,7 +108,7 @@ public abstract class AbstractUITagTest extends AbstractTagTest { /** * Initialize a map of {@link PropertyHolder} for generic tag property testing. Will be used when calling {@link * #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, String, String[])} as properties to - * verify.<p/> This implementation defines testdata for all common AbstractUITag properties and may be overridden in + * verify.<br> This implementation defines testdata for all common AbstractUITag properties and may be overridden in * subclasses. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java index b3555aa..dce1f4d 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AnchorTagTest.java @@ -78,40 +78,40 @@ public class AnchorTagTest extends AbstractUITagTest { * - current request url * - tag's value attribute * - tag's nested param tag - * <p/> + * <br> * id1 * === * - found in current request url * - found in tag's value attribute * - found in tag's param tag * CONCLUSION: tag's param tag takes precedence (paramId1) - * <p/> + * <br> * id2 * === * - found in current request url * - found in tag's value attribute * CONCLUSION: tag's value attribute take precedence (tagId2) - * <p/> + * <br> * urlParam1 * ========= * - found in current request url * CONCLUSION: param in current request url will be used (urlValue1) - * <p/> + * <br> * urlParam2 * ========= * - found in current request url * CONCLUSION: param in current request url will be used. (urlValue2) - * <p/> + * <br> * tagId * ===== * - found in tag's value attribute * CONCLUSION: param in tag's value attribute wil; be used. (tagValue) - * <p/> + * <br> * param1 * ====== * - found in nested param tag * CONCLUSION: param in nested param tag will be used. (param1value) - * <p/> + * <br> * param2 * ====== * - found in nested param tag @@ -208,16 +208,20 @@ public class AnchorTagTest extends AbstractUITagTest { } /** + * <p> * To test priority of parameter passed in to url component though * various way, with includeParams="NONE" - * - current request url - * - tag's value attribute - * - tag's nested param tag - * <p/> + * </p> + * + * - current request url<br> + * - tag's value attribute<br> + * - tag's nested param tag<br> + * + * <p> * In this case only parameters from the tag itself is taken into account. * Those from request will not count, only those in tag's value attribute * and nested param tag. - * + * </p> * @throws Exception */ public void testParametersPriorityWithIncludeParamsAsNONE() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java index 91150db..4f40b37 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/StrutsMockJspWriter.java @@ -28,10 +28,11 @@ import javax.servlet.jsp.JspWriter; /** - * Unforunately, the MockJspWriter throws a NotImplementedException when any of the Writer methods are invoked and + * <p> + * Unfortunately, the MockJspWriter throws a NotImplementedException when any of the Writer methods are invoked and * as you might guess, Velocity uses the Writer methods. I'velocityEngine subclassed the MockJspWriter for the time being so * that we can do testing on the results until MockJspWriter gets fully implemented. - * <p/> + * </p> * todo replace this once MockJspWriter implements Writer correctly (i.e. doesn't throw NotImplementException) */ public class StrutsMockJspWriter extends JspWriter { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java index 3b45fe5..9db9dcd 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxListTest.java @@ -38,7 +38,7 @@ public class CheckboxListTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java index d05267b..d6971e8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/CheckboxTest.java @@ -39,7 +39,7 @@ public class CheckboxTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java index 7a54f4a..bd316f6 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java @@ -57,7 +57,7 @@ public class FileTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java index c9427d1..5e7fe8c 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java @@ -391,11 +391,16 @@ public class FormTagTest extends AbstractUITagTest { /** - * Testing that this: <p> + * <p> + * Testing that this: + * </p> + * <pre> * <a:form name="'myForm'" namespace="'/testNamespace'" action="'testNamespaceAction'" method="'post'"> - * <p/> + * </pre> + * <p> * doesn't create an action of "/testNamespace/testNamespaceAction.action" when the "struts.action.extension" * config property is set to "jspa". + * </p> */ public void testFormTagWithDifferentActionExtension() throws Exception { initDispatcher(new HashMap<String,String>(){{ @@ -419,9 +424,9 @@ public class FormTagTest extends AbstractUITagTest { } /** - * Testing that this: <p> + * Testing that this: <br> * <a:form name="'myForm'" action="'/testNamespace/testNamespaceAction.jspa'" method="'post'"> - * <p/> + * <br> * doesn't create an action of "/testNamespace/testNamespaceAction.action" */ public void testFormTagWithDifferentActionExtensionHardcoded() throws Exception { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java index 3aca47c..e44ade5 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/HeadTagTest.java @@ -25,7 +25,7 @@ import org.apache.struts2.views.jsp.AbstractUITagTest; /** * Unit test for {@link HeadTag}. - * <p/> + * <br> * Note: If unit test fails with encoding difference check the src/test/struts.properties * and adjust the .txt files accordingly * http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java index ea34dcc..926d3a4 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/HiddenTest.java @@ -68,7 +68,7 @@ public class HiddenTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java index 7ef1155..4b84bec 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/LabelTest.java @@ -69,7 +69,7 @@ public class LabelTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java index 64a3b15..913ead8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java @@ -212,7 +212,7 @@ public class ResetTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java index df0f432..2a33037 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java @@ -238,7 +238,7 @@ public class SubmitTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java index 36d5925..4494bc3 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextareaTest.java @@ -60,7 +60,7 @@ public class TextareaTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java index e1a81c4..d61aae8 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java @@ -37,7 +37,7 @@ public class TextfieldTest extends AbstractUITagTest { /** * Initialize a map of {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder} for generic tag * property testing. Will be used when calling {@link #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, - * String, String[])} as properties to verify.<p/> This implementation extends testdata from AbstractUITag. + * String, String[])} as properties to verify.<br> This implementation extends testdata from AbstractUITag. * * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.AbstractUITagTest.PropertyHolder#getName()} * as key. http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/core/src/test/resources/XSLTResultTest3.xsl ---------------------------------------------------------------------- diff --git a/core/src/test/resources/XSLTResultTest3.xsl b/core/src/test/resources/XSLTResultTest3.xsl index 9f8ae5b..05a2cf0 100644 --- a/core/src/test/resources/XSLTResultTest3.xsl +++ b/core/src/test/resources/XSLTResultTest3.xsl @@ -29,8 +29,9 @@ <html> <body> Hello <xsl:value-of select="username"/> how are you? - <p/> + <p> We have the following books: + </p> <xsl:for-each select="books/item"> <br/><xsl:value-of select="title"/> by <xsl:value-of select="author"/>. </xsl:for-each> http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java ---------------------------------------------------------------------- diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java index db40c4b..1c765fb 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/constraints/FieldMatch.java @@ -36,14 +36,17 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Validation annotation to validate that two fields are equal. * An array of fields and their matching confirmation fields can be supplied. - * <p/> + * <p> * Example, compare 1 pair of fields: + * </p> * <pre> * * @FieldMatch(first = "password", second = "confirmPassword", message = "The password fields must match") * </pre> - * <p/> + * + * <p> * Example, compare more than 1 pair of fields: + * </p> * <pre> * @FieldMatch.List({ * @FieldMatch(first = "password", second = "confirmPassword", message = "The password fields must match"), http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java ---------------------------------------------------------------------- diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java index fb4c5cd..e8c5225 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/constant/ValidatorConstants.java @@ -23,7 +23,7 @@ package org.apache.struts.beanvalidation.validation.constant; /** * <p>Class consisting of various constant values being used within * bean validation plugin </p> - * <p/> + * * <p> * These values can be overridden using struts.xml file by providing custom values. * </p> http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java ---------------------------------------------------------------------- diff --git a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java index 0dcdb6b..c2a35cf 100644 --- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java +++ b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java @@ -46,8 +46,9 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; /** - * <p/> - * Use the dwr configuration as follows :- + * <p> + * Use the dwr configuration as follows: + * </p> * * <pre> * <!-- START SNIPPET: dwrConfiguration --> http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java ---------------------------------------------------------------------- diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java index bfd32c5..4fbccad 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/PageContextImpl.java @@ -580,7 +580,7 @@ public class PageContextImpl extends PageContext { } /** - * Returns the exception associated with this page context, if any. <p/> + * Returns the exception associated with this page context, if any. <br> * Added wrapping for Throwables to avoid ClassCastException: see Bugzilla * 31171 for details. * http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java ---------------------------------------------------------------------- diff --git a/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java b/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java index 8db9c25..f27afc8 100644 --- a/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java +++ b/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/AbstractGxpResult.java @@ -29,9 +29,12 @@ import java.io.Writer; import java.util.Locale; /** + * <p> * The abstract base class for our Struts 2 GXP result type implementation. It * outputs GXP, and pulls GXP parameters from Struts 2's value stack. Implementing * classes have to: + * </p> + * * <ol> * <li>Implement <code>execute(ActionInvocation)</code>, which must instruct the * GXP to write itself to the output stream. See {@link GxpResult} for a @@ -40,10 +43,12 @@ import java.util.Locale; * the value 'gxpName'. Struts 2 needs this to set the name of your * template into this object.</li> * </ol> - * <p/> + * * <p>If you want to use instantiated GXPs (using the nested * {@code Interface}), you can set the use{@code useInstances} parameter to * {@code true}: + * </p> + * * <pre> * <result-types> * <result-type name="gxp" class="org.apache.struts2.views.gxp.GxpResult"> @@ -51,12 +56,15 @@ import java.util.Locale; * </result-type> * </result-types> * </pre> + * + * <p> * This means that Struts 2 will attempt to instantiate the {@code Interface} * using the {@link com.opensymphony.xwork2.ObjectFactory}. If * {@link com.google.webwork.GuiceWebWorkIntegrationModule} is installed, or * {@link com.google.webwork.ContainerObjectFactory} is set as the static * {@code ObjectFactory} instance, then Guice will be used to instantiate the * GXP instance; otherwise, only GXPs with no constructor parameters will work. + * </p> * * @author Bob Lee */ http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java ---------------------------------------------------------------------- diff --git a/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java b/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java index 517f740..b854ef1 100644 --- a/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java +++ b/plugins/gxp/src/main/java/org/apache/struts2/views/gxp/GxpResult.java @@ -29,19 +29,21 @@ import com.opensymphony.xwork2.inject.Inject; import java.io.IOException; /** + * <p> * Struts 2 GXP result type implementation. Outputs GXP. Pulls GXP parameters * from Struts 2's value stack. - * <p/> + * </p> + * * <p>Declare the GXP result type for your package in the xwork.xml file:</p> - * <p/> + * * <pre> * <result-types> * <result-type name="gxp" class="org.apache.struts2.views.gxp.GxpResult"/> * </result-types> * </pre> - * <p/> + * * <p>Or if you want to output XML instead of HTML:</p> - * <p/> + * * <pre> * <result-types> * <result-type name="gxp" class="org.apache.struts2.views.gxp.GxpResult"> @@ -49,13 +51,13 @@ import java.io.IOException; * </result-type> * </result-types> * </pre> - * <p/> + * * <p>Outputting XML changes the content type from text/html to application/xml * and configures the {@link GxpContext} to output XML. This is useful in * situations like specifying the doctype of your GXP to be 'mobile'.</p> - * <p/> + * * <p>Use the GXP result type for the result of an action. For example:</p> - * <p/> + * * <pre> * <result name="success" type="gxp">/myPackage/MyGxp.gxp</result> * </pre> http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java ---------------------------------------------------------------------- diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index a8492af..e356506 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -50,18 +50,18 @@ import java.util.TimeZone; /** * <!-- START SNIPPET: description --> - * <p/> + * <p> * Generates a JasperReports report using the specified format or PDF if no * format is specified. - * <p/> + * </p> * <!-- END SNIPPET: description --> - * <p /> + * <p> * <b>This result type takes the following parameters:</b> - * <p/> + * </p> * <!-- START SNIPPET: params --> - * <p/> + * * <ul> - * <p/> + * * <li><b>location (default)</b> - the location where the compiled jasper report * definition is (foo.jasper), relative from current URL.</li> * <li><b>dataSource (required)</b> - the EL expression used to retrieve the @@ -105,21 +105,27 @@ import java.util.TimeZone; * is not set to false. * </p> * <!-- END SNIPPET: params --> - * <b>Example:</b> - * <pre><!-- START SNIPPET: example1 --> + * <p><b>Example:</b></p> + * <pre> + * <!-- START SNIPPET: example1 --> * <result name="success" type="jasper"> * <param name="location">foo.jasper</param> * <param name="dataSource">mySource</param> * <param name="format">CSV</param> * </result> - * <!-- END SNIPPET: example1 --></pre> + * <!-- END SNIPPET: example1 --> + * </pre> + * * or for pdf - * <pre><!-- START SNIPPET: example2 --> + * + * <pre> + * <!-- START SNIPPET: example2 --> * <result name="success" type="jasper"> * <param name="location">foo.jasper</param> * <param name="dataSource">mySource</param> * </result> - * <!-- END SNIPPET: example2 --></pre> + * <!-- END SNIPPET: example2 --> + * </pre> */ public class JasperReportsResult extends StrutsResultSupport implements JasperReportConstants { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java ---------------------------------------------------------------------- diff --git a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java index 4a1886e..63f965b 100644 --- a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java +++ b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java @@ -35,33 +35,34 @@ import javax.servlet.http.HttpServletResponse; /** * <!-- START SNIPPET: description --> - * <p/> + * <p> * A custom Result type for chart data. Built on top of * <a href="http://www.jfree.org/jfreechart/"; target="_blank">JFreeChart</a>. When executed * this Result will write the given chart as a PNG or JPG to the servlet output stream. - * <p/> + * </p> * <!-- END SNIPPET: description --> - * <p/> + * <p> * <b>This result type takes the following parameters:</b> - * <p/> + * </p> * <!-- START SNIPPET: params --> - * <p/> + * * <ul> - * <p/> + * * <li><b>value</b> - the name of the JFreeChart object on the ValueStack, defaults to 'chart'.</li> - * <p/> + * * <li><b>type</b> - the render type for this chart. Can be jpg (or jpeg) or png. Defaults to png.</li> - * <p/> + * * <li><b>width (required)</b> - the width (in pixels) of the rendered chart.</li> - * <p/> + * * <li><b>height (required)</b> - the height (in pixels) of the rendered chart.</li> - * <p/> + * * </ul> * <!-- END SNIPPET: params --> - * <p/> + * <p> * <b>Example:</b> - * <p/> - * <pre><!-- START SNIPPET: example --> + * </p> + * <pre> + * <!-- START SNIPPET: example --> * public class ExampleChartAction extends ActionSupport { * * private JFreeChart chart; @@ -99,7 +100,8 @@ import javax.servlet.http.HttpServletResponse; * <param name="width">640</param> * <param name="height">480</param> * </result> - * <!-- END SNIPPET: example --></pre> + * <!-- END SNIPPET: example --> + * </pre> */ public class ChartResult extends StrutsResultSupport { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java ---------------------------------------------------------------------- diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java index c0ae8a6..d03be45 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java @@ -45,18 +45,23 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.WildcardUtil; /** - * <!-- START SNIPPET: description --> <p/> This result serializes an action - * into JSON. <p/> <!-- END SNIPPET: description --> <p/> <p/> <u>Result - * parameters:</u> <p/> <!-- START SNIPPET: parameters --> <p/> + * <!-- START SNIPPET: description --> + * <p> + * This result serializes an action into JSON. + * </p> + * <!-- END SNIPPET: description --> + * <p><u>Result parameters:</u></p> + * <!-- START SNIPPET: parameters --> * <ul> - * <p/> + * * <li>excludeProperties - list of regular expressions matching the properties * to be excluded. The regular expressions are evaluated against the OGNL * expression representation of the properties. </li> - * <p/> + * * </ul> - * <p/> <!-- END SNIPPET: parameters --> <p/> <b>Example:</b> <p/> - * <p/> + * <!-- END SNIPPET: parameters --> + * <p><b>Example:</b></p> + * * <pre> * <!-- START SNIPPET: example --> * <result name="success" type="json" /> @@ -236,7 +241,7 @@ public class JSONResult implements Result { } /** - * Retrieve the encoding <p/> + * Retrieve the encoding * * @return The encoding associated with this template (defaults to the value * of param 'encoding', if empty default to 'struts.i18n.encoding' property) http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java ---------------------------------------------------------------------- diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java index 5c2e9fc..fc2b25b 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONUtil.java @@ -420,10 +420,10 @@ public class JSONUtil { /** * Visit all the interfaces realized by the specified object, its - * superclasses and its interfaces <p/> Visitation is performed in the + * superclasses and its interfaces <br> Visitation is performed in the * following order: aClass aClass' interfaces the interface's superclasses * (interfaces) aClass' superclass superclass' interfaces superclass' - * interface's superclasses (interfaces) super-superclass and so on <p/> The + * interface's superclasses (interfaces) super-superclass and so on <br> The * Object base class is base excluded. Classes/interfaces are only visited * once each * @@ -443,7 +443,7 @@ public class JSONUtil { /** * Recursive method to visit all the interfaces of a class (and its * superclasses and super-interfaces) if they haven't already been visited. - * <p/> Always visits itself if it hasn't already been visited + * <br> Always visits itself if it hasn't already been visited * * @param thisClass * the current class to visit (if not already done so) http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/json/src/test/java/org/apache/struts2/json/JSONEnumTest.java ---------------------------------------------------------------------- diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONEnumTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONEnumTest.java index b8b0954..0db7010 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/JSONEnumTest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONEnumTest.java @@ -71,7 +71,7 @@ public class JSONEnumTest extends TestCase { } /** - * Asserts that a bean can be serialized to JSON and restored as a map <p/> + * Asserts that a bean can be serialized to JSON and restored as a map <br> * In this case, the name of the enum is in _name and the two properties of * AnEnumBean are also serialized */ http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiHostFactory.java ---------------------------------------------------------------------- diff --git a/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiHostFactory.java b/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiHostFactory.java index a658892..9679744 100644 --- a/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiHostFactory.java +++ b/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiHostFactory.java @@ -25,12 +25,17 @@ import org.apache.struts2.osgi.host.GlassfishOSGiHost; import org.apache.struts2.osgi.host.OsgiHost; /** + * <p> * OsgiHostFactory that creates proper OsgiHost implementation according to * context param from web.xml - * <p/> + * </p> + * + * <p> * Two implementations are supported right now: - * - Apache Felix - * - Glassfish (which contains Apache Felix already) + * </p> + * + * - Apache Felix <br> + * - Glassfish (which contains Apache Felix already)<br> */ public class OsgiHostFactory { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java ---------------------------------------------------------------------- diff --git a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java index ef8722b..9472285 100644 --- a/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java +++ b/plugins/oval/src/main/java/org/apache/struts2/oval/interceptor/OValValidationManager.java @@ -10,12 +10,12 @@ public interface OValValidationManager { /** * <p>This method 'collects' all the validator configurations for a given * action invocation.</p> - * <p/> + * * <p>It will traverse up the class hierarchy looking for validators for every super class * and directly implemented interface of the current action, as well as adding validators for * any alias of this invocation. Nifty!</p> - * <p/> - * <p>Given the following class structure: + * + * <p>Given the following class structure: </p> * <pre> * interface Thing; * interface Animal extends Thing; @@ -23,9 +23,9 @@ public interface OValValidationManager { * class AnimalImpl implements Animal; * class QuadrapedImpl extends AnimalImpl implements Quadraped; * class Dog extends QuadrapedImpl; - * </pre></p> - * <p/> - * <p>This method will look for the following config files for Dog: + * </pre> + * + * <p>This method will look for the following config files for Dog:</p> * <pre> * Animal * Animal-context @@ -37,8 +37,8 @@ public interface OValValidationManager { * QuadrapedImpl-context * Dog * Dog-context - * </pre></p> - * <p/> + * </pre> + * * <p>Note that the validation rules for Thing is never looked for because no class in the * hierarchy directly implements Thing.</p> * http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java ---------------------------------------------------------------------- diff --git a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java index 9f9b4b8..c18277c 100644 --- a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java +++ b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java @@ -138,9 +138,10 @@ public class PellMultiPartRequest implements MultiPartRequest { /** * Sets the encoding for the uploaded params. This needs to be set if you are using character sets other than * ASCII. - * <p/> + * <p> * The encoding is looked up from the configuration setting 'struts.i18n.encoding'. This is usually set in * default.properties & struts.properties. + * </p> */ private void setEncoding() { String encoding = null; http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java ---------------------------------------------------------------------- diff --git a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java index 5033b99..506850f 100644 --- a/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java +++ b/plugins/plexus/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java @@ -41,11 +41,13 @@ import java.util.HashMap; import java.util.Map; /** - * Plexus integartion. You need three optional files: plexus-request.xml, plexus-session.xml, and + * <p> + * Plexus integration. You need three optional files: plexus-request.xml, plexus-session.xml, and * plexus-application.xml. - * <p/> + * </p> + * <p> * The syntax of these files is: - * <p/> + * </p> * <pre> * <plexus> * <components> http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java ---------------------------------------------------------------------- diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java index b323d06..a0dcb27 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DirectRenderFromEventAction.java @@ -28,6 +28,7 @@ import java.io.Serializable; import java.util.Map; /** + * <p> * When a portlet is targetted for an <code>event</code>, the portlet will receive two * portlet requests, one for the <code>event</code> phase, and then followed by a <code>render</code> * operation. When in the <code>event</code> phase, the action that is executed can't render @@ -35,11 +36,14 @@ import java.util.Map; * phase, and the action is set up with a result that should render something, the result can't * immediately be executed. The portlet needs to "wait" to the render phase to do the * rendering. - * <p/> + * </p> + * + * <p> * When the {@link org.apache.struts2.portlet.result.PortletResult} detects such a * scenario, instead of executing the actual view, it prepares a couple of render parameters * specifying this action and the location of the view, which then will be executed in the * following render request. + * </p> */ public class DirectRenderFromEventAction implements SessionAware, Action, Serializable { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java ---------------------------------------------------------------------- diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index ccfec82..b49cfc4 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -55,8 +55,8 @@ import java.io.Writer; * execution environment and then displays a Velocity template that will be * streamed directly to the servlet output. * - * <!-- END SNIPPET: description --> <p/><b>This result type takes the - * following parameters: </b> + * <!-- END SNIPPET: description --> + * <p><b>This result type takes the following parameters: </b></p> * * <!-- START SNIPPET: params --> * @@ -75,7 +75,7 @@ import java.io.Writer; * * <!-- END SNIPPET: params --> * - * <b>Example: </b> + * <p><b>Example: </b></p> * * <pre> * <!-- START SNIPPET: example --> @@ -200,7 +200,7 @@ public class PortletVelocityResult extends StrutsResultSupport { } /** - * Retrieve the content type for this template. <p/>People can override + * Retrieve the content type for this template. <br>People can override * this method if they want to provide specific content types for specific * templates (eg text/xml). * @@ -212,7 +212,7 @@ public class PortletVelocityResult extends StrutsResultSupport { } /** - * Retrieve the encoding for this template. <p/>People can override this + * Retrieve the encoding for this template. <br>People can override this * method if they want to provide specific encodings for specific templates. * * @return The encoding associated with this template (defaults to the value http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java ---------------------------------------------------------------------- diff --git a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java index 036bd14..adda4bc 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java @@ -93,12 +93,14 @@ public class PortletFreemarkerResult extends StrutsResultSupport { } /** + * <p> * Execute this result, using the specified template location. <p/>The - * template location has already been interoplated for any variable - * substitutions <p/>this method obtains the freemarker configuration and + * template location has already been interpolated for any variable + * substitutions <br>this method obtains the freemarker configuration and * the object wrapper from the provided hooks. It them implements the * template processing workflow by calling the hooks for preTemplateProcess * and postTemplateProcess + * </p> */ public void doExecute(String location, ActionInvocation invocation) throws IOException, TemplateException, PortletException { @@ -186,7 +188,7 @@ public class PortletFreemarkerResult extends StrutsResultSupport { * to obtain the FreeMarker configuration object that this result will use * for template loading. This is a hook that allows you to custom-configure * the configuration object in a subclass, or to fetch it from an IoC - * container. <p/><b>The default implementation obtains the configuration + * container. <br><b>The default implementation obtains the configuration * from the ConfigurationManager instance. </b> */ protected Configuration getConfiguration() throws TemplateException { @@ -197,7 +199,7 @@ public class PortletFreemarkerResult extends StrutsResultSupport { * This method is called from {@link #doExecute(String, ActionInvocation)} * to obtain the FreeMarker object wrapper object that this result will use * for adapting objects into template models. This is a hook that allows you - * to custom-configure the wrapper object in a subclass. <p/><b>The default + * to custom-configure the wrapper object in a subclass. <br><b>The default * implementation returns {@link Configuration#getObjectWrapper()}</b> */ protected ObjectWrapper getObjectWrapper() { @@ -212,8 +214,12 @@ public class PortletFreemarkerResult extends StrutsResultSupport { } /** + * <p> * Build the instance of the ScopesHashModel, including JspTagLib support - * <p/>Objects added to the model are <p/> + * </p> + * + * <p>Objects added to the model are:</p> + * * <ul> * <li>Application - servlet context attributes hash model * <li>JspTaglibs - jsp tag lib factory model http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java ---------------------------------------------------------------------- diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java index 4cadd82..0b2ac07 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestWorkflowInterceptor.java @@ -39,29 +39,32 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; /** * <!-- START SNIPPET: description --> - * + * <p> * An interceptor that makes sure there are not validation errors before allowing the interceptor chain to continue. * <b>This interceptor does not perform any validation</b>. - * + * </p> + * * <p>Copied from the {@link com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor}, this interceptor adds support for error handling of Restful * operations. For example, if an validation error is discovered, a map of errors is created and processed to be * returned, using the appropriate content handler for rendering the body.</p> * - * <p/>This interceptor does nothing if the name of the method being invoked is specified in the <b>excludeMethods</b> + * <p>This interceptor does nothing if the name of the method being invoked is specified in the <b>excludeMethods</b> * parameter. <b>excludeMethods</b> accepts a comma-delimited list of method names. For example, requests to * <b>foo!input.action</b> and <b>foo!back.action</b> will be skipped by this interceptor if you set the * <b>excludeMethods</b> parameter to "input, back". + * </p> * + * <p> * <b>Note:</b> As this method extends off MethodFilterInterceptor, it is capable of * deciding if it is applicable only to selective methods in the action class. This is done by adding param tags * for the interceptor element, naming either a list of excluded method names and/or a list of included method * names, whereby includeMethods overrides excludedMethods. A single * sign is interpreted as wildcard matching * all methods for both parameters. * See {@link MethodFilterInterceptor} for more info. - * + * </p> * <!-- END SNIPPET: description --> * - * <p/> <u>Interceptor parameters:</u> + * <p><u>Interceptor parameters:</u></p> * * <!-- START SNIPPET: parameters --> * @@ -74,17 +77,15 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; * * <!-- END SNIPPET: parameters --> * - * <p/> <u>Extending the interceptor:</u> - * - * <p/> + * <p><u>Extending the interceptor:</u></p> * * <!-- START SNIPPET: extending --> - * + * <p> * There are no known extension points for this interceptor. - * + * </p> * <!-- END SNIPPET: extending --> * - * <p/> <u>Example code:</u> + * <p><u>Example code:</u></p> * * <pre> * <!-- START SNIPPET: example --> http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java ---------------------------------------------------------------------- diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java b/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java index d7c9331..ced4511 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/Main.java @@ -33,14 +33,15 @@ import java.util.List; /** * <!-- START SNIPPET: javadoc --> - * + * <p> * Struts comes with various related tools included in the struts-core-VERSION.jar file. You can access these * tools by simply unpacking the Struts distribution and running <b>java -jar struts-core-VERSION.jar</b>. * Struts will automatically include all jars in the same directory as the struts-core-VERSION.jar file as well as all * jars in the <i>lib</i> directory. This means you can invoke these tools either from within the standard directory * structure found in the Struts distribution, or from within your WEB-INF/lib directory. + * </p> * - * <p/> You can access the help information for these tools by simply running the jar without any arguments. + * <p>You can access the help information for these tools by simply running the jar without any arguments.</p> * * <!-- END SNIPPET: javadoc --> */ http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java ---------------------------------------------------------------------- diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java index 00cb7e2..f806ee2 100644 --- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java +++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java @@ -30,17 +30,21 @@ import java.io.*; /** * <!-- START SNIPPET: javadocs-intro --> + * <p> * SiteGraph is a tool that renders out GraphViz-generated images depicting your * Struts-powered web application's flow. SiteGraph requires GraphViz be installed * and that the "dot" executable be in your command path. You can find GraphViz * at http://www.graphviz.org. + * </p> * <!-- END SNIPPET: javadocs-intro --> - * <p/> + * * <!-- START SNIPPET: javadocs-api --> + * <p> * If you wish to use SiteGraph through its API rather than through the command line, * you can do that as well. All you need to do is create a new SiteGraph instance, * optionally specify a {@link Writer} to output the dot content to, and then call * {@link #prepare()}. + * </p> * <!-- END SNIPPET: javadocs-api --> */ public class SiteGraph { http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java ---------------------------------------------------------------------- diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java index b2d9ef5..e6fa51b 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java @@ -47,7 +47,7 @@ import java.util.Locale; /** * <p>This is a SiteMesh FreeMarker view servlet.</p> - * <p/> + * * <p>It overrides the SiteMesh servlet to rely on the * Freemarker Manager in Struts instead of creating it's * own manager</p> @@ -228,9 +228,14 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke /** + * <p> * Create the instance of the freemarker Configuration object. - * <p/> + * </p> + * + * <p> * this implementation + * </p> + * * <ul> * <li>obtains the default configuration from Configuration.getDefaultConfiguration() * <li>sets up template loading from a ClassTemplateLoader and a WebappTemplateLoader @@ -243,14 +248,17 @@ public class FreemarkerDecoratorServlet extends freemarker.ext.servlet.Freemarke } /** + * <p> * Called before the execution is passed to template.process(). * This is a generic hook you might use in subclasses to perform a specific * action before the template is processed. By default does nothing. * A typical action to perform here is to inject application-specific * objects into the model root - * <p/> + * </p> + * * <p>Example: Expose the Serlvet context path as "baseDir" for all templates: - * <p/> + * </p> + * * <pre> * ((SimpleHash) data).put("baseDir", request.getContextPath() + "/"); * return true; http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java ---------------------------------------------------------------------- diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java index 416dfd5..bcbfb72 100644 --- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java +++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java @@ -46,7 +46,7 @@ import java.io.StringWriter; /** * <p>This is a SiteMesh Velocity view servlet.</p> - * <p/> + * * <p>It overrides the SiteMesh servlet to rely on the * Velocity Manager in Struts instead of creating it's * own manager</p> @@ -59,14 +59,14 @@ public class VelocityDecoratorServlet extends VelocityViewServlet { /** * <p>Initializes servlet, toolbox and Velocity template engine. * Called by the servlet container on loading.</p> - * <p/> + * * <p>NOTE: If no charset is specified in the default.contentType * property (in your velocity.properties) and you have specified * an output.encoding property, then that will be used as the * charset for the default content-type of pages served by this * servlet.</p> * - * @param config servlet configuation + * @param config servlet configuration */ public void init(ServletConfig config) throws ServletException { super.init(config); @@ -160,15 +160,17 @@ public class VelocityDecoratorServlet extends VelocityViewServlet { } /** + * <p> * Sets the content type of the response. This is available to be overridden * by a derived class. - * <p/> - * <p>The default implementation is : + * </p> + * <p>The default implementation is:</p> * <pre> - * <p/> + * * response.setContentType(defaultContentType); - * <p/> + * * </pre> + * <p> * where defaultContentType is set to the value of the default.contentType * property, or "text/html" if that is not set.</p> * http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java ---------------------------------------------------------------------- diff --git a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java index 7f7f985..251548d 100644 --- a/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java +++ b/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.java @@ -38,11 +38,14 @@ import javax.servlet.ServletContext; /** + * <p> * Struts object factory that integrates with Spring. - * <p/> + * </p> + * + * <p> * Spring should be loaded using a web context listener * <code>org.springframework.web.context.ContextLoaderListener</code> defined in <code>web.xml</code>. - * + * </p> */ public class StrutsSpringObjectFactory extends SpringObjectFactory { private static final Logger LOG = LogManager.getLogger(StrutsSpringObjectFactory.class); http://git-wip-us.apache.org/repos/asf/struts/blob/eb564a25/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java ---------------------------------------------------------------------- diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java index 0e2f865..d9319a4 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java @@ -36,15 +36,17 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** + * <p> * Default implementation of TilesUtil. * This class contains default implementation of utilities. This implementation * is intended to be used without Struts. - * <p/> + * </p> + * + * <p> * TilesUtilImpl implementation used to intercept .ftl requests and * ensure that they are setup properly to take advantage of the * {@link FreemarkerResult}. - * - * @version $Id$ + * </p> */ public class StrutsTilesRequestContext extends TilesRequestContextWrapper {
