(struts) 01/01: Merge pull request #900 from apache/WW-5251-retrofit-compat
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 c774e23ef913ad80f90d9f223d2ac0baef3ed25b Merge: 66c1ac431 93c11aaf6 Author: Lukasz Lenart AuthorDate: Sun Mar 31 11:35:52 2024 +0200 Merge pull request #900 from apache/WW-5251-retrofit-compat WW-5251 Fix deprecated interface method signature core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch master updated (66c1ac431 -> c774e23ef)
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 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review add 93c11aaf6 WW-5251 Fix deprecated interface method signature new c774e23ef Merge pull request #900 from apache/WW-5251-retrofit-compat 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: core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch WW-5251-retrofit-compat deleted (was 93c11aaf6)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5251-retrofit-compat in repository https://gitbox.apache.org/repos/asf/struts.git was 93c11aaf6 WW-5251 Fix deprecated interface method signature The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) 01/01: Uses proper context name in branch protection rule
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/branch-protction in repository https://gitbox.apache.org/repos/asf/struts.git commit 273c3a1a998c5933370cb3346a72c9935c2063db Author: Lukasz Lenart AuthorDate: Sun Mar 31 11:36:49 2024 +0200 Uses proper context name in branch protection rule --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index ed31174c3..87706aa57 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -16,7 +16,7 @@ github: master: # contexts are the names of checks that must pass. contexts: -- Java Maven / Build and Test +- build required_pull_request_reviews: require_code_owner_reviews: true required_approving_review_count: 1
(struts) branch fix/branch-protction created (now 273c3a1a9)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/branch-protction in repository https://gitbox.apache.org/repos/asf/struts.git at 273c3a1a9 Uses proper context name in branch protection rule This branch includes the following new commits: new 273c3a1a9 Uses proper context name in branch protection rule 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.
(struts) branch feature/WW-5402-autoload-classptah updated (885c9a51e -> 3e1c6f99f)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
omit 885c9a51e WW-5402 Auto loads Tiles definitions from classpath
add cda2a2b23 WW-5251 Reinstate deleted interfaces with transparent compat
add 19698e1fd WW-5251 Fix ParameterAware
add dc774c484 WW-5251 Reinstate RequestAware
add 7281d7e2e Merge pull request #898 from apache/WW-5251-retrofit-compat
add 6950fcb75 Enables required review by codeowners
add 66c1ac431 Merge pull request #899 from apache/feature/codeowners-review
add 93c11aaf6 WW-5251 Fix deprecated interface method signature
add c774e23ef Merge pull request #900 from apache/WW-5251-retrofit-compat
new 3e1c6f99f WW-5402 Auto loads Tiles definitions from classpath
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (885c9a51e)
\
N -- N -- N refs/heads/feature/WW-5402-autoload-classptah
(3e1c6f99f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.asf.yaml | 8 +-
.../struts2/interceptor/ApplicationAware.java} | 18 ++---
.../struts2/interceptor/HttpParametersAware.java} | 18 ++---
.../struts2/interceptor/ParameterAware.java} | 27 ++-
.../struts2/interceptor/PrincipalAware.java} | 16 +--
.../RequestAware.java} | 31 +++---
.../struts2/interceptor/ServletRequestAware.java} | 18 ++---
.../struts2/interceptor/ServletResponseAware.java} | 18 ++---
.../apache/struts2/interceptor/SessionAware.java} | 18 ++---
.../{action => util}/ServletContextAware.java | 17 ++--
.../portlet/interceptor/PortletContextAware.java} | 15 +++
.../interceptor/PortletPreferencesAware.java | 23 +---
.../PortletRequestAware.java | 14 +-
.../PortletResponseAware.java | 14 +-
14 files changed, 124 insertions(+), 131 deletions(-)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ApplicationAware.java} (74%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/HttpParametersAware.java} (73%)
copy core/src/main/java/{com/opensymphony/xwork2/LocaleProviderFactory.java =>
org/apache/struts2/interceptor/ParameterAware.java} (65%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/PrincipalAware.java} (75%)
copy
core/src/main/java/org/apache/struts2/{views/freemarker/tags/DateModel.java =>
interceptor/RequestAware.java} (61%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletRequestAware.java} (72%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/ServletResponseAware.java} (71%)
copy
core/src/{test/java/org/apache/struts2/interceptor/ExecuteAndWaitDelayAction.java
=> main/java/org/apache/struts2/interceptor/SessionAware.java} (76%)
copy core/src/main/java/org/apache/struts2/{action =>
util}/ServletContextAware.java (73%)
copy
plugins/{rest/src/main/java/org/apache/struts2/rest/handler/xstream/XStreamPermissionProvider.java
=>
portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java}
(72%)
copy core/src/test/java/com/opensymphony/xwork2/VoidResult.java =>
plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java
(69%)
copy plugins/portlet/src/main/java/org/apache/struts2/portlet/{action =>
interceptor}/PortletRequestAware.java (71%)
copy plugins/portlet/src/main/java/org/apache/struts2/portlet/{action =>
interceptor}/PortletResponseAware.java (71%)
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 3e1c6f99fa7ebfe1f1c1a3c23ff64b81b13f0631
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 25 ++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
3 files changed, 146 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 205476467..d1b1a4f52 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -69,6 +69,7 @@ import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +101,20 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
+ */
+@Deprecated
+public static final String TILES_DEFAULT_PATTERN =
"/WEB-INF/**/tiles*.xml,classpath*:META-INF/**/tiles*.xml";
+
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
*/
-public static final String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS = new
HashSet() {{
+add("/WEB-INF/**/tiles*.xml");
+add("classpath*:META-INF/**/tiles*.xml");
+}};
/**
* Supported expression languages
@@ -213,7 +224,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..122bfe51d
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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
+ * rega
(struts) 01/01: WW-5402 Auto loads Tiles definitions from classpath
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5402-autoload-classptah
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c7ae614824b4c158b9998575294d94fe9a746c41
Author: Lukasz Lenart
AuthorDate: Sun Mar 24 11:29:12 2024 +0100
WW-5402 Auto loads Tiles definitions from classpath
---
plugins/tiles/pom.xml | 3 -
.../struts2/tiles/StrutsTilesContainerFactory.java | 28 +++--
.../tiles/StrutsTilesContainerFactoryTest.java | 128 +
3 files changed, 149 insertions(+), 10 deletions(-)
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 440f6ee79..1a6caf2c1 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -35,9 +35,6 @@
build-autotags
-
-true
-
diff --git
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index 205476467..ed03f8268 100644
---
a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++
b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -25,11 +25,6 @@ import ognl.PropertyAccessor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tiles.api.TilesContainer;
-import org.apache.tiles.request.ApplicationContext;
-import org.apache.tiles.request.ApplicationResource;
-import org.apache.tiles.request.Request;
-import org.apache.tiles.request.render.BasicRendererFactory;
-import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.core.definition.DefinitionsFactory;
import
org.apache.tiles.core.definition.pattern.DefinitionPatternMatcherFactory;
import org.apache.tiles.core.definition.pattern.PatternDefinitionResolver;
@@ -57,6 +52,11 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
+import org.apache.tiles.request.ApplicationContext;
+import org.apache.tiles.request.ApplicationResource;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.BasicRendererFactory;
+import org.apache.tiles.request.render.ChainedDelegateRenderer;
import org.apache.tiles.request.render.Renderer;
import javax.el.ArrayELResolver;
@@ -68,7 +68,10 @@ import javax.el.MapELResolver;
import javax.el.ResourceBundleELResolver;
import javax.servlet.jsp.JspFactory;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -100,10 +103,21 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
public static final String PATTERN_WILDCARD = "WILDCARD";
public static final String PATTERN_REGEXP = "REGEXP";
+/**
+ * Default pattern to be used to collect Tiles definitions if user didn't
configure any
+ *
+ * @deprecated since Struts 6.4.0, use {@link #TILES_DEFAULT_PATTERNS}
instead
+ */
+@Deprecated
+public static final String TILES_DEFAULT_PATTERN =
"/WEB-INF/**/tiles*.xml,classpath*:META-INF/**/tiles*.xml";
+
/**
* Default pattern to be used to collect Tiles definitions if user didn't
configure any
*/
-public static final String TILES_DEFAULT_PATTERN = "tiles*.xml";
+public static final Set TILES_DEFAULT_PATTERNS =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+"/WEB-INF/**/tiles*.xml",
+"classpath*:META-INF/**/tiles*.xml"
+)));
/**
* Supported expression languages
@@ -213,7 +227,7 @@ public class StrutsTilesContainerFactory extends
BasicTilesContainerFactory {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return
TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
-return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
+return TILES_DEFAULT_PATTERNS;
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext
applicationContext) {
diff --git
a/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
new file mode 100644
index 0..122bfe51d
--- /dev/null
+++
b/plugins/tiles/src/test/java/org/apache/struts2/tiles/StrutsTilesContainerFactoryTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) unde
(struts) branch feature/WW-5402-autoload-classptah updated (3e1c6f99f -> c7ae61482)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5402-autoload-classptah in repository https://gitbox.apache.org/repos/asf/struts.git discard 3e1c6f99f WW-5402 Auto loads Tiles definitions from classpath new c7ae61482 WW-5402 Auto loads Tiles definitions from classpath This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3e1c6f99f) \ N -- N -- N refs/heads/feature/WW-5402-autoload-classptah (c7ae61482) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. 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/tiles/StrutsTilesContainerFactory.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-)
(struts-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.9.1 created (now 1f4f606)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.9.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 1f4f606 Bump io.quarkus:quarkus-universe-bom from 3.7.3 to 3.9.1 No new revisions were added by this update.
(struts-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.8.3 deleted (was bb89475)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.8.3 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was bb89475 Bump io.quarkus:quarkus-universe-bom from 3.7.3 to 3.8.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
