WW-5233 Introduces Tiles base code into the Tiles plugin

WW-5233 Copies a based set of Tiles classes used by Struts WW-5233 Copies Portlet related Tiles code base WW-5233 Copies Tiles API related tests WW-5233 Copies Tiles Core related tests WW-5233 Copies Tiles EL related tests WW-5233 Copies Tiles OGNL related tests WW-5233 Copies Tiles Template related tests WW-5233 Copies Tiles Servlet related tests WW-5233 Upgrades Easymock to version 4.3 to support Java 17 WW-5233 Copies Tiles Request related tests WW-5233 Copies Tiles Autotag related tests WW-5233 Drops useless @Version tag and addresses some potential RegEx vulnerabilities WW-5233 Addresses bugs reported by Sonar WW-5233 Addresses a few code smells WW-5233 Copies Tiles Portal related tests WW-5233 Fixes broken test WW-5233 Adds Tiles DTD definition Add missing classes and tld definition. Add generating of Autotags and tests. Make plugin standalone with all generated resources. Make plugin standalone with all generated resources for velocity. Make plugin standalone with all generated resources for velocity. WW-5233 Marks Velocity dependencies as optional
apache · Jun 29, 2023 · 6f0df80 · 6f0df80
1 parent 4c926c2
commit 6f0df80
Show file tree

Hide file tree

Showing 504 changed files with 52,305 additions and 185 deletions.
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
@@ -68,12 +68,6 @@
             <artifactId>struts2-json-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-convention-plugin</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -24,8 +24,8 @@
 
     <parent>
         <groupId>org.apache.struts</groupId>
-        <artifactId>struts-master</artifactId>
-        <version>14</version>
+        <artifactId>struts2-parent</artifactId>
+        <version>6.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-bom</artifactId>

diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
@@ -40,10 +40,6 @@
              <groupId>org.apache.struts</groupId>
              <artifactId>struts2-portlet-plugin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-request-portlet</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
@@ -55,9 +51,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-            <scope>runtime</scope>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <properties>

diff --git a/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java b/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
@@ -22,9 +22,9 @@
 import org.apache.struts2.portlet.PortletConstants;
 import org.apache.struts2.portlet.context.PortletActionContext;
 import org.apache.struts2.result.ServletDispatcherResult;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.TilesException;
-import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.api.TilesContainer;
+import org.apache.tiles.api.TilesException;
+import org.apache.tiles.api.access.TilesAccess;
 import org.apache.tiles.request.ApplicationContext;
 import org.apache.tiles.request.Request;
 import org.apache.tiles.request.portlet.RenderPortletRequest;