(struts-intellij-plugin) 01/01: Merge pull request #9 from burtonrhodes/main
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git commit da3cc5b948c24c5a8d422ed8ff4ddec001ca9131 Merge: 172a5ea c1c1294 Author: Lukasz Lenart AuthorDate: Fri Nov 15 07:59:32 2024 +0100 Merge pull request #9 from burtonrhodes/main Bump compatible IntelliJ version to 243.* build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-intellij-plugin) branch main updated (172a5ea -> da3cc5b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 172a5ea Merge pull request #7 from apache/feature/WW-5446-fix-deprecation add c1c1294 Bump compatible intellij version to 243.* new da3cc5b Merge pull request #9 from burtonrhodes/main 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: build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) 01/01: WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5463-servlet-path
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c4007acbffad30e2a0aa117848cb2ea5ac12babe
Author: Lukasz Lenart
AuthorDate: Fri Nov 15 08:45:35 2024 +0100
WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH
---
.../main/java/org/apache/struts2/result/ServletDispatcherResult.java | 3 +++
.../java/org/apache/struts2/result/ServletDispatcherResultTest.java | 4
2 files changed, 7 insertions(+)
diff --git
a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java
b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java
index d50ebadf5..5e906d7d1 100644
--- a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java
+++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java
@@ -158,6 +158,9 @@ public class ServletDispatcherResult extends
StrutsResultSupport {
//if we are inside an action tag, we always need to do an include
boolean insideActionTag = (Boolean)
ObjectUtils.defaultIfNull(request.getAttribute(StrutsStatics.STRUTS_ACTION_TAG_INVOCATION),
Boolean.FALSE);
+// this should allow integration with third-party view related
frameworks
+request.setAttribute(RequestDispatcher.FORWARD_SERVLET_PATH,
finalLocation.substring(0, finalLocation.indexOf('?')));
+
// If we're included, then include the view
// Otherwise do forward
// This allow the page to, for example, set content type
diff --git
a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
index 2947e71e5..c64c9d76a 100644
---
a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
+++
b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.struts2.result;
+import jakarta.servlet.RequestDispatcher;
import org.apache.struts2.ActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.StrutsStatics;
@@ -47,6 +48,7 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
view.execute(invocation);
assertEquals("foo.jsp", response.getForwardedUrl());
+assertEquals("foo.jsp",
request.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH));
}
public void testInclude() throws Exception {
@@ -60,6 +62,7 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
view.execute(invocation);
assertEquals("foo.jsp", response.getIncludedUrl());
+assertEquals("foo.jsp",
request.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH));
}
public void testWithParameter() throws Exception {
@@ -73,6 +76,7 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
// See https://issues.apache.org/jira/browse/WW-5486
assertEquals("1", stack.findString("#parameters.bar"));
+assertEquals("foo.jsp",
request.getAttribute(RequestDispatcher.FORWARD_SERVLET_PATH));
}
@Override
(struts) branch feature/WW-5463-servlet-path created (now c4007acbf)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5463-servlet-path in repository https://gitbox.apache.org/repos/asf/struts.git at c4007acbf WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH This branch includes the following new commits: new c4007acbf WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH 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-5463-servlet-path updated (c4007acbf -> 24c0e5f64)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5463-servlet-path in repository https://gitbox.apache.org/repos/asf/struts.git discard c4007acbf WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH add 24c0e5f64 WW-5463 Exposes final location as request attribute FORWARD_SERVLET_PATH 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 (c4007acbf) \ N -- N -- N refs/heads/feature/WW-5463-servlet-path (24c0e5f64) 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. No new revisions were added by this update. Summary of changes: .../java/org/apache/struts2/result/ServletDispatcherResult.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
(struts-examples) 01/02: Adds simple example with Sitemesh3 integration
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/multiple-decorators
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 46a36898686060ead377e163c3edf31a2ad568a0
Author: Lukasz Lenart
AuthorDate: Fri Oct 11 08:12:53 2024 +0200
Adds simple example with Sitemesh3 integration
---
pom.xml| 1 +
sitemesh3/README.md| 6 ++
sitemesh3/pom.xml | 69 ++
.../src/main/resources/DefaultMessages.properties | 5 ++
.../main/resources/DefaultMessages_es.properties | 5 ++
sitemesh3/src/main/resources/log4j2.xml| 14 +
sitemesh3/src/main/resources/struts.xml| 22 +++
.../main/webapp/WEB-INF/decorators/decorator.html | 9 +++
sitemesh3/src/main/webapp/WEB-INF/hello.jsp| 30 ++
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml| 3 +
sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++
sitemesh3/src/main/webapp/index.html | 10
12 files changed, 218 insertions(+)
diff --git a/pom.xml b/pom.xml
index 994105d..debfc0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
wildcard-method-selection
wildcard-regex
jasperreports
+sitemesh3
diff --git a/sitemesh3/README.md b/sitemesh3/README.md
new file mode 100644
index 000..ca3308a
--- /dev/null
+++ b/sitemesh3/README.md
@@ -0,0 +1,6 @@
+Struts 2 Sitemesh 3 example
+==
+
+Simple Struts 2 project which demonstrates Sitemesh 3 usage
+
+Published under [Apache License
2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/sitemesh3/pom.xml b/sitemesh3/pom.xml
new file mode 100644
index 000..7f31a85
--- /dev/null
+++ b/sitemesh3/pom.xml
@@ -0,0 +1,69 @@
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+4.0.0
+
+org.apache.struts
+struts-examples
+2.0.0
+
+
+sitemesh3
+Struts Sitemesh 3 Example
+
+war
+
+
+
+org.sitemesh
+sitemesh
+3.2.1
+
+
+
+org.apache.struts
+struts2-config-browser-plugin
+${struts2.version}
+
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+${log4j2.version}
+
+
+
+org.apache.struts
+struts2-junit-plugin
+${struts2.version}
+test
+
+
+
+junit
+junit
+4.13.2
+test
+
+
+
+
+
+
+
+org.eclipse.jetty
+jetty-maven-plugin
+${jetty-plugin.version}
+
+
+/${project.artifactId}
+
+CTRL+C
+8999
+10
+
+
+
+
+
+
diff --git a/sitemesh3/src/main/resources/DefaultMessages.properties
b/sitemesh3/src/main/resources/DefaultMessages.properties
new file mode 100644
index 000..074cd28
--- /dev/null
+++ b/sitemesh3/src/main/resources/DefaultMessages.properties
@@ -0,0 +1,5 @@
+HelloWorld.message = Struts is up and running...
+requiredstring= ${getText(fieldName)} is required.
+password = Password
+username = User Name
+Missing.message = This feature is under construction. Please try again in the
next iteration.
diff --git a/sitemesh3/src/main/resources/DefaultMessages_es.properties
b/sitemesh3/src/main/resources/DefaultMessages_es.properties
new file mode 100644
index 000..ce5d083
--- /dev/null
+++ b/sitemesh3/src/main/resources/DefaultMessages_es.properties
@@ -0,0 +1,5 @@
+HelloWorld.message = \u00A1Struts est\u00E1 bien\!...
+requiredstring = ${getText(fieldName)} es requerido.
+password = Contrase\u00F1a
+username = Nombre de Usuario
+Missing.message = P\u00E1gina bajo construcci\u00F3n, trate de nuevo en la
proxima versi\u00F3n.
\ No newline at end of file
diff --git a/sitemesh3/src/main/resources/log4j2.xml
b/sitemesh3/src/main/resources/log4j2.xml
new file mode 100644
index 000..1f4e3df
--- /dev/null
+++ b/sitemesh3/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sitemesh3/src/main/resources/struts.xml
b/sitemesh3/src/main/resources/struts.xml
new file mode 100644
index 000..e95c041
--- /dev/null
+++ b/sitemesh3/src/main/resources/struts.xml
@@ -0,0 +1,22 @@
+
+https://struts.apache.org/dtds/struts-6.0.dtd";>
+
+
+
+
+
+
+
+
+hello
+
+
+
+
+/WEB-INF/
(struts-examples) 02/02: Extends example with Sitemesh 3 to support multiple decorators
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/multiple-decorators
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 1efef9c4cd182d3365f8f988a4a8d75aa93cee34
Author: Lukasz Lenart
AuthorDate: Thu Nov 14 13:22:52 2024 +0100
Extends example with Sitemesh 3 to support multiple decorators
---
sitemesh3/src/main/resources/struts.xml | 4 +---
.../WEB-INF/decorators/{decorator.html => decorator1.html} | 1 +
.../WEB-INF/decorators/{decorator.html => decorator2.html} | 1 +
sitemesh3/src/main/webapp/WEB-INF/hello.jsp | 8 +---
sitemesh3/src/main/webapp/WEB-INF/index.jsp | 7 +++
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml | 12 ++--
sitemesh3/src/main/webapp/index.html | 2 +-
7 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/sitemesh3/src/main/resources/struts.xml
b/sitemesh3/src/main/resources/struts.xml
index e95c041..e117812 100644
--- a/sitemesh3/src/main/resources/struts.xml
+++ b/sitemesh3/src/main/resources/struts.xml
@@ -9,9 +9,7 @@
-
-hello
-
+/WEB-INF/index.jsp
diff --git a/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
b/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator1.html
similarity index 85%
copy from sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
copy to sitemesh3/src/main/webapp/WEB-INF/decorators/decorator1.html
index eeb64a1..01b2f66 100644
--- a/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
+++ b/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator1.html
@@ -4,6 +4,7 @@
+Decorator 1
\ No newline at end of file
diff --git a/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
b/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator2.html
similarity index 85%
rename from sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
rename to sitemesh3/src/main/webapp/WEB-INF/decorators/decorator2.html
index eeb64a1..2caccec 100644
--- a/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
+++ b/sitemesh3/src/main/webapp/WEB-INF/decorators/decorator2.html
@@ -4,6 +4,7 @@
+Decorator 2
\ No newline at end of file
diff --git a/sitemesh3/src/main/webapp/WEB-INF/hello.jsp
b/sitemesh3/src/main/webapp/WEB-INF/hello.jsp
index a4aa404..4887549 100644
--- a/sitemesh3/src/main/webapp/WEB-INF/hello.jsp
+++ b/sitemesh3/src/main/webapp/WEB-INF/hello.jsp
@@ -1,10 +1,6 @@
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
-
-
-SiteMesh example: Hello World
-
-
+
Languages
@@ -26,5 +22,3 @@
EL: ${url}
-
-
diff --git a/sitemesh3/src/main/webapp/WEB-INF/index.jsp
b/sitemesh3/src/main/webapp/WEB-INF/index.jsp
new file mode 100644
index 000..4375047
--- /dev/null
+++ b/sitemesh3/src/main/webapp/WEB-INF/index.jsp
@@ -0,0 +1,7 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+
+en
+
+English
diff --git a/sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
b/sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
index 77fbc3b..ad05d21 100644
--- a/sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
+++ b/sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
@@ -1,3 +1,11 @@
-
-
\ No newline at end of file
+
+
+
+
+
+
+/hello*
+decorator2.html
+
+
diff --git a/sitemesh3/src/main/webapp/index.html
b/sitemesh3/src/main/webapp/index.html
index dc2bbd0..abdee36 100644
--- a/sitemesh3/src/main/webapp/index.html
+++ b/sitemesh3/src/main/webapp/index.html
@@ -1,7 +1,7 @@
-
+
(struts-examples) branch feature/sitemesh3 deleted (was 93a874c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/sitemesh3 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 93a874c Adds simple example with Sitemesh3 integration 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-examples) 01/01: Merge pull request #377 from apache/feature/sitemesh3
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-examples.git commit f6dcf446119a28739760d91b6810266a516d55fd Merge: 41778a9 93a874c Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:23:17 2024 +0100 Merge pull request #377 from apache/feature/sitemesh3 Adds simple example with Sitemesh3 integration pom.xml| 1 + sitemesh3/README.md| 6 ++ sitemesh3/pom.xml | 69 ++ .../src/main/resources/DefaultMessages.properties | 5 ++ .../main/resources/DefaultMessages_es.properties | 5 ++ sitemesh3/src/main/resources/log4j2.xml| 14 + sitemesh3/src/main/resources/struts.xml| 22 +++ .../main/webapp/WEB-INF/decorators/decorator.html | 9 +++ sitemesh3/src/main/webapp/WEB-INF/hello.jsp| 27 + sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml| 3 + sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++ sitemesh3/src/main/webapp/index.html | 10 12 files changed, 215 insertions(+)
(struts-examples) branch feature/multiple-decorators created (now 1efef9c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/multiple-decorators in repository https://gitbox.apache.org/repos/asf/struts-examples.git at 1efef9c Extends example with Sitemesh 3 to support multiple decorators This branch includes the following new commits: new 46a3689 Adds simple example with Sitemesh3 integration new 1efef9c Extends example with Sitemesh 3 to support multiple decorators The 2 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-5484-dwr deleted (was 8a2f494c1)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5484-dwr in repository https://gitbox.apache.org/repos/asf/struts.git was 8a2f494c1 WW-5484 Marks the DWR plugin as deprecated 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: Merge pull request #1126 from apache/feature/WW-5484-dwr
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 1903e0ef33a1c942b0ce556985b4a7f12e9d79ce Merge: 6b2e5ecd9 8a2f494c1 Author: Lukasz Lenart AuthorDate: Thu Nov 14 15:55:01 2024 +0100 Merge pull request #1126 from apache/feature/WW-5484-dwr WW-5484 Marks the DWR plugin as deprecated plugins/dwr/README.md | 4 plugins/dwr/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
(struts) branch master updated (6b2e5ecd9 -> 1903e0ef3)
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 6b2e5ecd9 Merge pull request #1125 from apache/dependabot/github_actions/github/codeql-action-3.27.1 add 8a2f494c1 WW-5484 Marks the DWR plugin as deprecated new 1903e0ef3 Merge pull request #1126 from apache/feature/WW-5484-dwr 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: plugins/dwr/README.md | 4 plugins/dwr/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
(struts-examples) 01/01: Merge pull request #379 from apache/dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0
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-examples.git commit 0395921920ff8cd83ca45412002bb0dfa980e722 Merge: f6dcf44 6edf340 Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:27:39 2024 +0100 Merge pull request #379 from apache/dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0 Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch feature/multiple-decorators updated (1efef9c -> 8930901)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/multiple-decorators in repository https://gitbox.apache.org/repos/asf/struts-examples.git discard 1efef9c Extends example with Sitemesh 3 to support multiple decorators discard 46a3689 Adds simple example with Sitemesh3 integration add 93a874c Adds simple example with Sitemesh3 integration add f6dcf44 Merge pull request #377 from apache/feature/sitemesh3 add ab1eb61 Adds simple example with Sitemesh3 integration add 8930901 Extends example with Sitemesh 3 to support multiple decorators 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 (1efef9c) \ N -- N -- N refs/heads/feature/multiple-decorators (8930901) 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. No new revisions were added by this update. Summary of changes:
(struts-examples) branch dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0 deleted (was 6edf340)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 6edf340 Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0 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-examples) branch master updated (f6dcf44 -> 0395921)
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-examples.git from f6dcf44 Merge pull request #377 from apache/feature/sitemesh3 add 6edf340 Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0 new 0395921 Merge pull request #379 from apache/dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch dependabot/maven/shiro.version-2.0.1 deleted (was d997bed)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/shiro.version-2.0.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was d997bed Bump shiro.version from 2.0.0 to 2.0.1 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-examples) branch master updated (0395921 -> 288abeb)
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-examples.git from 0395921 Merge pull request #379 from apache/dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0 add d997bed Bump shiro.version from 2.0.0 to 2.0.1 new 288abeb Merge pull request #380 from apache/dependabot/maven/shiro.version-2.0.1 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: shiro-basic/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch master updated (288abeb -> 9c0e00d)
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-examples.git from 288abeb Merge pull request #380 from apache/dependabot/maven/shiro.version-2.0.1 add 282c3a8 Bump log4j2.version from 2.23.1 to 2.24.1 new 9c0e00d Merge pull request #382 from apache/dependabot/maven/log4j2.version-2.24.1 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) 01/01: Merge pull request #382 from apache/dependabot/maven/log4j2.version-2.24.1
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-examples.git commit 9c0e00da5bd841ca08beff7100bb6a31483276a6 Merge: 288abeb 282c3a8 Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:28:13 2024 +0100 Merge pull request #382 from apache/dependabot/maven/log4j2.version-2.24.1 Bump log4j2.version from 2.23.1 to 2.24.1 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) 01/01: Merge pull request #380 from apache/dependabot/maven/shiro.version-2.0.1
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-examples.git commit 288abebce7bca417e16e7b20d888c4ad41b004cb Merge: 0395921 d997bed Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:27:55 2024 +0100 Merge pull request #380 from apache/dependabot/maven/shiro.version-2.0.1 Bump shiro.version from 2.0.0 to 2.0.1 shiro-basic/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch master updated (41778a9 -> f6dcf44)
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-examples.git
from 41778a9 Merge pull request #376 from
apache/dependabot/maven/rest-angular/org.springframework-spring-web-6.1.12
add 93a874c Adds simple example with Sitemesh3 integration
new f6dcf44 Merge pull request #377 from apache/feature/sitemesh3
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:
pom.xml| 1 +
sitemesh3/README.md| 6 +++
{tiles => sitemesh3}/pom.xml | 10 ++---
.../src/main/resources/DefaultMessages.properties | 0
.../main/resources/DefaultMessages_es.properties | 0
{tiles => sitemesh3}/src/main/resources/log4j2.xml | 0
sitemesh3/src/main/resources/struts.xml| 22 +++
.../main/webapp/WEB-INF/decorators/decorator.html | 9 +
.../src/main/webapp/WEB-INF/hello.jsp | 17 ++---
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml| 3 ++
sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++
{blank => sitemesh3}/src/main/webapp/index.html| 0
12 files changed, 101 insertions(+), 11 deletions(-)
create mode 100644 sitemesh3/README.md
copy {tiles => sitemesh3}/pom.xml (89%)
copy tiles/src/main/resources/org/demo/example/package.properties =>
sitemesh3/src/main/resources/DefaultMessages.properties (100%)
copy tiles/src/main/resources/org/demo/example/package_es.properties =>
sitemesh3/src/main/resources/DefaultMessages_es.properties (100%)
copy {tiles => sitemesh3}/src/main/resources/log4j2.xml (100%)
create mode 100644 sitemesh3/src/main/resources/struts.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
copy tiles/src/main/webapp/example/HelloWorld.jsp =>
sitemesh3/src/main/webapp/WEB-INF/hello.jsp (61%)
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/web.xml
copy {blank => sitemesh3}/src/main/webapp/index.html (100%)
(struts-examples) branch master updated (7599eb8 -> 4514323)
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-examples.git from 7599eb8 Merge pull request #386 from apache/dependabot/github_actions/actions/cache-4.1.2 add 37b8777 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.11.1 add 4514323 Merge pull request #387 from apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch dependabot/github_actions/actions/cache-4.1.2 deleted (was f17c050)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/actions/cache-4.1.2 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was f17c050 Bump actions/cache from 4.0.2 to 4.1.2 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-examples) 01/01: Merge pull request #386 from apache/dependabot/github_actions/actions/cache-4.1.2
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-examples.git commit 7599eb8ca0b6a34944a3c5b4b36e5b5ea74de70b Merge: 9c0e00d f17c050 Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:28:35 2024 +0100 Merge pull request #386 from apache/dependabot/github_actions/actions/cache-4.1.2 Bump actions/cache from 4.0.2 to 4.1.2 .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch master updated (9c0e00d -> 7599eb8)
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-examples.git from 9c0e00d Merge pull request #382 from apache/dependabot/maven/log4j2.version-2.24.1 add f17c050 Bump actions/cache from 4.0.2 to 4.1.2 new 7599eb8 Merge pull request #386 from apache/dependabot/github_actions/actions/cache-4.1.2 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: .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch dependabot/maven/log4j2.version-2.24.1 deleted (was 282c3a8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.24.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 282c3a8 Bump log4j2.version from 2.23.1 to 2.24.1 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-examples) branch dependabot/github_actions/actions/checkout-4.2.2 updated (a39572c -> 08b3f3d)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/github_actions/actions/checkout-4.2.2
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
omit a39572c Bump actions/checkout from 4.1.7 to 4.2.2
add 93a874c Adds simple example with Sitemesh3 integration
add f6dcf44 Merge pull request #377 from apache/feature/sitemesh3
add 6edf340 Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0
add 0395921 Merge pull request #379 from
apache/dependabot/maven/jakarta.servlet-jakarta.servlet-api-6.1.0
add d997bed Bump shiro.version from 2.0.0 to 2.0.1
add 288abeb Merge pull request #380 from
apache/dependabot/maven/shiro.version-2.0.1
add 282c3a8 Bump log4j2.version from 2.23.1 to 2.24.1
add 9c0e00d Merge pull request #382 from
apache/dependabot/maven/log4j2.version-2.24.1
add f17c050 Bump actions/cache from 4.0.2 to 4.1.2
add 7599eb8 Merge pull request #386 from
apache/dependabot/github_actions/actions/cache-4.1.2
add 37b8777 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3
to 3.11.1
add 4514323 Merge pull request #387 from
apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1
add 08b3f3d Bump actions/checkout from 4.1.7 to 4.2.2
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 (a39572c)
\
N -- N -- N
refs/heads/dependabot/github_actions/actions/checkout-4.2.2 (08b3f3d)
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.
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml| 2 +-
pom.xml| 7 ++--
shiro-basic/pom.xml| 2 +-
sitemesh3/README.md| 6 +++
{tiles => sitemesh3}/pom.xml | 10 ++---
.../src/main/resources/DefaultMessages.properties | 0
.../main/resources/DefaultMessages_es.properties | 0
{tiles => sitemesh3}/src/main/resources/log4j2.xml | 0
sitemesh3/src/main/resources/struts.xml| 22 +++
.../main/webapp/WEB-INF/decorators/decorator.html | 9 +
.../src/main/webapp/WEB-INF/hello.jsp | 17 ++---
sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml| 3 ++
sitemesh3/src/main/webapp/WEB-INF/web.xml | 44 ++
{blank => sitemesh3}/src/main/webapp/index.html| 0
14 files changed, 106 insertions(+), 16 deletions(-)
create mode 100644 sitemesh3/README.md
copy {tiles => sitemesh3}/pom.xml (89%)
copy tiles/src/main/resources/org/demo/example/package.properties =>
sitemesh3/src/main/resources/DefaultMessages.properties (100%)
copy tiles/src/main/resources/org/demo/example/package_es.properties =>
sitemesh3/src/main/resources/DefaultMessages_es.properties (100%)
copy {tiles => sitemesh3}/src/main/resources/log4j2.xml (100%)
create mode 100644 sitemesh3/src/main/resources/struts.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/decorators/decorator.html
copy tiles/src/main/webapp/example/HelloWorld.jsp =>
sitemesh3/src/main/webapp/WEB-INF/hello.jsp (61%)
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/sitemesh3.xml
create mode 100644 sitemesh3/src/main/webapp/WEB-INF/web.xml
copy {blank => sitemesh3}/src/main/webapp/index.html (100%)
(struts-examples) branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1 deleted (was 37b8777)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 37b8777 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.11.1 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-examples) branch dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-4.0.0 deleted (was e8b53f0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-4.0.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was e8b53f0 Bump jakarta.servlet.jsp:jakarta.servlet.jsp-api from 3.1.0 to 4.0.0 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-examples) 01/01: Merge pull request #385 from apache/dependabot/github_actions/actions/checkout-4.2.2
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-examples.git commit 8ae9f12fd3b23f466616bfd86a36008f2cbcb11b Merge: eb1d1c6 08b3f3d Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:31:45 2024 +0100 Merge pull request #385 from apache/dependabot/github_actions/actions/checkout-4.2.2 Bump actions/checkout from 4.1.7 to 4.2.2 .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch master updated (eb1d1c6 -> 8ae9f12)
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-examples.git from eb1d1c6 Merge pull request #381 from apache/dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-4.0.0 add 08b3f3d Bump actions/checkout from 4.1.7 to 4.2.2 new 8ae9f12 Merge pull request #385 from apache/dependabot/github_actions/actions/checkout-4.2.2 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: .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch dependabot/github_actions/actions/checkout-4.2.2 deleted (was 08b3f3d)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/github_actions/actions/checkout-4.2.2 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 08b3f3d Bump actions/checkout from 4.1.7 to 4.2.2 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-examples) branch master updated (4514323 -> eb1d1c6)
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-examples.git from 4514323 Merge pull request #387 from apache/dependabot/maven/org.apache.maven.plugins-maven-javadoc-plugin-3.11.1 add e8b53f0 Bump jakarta.servlet.jsp:jakarta.servlet.jsp-api from 3.1.0 to 4.0.0 new eb1d1c6 Merge pull request #381 from apache/dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-4.0.0 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) 01/01: Merge pull request #381 from apache/dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-4.0.0
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-examples.git commit eb1d1c6059ba9776f62e41163dec9369a23bb982 Merge: 4514323 e8b53f0 Author: Lukasz Lenart AuthorDate: Thu Nov 14 13:31:21 2024 +0100 Merge pull request #381 from apache/dependabot/maven/jakarta.servlet.jsp-jakarta.servlet.jsp-api-4.0.0 Bump jakarta.servlet.jsp:jakarta.servlet.jsp-api from 3.1.0 to 4.0.0 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch feature/multiple-decorators updated (8930901 -> 0e91552)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/multiple-decorators in repository https://gitbox.apache.org/repos/asf/struts-examples.git discard 8930901 Extends example with Sitemesh 3 to support multiple decorators discard ab1eb61 Adds simple example with Sitemesh3 integration add 0e91552 Extends example with Sitemesh 3 to support multiple decorators 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 (8930901) \ N -- N -- N refs/heads/feature/multiple-decorators (0e91552) 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. No new revisions were added by this update. Summary of changes: sitemesh3/src/main/webapp/WEB-INF/decorators/decorator1.html | 2 +- sitemesh3/src/main/webapp/WEB-INF/decorators/decorator2.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
