From 93c092de041f4d682530d5280d361978bcdf01fd Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Wed, 27 Sep 2006 07:31:21 +0000
Subject: [PATCH] Creating sitemesh plugin WW-1457

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@450363 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/pom.xml                         |  5 +++
 core/pom.xml                                  |  8 ----
 .../struts2/dispatcher/FilterDispatcher.java  |  1 -
 plugins/sitemesh/pom.xml                      | 45 +++++++++++++++++++
 .../sitemesh/FreeMarkerPageFilter.java        |  0
 .../struts2/sitemesh/TemplatePageFilter.java  |  0
 .../struts2/sitemesh/VelocityPageFilter.java  |  0
 7 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 plugins/sitemesh/pom.xml
 rename {core => plugins/sitemesh}/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java (100%)
 rename {core => plugins/sitemesh}/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java (100%)
 rename {core => plugins/sitemesh}/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java (100%)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index c7631bc9d..6431ca911 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -42,6 +42,11 @@
             <version>${pom.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-sitemesh-plugin</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
  
         <dependency>
            <groupId>javax.servlet</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 2fc402fa7..82b83d97d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -128,14 +128,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- Sitemesh -->
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>sitemesh</artifactId>
-            <version>2.2.1</version>
-            <optional>true</optional>
-        </dependency>
-
         <!-- Quickstart -->
         <dependency>
             <groupId>jetty</groupId>
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
index fffe1e1bc..73152727d 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
@@ -49,7 +49,6 @@ import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.mapper.ActionMapperFactory;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 
-import com.opensymphony.module.sitemesh.RequestConstants;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.XWorkException;
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
new file mode 100644
index 000000000..b0d9a8b4a
--- /dev/null
+++ b/plugins/sitemesh/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>2.0.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-sitemesh-plugin</artifactId>
+    <packaging>jar</packaging>
+    <name>Struts 2 Sitemesh Plugin</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/sitemesh</url>
+        </site>
+    </distributionManagement>
+    
+    <dependencies>
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        <!-- Velocity -->
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.4</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <version>1.1</version>
+            <optional>true</optional>
+        </dependency>
+
+
+   </dependencies>
+</project>
diff --git a/core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
rename to plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreeMarkerPageFilter.java
diff --git a/core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
rename to plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/TemplatePageFilter.java
diff --git a/core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java
rename to plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityPageFilter.java