From 841313ec1f81e809f28be2344d7a080dedfbdeb4 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 30 Oct 2023 11:05:50 -0500
Subject: [PATCH] WN-5141

- more portlet removals
---
 assembly/src/main/assembly/all.xml                        | 8 --------
 assembly/src/main/assembly/docs.xml                       | 8 --------
 core/src/main/java/org/apache/struts2/StrutsStatics.java  | 5 -----
 .../java/org/apache/struts2/components/UrlRenderer.java   | 2 +-
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 067c7ad3a..8e83663f9 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -173,14 +173,6 @@
         <directory>../plugins/plexus/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/portlet/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/portlet-tiles/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-portlet-tiles-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/rest/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 829bdbd00..3cd720c94 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -108,14 +108,6 @@
             <directory>../plugins/plexus/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>../plugins/portlet/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin/apidocs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../plugins/portlet-tiles/target/apidocs</directory>
-            <outputDirectory>docs/struts2-plugins/struts2-portlet-tiles-plugin/apidocs</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>../plugins/rest/target/apidocs</directory>
             <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
diff --git a/core/src/main/java/org/apache/struts2/StrutsStatics.java b/core/src/main/java/org/apache/struts2/StrutsStatics.java
index a7c8eecf2..478bea734 100644
--- a/core/src/main/java/org/apache/struts2/StrutsStatics.java
+++ b/core/src/main/java/org/apache/struts2/StrutsStatics.java
@@ -53,11 +53,6 @@ public interface StrutsStatics {
      */
     String PAGE_CONTEXT = "com.opensymphony.xwork2.dispatcher.PageContext";
 
-    /**
-     * Constant for the PortletContext object
-     */
-    String STRUTS_PORTLET_CONTEXT = "struts.portlet.context";
-
     /**
      * Set as an attribute in the request to let other parts of the framework know that the invocation is happening inside an
      * action tag
diff --git a/core/src/main/java/org/apache/struts2/components/UrlRenderer.java b/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
index b2f838a9a..9a069e8a9 100644
--- a/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
+++ b/core/src/main/java/org/apache/struts2/components/UrlRenderer.java
@@ -24,7 +24,7 @@ import java.io.Writer;
 
 /**
  * Implementations of this interface are responsible for rendering/creating URLs for a specific
- * environment (e.g. Servlet, Portlet). 
+ * environment (e.g. Servlet). 
  *
  */
 public interface UrlRenderer {