[struts] branch master updated: WW-4963 Adds missing references to the new versions
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/master by this push:
new 38c6333 WW-4963 Adds missing references to the new versions
38c6333 is described below
commit 38c63334a4748838db1be82f7fb1f31fe6944a36
Author: Lukasz Lenart
AuthorDate: Sun Feb 20 10:37:25 2022 +0100
WW-4963 Adds missing references to the new versions
---
.../interceptor/ServletConfigInterceptor.java | 32 --
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
index 0ef0f37..6342400 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
@@ -45,25 +45,23 @@ import
com.opensymphony.xwork2.interceptor.AbstractInterceptor;
*
*
*
- *
* {@link ServletContextAware}
- *
+ * {@link org.apache.struts2.action.ServletContextAware}
* {@link ServletRequestAware}
- *
+ * {@link org.apache.struts2.action.ServletRequestAware}
* {@link ServletResponseAware}
- *
+ * {@link org.apache.struts2.action.ServletResponseAware}
* {@link ParameterAware} - deprecated since 2.5.4, please use {@link
HttpParametersAware}
- *
* {@link HttpParametersAware}
- *
+ * {@link org.apache.struts2.action.ParametersAware}
* {@link RequestAware}
- *
+ * {@link org.apache.struts2.action.ServletRequestAware}
* {@link SessionAware}
- *
+ * {@link org.apache.struts2.action.SessionAware}
* {@link ApplicationAware}
- *
+ * {@link org.apache.struts2.action.ApplicationAware}
* {@link PrincipalAware}
- *
+ * {@link org.apache.struts2.action.PrincipalAware}
*
*
*
@@ -101,13 +99,19 @@ import
com.opensymphony.xwork2.interceptor.AbstractInterceptor;
*
*
* @see ServletContextAware
+ * @see org.apache.struts2.action.ServletContextAware
* @see ServletRequestAware
+ * @see org.apache.struts2.action.ServletRequestAware
* @see ServletResponseAware
+ * @see org.apache.struts2.action.ServletResponseAware
* @see ParameterAware
- * @see ParametersAware
+ * @see org.apache.struts2.action.ParametersAware
* @see SessionAware
+ * @see org.apache.struts2.action.SessionAware
* @see ApplicationAware
+ * @see org.apache.struts2.action.ApplicationAware
* @see PrincipalAware
+ * @see org.apache.struts2.action.PrincipalAware
*/
public class ServletConfigInterceptor extends AbstractInterceptor implements
StrutsStatics {
@@ -159,7 +163,7 @@ public class ServletConfigInterceptor extends
AbstractInterceptor implements Str
if (action instanceof ApplicationAware) {
((ApplicationAware)
action).setApplication(context.getApplication());
}
-
+
if (action instanceof org.apache.struts2.action.ApplicationAware) {
((org.apache.struts2.action.ApplicationAware)
action).withApplication(context.getApplication());
}
@@ -167,7 +171,7 @@ public class ServletConfigInterceptor extends
AbstractInterceptor implements Str
if (action instanceof SessionAware) {
((SessionAware) action).setSession(context.getSession());
}
-
+
if (action instanceof org.apache.struts2.action.SessionAware) {
((org.apache.struts2.action.SessionAware)
action).withSession(context.getSession());
}
@@ -179,7 +183,7 @@ public class ServletConfigInterceptor extends
AbstractInterceptor implements Str
if (action instanceof PrincipalAware) {
HttpServletRequest request = context.getServletRequest();
if(request != null) {
-// We are in servtlet environment, so principal information
resides in HttpServletRequest
+// We are in servlet environment, so principal information
resides in HttpServletRequest
((PrincipalAware) action).setPrincipalProxy(new
ServletPrincipalProxy(request));
}
}
[struts] branch WW-5016-uses-proper-format updated: WW-5016 Introduces different format adapters to allow use different APIs
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5016-uses-proper-format
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/WW-5016-uses-proper-format by
this push:
new e3dff76 WW-5016 Introduces different format adapters to allow use
different APIs
e3dff76 is described below
commit e3dff7691e72a30cf6ebcad1bbace48e56f56380
Author: Lukasz Lenart
AuthorDate: Sun Feb 20 13:29:46 2022 +0100
WW-5016 Introduces different format adapters to allow use different APIs
---
.../StrutsDefaultConfigurationProvider.java| 6 ++
.../java/org/apache/struts2/StrutsConstants.java | 3 +
.../java/org/apache/struts2/components/Date.java | 78 ++-
.../struts2/components/date/DateFormatter.java | 33
.../components/date/DateTimeFormatterAdapter.java | 47 +++
.../components/date/SimpleDateFormatAdapter.java | 48
.../config/StrutsBeanSelectionProvider.java| 5 +-
.../org/apache/struts2/default.properties | 6 ++
core/src/main/resources/struts-default.xml | 5 +-
.../org/apache/struts2/components/DateTest.java| 90 ++
10 files changed, 280 insertions(+), 41 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
index 400674d..a5dcf99 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
@@ -56,6 +56,9 @@ import com.opensymphony.xwork2.conversion.impl.DateConverter;
import
com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor;
import com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor;
import com.opensymphony.xwork2.security.NotExcludedAcceptedPatternsChecker;
+import org.apache.struts2.components.date.DateFormatter;
+import org.apache.struts2.components.date.DateTimeFormatterAdapter;
+import org.apache.struts2.components.date.SimpleDateFormatAdapter;
import org.apache.struts2.conversion.StrutsConversionPropertiesProcessor;
import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer;
import org.apache.struts2.conversion.StrutsTypeConverterCreator;
@@ -218,6 +221,9 @@ public class StrutsDefaultConfigurationProvider implements
ConfigurationProvider
, Scope.SINGLETON)
.factory(ValueSubstitutor.class, EnvsValueSubstitutor.class,
Scope.SINGLETON)
+
+.factory(DateFormatter.class, "simpleDateFormat",
SimpleDateFormatAdapter.class, Scope.SINGLETON)
+.factory(DateFormatter.class, "dateTimeFormatter",
DateTimeFormatterAdapter.class, Scope.SINGLETON)
;
props.setProperty(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION,
Boolean.FALSE.toString());
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 789b7c3..64ac93b 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -18,6 +18,7 @@
*/
package org.apache.struts2;
+import org.apache.struts2.components.date.DateFormatter;
import org.apache.struts2.dispatcher.mapper.CompositeActionMapper;
/**
@@ -384,4 +385,6 @@ public final class StrutsConstants {
public static final String STRUTS_CHAINING_COPY_MESSAGES =
"struts.chaining.copyMessages";
public static final String STRUTS_OBJECT_FACTORY_CLASSLOADER =
"struts.objectFactory.classloader";
+/** See {@link
org.apache.struts2.components.Date#setDateFormatter(DateFormatter)} */
+public static final String STRUTS_DATE_FORMATTER = "struts.date.formatter";
}
diff --git a/core/src/main/java/org/apache/struts2/components/Date.java
b/core/src/main/java/org/apache/struts2/components/Date.java
index ec9bb19..0560057 100644
--- a/core/src/main/java/org/apache/struts2/components/Date.java
+++ b/core/src/main/java/org/apache/struts2/components/Date.java
@@ -18,11 +18,13 @@
*/
package org.apache.struts2.components;
-import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.components.date.DateFormatter;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -33,8 +35,6 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.ti
[struts] branch WW-5016-uses-proper-format updated: WW-5016 Fixes typo in instance name
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5016-uses-proper-format in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/WW-5016-uses-proper-format by this push: new 5648721 WW-5016 Fixes typo in instance name 5648721 is described below commit 5648721d07b483427ed00c4315b91f45cd359918 Author: Lukasz Lenart AuthorDate: Sun Feb 20 13:33:49 2022 +0100 WW-5016 Fixes typo in instance name --- .../xwork2/config/providers/StrutsDefaultConfigurationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java index a5dcf99..f932373 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java @@ -222,7 +222,7 @@ public class StrutsDefaultConfigurationProvider implements ConfigurationProvider .factory(ValueSubstitutor.class, EnvsValueSubstitutor.class, Scope.SINGLETON) -.factory(DateFormatter.class, "simpleDateFormat", SimpleDateFormatAdapter.class, Scope.SINGLETON) +.factory(DateFormatter.class, "simpleDateFormatter", SimpleDateFormatAdapter.class, Scope.SINGLETON) .factory(DateFormatter.class, "dateTimeFormatter", DateTimeFormatterAdapter.class, Scope.SINGLETON) ;
[struts] branch master updated (38c6333 -> 059514d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git. from 38c6333 WW-4963 Adds missing references to the new versions add b1e9eae WW-5168 Support submit unchecked in Javatemplates and fixes logic for all FTL template add 1c3cab2 WW-5168 Fixes disabled attribute across all the Javatemplate tags add d454384 WW-5168 Reverts condition in if statement add fe7959e WW-5168 Adjusts tests to flipped if condition new 059514d Merge pull request #531 from apache/WW-5168-submit-unchecked The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/struts2/components/Checkbox.java| 3 +- .../org/apache/struts2/components/Component.java | 5 +- .../java/org/apache/struts2/components/UIBean.java | 12 ++-- .../org/apache/struts2/views/java/Attributes.java | 14 +++-- .../struts2/views/java/simple/AnchorHandler.java | 14 +++-- .../struts2/views/java/simple/CheckboxHandler.java | 39 +++-- .../struts2/views/java/simple/LinkHandler.java | 6 +- .../struts2/views/java/simple/ResetHandler.java| 17 +++--- .../struts2/views/java/simple/AnchorTest.java | 2 +- .../struts2/views/java/simple/CheckboxTest.java| 24 +++- .../apache/struts2/views/java/simple/FileTest.java | 2 +- .../struts2/views/java/simple/HiddenTest.java | 2 +- .../apache/struts2/views/java/simple/LinkTest.java | 65 -- .../struts2/views/java/simple/PasswordTest.java| 8 +-- .../struts2/views/java/simple/SelectTest.java | 2 +- .../struts2/views/java/simple/SubmitTest.java | 8 +-- .../struts2/views/java/simple/TextAreaTest.java| 4 +- .../struts2/views/java/simple/TextFieldTest.java | 2 +- 18 files changed, 147 insertions(+), 82 deletions(-)
[struts] 01/01: Merge pull request #531 from apache/WW-5168-submit-unchecked
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 059514d6cad6599a1bf2245a4ebee55207cdfcfb Merge: 38c6333 fe7959e Author: Lukasz Lenart AuthorDate: Sun Feb 20 16:58:26 2022 +0100 Merge pull request #531 from apache/WW-5168-submit-unchecked [WW-5168] Support submit unchecked in Javatemplates and fixes logic for FTL template .../org/apache/struts2/components/Checkbox.java| 3 +- .../org/apache/struts2/components/Component.java | 5 +- .../java/org/apache/struts2/components/UIBean.java | 12 ++-- .../org/apache/struts2/views/java/Attributes.java | 14 +++-- .../struts2/views/java/simple/AnchorHandler.java | 14 +++-- .../struts2/views/java/simple/CheckboxHandler.java | 39 +++-- .../struts2/views/java/simple/LinkHandler.java | 6 +- .../struts2/views/java/simple/ResetHandler.java| 17 +++--- .../struts2/views/java/simple/AnchorTest.java | 2 +- .../struts2/views/java/simple/CheckboxTest.java| 24 +++- .../apache/struts2/views/java/simple/FileTest.java | 2 +- .../struts2/views/java/simple/HiddenTest.java | 2 +- .../apache/struts2/views/java/simple/LinkTest.java | 65 -- .../struts2/views/java/simple/PasswordTest.java| 8 +-- .../struts2/views/java/simple/SelectTest.java | 2 +- .../struts2/views/java/simple/SubmitTest.java | 8 +-- .../struts2/views/java/simple/TextAreaTest.java| 4 +- .../struts2/views/java/simple/TextFieldTest.java | 2 +- 18 files changed, 147 insertions(+), 82 deletions(-)
[struts-examples] branch dependabot/maven/org.hibernate-hibernate-validator-7.0.2.Final created (now fc2f318)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.hibernate-hibernate-validator-7.0.2.Final in repository https://gitbox.apache.org/repos/asf/struts-examples.git. at fc2f318 Bump hibernate-validator from 4.3.2.Final to 7.0.2.Final No new revisions were added by this update.
[struts-examples] branch dependabot/maven/org.slf4j-slf4j-simple-1.7.36 created (now 528ea1d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.slf4j-slf4j-simple-1.7.36 in repository https://gitbox.apache.org/repos/asf/struts-examples.git. at 528ea1d Bump slf4j-simple from 1.7.32 to 1.7.36 No new revisions were added by this update.
[struts] branch WW-5016-uses-proper-format updated: WW-5016 Improves description of different patterns
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5016-uses-proper-format in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/WW-5016-uses-proper-format by this push: new 4746a49 WW-5016 Improves description of different patterns 4746a49 is described below commit 4746a49d177baee9d99acd243c2aec627828b2bc Author: Lukasz Lenart AuthorDate: Mon Feb 21 08:47:36 2022 +0100 WW-5016 Improves description of different patterns --- core/src/main/resources/org/apache/struts2/default.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties index 57b692a..4456d10 100644 --- a/core/src/main/resources/org/apache/struts2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -246,7 +246,7 @@ struts.handle.exception=true ### Defines which named instance of DateFormatter to use, there are two instances: ### - simpleDateFormatter (based on SimpleDateFormat) ### - dateTimeFormatter (based on Java 8 Date/Time API) -### These formatters are using a slightly different patterns, please check JavaDocs for from details and WW-5016 +### These formatters are using a slightly different patterns, please check JavaDocs of both and more details is in WW-5016 struts.date.formatter=dateTimeFormatter ### END SNIPPET: complete_file
