This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch release/struts-7-0-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/release/struts-7-0-x by this
push:
new bf2d85ebe [WW-5141] Removes deprecated plugins (#798)
bf2d85ebe is described below
commit bf2d85ebe75bec45b1ed75ee45d92d28d5f49715
Author: James Dyer <[email protected]>
AuthorDate: Tue Nov 21 12:26:07 2023 -0600
[WW-5141] Removes deprecated plugins (#798)
* WW-5141
- remove portlet
* WW-5141
- remove "pell multipart plugin"
* WW-5141
- remove code for "pell multipart plugin"
* WW-5141
- remove dwr plugin
* WW-5141
- remove dwr plugin code
* WW-5141
- remove "dwr" from "struts-showcase"
* WW-5141
- remove references to "oval plugin" (removed)
* WW-5141
- remove dwr from struts-showcase
---
apps/showcase/pom.xml | 9 --
.../struts2/showcase/ajax/tree/Category.java | 3 +-
.../src/main/resources/struts-validation.xml | 7 +-
.../src/main/webapp/WEB-INF/decorators/main.jsp | 1 -
.../main/webapp/WEB-INF/validation/quiz-dwr.jsp | 92 -----------
apps/showcase/src/main/webapp/WEB-INF/web.xml | 19 +--
assembly/pom.xml | 20 ---
assembly/src/main/assembly/all.xml | 20 ---
assembly/src/main/assembly/docs.xml | 12 --
assembly/src/main/assembly/lib.xml | 8 -
bom/pom.xml | 25 ---
plugins/dwr/README.md | 6 -
plugins/dwr/pom.xml | 44 ------
.../apache/struts2/validators/DWRValidator.java | 123 ---------------
plugins/dwr/src/site/site.xml | 56 -------
plugins/pell-multipart/README.md | 2 -
plugins/pell-multipart/pom.xml | 45 ------
.../dispatcher/multipart/PellMultiPartRequest.java | 161 -------------------
.../pell-multipart/src/main/resources/LICENSE.txt | 174 ---------------------
.../pell-multipart/src/main/resources/NOTICE.txt | 5 -
.../src/main/resources/struts-plugin.xml | 28 ----
plugins/pell-multipart/src/site/site.xml | 56 -------
plugins/pom.xml | 6 -
pom.xml | 43 -----
src/etc/project-suppression.xml | 30 ----
25 files changed, 3 insertions(+), 992 deletions(-)
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 6955c7f8f..a21af558a 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -58,11 +58,6 @@
<artifactId>struts2-tiles-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-dwr-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
@@ -126,10 +121,6 @@
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
</dependency>
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
index 63c34fc4c..2f0571728 100644
---
a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
+++
b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
@@ -46,8 +46,7 @@ public class Category {
new Category(15, "Dojo"),
new Category(16, "Prototype"),
new Category(17,
"Scriptaculous"),
- new Category(18, "OpenRico"),
- new Category(19, "DWR")));
+ new Category(18, "OpenRico")));
}
public static Category getById(long id) {
diff --git a/apps/showcase/src/main/resources/struts-validation.xml
b/apps/showcase/src/main/resources/struts-validation.xml
index de225d7e1..38e2adf83 100755
--- a/apps/showcase/src/main/resources/struts-validation.xml
+++ b/apps/showcase/src/main/resources/struts-validation.xml
@@ -47,12 +47,7 @@
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
- <action name="quizDwr"
class="org.apache.struts2.showcase.validation.QuizAction">
- <result
name="input">/WEB-INF/validation/quiz-dwr.jsp</result>
- <result>/WEB-INF/validation/quiz-success.jsp</result>
- </action>
-
- <action name="quizClientCss"
class="org.apache.struts2.showcase.validation.QuizAction">
+ <action name="quizClientCss"
class="org.apache.struts2.showcase.validation.QuizAction">
<result
name="input">/WEB-INF/validation/quiz-client-css.jsp</result>
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
index 77f387ace..34f732db3 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -226,7 +226,6 @@
<li><s:a
href="%{storeMessageAcrossRequestExample}">Store across request using
MessageStoreInterceptor (Example)</s:a></li>
<li><s:a href="%{quizBasic}">Validation
(basic)</s:a></li>
<li><s:a href="%{quizClient}">Validation
(client)</s:a></li>
- <li><s:a href="%{quizDwr}">Validation
(DWR)</s:a></li>
<li><s:a href="%{quizClientCss}">Validation
(client using css_xhtml theme)</s:a></li>
<li><s:a href="%{visitorValidatorUrl}">Visitor
Validator</s:a></li>
<li><s:a href="%{ajaxFormSubmitUrl}">AJAX Form
Submit</s:a></li>
diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp
b/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp
deleted file mode 100644
index 51d26e781..000000000
--- a/apps/showcase/src/main/webapp/WEB-INF/validation/quiz-dwr.jsp
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-/*
-* 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.
-*/
--->
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<!-- START SNIPPET: dwrValidation -->
-
-<html>
-<head>
- <title>Struts2 Showcase - Validation - DWR</title>
- <s:head/>
- <s:script type='text/javascript' src='../dwr/engine.js'></s:script>
- <s:script type='text/javascript' src='../dwr/util.js'></s:script>
- <s:script type='text/javascript'
src='../dwr/interface/validator.js'></s:script>
- <s:script type='text/javascript'>
- var dwrValidateReply = function(data) {
- var validationResult = '';
- for (index = 0; index < data.actionErrors.length; ++index) {
- validationResult += (data.actionErrors[index] + '. ');
- }
- for (index = 0; index < data.actionMessages.length; ++index) {
- validationResult += (data.actionMessages[index] + '. ');
- }
- if (typeof data.fieldErrors.name !== 'undefined') {
- for (index = 0; index < data.fieldErrors.name.length; ++index)
{
- validationResult += (data.fieldErrors.name[index] + '. ');
- }
- }
- if (typeof data.fieldErrors.age !== 'undefined') {
- for (index = 0; index < data.fieldErrors.age.length; ++index) {
- validationResult += (data.fieldErrors.age[index] + '. ');
- }
- }
- if (validationResult === '') {
- $('form').submit();
- } else {
- dwr.util.setValue('validationResult', validationResult);
- }
- };
- function dwrFormValidation() {
- var postData = {};
- $('form').serializeArray().map(function (x) {
- postData[x.name] = x.value;
- });
- validator.doPost('/validation', 'quizDwr', postData,
dwrValidateReply);
- return false;
- }
- </s:script>
-</head>
-
-<body>
-
-<div class="page-header">
- <h1>DWR validation Example</h1>
-</div>
-
-<div class="container-fluid">
- <div class="row">
- <div class="col-md-12">
-
- <s:form method="post">
- <s:textfield label="Name" name="name"/>
- <s:textfield label="Age" name="age"/>
- <s:textfield label="Favorite color"
name="answer"/>
- <s:submit cssClass="btn btn-primary"
onClick="return dwrFormValidation()"/>
- </s:form>
- <div id="validationResult" class="errorMessage"></div>
- </div>
- </div>
-</div>
-</body>
-</html>
-
-<!-- END SNIPPET: dwrValidation -->
-
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml
b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index 001641b7d..dcc188944 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -98,16 +98,6 @@
<listener-class>org.apache.struts2.dispatcher.listener.StrutsListener</listener-class>
</listener>
- <!-- SNIPPET START: dwr -->
-
- <servlet>
- <servlet-name>dwr</servlet-name>
- <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>true</param-value>
- </init-param>
- </servlet>
<servlet>
<servlet-name>JspSupportServlet</servlet-name>
<servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
@@ -147,12 +137,7 @@
<servlet-class>org.apache.struts2.showcase.servlet.TestServlet</servlet-class>
</servlet>
- <servlet-mapping>
- <servlet-name>dwr</servlet-name>
- <url-pattern>/dwr/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
+ <servlet-mapping>
<servlet-name>sitemesh-freemarker</servlet-name>
<url-pattern>*.ftl</url-pattern>
</servlet-mapping>
@@ -172,8 +157,6 @@
<url-pattern>/testServlet/*</url-pattern>
</servlet-mapping>
- <!-- END SNIPPET: dwr -->
-
<!-- SNIPPET START: example.velocity.filter.chain
<filter>
<filter-name>struts-cleanup</filter-name>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f5489212d..f5d0aeffe 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -163,11 +163,6 @@
<artifactId>struts2-config-browser-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-dwr-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-jasperreports-plugin</artifactId>
@@ -183,21 +178,11 @@
<artifactId>struts2-junit-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-pell-multipart-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-plugin</artifactId>
@@ -221,11 +206,6 @@
<artifactId>struts2-tiles-plugin</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-oval-plugin</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
diff --git a/assembly/src/main/assembly/all.xml
b/assembly/src/main/assembly/all.xml
index 0c08b4810..b91aeec30 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -78,14 +78,6 @@
<include>SITEMESH-LICENSE.txt</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../plugins/oval/src/main/resources</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>OVAL-LICENSE.txt</include>
- <include>XSTREAM-LICENSE.txt</include>
- </includes>
- </fileSet>
<fileSet>
<directory>target/apps</directory>
<outputDirectory>apps</outputDirectory>
@@ -133,10 +125,6 @@
<directory>../plugins/convention/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../plugins/dwr/target/apidocs</directory>
-
<outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
- </fileSet>
<fileSet>
<directory>../plugins/embeddedjsp/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
@@ -169,14 +157,6 @@
<directory>../plugins/osgi/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-osgi-plugin/apidocs</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../plugins/oval/target/apidocs</directory>
-
<outputDirectory>docs/struts2-plugins/struts2-oval-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../plugins/pell-multipart/target/apidocs</directory>
-
<outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin/apidocs</outputDirectory>
- </fileSet>
<fileSet>
<directory>../plugins/plexus/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
diff --git a/assembly/src/main/assembly/docs.xml
b/assembly/src/main/assembly/docs.xml
index 00f7b8ba9..e7d9594b3 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -68,10 +68,6 @@
<directory>../plugins/convention/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../plugins/dwr/target/apidocs</directory>
-
<outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
- </fileSet>
<fileSet>
<directory>../plugins/embeddedjsp/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
@@ -104,14 +100,6 @@
<directory>../plugins/osgi/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-osgi-plugin/apidocs</outputDirectory>
</fileSet>
- <fileSet>
- <directory>../plugins/oval/target/apidocs</directory>
-
<outputDirectory>docs/struts2-plugins/struts2-oval-plugin/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../plugins/pell-multipart/target/apidocs</directory>
-
<outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin/apidocs</outputDirectory>
- </fileSet>
<fileSet>
<directory>../plugins/plexus/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
diff --git a/assembly/src/main/assembly/lib.xml
b/assembly/src/main/assembly/lib.xml
index f40bfb26c..b03f2d3cc 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -78,13 +78,5 @@
<include>SITEMESH-LICENSE.txt</include>
</includes>
</fileSet>
- <fileSet>
- <directory>../plugins/oval/src/main/resources</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>OVAL-LICENSE.txt</include>
- <include>XSTREAM-LICENSE.txt</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
diff --git a/bom/pom.xml b/bom/pom.xml
index 0e9e2db68..b973d2d0f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -81,11 +81,6 @@
<artifactId>struts2-config-browser-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-dwr-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
@@ -126,31 +121,11 @@
<artifactId>struts2-osgi-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-oval-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-pell-multipart-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-tiles-plugin</artifactId>
- <version>${struts-version.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-rest-plugin</artifactId>
diff --git a/plugins/dwr/README.md b/plugins/dwr/README.md
deleted file mode 100644
index dc0c30a37..000000000
--- a/plugins/dwr/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Struts 2 Direct Web Remoting (DWR) plugin
-This plugin allows to use Struts validation via DWR as remote beans.
-You will find more details in
[documentation](https://struts.apache.org/plugins/dwr/).
-
-## Installation
-Just drop this plugin JAR into `WEB-INF/lib` folder or add it as a Maven
dependency.
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
deleted file mode 100644
index a3ce5ffae..000000000
--- a/plugins/dwr/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * 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.
- */
--->
-<project xmlns="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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-plugins</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>struts2-dwr-plugin</artifactId>
- <packaging>jar</packaging>
- <name>Struts 2 DWR Plugin</name>
-
- <dependencies>
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-</project>
diff --git
a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
b/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
deleted file mode 100644
index 0809ea0e2..000000000
--- a/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.struts2.validators;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.ApplicationMap;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.HttpParameters;
-import org.apache.struts2.dispatcher.RequestMap;
-import org.apache.struts2.dispatcher.SessionMap;
-
-import org.directwebremoting.WebContextFactory;
-
-import com.opensymphony.xwork2.Action;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.DefaultActionInvocation;
-import com.opensymphony.xwork2.interceptor.ValidationAware;
-import com.opensymphony.xwork2.ValidationAwareSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.LogManager;
-
-/**
- * <p>
- * Use the dwr configuration as follows:
- * </p>
- *
- * <pre>
- * <!-- START SNIPPET: dwrConfiguration -->
- *
- * <dwr>
- * <allow>
- * <create creator="new" javascript="validator"
class="org.apache.struts2.validators.DWRValidator"/>
- * <convert converter="bean"
match="com.opensymphony.xwork2.ValidationAwareSupport"/>
- * </allow>
- * </dwr>
- *
- * <!-- END SNIPPET: dwrConfiguration -->
- * </pre>
- */
-public class DWRValidator {
-
- private static final Logger LOG = LogManager.getLogger(DWRValidator.class);
-
- public ValidationAwareSupport doPost(String namespace, String actionName,
Map params) throws Exception {
- HttpServletRequest req =
WebContextFactory.get().getHttpServletRequest();
- ServletContext servletContext =
WebContextFactory.get().getServletContext();
- HttpServletResponse res =
WebContextFactory.get().getHttpServletResponse();
-
- HttpParameters.Builder requestParams =
HttpParameters.create(req.getParameterMap());
- if (params != null) {
- requestParams = requestParams.withExtraParams(params);
- }
- Map<String, Object> requestMap = new RequestMap(req);
- Map<String, Object> session = new SessionMap(req);
- Map<String, Object> application = new ApplicationMap(servletContext);
- Dispatcher du = Dispatcher.getInstance();
- Map<String, Object> ctx = du.createContextMap(requestMap,
- requestParams.build(),
- session,
- application,
- req,
- res);
-
- try {
- ActionProxyFactory actionProxyFactory =
du.getContainer().getInstance(ActionProxyFactory.class);
- ActionProxy proxy =
actionProxyFactory.createActionProxy(namespace, actionName, null, ctx, true,
true);
- proxy.execute();
- Object action = proxy.getAction();
-
- if (action instanceof ValidationAware) {
- ValidationAware aware = (ValidationAware) action;
- ValidationAwareSupport vas = new ValidationAwareSupport();
- vas.setActionErrors(aware.getActionErrors());
- vas.setActionMessages(aware.getActionMessages());
- vas.setFieldErrors(aware.getFieldErrors());
-
- return vas;
- } else {
- return null;
- }
- } catch (Exception e) {
- LOG.error("Error while trying to validate", e);
- return null;
- }
- }
-
- public static class ValidatorActionInvocation extends
DefaultActionInvocation {
-
- protected ValidatorActionInvocation(Map<String, Object> extraContext,
boolean pushAction) throws Exception {
- super(extraContext, pushAction);
- }
-
- protected String invokeAction(Object action, ActionConfig
actionConfig) throws Exception {
- return Action.NONE; // don't actually execute the action
- }
- }
-
-}
diff --git a/plugins/dwr/src/site/site.xml b/plugins/dwr/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/dwr/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * 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.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/pell-multipart/README.md b/plugins/pell-multipart/README.md
deleted file mode 100644
index 0372995e8..000000000
--- a/plugins/pell-multipart/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Struts 2 Pell Multipart plugin
-This plugin is deprecated and it will be removed soon, **please do not use
it**!
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
deleted file mode 100644
index 2ff2e2e16..000000000
--- a/plugins/pell-multipart/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * 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.
- */
--->
-<project xmlns="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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-plugins</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>struts2-pell-multipart-plugin</artifactId>
- <packaging>jar</packaging>
- <name>DEPRECATED: Struts 2 Pell Multipart Plugin - since 6.2.0</name>
-
- <dependencies>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>pell-multipart</artifactId>
- <version>2.1.5</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-</project>
diff --git
a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
b/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
deleted file mode 100644
index 9688be65e..000000000
---
a/plugins/pell-multipart/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.
- */
-package org.apache.struts2.dispatcher.multipart;
-
-import http.utils.multipartrequest.ServletMultipartRequest;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-/**
- * Multipart form data request adapter for Jason Pell's multipart utils
package.
- *
- */
-public class PellMultiPartRequest extends AbstractMultiPartRequest {
-
- private static final Logger LOG =
LogManager.getLogger(PellMultiPartRequest.class);
-
- private ServletMultipartRequest multi;
-
- /**
- * Creates a new request wrapper to handle multi-part data using methods
adapted from Jason Pell's
- * multipart classes (see class description).
- *
- * @param saveDir the directory to save off the file
- * @param servletRequest the request containing the multipart
- */
- public void parse(HttpServletRequest servletRequest, String saveDir)
throws IOException {
- //this needs to be synchronised, as we should not change the encoding
at the same time as
- //calling the constructor. See javadoc for
MultipartRequest.setEncoding().
- synchronized (this) {
- setEncoding();
- if (maxSize != null && maxSize > -1) {
- int intMaxSize = (maxSize >= Integer.MAX_VALUE ?
Integer.MAX_VALUE : maxSize.intValue());
- multi = new ServletMultipartRequest(servletRequest, saveDir,
intMaxSize);
- } else {
- multi = new ServletMultipartRequest(servletRequest, saveDir);
- }
- }
- }
-
- public Enumeration getFileParameterNames() {
- return multi.getFileParameterNames();
- }
-
- public String[] getContentType(String fieldName) {
- return new String[]{multi.getContentType(fieldName)};
- }
-
- public UploadedFile[] getFile(String fieldName) {
- return new UploadedFile[]{ new
StrutsUploadedFile(multi.getFile(fieldName)) };
- }
-
- public String[] getFileNames(String fieldName) {
-
- // TODO - not sure about this - is this the filename of the actual
file or
- // TODO - the uploaded filename as provided by the browser?
- // TODO - Not sure what version of Pell this class uses as it doesn't
seem to be the latest
- return new String[]{multi.getFile(fieldName).getName()};
- }
-
- public String[] getFilesystemName(String fieldName) {
- return new String[]{multi.getFileSystemName(fieldName)};
- }
-
- public String getParameter(String name) {
- return multi.getURLParameter(name);
- }
-
- public Enumeration<String> getParameterNames() {
- return multi.getParameterNames();
- }
-
- public String[] getParameterValues(String name) {
- Enumeration enumeration = multi.getURLParameters(name);
-
- if (!enumeration.hasMoreElements()) {
- return null;
- }
-
- List<String> values = new ArrayList<String>();
-
- while (enumeration.hasMoreElements()) {
- values.add((String) enumeration.nextElement());
- }
-
- return values.toArray(new String[values.size()]);
- }
-
- /**
- * Sets the encoding for the uploaded params. This needs to be set if you
are using character sets other than
- * ASCII.
- * <p>
- * The encoding is looked up from the configuration setting
'struts.i18n.encoding'. This is usually set in
- * default.properties & struts.properties.
- * </p>
- */
- private void setEncoding() {
- String encoding = null;
-
- try {
- encoding = defaultEncoding;
-
- if (encoding != null) {
- //NB: This should never be called at the same time as the
constructor for
- //ServletMultiPartRequest, as it can cause problems.
- //See javadoc for MultipartRequest.setEncoding()
-
http.utils.multipartrequest.MultipartRequest.setEncoding(encoding);
- } else {
-
http.utils.multipartrequest.MultipartRequest.setEncoding("UTF-8");
- }
- } catch (IllegalArgumentException e) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Could not get encoding property
'struts.i18n.encoding' for file upload. Using system default");
- }
- } catch (UnsupportedEncodingException e) {
- LOG.error("Encoding " + encoding + " is not a valid encoding.
Please check your struts.properties file.");
- }
- }
-
- /* (non-Javadoc)
- * @see org.apache.struts2.dispatcher.multipart.MultiPartRequest#cleanUp()
- */
- public void cleanUp() {
- Enumeration fileParameterNames = multi.getFileParameterNames();
- while (fileParameterNames != null &&
fileParameterNames.hasMoreElements()) {
- String inputValue = (String) fileParameterNames.nextElement();
- UploadedFile[] files = getFile(inputValue);
- for (UploadedFile currentFile : files) {
- LOG.debug("Removing file {} {}", inputValue, currentFile);
- if ((currentFile != null) && currentFile.isFile()) {
- if (!currentFile.delete()) {
- LOG.warn("Resource Leaking: Could not remove uploaded
file [{}]", currentFile.getAbsolutePath());
- }
- }
- }
- }
- }
-
-}
diff --git a/plugins/pell-multipart/src/main/resources/LICENSE.txt
b/plugins/pell-multipart/src/main/resources/LICENSE.txt
deleted file mode 100644
index dd5b3a58a..000000000
--- a/plugins/pell-multipart/src/main/resources/LICENSE.txt
+++ /dev/null
@@ -1,174 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
diff --git a/plugins/pell-multipart/src/main/resources/NOTICE.txt
b/plugins/pell-multipart/src/main/resources/NOTICE.txt
deleted file mode 100644
index bfba90c29..000000000
--- a/plugins/pell-multipart/src/main/resources/NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Struts
-Copyright 2000-2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/plugins/pell-multipart/src/main/resources/struts-plugin.xml
b/plugins/pell-multipart/src/main/resources/struts-plugin.xml
deleted file mode 100644
index 2640ad485..000000000
--- a/plugins/pell-multipart/src/main/resources/struts-plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-/*
- * 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.
- */
--->
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
- "https://struts.apache.org/dtds/struts-6.0.dtd";>
-
-<struts>
- <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="pell"
class="org.apache.struts2.dispatcher.multipart.PellMultiPartRequest" />
-</struts>
diff --git a/plugins/pell-multipart/src/site/site.xml
b/plugins/pell-multipart/src/site/site.xml
deleted file mode 100644
index 54fdcf4f4..000000000
--- a/plugins/pell-multipart/src/site/site.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * 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.
- */
--->
-<project name="Apache Struts">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>${fluido-skin.version}</version>
- </skin>
- <bannerLeft>
- <name>Apache Software Foundation</name>
- <src>http://www.apache.org/images/asf-logo.gif</src>
- <href>http://www.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Apache Struts</name>
- <src>http://struts.apache.org/img/struts-logo.svg</src>
- <href>http://struts.apache.org/</href>
- </bannerRight>
- <publishDate position="left"/>
- <version position="right"/>
- <body>
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Struts" href="http://struts.apache.org/"/>
- </links>
-
- <menu ref="parent"/>
- <menu ref="reports"/>
-
- <footer>
- <![CDATA[<div class="row span12">
- Apache Struts, Struts, Apache, the Apache feather logo, and the
Apache Struts project
- logos are trademarks of The Apache Software Foundation.
- </div>]]>
- </footer>
- </body>
-</project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index fdfd9144e..3463a109f 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -37,7 +37,6 @@
<module>cdi</module>
<module>config-browser</module>
<module>convention</module>
- <module>dwr</module>
<module>embeddedjsp</module>
<module>gxp</module>
<module>jasperreports</module>
@@ -47,12 +46,7 @@
<module>junit</module>
<module>osgi</module>
<module>oval</module>
- <module>pell-multipart</module>
<module>plexus</module>
- <module>portlet</module>
- <module>portlet-junit</module>
- <module>portlet-mocks</module>
- <module>portlet-tiles</module>
<module>rest</module>
<module>sitemesh</module>
<module>spring</module>
diff --git a/pom.xml b/pom.xml
index 4945b016c..b091e8ae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,26 +534,6 @@
<artifactId>struts2-cdi-plugin</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-dwr-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-tiles-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-portlet-mocks-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
@@ -594,11 +574,6 @@
<artifactId>struts2-jfreechart-plugin</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-pell-multipart-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plexus-plugin</artifactId>
@@ -619,11 +594,6 @@
<artifactId>struts2-testng-plugin</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-oval-plugin</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
@@ -702,12 +672,6 @@
<version>1.4.1</version>
</dependency>
- <dependency>
- <groupId>org.directwebremoting</groupId>
- <artifactId>dwr</artifactId>
- <version>3.0.2-RELEASE</version>
- </dependency>
-
<dependency>
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
@@ -1083,13 +1047,6 @@
<version>6.1.26</version>
</dependency>
- <!-- Portlet -->
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- </dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
diff --git a/src/etc/project-suppression.xml b/src/etc/project-suppression.xml
index be1c572b1..38324163d 100644
--- a/src/etc/project-suppression.xml
+++ b/src/etc/project-suppression.xml
@@ -148,36 +148,6 @@
<packageUrl
regex="true">^pkg:maven/org\.codehaus\.plexus/plexus\-utils@.*$</packageUrl>
<vulnerabilityName>Possible XML Injection</vulnerabilityName>
</suppress>
- <suppress>
- <notes><![CDATA[file name: oval-1.90.jar]]></notes>
- <packageUrl regex="true">^pkg:maven/net\.sf\.oval/oval@.*$</packageUrl>
- <cpe>cpe:/a:apache:groovy</cpe>
- </suppress>
- <suppress>
- <notes><![CDATA[file name: oval-1.90.jar]]></notes>
- <packageUrl regex="true">^pkg:maven/net\.sf\.oval/oval@.*$</packageUrl>
- <cpe>cpe:/a:apache:log4j</cpe>
- </suppress>
- <suppress>
- <notes><![CDATA[file name: oval-1.90.jar]]></notes>
- <packageUrl regex="true">^pkg:maven/net\.sf\.oval/oval@.*$</packageUrl>
- <cpe>cpe:/a:jruby:jruby</cpe>
- </suppress>
- <suppress>
- <notes><![CDATA[file name: oval-1.90.jar]]></notes>
- <packageUrl regex="true">^pkg:maven/net\.sf\.oval/oval@.*$</packageUrl>
- <cpe>cpe:/a:xstream_project:xstream</cpe>
- </suppress>
- <suppress>
- <notes><![CDATA[file name: oval-1.90.jar: xstream-1.4.19.jar]]></notes>
- <packageUrl
regex="true">^pkg:maven/com\.thoughtworks\.xstream/xstream@.*$</packageUrl>
- <cve>CVE-2022-40151</cve>
- <cve>CVE-2022-40152</cve>
- <cve>CVE-2022-40153</cve>
- <cve>CVE-2022-40154</cve>
- <cve>CVE-2022-40155</cve>
- <cve>CVE-2022-40156</cve>
- </suppress>
<!-- TestNG -->
<suppress>
<notes><![CDATA[file name: guava-19.0.jar]]></notes>
