Author: mrdon
Date: Wed Sep 27 00:31:21 2006
New Revision: 450363
URL: http://svn.apache.org/viewvc?view=rev&rev=450363
Log:
Creating sitemesh plugin
WW-1457
Added:
struts/struts2/trunk/plugins/sitemesh/
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/sitemesh/src/
struts/struts2/trunk/plugins/sitemesh/src/main/
struts/struts2/trunk/plugins/sitemesh/src/main/java/
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/
struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/
- copied from r450303,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/sitemesh/
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=450363&r1=450362&r2=450363
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Wed Sep 27 00:31:21 2006
@@ -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>
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=450363&r1=450362&r2=450363
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Wed Sep 27 00:31:21 2006
@@ -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>
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?view=diff&rev=450363&r1=450362&r2=450363
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Wed Sep 27 00:31:21 2006
@@ -49,7 +49,6 @@
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;
Added: struts/struts2/trunk/plugins/sitemesh/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?view=auto&rev=450363
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/pom.xml (added)
+++ struts/struts2/trunk/plugins/sitemesh/pom.xml Wed Sep 27 00:31:21 2006
@@ -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>
