(struts-intellij-plugin) branch feature/WW-5446-fix-deprecation updated (73b8aed -> 041ac6e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5446-fix-deprecation in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 73b8aed WW-5446 Adds missing plugin dependencies add 041ac6e WW-5446 Except JSP files in any folder No new revisions were added by this update. Summary of changes: .../com/intellij/struts2/dom/inspection/Struts2ModelInspection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
svn commit: r71163 - /dev/struts/idea-plugin/struts-2024.4.2.zip
Author: lukaszlenart Date: Fri Aug 30 10:40:13 2024 New Revision: 71163 Log: Drops test build Removed: dev/struts/idea-plugin/struts-2024.4.2.zip
svn commit: r71164 - /dev/struts/idea-plugin/struts-2024.4.2.zip
Author: lukaszlenart Date: Fri Aug 30 10:40:40 2024 New Revision: 71164 Log: Adds the latest plugin version Added: dev/struts/idea-plugin/struts-2024.4.2.zip (with props) Added: dev/struts/idea-plugin/struts-2024.4.2.zip == Binary file - no diff available. Propchange: dev/struts/idea-plugin/struts-2024.4.2.zip -- svn:mime-type = application/octet-stream
(struts) branch feature/WW-5450-use-contstants created (now 9292dc2d0)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5450-use-contstants in repository https://gitbox.apache.org/repos/asf/struts.git at 9292dc2d0 WW-5450 Uses existing Jakarta constants instead of free hand strings This branch includes the following new commits: new 9292dc2d0 WW-5450 Uses existing Jakarta constants instead of free hand strings 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) 01/01: WW-5450 Uses existing Jakarta constants instead of free hand strings
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5450-use-contstants
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9292dc2d07dfd4341e3fc78e21483fe5175ea2ca
Author: Lukasz Lenart
AuthorDate: Fri Aug 30 13:41:43 2024 +0200
WW-5450 Uses existing Jakarta constants instead of free hand strings
---
core/src/main/java/org/apache/struts2/RequestUtils.java| 3 ++-
core/src/main/java/org/apache/struts2/components/Include.java | 10 +-
.../java/org/apache/struts2/components/ServletUrlRenderer.java | 3 ++-
.../struts2/dispatcher/DefaultDispatcherErrorHandler.java | 3 ++-
.../org/apache/struts2/result/ServletDispatcherResult.java | 10 +-
.../org/apache/struts2/views/freemarker/FreemarkerManager.java | 3 ++-
.../java/org/apache/struts2/views/util/DefaultUrlHelper.java | 5 +++--
.../java/org/apache/tiles/web/util/TilesDispatchServlet.java | 3 ++-
8 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/RequestUtils.java
b/core/src/main/java/org/apache/struts2/RequestUtils.java
index 46b1dac8f..5840ff06b 100644
--- a/core/src/main/java/org/apache/struts2/RequestUtils.java
+++ b/core/src/main/java/org/apache/struts2/RequestUtils.java
@@ -18,6 +18,7 @@
*/
package org.apache.struts2;
+import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.FastDateFormat;
@@ -89,7 +90,7 @@ public class RequestUtils {
*/
public static String getUri(HttpServletRequest request) {
// handle http dispatcher includes.
-String uri = (String)
request.getAttribute("jakarta.servlet.include.servlet_path");
+String uri = (String)
request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
if (uri != null) {
return uri;
}
diff --git a/core/src/main/java/org/apache/struts2/components/Include.java
b/core/src/main/java/org/apache/struts2/components/Include.java
index 02867d890..5d2f61a4c 100644
--- a/core/src/main/java/org/apache/struts2/components/Include.java
+++ b/core/src/main/java/org/apache/struts2/components/Include.java
@@ -42,6 +42,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Writer;
import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -100,7 +101,7 @@ public class Include extends Component {
private static final Logger LOG = LogManager.getLogger(Include.class);
-private static final String systemEncoding =
System.getProperty("file.encoding");
+private static final String systemEncoding =
Charset.defaultCharset().displayName();
protected String value;
private final HttpServletRequest req;
@@ -149,8 +150,7 @@ public class Include extends Component {
String concat = "";
// Set parameters
-for (Object next : parameters.entrySet()) {
-Map.Entry entry = (Map.Entry) next;
+for (Map.Entry entry : parameters.entrySet()) {
Object name = entry.getKey();
List values = (List) entry.getValue();
@@ -191,7 +191,7 @@ public class Include extends Component {
} else if (!(request instanceof HttpServletRequest hrequest)) {
returnValue = relativePath;
} else {
-String uri = (String)
request.getAttribute("jakarta.servlet.include.servlet_path");
+String uri = (String)
request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
if (uri == null) {
uri = RequestUtils.getServletPath(hrequest);
@@ -203,7 +203,7 @@ public class Include extends Component {
// .. is illegal in an absolute path according to the Servlet Spec and
will cause
// known problems on Orion application servers.
if (returnValue.contains("..")) {
-Stack stack = new Stack();
+Stack stack = new Stack<>();
StringTokenizer pathParts = new
StringTokenizer(returnValue.replace('\\', '/'), "/");
while (pathParts.hasMoreTokens()) {
diff --git
a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
index fcca60538..ab87b77ad 100644
--- a/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java
@@ -23,6 +23,7 @@ import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.config.entities.ActionConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.util.ValueStack;
+import jakarta.servlet.RequestDispatcher;
import org.apache.commons.lang3.StringU
(struts) branch feature/WW-5450-use-contstants updated (9292dc2d0 -> 7aa491eb4)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5450-use-contstants in repository https://gitbox.apache.org/repos/asf/struts.git from 9292dc2d0 WW-5450 Uses existing Jakarta constants instead of free hand strings add 7aa491eb4 WW-5450 Avoids accessing parameters via a key No new revisions were added by this update. Summary of changes: .../test/java/org/apache/struts2/result/ServletDispatcherResultTest.java | 1 - 1 file changed, 1 deletion(-)
(struts) branch feature/WW-5450-use-contstants updated (7aa491eb4 -> e743ddec3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5450-use-contstants in repository https://gitbox.apache.org/repos/asf/struts.git from 7aa491eb4 WW-5450 Avoids accessing parameters via a key add b6cffd2ff WW-5450 Uses proper naming when defining a constant add f50cb28f8 WW-5450 Simplifies boolean expression add e743ddec3 WW-5450 Drops unused import No new revisions were added by this update. Summary of changes: core/src/main/java/org/apache/struts2/components/Include.java | 4 ++-- .../main/java/org/apache/struts2/result/ServletDispatcherResult.java | 2 +- .../java/org/apache/struts2/result/ServletDispatcherResultTest.java | 1 - 3 files changed, 3 insertions(+), 4 deletions(-)
(struts-intellij-plugin) 01/01: Imports build from Jetbrains template See here https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/better-build
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 36274ff9bb978fe29d3e3b893a28127f85d563e5
Author: Lukasz Lenart
AuthorDate: Fri Aug 30 14:56:53 2024 +0200
Imports build from Jetbrains template
See here
https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml
---
.github/workflows/build.yml | 275
1 file changed, 275 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000..73efc2c
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,275 @@
+# 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 regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# GitHub Actions Workflow is created for testing and preparing the plugin
release in the following steps:
+# - Validate Gradle Wrapper.
+# - Run 'test' and 'verifyPlugin' tasks.
+# - Run Qodana inspections.
+# - Run the 'buildPlugin' task and prepare artifact for further tests.
+# - Run the 'runPluginVerifier' task.
+# - Create a draft release.
+#
+# The workflow is triggered on push and pull_request events.
+#
+# GitHub Actions reference: https://help.github.com/en/actions
+#
+## JBIJPPTPL
+
+name: Build
+on:
+ # Trigger the workflow on pushes to only the 'main' branch (this avoids
duplicate checks being run e.g., for dependabot pull requests)
+ push:
+branches: [ main ]
+ # Trigger the workflow on any pull request
+ pull_request:
+
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
+ cancel-in-progress: true
+
+jobs:
+
+ # Prepare environment and build the plugin
+ build:
+name: Build
+runs-on: ubuntu-latest
+outputs:
+ version: ${{ steps.properties.outputs.version }}
+ changelog: ${{ steps.properties.outputs.changelog }}
+ pluginVerifierHomeDir: ${{
steps.properties.outputs.pluginVerifierHomeDir }}
+steps:
+
+ # Check out the current repository
+ - name: Fetch Sources
+uses: actions/checkout@v4
+
+ # Validate wrapper
+ - name: Gradle Wrapper Validation
+uses: gradle/actions/wrapper-validation@v3
+
+ # Set up Java environment for the next steps
+ - name: Setup Java
+uses: actions/setup-java@v4
+with:
+ distribution: zulu
+ java-version: 17
+
+ # Setup Gradle
+ - name: Setup Gradle
+uses: gradle/actions/setup-gradle@v3
+with:
+ gradle-home-cache-cleanup: true
+
+ # Set environment variables
+ - name: Export Properties
+id: properties
+shell: bash
+run: |
+ PROPERTIES="$(./gradlew properties --console=plain -q)"
+ VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
+ CHANGELOG="$(./gradlew getChangelog --unreleased --no-header
--console=plain -q)"
+
+ echo "version=$VERSION" >> $GITHUB_OUTPUT
+ echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
+
+ echo "changelog<> $GITHUB_OUTPUT
+ echo "$CHANGELOG" >> $GITHUB_OUTPUT
+ echo "EOF" >> $GITHUB_OUTPUT
+
+ # Build plugin
+ - name: Build plugin
+run: ./gradlew buildPlugin
+
+ # Prepare plugin archive content for creating artifact
+ - name: Prepare Plugin Artifact
+id: artifact
+shell: bash
+run: |
+ cd ${{ github.workspace }}/build/distributions
+ FILENAME=`ls *.zip`
+ unzip "$FILENAME" -d content
+
+ echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
+
+ # Store already-built plugin as an artifact for downloading
+ - name: Upload artifact
+uses: actions/upload-artifact@v4
+with:
+ name: ${{ steps.artifact.outputs.filename }}
+ path: ./build/distributions/content/*/*
+
+ # Run tests and upload a code coverage report
+ test:
+name: Test
+needs: [ build ]
+runs-on: ubuntu-latest
+steps:
+
+ # Check out the current repository
+ - name: Fetch Sources
+uses: actions/checkout@v4
+
+ # Set up Java en
(struts-intellij-plugin) branch feature/better-build created (now 36274ff)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git at 36274ff Imports build from Jetbrains template See here https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml This branch includes the following new commits: new 36274ff Imports build from Jetbrains template See here https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml 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-intellij-plugin) branch feature/better-build updated (36274ff -> 2d4f393)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 36274ff Imports build from Jetbrains template See here https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml add 2d4f393 Adds required checks to pass No new revisions were added by this update. Summary of changes: .asf.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(struts-intellij-plugin) branch feature/better-build updated (2d4f393 -> 0a7608a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 2d4f393 Adds required checks to pass add 0a7608a Drops disallowed action No new revisions were added by this update. Summary of changes: .github/workflows/build.yml | 7 --- 1 file changed, 7 deletions(-)
(struts-intellij-plugin) branch feature/better-build updated (0a7608a -> 9831eda)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git discard 0a7608a Drops disallowed action add 9831eda Drops disallowed action 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 (0a7608a) \ N -- N -- N refs/heads/feature/better-build (9831eda) 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/build.yml | 7 --- 1 file changed, 7 deletions(-)
(struts-intellij-plugin) branch feature/better-build updated (9831eda -> a62b96f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 9831eda Drops disallowed action add a62b96f Adds gradle plugins to support build No new revisions were added by this update. Summary of changes: build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+)
(struts-intellij-plugin) branch feature/better-build updated (a62b96f -> 23228fc)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git omit a62b96f Adds gradle plugins to support build add 23228fc Adds gradle plugins to support build 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 (a62b96f) \ N -- N -- N refs/heads/feature/better-build (23228fc) 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: build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
(struts-intellij-plugin) branch feature/better-build updated (23228fc -> b406b2c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 23228fc Adds gradle plugins to support build add b406b2c Reconfigures Gradle build to match template No new revisions were added by this update. Summary of changes: .gitignore| 1 + build.gradle.kts | 179 +++--- gradle.properties | 36 +- gradle/libs.versions.toml | 22 ++ 4 files changed, 195 insertions(+), 43 deletions(-) create mode 100644 gradle/libs.versions.toml
(struts-intellij-plugin) branch feature/better-build updated (b406b2c -> d6b427a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from b406b2c Reconfigures Gradle build to match template add d6b427a Extends README to include required sections No new revisions were added by this update. Summary of changes: README.md | 142 ++ 1 file changed, 142 insertions(+)
(struts-intellij-plugin) branch feature/better-build updated (d6b427a -> 00cb510)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from d6b427a Extends README to include required sections add 00cb510 Adds CHANGELOG No new revisions were added by this update. Summary of changes: CHANGELOG.md | 800 +++ 1 file changed, 800 insertions(+) create mode 100644 CHANGELOG.md
(struts-intellij-plugin) branch feature/better-build updated (00cb510 -> a9f0d7a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 00cb510 Adds CHANGELOG add fc91723 Simplifies CHANGELOG add a9f0d7a Fixes plugin dependencies No new revisions were added by this update. Summary of changes: CHANGELOG.md | 780 -- gradle.properties | 4 +- 2 files changed, 2 insertions(+), 782 deletions(-)
(struts-intellij-plugin) branch feature/better-build updated (a9f0d7a -> 5c95b3f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from a9f0d7a Fixes plugin dependencies add 5c95b3f Lowers supported platform No new revisions were added by this update. Summary of changes: gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(struts-intellij-plugin) 01/01: Merge pull request #7 from apache/feature/WW-5446-fix-deprecation
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 172a5ea571aae5b790da93e33290ccaea0c91363 Merge: 60aa6c5 041ac6e Author: Lukasz Lenart AuthorDate: Fri Aug 30 16:26:25 2024 +0200 Merge pull request #7 from apache/feature/WW-5446-fix-deprecation WW-5446 Fixes deprecated code and missing dependencies build.gradle.kts | 1 + .../intellij/struts2/dom/inspection/Struts2ModelInspection.java | 2 +- src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java | 3 ++- .../com/intellij/struts2/jsp/TaglibCssInlineStyleInjector.java | 5 +++-- .../java/com/intellij/struts2/jsp/TaglibJavaScriptInjector.java | 5 +++-- src/main/java/com/intellij/struts2/jsp/TaglibOgnlInjector.java | 5 +++-- .../ognl/completion/OgnlKeywordCompletionContributor.java| 9 - .../struts2/reference/StrutsTaglibReferenceContributorBase.java | 7 --- .../struts2/spellchecker/Struts2BundledDictionaryProvider.java | 2 +- src/main/resources/META-INF/plugin.xml | 2 ++ .../com/intellij/struts2/spellchecker => resources}/struts2.dic | 0 11 files changed, 28 insertions(+), 13 deletions(-)
(struts-intellij-plugin) branch main updated (60aa6c5 -> 172a5ea)
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 60aa6c5 Merge pull request #6 from apache/fix/WW-5446-jsp-clickable
add df6b80e WW-5446 Adds missing dependency
add 60e2ba9 WW-5446 Fixes loading of dictionary
add 8618ac1 WW-5446 Replaces deprecated code with recommended approach
add 73b8aed WW-5446 Adds missing plugin dependencies
add 041ac6e WW-5446 Except JSP files in any folder
new 172a5ea Merge pull request #7 from
apache/feature/WW-5446-fix-deprecation
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 | 1 +
.../intellij/struts2/dom/inspection/Struts2ModelInspection.java | 2 +-
src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java | 3 ++-
.../com/intellij/struts2/jsp/TaglibCssInlineStyleInjector.java | 5 +++--
.../java/com/intellij/struts2/jsp/TaglibJavaScriptInjector.java | 5 +++--
src/main/java/com/intellij/struts2/jsp/TaglibOgnlInjector.java | 5 +++--
.../ognl/completion/OgnlKeywordCompletionContributor.java| 9 -
.../struts2/reference/StrutsTaglibReferenceContributorBase.java | 7 ---
.../struts2/spellchecker/Struts2BundledDictionaryProvider.java | 2 +-
src/main/resources/META-INF/plugin.xml | 2 ++
.../com/intellij/struts2/spellchecker => resources}/struts2.dic | 0
11 files changed, 28 insertions(+), 13 deletions(-)
rename src/main/{java/com/intellij/struts2/spellchecker =>
resources}/struts2.dic (100%)
(struts-intellij-plugin) branch feature/WW-5446-fix-deprecation deleted (was 041ac6e)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5446-fix-deprecation in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git was 041ac6e WW-5446 Except JSP files in any folder 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-intellij-plugin) branch feature/better-build updated (5c95b3f -> 5c63c7c)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch feature/better-build
in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
discard 5c95b3f Lowers supported platform
discard a9f0d7a Fixes plugin dependencies
discard fc91723 Simplifies CHANGELOG
discard 00cb510 Adds CHANGELOG
discard d6b427a Extends README to include required sections
discard b406b2c Reconfigures Gradle build to match template
discard 23228fc Adds gradle plugins to support build
discard 9831eda Drops disallowed action
discard 2d4f393 Adds required checks to pass
discard 36274ff Imports build from Jetbrains template See here
https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml
add df6b80e WW-5446 Adds missing dependency
add 60e2ba9 WW-5446 Fixes loading of dictionary
add 8618ac1 WW-5446 Replaces deprecated code with recommended approach
add 73b8aed WW-5446 Adds missing plugin dependencies
add 041ac6e WW-5446 Except JSP files in any folder
add 172a5ea Merge pull request #7 from
apache/feature/WW-5446-fix-deprecation
add 19235be Imports build from Jetbrains template See here
https://github.com/JetBrains/intellij-platform-plugin-template/blob/main/.github/workflows/build.yml
add bf9ce17 Adds required checks to pass
add 525dea9 Drops disallowed action
add 810e8eb Adds gradle plugins to support build
add 252f813 Reconfigures Gradle build to match template
add 63aec3d Extends README to include required sections
add 77ccf09 Adds CHANGELOG
add 9b7bc20 Simplifies CHANGELOG
add a3ee5f3 Fixes plugin dependencies
add 5c63c7c Lowers supported platform
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 (5c95b3f)
\
N -- N -- N refs/heads/feature/better-build (5c63c7c)
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:
.../intellij/struts2/dom/inspection/Struts2ModelInspection.java | 2 +-
src/main/java/com/intellij/struts2/facet/ui/StrutsFilesTree.java | 3 ++-
.../com/intellij/struts2/jsp/TaglibCssInlineStyleInjector.java | 5 +++--
.../java/com/intellij/struts2/jsp/TaglibJavaScriptInjector.java | 5 +++--
src/main/java/com/intellij/struts2/jsp/TaglibOgnlInjector.java | 5 +++--
.../ognl/completion/OgnlKeywordCompletionContributor.java| 9 -
.../struts2/reference/StrutsTaglibReferenceContributorBase.java | 7 ---
.../struts2/spellchecker/Struts2BundledDictionaryProvider.java | 2 +-
src/main/resources/META-INF/plugin.xml | 2 ++
.../com/intellij/struts2/spellchecker => resources}/struts2.dic | 0
10 files changed, 27 insertions(+), 13 deletions(-)
rename src/main/{java/com/intellij/struts2/spellchecker =>
resources}/struts2.dic (100%)
(struts-intellij-plugin) branch feature/better-build updated (5c63c7c -> 5546539)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 5c63c7c Lowers supported platform add 5546539 Removes annotation in type context No new revisions were added by this update. Summary of changes: src/main/java/com/intellij/struts2/StrutsBundle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-intellij-plugin) branch feature/better-build updated (5546539 -> 2576922)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 5546539 Removes annotation in type context add 2576922 Adds Qodana config No new revisions were added by this update. Summary of changes: .gitignore | 1 + qodana.yml | 27 +++ 2 files changed, 28 insertions(+) create mode 100644 qodana.yml
(struts-intellij-plugin) branch feature/better-build updated (2576922 -> 6469e0b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/better-build in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git from 2576922 Adds Qodana config add ceb0a2d Excludes test data from RAT scanning add 6469e0b Removes duplicated repositories definition No new revisions were added by this update. Summary of changes: build.gradle.kts| 1 - settings.gradle.kts | 9 + 2 files changed, 1 insertion(+), 9 deletions(-)
(struts) branch feature/WW-5450-use-contstants deleted (was e743ddec3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch feature/WW-5450-use-contstants in repository https://gitbox.apache.org/repos/asf/struts.git was e743ddec3 WW-5450 Drops unused import 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: WW-5450 Sets RequestDispatcher#FORWARD_REQUEST_URI attribute when forwarding
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/WW-5450-forward
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 16dac7b0b548935b57b3a7f4d8e1afc6fba8bc6c
Author: Lukasz Lenart
AuthorDate: Sat Aug 31 07:04:24 2024 +0200
WW-5450 Sets RequestDispatcher#FORWARD_REQUEST_URI attribute when forwarding
---
.../main/java/org/apache/struts2/result/ServletDispatcherResult.java | 3 +++
.../java/org/apache/struts2/result/ServletDispatcherResultTest.java| 1 +
2 files changed, 4 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 df0896cf4..7de36e805 100644
--- a/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java
+++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java
@@ -166,6 +166,9 @@ public class ServletDispatcherResult extends
StrutsResultSupport {
request.setAttribute("struts.view_uri", finalLocation);
request.setAttribute("struts.request_uri",
request.getRequestURI());
+LOG.debug("Sets request attribute: {} to value: {}",
RequestDispatcher.FORWARD_REQUEST_URI, finalLocation);
+request.setAttribute(RequestDispatcher.FORWARD_REQUEST_URI,
finalLocation);
+
dispatcher.forward(request, response);
} else {
LOG.debug("Including location: {}", finalLocation);
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 90da7b6c9..c1ab57b11 100644
---
a/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
+++
b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java
@@ -75,6 +75,7 @@ public class ServletDispatcherResultTest extends
StrutsInternalTestCase implemen
requestMock.expectAndReturn("getRequestDispatcher",
C.args(C.eq("foo.jsp")), dispatcherMock.proxy());
requestMock.expect("setAttribute", C.ANY_ARGS); // this is a bad mock,
but it works
requestMock.expect("setAttribute", C.ANY_ARGS); // this is a bad mock,
but it works
+requestMock.expect("setAttribute",
C.args(C.eq(RequestDispatcher.FORWARD_REQUEST_URI), C.eq("foo.jsp")));
requestMock.matchAndReturn("getRequestURI", "foo.jsp");
Mock responseMock = new Mock(HttpServletResponse.class);
(struts) branch fix/WW-5450-forward updated (16dac7b0b -> 92967fcc7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5450-forward in repository https://gitbox.apache.org/repos/asf/struts.git omit 16dac7b0b WW-5450 Sets RequestDispatcher#FORWARD_REQUEST_URI attribute when forwarding add 92967fcc7 WW-5450 Sets RequestDispatcher#FORWARD_REQUEST_URI attribute when forwarding 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 (16dac7b0b) \ N -- N -- N refs/heads/fix/WW-5450-forward (92967fcc7) 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: .../test/java/org/apache/struts2/result/ServletDispatcherResultTest.java | 1 + 1 file changed, 1 insertion(+)
(struts) branch fix/WW-5450-forward created (now 16dac7b0b)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/WW-5450-forward in repository https://gitbox.apache.org/repos/asf/struts.git at 16dac7b0b WW-5450 Sets RequestDispatcher#FORWARD_REQUEST_URI attribute when forwarding This branch includes the following new commits: new 16dac7b0b WW-5450 Sets RequestDispatcher#FORWARD_REQUEST_URI attribute when forwarding 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 release/struts-7-0-x updated (46797922e -> e62ee8fcb)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git from 46797922e Merge pull request #1009 from apache/7.0.x/WW-5453-rename-velocity add 9292dc2d0 WW-5450 Uses existing Jakarta constants instead of free hand strings add 7aa491eb4 WW-5450 Avoids accessing parameters via a key add b6cffd2ff WW-5450 Uses proper naming when defining a constant add f50cb28f8 WW-5450 Simplifies boolean expression add e743ddec3 WW-5450 Drops unused import add e62ee8fcb Merge pull request #1034 from apache/feature/WW-5450-use-contstants No new revisions were added by this update. Summary of changes: core/src/main/java/org/apache/struts2/RequestUtils.java | 3 ++- .../src/main/java/org/apache/struts2/components/Include.java | 12 ++-- .../org/apache/struts2/components/ServletUrlRenderer.java| 3 ++- .../struts2/dispatcher/DefaultDispatcherErrorHandler.java| 3 ++- .../org/apache/struts2/result/ServletDispatcherResult.java | 12 ++-- .../apache/struts2/views/freemarker/FreemarkerManager.java | 3 ++- .../java/org/apache/struts2/views/util/DefaultUrlHelper.java | 5 +++-- .../apache/struts2/result/ServletDispatcherResultTest.java | 2 -- .../java/org/apache/tiles/web/util/TilesDispatchServlet.java | 3 ++- 9 files changed, 25 insertions(+), 21 deletions(-)
