Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-05 22:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WW-5141] Removes deprecated plugins (#798)

Browse Source 
* 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
This commit is contained in:
James Dyer
2023-11-21 12:26:07 -06:00
committed by Lukasz Lenart
parent bed0db3470
commit 6f35c02fbf
9 changed files with 25 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/pom.xml
+1 -1
View File
@@ -233,7 +233,7 @@
</httpConnector>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
<webApp>
<webApp>
<extraClasspath>
${project.build.directory}/extraclasspath/struts2-freemarker-jakarta.jar,
${project.build.directory}/extraclasspath/struts2-sitemesh2-jakarta.jar,
apps/showcase/src/main/webapp/WEB-INF/web.xml
+1 -3
View File
@@ -137,7 +137,7 @@
<servlet-class>org.apache.struts2.showcase.servlet.TestServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-mapping>
<servlet-name>sitemesh-freemarker</servlet-name>
<url-pattern>*.ftl</url-pattern>
</servlet-mapping>
@@ -157,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>
assembly/src/main/assembly/all.xml
+8 -4
View File
@@ -103,7 +103,7 @@
</fileSet>
<!-- Plugins -->
<!--
<!--
<fileSet>
<directory>../plugins/$plugin/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
@@ -125,6 +125,10 @@
<directory>../plugins/convention/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
<directory>../plugins/embeddedjsp/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
<directory>../plugins/gxp/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-gxp-plugin/apidocs</outputDirectory>
@@ -186,12 +190,12 @@
<fileSet>
<directory>../bundles/admin/target/site</directory>
<outputDirectory>docs/struts2-bundles/admin</outputDirectory>
</fileSet>
</fileSet>
<fileSet>
<directory>../bundles/demo/target/site</directory>
<outputDirectory>docs/struts2-bundles/demo</outputDirectory>
</fileSet>
</fileSet>
<!-- Include the source code in the assembly -->
<fileSet>
assembly/src/main/assembly/docs.xml
+4
View File
@@ -68,6 +68,10 @@
<directory>../plugins/convention/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
<directory>../plugins/embeddedjsp/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
</fileSet>
<fileSet>
<directory>../plugins/gxp/target/apidocs</directory>
<outputDirectory>docs/struts2-plugins/struts2-gxp-plugin/apidocs</outputDirectory>
bom/pom.xml
+5
View File
@@ -81,6 +81,11 @@
<artifactId>struts2-config-browser-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
<version>${struts-version.version}</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-gxp-plugin</artifactId>
core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowlist-2.xml
-41
View File
@@ -1,41 +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>
<package name="allow2">
<result-types>
<result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
</result-types>
<interceptors>
<interceptor name="noop" class="org.apache.struts2.interceptor.NoOpInterceptor"/>
</interceptors>
<action name="WildCard" class="com.opensymphony.xwork2.ActionSupport">
<result name="*" type="chain"/>
<interceptor-ref name="noop"/>
</action>
</package>
</struts>
plugins/junit/src/main/java/org/apache/struts2/junit/XWorkTestCase.java
-22
View File
@@ -1,22 +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.junit;
public abstract class XWorkTestCase extends com.opensymphony.xwork2.XWorkTestCase {
}
plugins/pom.xml
+5 -3
View File
@@ -37,6 +37,7 @@
<module>cdi</module>
<module>config-browser</module>
<module>convention</module>
<module>embeddedjsp</module>
<module>gxp</module>
<module>jasperreports</module>
<module>javatemplates</module>
@@ -44,9 +45,10 @@
<module>json</module>
<module>junit</module>
<module>osgi</module>
<module>oval</module>
<module>plexus</module>
<module>rest</module>
<module>sitemesh</module>
<module>sitemesh</module>
<module>spring</module>
<module>testng</module>
<module>tiles</module>
@@ -87,12 +89,12 @@
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
pom.xml
+1 -1
View File
@@ -706,7 +706,7 @@
<artifactId>struts2-velocity-tools-jsp-jakarta</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity.tools</groupId>
<artifactId>velocity-tools-generic</artifactId>