WW-1834 Tag r544865 as Struts 2.0.8

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_0_8@544873 13f79535-47bb-0310-9956-ffa450edef68
2026-08-09 16:46:55 +00:00 · 2007-06-06 16:07:32 +00:00
507 changed files with 3324 additions and 12571 deletions
@@ -1,10 +1,11 @@
 <?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">
+<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-apps</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.8</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-blank</artifactId>
@@ -47,10 +48,17 @@
            <plugin>
                <groupId>org.mortbay.jetty</groupId>
                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.0.1</version>
                <configuration>
                    <scanIntervalSeconds>10</scanIntervalSeconds>
                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+                        <version>1.0</version>
+                        <scope>provided</scope>
+                    </dependency>
+                </dependencies>
            </plugin>
        </plugins>
    </build>
@@ -1,10 +1,11 @@
 <?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">
+<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-apps</artifactId>
-      <version>2.0.12</version>
+      <version>2.0.8</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-mailreader</artifactId>
@@ -6,7 +6,7 @@
 <struts>

    <constant name="struts.action.extension" value="do" />
-    <constant name="struts.devMode" value="true" />
+    <constant name="struts.devMode" value="false" />
    <constant name="struts.enable.DynamicMethodInvocation" value="false" />

    <include file="mailreader-default.xml"/>
@@ -9,17 +9,14 @@
          type="text/css"/>
 </head>

-<body onload="self.focus();document.Login.username.focus()">
+<body onLoad="self.focus();document.Login.username.focus()">

 <s:actionerror />
-<s:text name="doesntexist" />
 <s:form action="Login" validate="true">
    <s:textfield key="username" />

    <s:password key="password" showPassword="true"/>

-    <s:textfield name="doesntexist" />
-
    <s:submit key="button.save"/>

    <s:reset key="button.reset"/>
@@ -20,7 +20,6 @@
    <li><a href="<s:url action="Logout"/>">
        <s:text name="mainMenu.logout"/>
    </a>
-    </li>
 </ul>
 </body>
 </html>
@@ -14,7 +14,7 @@
          type="text/css"/>
 </head>

-<body onload="self.focus();document.Registration_save_username.focus()">
+<body onLoad="self.focus();document.Registration_save_username.focus()">

 <s:actionerror/>
 <s:form action="Registration_save" validate="false">
@@ -17,7 +17,7 @@
          type="text/css"/>
 </head>

-<body onload="self.focus();document.Subscription.username.focus()">
+<body onLoad="self.focus();document.Subscription.username.focus()">

 <s:actionerror/>
 <s:form action="Subscription_save" validate="true">
@@ -182,36 +182,36 @@

  &lt;display-name>Struts 2 MailReader&lt;/display-name>

-  <strong>&lt;filter&gt;
-    &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-    &lt;filter-class&gt;
+  <strong>&lt;filter>
+    &lt;filter-name>struts2&lt;/filter-name>
+    &lt;filter-class>
      org.apache.struts2.dispatcher.FilterDispatcher
-    &lt;/filter-class&gt;
-   &lt;/filter&gt;</strong>
+    &lt;/filter-class>
+   &lt;/filter></strong>

-  &lt;filter-mapping&gt;
-    &lt;filter-name&gt;<strong>struts2</strong>&lt;/filter-name&gt;
-    &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-  &lt;/filter-mapping&gt;
+  &lt;filter-mapping>
+    &lt;filter-name><strong>struts2</strong>&lt;/filter-name>
+    &lt;url-pattern>/*&lt;/url-pattern>
+  &lt;/filter-mapping>

-  &lt;listener&gt;
-    &lt;listener-class&gt;
+  &lt;listener>
+    &lt;listener-class>
      org.springframework.web.context.ContextLoaderListener
-    &lt;/listener-class&gt;
-  &lt;/listener&gt;
+    &lt;/listener-class>
+  &lt;/listener>

-  &lt;!-- Application Listener for MailReader database --&gt;
-  &lt;listener&gt;
-    &lt;listener-class&gt;
+  &lt;!-- Application Listener for MailReader database -->
+  &lt;listener>
+    &lt;listener-class>
      mailreader2.ApplicationListener
-    &lt;/listener-class&gt;
-  &lt;/listener&gt;
+    &lt;/listener-class>
+  &lt;/listener>

-  &lt;welcome-file-list&gt;
-    &lt;welcome-file&gt;index.html&lt;/welcome-file&gt;
-  &lt;/welcome-file-list&gt;
+  &lt;welcome-file-list>
+    &lt;welcome-file>index.html&lt;/welcome-file>
+  &lt;/welcome-file-list>

-  &lt;/web-app&gt;</code></pre>
+  &lt;/web-app></code></pre>
 <hr/>

 <p>
@@ -281,13 +281,13 @@

 <hr/>
 <h5>MailReader's index.html</h5>
-<pre><code>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"&gt;
-&lt;html&gt;&lt;head&gt;
-  &lt;META HTTP-EQUIV="Refresh" CONTENT="0;<strong>URL=Welcome.do</strong>"&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;p&gt;Loading ...&lt;/p&gt;
-&lt;/body&gt;&lt;/html&gt;</code></pre>
+<pre><code>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+&lt;html>&lt;head>
+  &lt;META HTTP-EQUIV="Refresh" CONTENT="0;<strong>URL=Welcome.do</strong>">
+  &lt;/head>
+  &lt;body>
+    &lt;p>Loading ...&lt;/p>
+&lt;/body>&lt;/html></code></pre>
 <hr/>

 <p>
@@ -1,9 +1,31 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ * $Id$
+ */
+-->
+
+<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-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.8</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-apps</artifactId>
@@ -83,10 +105,14 @@
                                </goals>
                                <configuration>
                                    <tasks>
-                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath" />
-                                        <upload file="${project.build.directory}/${project.build.finalName}.war" account="struts" email="${email}" password="${password}" resourceId="${resourceId}" />
+                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath"/>
+                                        <upload file="${project.build.directory}/${project.build.finalName}.war"
+                                                account="struts" email="${email}"
+                                                password="${password}" resourceId="${resourceId}"/>

-                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts" email="${email}" password="${password}" />
+                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts"
+                                                   email="${email}"
+                                                   password="${password}"/>
                                    </tasks>
                                </configuration>
                            </execution>
@@ -109,7 +135,6 @@
            <plugin>
                <groupId>org.codehaus.cargo</groupId>
                <artifactId>cargo-maven2-plugin</artifactId>
-                <version>0.3.1</version>
                <configuration>
                    <container>
                        <containerId>tomcat5x</containerId>
@@ -131,11 +156,13 @@
                        <phase>process-sources</phase>
                        <configuration>
                            <tasks>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
-                                    <fileset dir="${basedir}/src/main/java" />
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                                      failonerror="false">
+                                    <fileset dir="${basedir}/src/main/java"/>
                                </copy>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
-                                    <fileset dir="${basedir}/src/main/resources" />
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                                      failonerror="false">
+                                    <fileset dir="${basedir}/src/main/resources"/>
                                </copy>
                            </tasks>
                        </configuration>
@@ -1,10 +1,11 @@
 <?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">
+<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-apps</artifactId>
-      <version>2.0.12</version>
+      <version>2.0.8</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-portlet</artifactId>
@@ -28,12 +29,6 @@
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-spring-plugin</artifactId>
            <version>${pom.version}</version>
-<exclusions>
-<exclusion>
-           <groupId>javax.servlet</groupId>
-           <artifactId>servlet-api</artifactId>
-</exclusion>
-</exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.struts</groupId>
@@ -56,25 +51,20 @@
            <artifactId>commons-digester</artifactId>
            <version>1.8</version>
        </dependency>
+
+
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
        <dependency>
            <groupId>commons-lang</groupId>
            <artifactId>commons-lang</artifactId>
-            <version>2.1</version>
+            <version>2.0</version>
        </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-    </dependency>
+
+
    </dependencies>
 </project>
@@ -44,7 +44,4 @@ public class FormExample extends ActionSupport {
    public void setLastName(String lastName) {
        this.lastName = lastName;
    }
-    public String displayResult() {
-    	return "displayResult";
-    }
 }
@@ -1,37 +0,0 @@
-/*
- * $Id: FormExample.java 471756 2006-11-06 15:01:43Z husted $
- *
- * 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.portlet.example;
-
-import org.apache.struts2.portlet.example.model.Name;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.ModelDriven;
-
-/**
- */
-public class FormExampleModelDriven extends ActionSupport implements ModelDriven<Name> {
-    
-	private Name name = new Name();
-
-	public Name getModel() {
-		return name;
-	}
-}
@@ -1,81 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.example.fileupload;
-
-import java.io.File;
-
-import org.apache.struts2.dispatcher.DefaultActionSupport;
-
-/**
- * File Upload example's action. <code>FileUploadAction</code>
- *
- */
-public class FileUploadAction extends DefaultActionSupport {
-
-    private static final long serialVersionUID = 5156288255337069381L;
-
-    private String contentType;
-    private File upload;
-    private String fileName;
-    private String caption;
-
-    // since we are using <s:file name="upload" .../> the file name will be
-    // obtained through getter/setter of <file-tag-name>FileName
-    public String getUploadFileName() {
-        return fileName;
-    }
-    public void setUploadFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-
-    // since we are using <s:file name="upload" ... /> the content type will be
-    // obtained through getter/setter of <file-tag-name>ContentType
-    public String getUploadContentType() {
-        return contentType;
-    }
-    public void setUploadContentType(String contentType) {
-        this.contentType = contentType;
-    }
-
-
-    // since we are using <s:file name="upload" ... /> the File itself will be
-    // obtained through getter/setter of <file-tag-name>
-    public File getUpload() {
-        return upload;
-    }
-    public void setUpload(File upload) {
-        this.upload = upload;
-    }
-
-
-    public String getCaption() {
-        return caption;
-    }
-    public void setCaption(String caption) {
-        this.caption = caption;
-    }
-
-    public String upload() throws Exception  {
-        return SUCCESS;
-    }
-
-}
@@ -1,18 +0,0 @@
-package org.apache.struts2.portlet.example.model;
-
-public class Name {
-	private String firstName;
-	private String lastName;
-	public String getFirstName() {
-		return firstName;
-	}
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-	public String getLastName() {
-		return lastName;
-	}
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-}
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd">
-
-<struts>	
-	<package name="edit" extends="struts-portlet-default"
-		namespace="/edit">
-		<action name="index"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">/WEB-INF/edit/index.jsp</result>
-		</action>
-		<action name="test"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">/WEB-INF/edit/test.jsp</result>
-		</action>
-		<action name="formExampleEdit"
-			class="org.apache.struts2.portlet.example.FormExample" method="input">
-			<result name="input">
-				/WEB-INF/edit/formExampleInput.jsp
-			</result>
-		</action>
-
-		<action name="processFormExampleEdit"
-			class="org.apache.struts2.portlet.example.FormExample">
-			<result name="input">
-				/WEB-INF/edit/formExampleInput.jsp
-			</result>
-			<result name="success">
-				/edit/processFormExampleForward.action?firstName=${firstName}&amp;lastName=${lastName}
-			</result>
-		</action>
-
-		<action name="processFormExampleForward"
-			class="org.apache.struts2.portlet.example.FormExample">
-			<result name="success">
-				/WEB-INF/edit/formExample.jsp
-			</result>
-		</action>
-	</package>
-
-	<package name="editTest" extends="edit" namespace="/edit/dummy/test">
-		<action name="testAction"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">/WEB-INF/edit/namespaceTest.jsp</result>
-		</action>
-	</package>
-</struts>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd">
-
-<struts>
-	<package name="help" extends="struts-portlet-default"
-		namespace="/help">
-		<action name="index"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">/WEB-INF/help/index.jsp</result>
-		</action>
-	</package>
-</struts>
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd">
-
-<struts>
-	<package name="view" extends="struts-portlet-default"
-		namespace="/view">
-		<action name="index"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="success">/WEB-INF/view/index.jsp</result>
-		</action>
-
-		<action name="formExample"
-			class="org.apache.struts2.portlet.example.FormExample" method="input">
-			<result name="input">
-				/WEB-INF/view/formExampleInput.jsp
-			</result>
-		</action>
-
-		<action name="processFormExample"
-			class="org.apache.struts2.portlet.example.FormExample">
-			<result name="input">
-				/WEB-INF/view/formExampleInput.jsp
-			</result>
-			<result name="success">
-				/WEB-INF/view/formExample.jsp
-			</result>
-		</action>
-		
-		<action name="formExamplePrg" class="org.apache.struts2.portlet.example.FormExample">
-			<result name="input">
-				/WEB-INF/view/formExampleInputPrg.jsp
-			</result>
-			<result name="success" type="redirectAction">
-				<param name="actionName">formExamplePrg</param>
-				<param name="method">displayResult</param>
-				<param name="firstName">${firstName}</param>
-				<param name="lastName">${lastName}</param>
-			</result>
-			<result name="displayResult">
-				/WEB-INF/view/formExample.jsp
-			</result>
-		</action>
-		
-		<action name="formExampleModelDriven"
-			class="org.apache.struts2.portlet.example.FormExampleModelDriven">
-			<result name="input">
-				/WEB-INF/view/formExampleInputModelDriven.jsp
-			</result>
-			<result name="success">
-				/WEB-INF/view/formExample.jsp
-			</result>
-		</action>
-
-		<action name="validationExample"
-			class="org.apache.struts2.portlet.example.FormExample" method="input">
-			<result name="input">
-				/WEB-INF/view/formExampleInputValidation.jsp
-			</result>
-		</action>
-
-		<action name="processValidationExample"
-			class="org.apache.struts2.portlet.example.FormExample">
-			<result name="success">
-				/WEB-INF/view/formExample.jsp
-			</result>
-			<result name="input">
-				/WEB-INF/view/formExampleInputValidation.jsp
-			</result>
-		</action>
-		
-		<action name="fileUpload" class="org.apache.struts2.portlet.example.fileupload.FileUploadAction">
-			<result name="input">
-				/WEB-INF/view/fileUpload.jsp
-			</result>
-			<result name="success">
-				/WEB-INF/view/fileUploadSuccess.jsp
-			</result>
-		</action>
-
-		<action name="tokenExample"
-			class="com.opensymphony.xwork2.ActionSupport" method="input">
-			<result name="input">
-				/WEB-INF/view/tokenExampleInput.jsp
-			</result>
-		</action>
-
-		<action name="processTokenExample"
-			class="com.opensymphony.xwork2.ActionSupport">
-			<result name="input">
-				/WEB-INF/view/tokenExampleInput.jsp
-			</result>
-			<result name="invalid.token">
-				/WEB-INF/view/tokenExampleInput.jsp
-			</result>
-			<result name="success">
-				/WEB-INF/view/tokenExample.jsp
-			</result>
-			<interceptor-ref name="portletDefaultStackWithToken" />
-		</action>
-
-		<action name="springExample" class="springAction">
-			<result name="success">
-				/WEB-INF/view/springExample.jsp
-			</result>
-		</action>
-
-		<action name="freeMarkerExample"
-			class="com.opensymphony.xwork2.ActionSupport" method="input">
-			<result type="freemarker" name="input">
-				/WEB-INF/view/freeMarkerExampleInput.ftl
-			</result>
-		</action>
-
-		<action name="processFreeMarkerExample"
-			class="org.apache.struts2.portlet.example.FormExample">
-			<result name="success">/view/processFreeMarkerView.action?firstName=${firstName}&amp;lastName=${lastName}</result>
-		</action>
-		
-		<action name="processFreeMarkerView" class="org.apache.struts2.portlet.example.FormExample">
-			<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
-		</action>
-		
-		<action name="velocityHelloWorld" class="com.opensymphony.xwork2.ActionSupport">
-			<result type="velocity" name="success">/WEB-INF/view/helloWorld.vm</result>
-		</action>
-
-	</package>
-</struts>
@@ -1,11 +1,161 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE xwork PUBLIC
+    "-//OpenSymphony Group//XWork 1.1.1//EN"
+    "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+<xwork>
+	<include file="struts-portlet-default.xml" />

-<struts>
-	<include file="struts-portlet-default.xml"/>
-	<include file="struts-view.xml"/>
-	<include file="struts-edit.xml"/>
-	<include file="struts-help.xml"/>
-</struts>
+	<package name="view" extends="struts-portlet-default"
+		namespace="/view">
+		<action name="index"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">/WEB-INF/view/index.jsp</result>
+		</action>
+
+		<action name="formExample"
+			class="org.apache.struts2.portlet.example.FormExample" method="input">
+			<result name="input">
+				/WEB-INF/view/formExampleInput.jsp
+			</result>
+		</action>
+
+		<action name="processFormExample"
+			class="org.apache.struts2.portlet.example.FormExample">
+			<result name="input">
+				/WEB-INF/view/formExampleInput.jsp
+			</result>
+			<result name="success">
+				/WEB-INF/view/formExample.jsp
+			</result>
+		</action>
+
+		<action name="validationExample"
+			class="org.apache.struts2.portlet.example.FormExample" method="input">
+			<result name="input">
+				/WEB-INF/view/formExampleInputValidation.jsp
+			</result>
+		</action>
+
+		<action name="processValidationExample"
+			class="org.apache.struts2.portlet.example.FormExample">
+			<result name="success">
+				/WEB-INF/view/formExample.jsp
+			</result>
+			<result name="input">
+				/WEB-INF/view/formExampleInputValidation.jsp
+			</result>
+			<interceptor-ref name="validationWorkflowStack" />
+		</action>
+
+		<action name="tokenExample"
+			class="com.opensymphony.xwork2.ActionSupport" method="input">
+			<result name="input">
+				/WEB-INF/view/tokenExampleInput.jsp
+			</result>
+		</action>
+
+		<action name="processTokenExample"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="input">
+				/WEB-INF/view/tokenExampleInput.jsp
+			</result>
+			<result name="invalid.token">
+				/WEB-INF/view/tokenExampleInput.jsp
+			</result>
+			<result name="success">
+				/WEB-INF/view/tokenExample.jsp
+			</result>
+			<interceptor-ref name="token" />
+			<interceptor-ref name="defaultStack" />
+		</action>
+
+		<action name="springExample" class="springAction">
+			<result name="success">
+				/WEB-INF/view/springExample.jsp
+			</result>
+		</action>
+
+		<action name="ajaxExample"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">
+				/WEB-INF/view/ajaxExample.jsp
+			</result>
+		</action>
+
+		<action name="ajaxData"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">/WEB-INF/view/ajaxData.jsp</result>
+		</action>
+
+		<action name="freeMarkerExample"
+			class="com.opensymphony.xwork2.ActionSupport" method="input">
+			<result type="freemarker" name="input">
+				/WEB-INF/view/freeMarkerExampleInput.ftl
+			</result>
+		</action>
+
+		<action name="processFreeMarkerExample"
+			class="org.apache.struts2.portlet.example.FormExample">
+			<result name="success">/view/processFreeMarkerView.action?firstName=${firstName}&amp;lastName=${lastName}</result>
+		</action>
+		
+		<action name="processFreeMarkerView" class="org.apache.struts2.portlet.example.FormExample">
+			<result type="freemarker" name="success">/WEB-INF/view/freeMarkerExample.ftl</result>
+		</action>
+		
+		<action name="velocityHelloWorld" class="com.opensymphony.xwork2.ActionSupport">
+			<result type="velocity" name="success">/WEB-INF/view/helloWorld.vm</result>
+		</action>
+
+	</package>
+
+	<package name="edit" extends="struts-portlet-default"
+		namespace="/edit">
+		<action name="index"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">/WEB-INF/edit/index.jsp</result>
+		</action>
+		<action name="test"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">/WEB-INF/edit/test.jsp</result>
+		</action>
+		<action name="formExampleEdit"
+			class="org.apache.struts2.portlet.example.FormExample" method="input">
+			<result name="input">
+				/WEB-INF/edit/formExampleInput.jsp
+			</result>
+		</action>
+
+		<action name="processFormExampleEdit"
+			class="org.apache.struts2.portlet.example.FormExample">
+			<result name="input">
+				/WEB-INF/edtt/formExampleInput.jsp
+			</result>
+			<result name="success">
+				/edit/processFormExampleForward.action?firstName=${firstName}&amp;lastName=${lastName}
+			</result>
+		</action>
+
+		<action name="processFormExampleForward"
+			class="org.apache.struts2.portlet.example.FormExample">
+			<result name="success">
+				/WEB-INF/edit/formExample.jsp
+			</result>
+		</action>
+	</package>
+
+	<package name="editTest" extends="edit" namespace="/edit/dummy/test">
+		<action name="testAction"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">/WEB-INF/edit/namespaceTest.jsp</result>
+		</action>
+	</package>
+
+	<package name="help" extends="struts-portlet-default"
+		namespace="/help">
+		<action name="index"
+			class="com.opensymphony.xwork2.ActionSupport">
+			<result name="success">/WEB-INF/help/index.jsp</result>
+		</action>
+	</package>
+</xwork>
@@ -1,132 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    version="1.0"
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    id="struts-portlet">
-
-    <portlet id="StrutsPortlet">
-        <description xml:lang="EN">Struts Test Portlet</description>
-        <portlet-name>StrutsPortlet</portlet-name>
-        <display-name xml:lang="EN">Struts Test Portlet</display-name>
+<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" id="struts-portlet">
+  <portlet id="StrutsPortlet">
+    <description xml:lang="EN">Struts Test Portlet</description>
+    <portlet-name>StrutsPortlet</portlet-name>
+    <display-name xml:lang="EN">Struts Test Portlet</display-name>
    
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+    <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>

-        <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>viewNamespace</name>
-            <value>/view</value>
-        </init-param>
-
-        <!-- The default action to invoke in view mode. -->
-        <init-param>
-            <name>defaultViewAction</name>
-            <value>index</value>
-        </init-param>
-
-        <!-- The edit mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>editNamespace</name>
-            <value>/edit</value>
-        </init-param>
-
-        <!-- The default action to invoke in edit mode. -->
-        <init-param>
-            <name>defaultEditAction</name>
-            <value>index</value>
-        </init-param>
-
-        <!-- The help mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>helpNamespace</name>
-            <value>/help</value>
-        </init-param>
-
-        <!-- The default action to invoke in help mode. -->
-        <init-param>
-            <name>defaultHelpAction</name>
-            <value>index</value>
-        </init-param>
+    <init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>viewNamespace</name>
+		<value>/view</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultViewAction</name>
+		<value>index</value>
+	</init-param>
+	<init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>editNamespace</name>
+		<value>/edit</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultEditAction</name>
+		<value>index</value>
+	</init-param>
+	<init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>helpNamespace</name>
+		<value>/help</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultHelpAction</name>
+		<value>index</value>
+	</init-param>
    
-        <expiration-cache>0</expiration-cache>

-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>edit</portlet-mode>
-            <portlet-mode>help</portlet-mode>
-			<portlet-mode>view</portlet-mode>
-        </supports>
+    
+    <expiration-cache>0</expiration-cache>

-        <supported-locale>en</supported-locale>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>edit</portlet-mode>
+      <portlet-mode>help</portlet-mode>
+    </supports>

-        <portlet-info>
-            <title>My StrutsPortlet portlet</title>
-            <short-title>SP</short-title>
-            <keywords>struts,portlet</keywords>
-        </portlet-info>
-    </portlet>
+    <supported-locale>en</supported-locale>
+
+    <portlet-info>
+      <title>My StrutsPortlet portlet</title>
+      <short-title>SP</short-title>
+      <keywords>struts,portlet</keywords>
+    </portlet-info>
+  </portlet>
  
-    <portlet id="StrutsPortlet2">
-        <description xml:lang="EN">Struts Test Portlet2</description>
-        <portlet-name>StrutsPortlet2</portlet-name>
-        <display-name xml:lang="EN">Struts Test Portlet2</display-name>
+  <portlet id="StrutsPortlet2">
+    <description xml:lang="EN">Struts Test Portlet2</description>
+    <portlet-name>StrutsPortlet2</portlet-name>
+    <display-name xml:lang="EN">Struts Test Portlet2</display-name>
    
-        <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
+    <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>

-        <!-- The view mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>viewNamespace</name>
-            <value>/view</value>
-        </init-param>
+    <init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>viewNamespace</name>
+		<value>/view</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultViewAction</name>
+		<value>index</value>
+	</init-param>
+	<init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>editNamespace</name>
+		<value>/edit</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultEditAction</name>
+		<value>index</value>
+	</init-param>
+	<init-param>
+		<!-- The view mode namespace. Maps to a namespace in the xwork config file -->
+		<name>helpNamespace</name>
+		<value>/help</value>
+	</init-param>
+    <init-param>
+		<!-- The default action to invoke in view mode -->
+		<name>defaultHelpAction</name>
+		<value>index</value>
+	</init-param>
+    

-        <!-- The default action to invoke in view mode. -->
-        <init-param>
-            <name>defaultViewAction</name>
-            <value>index</value>
-        </init-param>
+    
+    <expiration-cache>0</expiration-cache>

-        <!-- The edit mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>editNamespace</name>
-            <value>/edit</value>
-        </init-param>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>edit</portlet-mode>
+      <portlet-mode>help</portlet-mode>
+    </supports>

-        <!-- The default action to invoke in edit mode. -->
-        <init-param>
-            <name>defaultEditAction</name>
-            <value>index</value>
-        </init-param>
+    <supported-locale>en</supported-locale>

-        <!-- The help mode namespace. Maps to a namespace in the Struts 2 config file. -->
-        <init-param>
-            <name>helpNamespace</name>
-            <value>/help</value>
-        </init-param>
-
-        <!-- The default action to invoke in help mode. -->
-        <init-param>
-            <name>defaultHelpAction</name>
-            <value>index</value>
-        </init-param>
-
-        <expiration-cache>0</expiration-cache>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>edit</portlet-mode>
-            <portlet-mode>help</portlet-mode>
-			<portlet-mode>view</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>My StrutsPortlet portlet2</title>
-            <short-title>SP2</short-title>
-            <keywords>struts,portlet</keywords>
-        </portlet-info>
-    </portlet>
+    <portlet-info>
+      <title>My StrutsPortlet portlet2</title>
+      <short-title>SP2</short-title>
+      <keywords>struts,portlet</keywords>
+    </portlet-info>
+  </portlet>

 </portlet-app>
@@ -1,13 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-    <h1>Fileupload sample</h1>
-
-	<s:actionerror />
-	<s:fielderror />
-    <s:form action="fileUpload" method="POST" enctype="multipart/form-data">
-        <s:file name="upload" label="File"/>
-        <s:textfield name="caption" label="Caption"/>
-        <s:submit />
-    </s:form>
-
-
@@ -1,14 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<h1>Fileupload sample</h1>
-
-<p>
-    <ul>
-        <li>ContentType: <s:property value="uploadContentType" /></li>
-        <li>FileName: <s:property value="uploadFileName" /></li>
-        <li>File: <s:property value="upload" /></li>
-        <li>Caption:<s:property value="caption" /></li>
-    </ul>
-</p>
-
-
@@ -1,8 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<H2>Input your name</H2>
-<s:form action="formExampleModelDriven" method="POST">
-    <s:textfield label="First name" name="firstName" value="%{firstName}"/>
-    <s:textfield label="Last name" name="lastName" value="%{lastName}"/>
-    <s:submit value="Submit the form"/>
-</s:form>
@@ -1,8 +0,0 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<H2>Input your name</H2>
-<s:form action="formExamplePrg" method="POST">
-    <s:textfield label="First name" name="firstName" value="%{firstName}"/>
-    <s:textfield label="Last name" name="lastName" value="%{lastName}"/>
-    <s:submit value="Submit the form"/>
-</s:form>
@@ -4,12 +4,10 @@
 Here you'll find examples of what is possible with the Struts Portlet integration framework.
 <ul>
 <li><a href="<s:url action="formExample"/>">A simple form</a></li>
-<li><a href="<s:url action="formExamplePrg" method="input"/>">Form example with proper PRG</a></li>
-<li><a href="<s:url action="formExampleModelDriven" method="input"/>">Model driven example</li>
 <li><a href="<s:url action="validationExample"/>">Validation</a></li>
 <li><a href="<s:url action="tokenExample"/>">Token</a></li>
 <li><a href="<s:url action="springExample"/>">Spring integration</a></li>
-<li><a href="<s:url action="fileUpload" method="input"/>">File upload</li>
+<li><a href="<s:url action="ajaxExample"/>">Ajax</a></li>
 <li><a href="<s:url action="freeMarkerExample"/>">FreeMarker</a></li>
 <li><a href="<s:url action="velocityHelloWorld"/>">Velocity</a></li>
 <li><a href="<s:url action="index" portletMode="edit"/>">Go to edit mode and see what's there</a></li>
@@ -1,30 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app id="StrutsPortlet">
+	<!-- Uncomment/comment this if you need/don't need Spring support -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext*.xml</param-value>
+	</context-param>
+	<filter id="filterdispatcher">
+		<filter-name>action2</filter-name>
+		<filter-class>
+			org.apache.struts2.dispatcher.FilterDispatcher
+		</filter-class>
+	</filter>

-    <!-- Uncomment/comment this if you need/don't need Spring support -->
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>/WEB-INF/applicationContext*.xml</param-value>
-    </context-param>
-
-    <filter id="filterdispatcher">
-        <filter-name>Struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>Struts2</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
+	<filter-mapping>
+		<filter-name>action2</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+    
    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+	<listener>
+		<listener-class>
+			org.apache.struts2.portlet.context.ServletContextHolderListener
+		</listener-class>
+	</listener>


+	<servlet id="preparator">
+		<servlet-name>preparator</servlet-name>
+		<servlet-class>
+			org.apache.struts2.portlet.context.PreparatorServlet
+		</servlet-class>
+	</servlet>
+	<servlet id="dwr">
+		<servlet-name>dwr</servlet-name>
+		<servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>dwr</servlet-name>
+		<url-pattern>/dwr/*</url-pattern>
+	</servlet-mapping>
+
 </web-app>
@@ -1,10 +1,11 @@
 <?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">
+<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-apps</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.8</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-showcase</artifactId>
@@ -64,7 +65,7 @@
        <dependency>
            <groupId>org.apache.tiles</groupId>
            <artifactId>tiles-jsp</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.3</version>
            <scope>runtime</scope>
        </dependency>

@@ -70,23 +70,15 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
                }
            }
            pageLines = read(in, -1);
-
-            if (in != null) {
-                in.close();
-            }
        }

        if (className != null && className.trim().length() > 0) {
-            className = "/" + className.replace('.', '/') + ".java";
+            className = "/"+className.replace('.', '/') + ".java";
            InputStream in = getClass().getResourceAsStream(className);
            if (in == null) {
                in = servletContext.getResourceAsStream("/WEB-INF/src"+className);
            }
            classLines = read(in, -1);
-
-            if (in != null) {
-                in.close();
-            }
        }

        if (config != null && config.trim().length() > 0) {
@@ -126,6 +118,8 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
        this.padding = padding;
    }

+
+
    /**
     * @return the classLines
     */
@@ -221,4 +215,6 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
    public void setServletContext(ServletContext arg0) {
        this.servletContext = arg0;
    }
+
+
 }
@@ -2,5 +2,4 @@ Apache Struts
 Copyright 2000-2007 The Apache Software Foundation

 This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-Nifty Corners (http://www.html.it/articoli/nifty/index.html).
+The Apache Software Foundation (http://www.apache.org/).
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>

 <!DOCTYPE validators PUBLIC
-      "-//OpenSymphony Group//XWork Validator 1.0//EN"
-      "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-
-<!-- START SNIPPET: fieldValidatorsExample -->
-
+  		"-//OpenSymphony Group//XWork Validator 1.0//EN" 
+  		"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+  		
+<!-- START SNIPPET: fieldValidatorsExample -->  		
+  		
 <validators>
-  <field name="requiredValidatorField">
-    <field-validator type="required">
-      <message><![CDATA[ required ]]></message>
-    </field-validator>
-  </field>
-  <field name="requiredStringValidatorField">
-    <field-validator type="requiredstring">
-      <param name="trim">true</param>
+	<field name="requiredValidatorField">
+		<field-validator type="required">
+			<message><![CDATA[ required ]]></message>
+		</field-validator>
+	</field>
+	<field name="requiredStringValidatorField">
+		<field-validator type="requiredstring">
+			<param name="trim">true</param>
            <message key="i18n.nothing.here"><![CDATA[ required and must be string ]]></message>
-    </field-validator>
-  </field>
-  <field name="requiredStringValidatorField">
-    <field-validator type="requiredstring">
-      <param name="trim">true</param>
+		</field-validator>
+	</field>
+	<field name="requiredStringValidatorField">
+		<field-validator type="requiredstring">
+			<param name="trim">true</param>
            <message key="i18n.requiredstring"><![CDATA[ required and must be string ]]></message>
-    </field-validator>
-  </field>
-  <field name="integerValidatorField">
-    <field-validator type="int">
-      <param name="min">1</param>
-      <param name="max">10</param>
-      <message><![CDATA[ must be integer min 1 max 10 if supplied ]]></message>
-    </field-validator>
-  </field>
-  <field name="dateValidatorField">
-    <field-validator type="date">
-      <param name="min">01/01/1990</param>
-      <param name="max">01/01/2000</param>
-      <message><![CDATA[ must be a min 01/01/1990 max 01/01/2000 if supplied ]]></message>
-    </field-validator>
-  </field>
-  <field name="emailValidatorField">
-    <field-validator type="email">
-      <message><![CDATA[ must be a valid email if supplied ]]></message>
-    </field-validator>
-  </field>
-  <field name="urlValidatorField">
-    <field-validator type="url">
-      <message><![CDATA[ must be a valid url if supplied ]]></message>
-    </field-validator>
-  </field>
-  <field name="stringLengthValidatorField">
-    <field-validator type="stringlength">
-      <param name="maxLength">4</param>
-      <param name="minLength">2</param>
-      <param name="trim">true</param>
-      <message><![CDATA[ must be a String of a specific greater than 1 less than 5 if specified ]]></message>
-    </field-validator>
-  </field>
-  <field name="regexValidatorField">
-    <field-validator type="regex">
-      <param name="expression">.*\.txt</param>
-      <message><![CDATA[ regexValidatorField must match a regexp (.*\.txt) if specified ]]></message>
-    </field-validator>
-  </field>
-  <field name="fieldExpressionValidatorField">
-    <field-validator type="fieldexpression">
-      <param name="expression">(fieldExpressionValidatorField == requiredValidatorField)</param>
-      <message><![CDATA[ must be the same as the Required Validator Field if specified ]]></message>
-    </field-validator>
-  </field>
+		</field-validator>
+	</field>
+	<field name="integerValidatorField">
+		<field-validator type="int">
+			<param name="min">1</param>
+			<param name="max">10</param>
+			<message><![CDATA[ must be integer min 1 max 10 if supplied ]]></message>
+		</field-validator>
+	</field>
+	<field name="dateValidatorField">
+		<field-validator type="date">
+			<param name="min">01/01/1990</param>
+			<param name="max">01/01/2000</param>
+			<message><![CDATA[ must be a min 01-01-1990 max 01-01-2000 if supplied ]]></message>
+		</field-validator>
+	</field>
+	<field name="emailValidatorField">
+		<field-validator type="email">
+			<message><![CDATA[ must be a valid email if supplied ]]></message>
+		</field-validator>
+	</field>
+	<field name="urlValidatorField">
+		<field-validator type="url">
+			<message><![CDATA[ must be a valid url if supplied ]]></message>
+		</field-validator>
+	</field>
+	<field name="stringLengthValidatorField">
+		<field-validator type="stringlength">
+			<param name="maxLength">4</param>
+			<param name="minLength">2</param>
+			<param name="trim">true</param>
+			<message><![CDATA[ must be a String of a specific greater than 1 less than 5 if specified ]]></message>
+		</field-validator>
+	</field>
+	<field name="regexValidatorField">
+		<field-validator type="regex">
+			<param name="expression">.*\.txt</param>
+			<message><![CDATA[ regexValidatorField must match a regexp (.*\.txt) if specified ]]></message>
+		</field-validator>
+	</field>
+	<field name="fieldExpressionValidatorField">
+		<field-validator type="fieldexpression">
+			<param name="expression">(fieldExpressionValidatorField == requiredValidatorField)</param>
+			<message><![CDATA[ must be the same as the Required Validator Field if specified ]]></message>
+		</field-validator>
+	</field>
 </validators>

 <!-- END SNIPPET: fieldValidatorsExample -->
@@ -30,7 +30,7 @@
 	    <default-interceptor-ref name="integration" />
 	    <default-action-ref name="editGangster" />
 	    
-	    <!-- Display entry page that uses Model-Driven technique -->
+	    <!-- Diplay entry page that uses Model-Driven technique -->
 		<action name="editGangster" class="org.apache.struts2.s1.Struts1Action">
 	    	<param name="className">org.apache.struts2.showcase.integration.EditGangsterAction</param>
 			<result>modelDriven.jsp</result>
@@ -17,10 +17,6 @@
            <result type="tiles">showcase.freemarker</result>
        </action>

-        <action name="freemarkerLayout">
-            <result type="tiles">showcase.freemarkerLayout</result>
-        </action>
-
        <action name="sanity">
            <result type="redirect">/tiles/layout.jsp</result>
            <result type="redirect" name="success">/tiles/layout.jsp</result>
@@ -39,10 +39,4 @@
        <put-attribute name="body" value="/tiles/body.ftl"/>
    </definition>

-    <definition name="showcase.freemarkerLayout" template="/tiles/layout.ftl">
-        <put-attribute name="title" value="Tiles/Freemarker Showcase"/>
-        <put-attribute name="header" value="/tiles/header.jsp"/>
-        <put-attribute name="body" value="/tiles/body.ftl"/>
-    </definition>
-
 </tiles-definitions>
@@ -80,12 +80,6 @@
 	    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
    	<load-on-startup>1</load-on-startup>
  	</servlet>
-  		<servlet>
-    	<servlet-name>JspSupportServlet</servlet-name>
-    	<servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
-    	<load-on-startup>1</load-on-startup>
-  	</servlet>
-

  	<!-- JavaServer Faces Servlet Mapping, not called directly -->
    	<servlet-mapping>
@@ -11,7 +11,7 @@
 		</li>
        <li>
            <@s.url id="url" action="hangmanAjax" namespace="/hangman" />
-            <@s.a href="%{#url}">Hangman (Ajax - Experimental)</@s.a>
+            (broken) <@s.a href="%{#url}">Hangman (Ajax - Experimental)</@s.a>
        </li>
 	</ul>
 </body>
@@ -10,9 +10,6 @@
        <li>
            <a href="freemarker.action">View FreeMarker Example</a>
        </li>
-        <li>
-            <a href="freemarkerLayout.action">View Example with a FreeMarker Layout</a>
-        </li>
    </ul>

 </div>
@@ -1,12 +0,0 @@
-<#assign tiles=JspTaglibs["http://tiles.apache.org/tags-tiles"]>
-<@tiles.importAttribute name="title" scope="request"/>
-<html>
-    <head><title><@tiles.getAsString name="title"/></title></head>
-<body>
-    <@tiles.insertAttribute name="header"/>
-    <p id="body">
-        <@tiles.insertAttribute name="body"/>
-    </p>
-	<p>Notice that this is a layout made in FreeMarker</p>
-</body>
-</html>
@@ -11,7 +11,5 @@
    <p id="body">
        <tiles:insertAttribute name="body"/>
    </p>
-
-	<p>Notice that this is a layout made in JSP</p>
 </body>
 </html>
@@ -13,7 +13,7 @@
    </head>
    <body>
        <h1>Validation Examples</h1>
-
+        
        <s:url id="quizBasic" namespace="/validation" action="quizBasic" method="input"/>
        <s:url id="quizClient" namespace="/validation" action="quizClient" method="input"/>
        <s:url id="quizClientCss" namespace="/validation" action="quizClientCss" method="input"/>
@@ -24,13 +24,13 @@
        <s:url id="clientSideValidationUrl" action="clientSideValidationExample" namespace="/validation" />
        <s:url id="backToShowcase" action="showcase" namespace="/" />
        <s:url id="storeMessageAcrossRequestExample" value="/validation/storeErrorsAcrossRequestExample.jsp" />
-
+        
        <ul>
            <li><s:a href="%{fieldValidatorUrl}">Field Validators</s:a></li>
            <li><s:a href="%{clientSideValidationUrl}">Field Validators with client-side JavaScript</s:a></li>
            <li><s:a href="%{nonFieldValidatorUrl}">Non Field Validator</s:a></li>
            <li><s:a href="%{storeMessageAcrossRequestExample}">Store across request using MessageStoreInterceptor (Example)</s:a></li>
-            <li><s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
+            <li>(broken) <s:a href="%{quizAjax}">Validation (ajax)</s:a></li>
            <li><s:a href="%{quizBasic}">Validation (basic)</s:a></li>
            <li><s:a href="%{quizClient}">Validation (client)</s:a></li>
            <li><s:a href="%{quizClientCss}">Validation (client using css_xhtml theme)</s:a></li>
@@ -33,7 +33,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.8</version>
    </parent>

    <scm>
@@ -100,10 +100,10 @@
                        <configuration>
                            <artifactItems>
                                <artifactItem>
-                                    <groupId>com.opensymphony</groupId>
+                                    <groupId>opensymphony</groupId>
                                    <artifactId>xwork</artifactId>
                                    <classifier>javadoc</classifier>
-                                    <version>2.0.6</version>
+                                    <version>2.0.3</version>
                                </artifactItem>
                            </artifactItems>
                            <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
@@ -231,12 +231,6 @@
            <version>${version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-            <version>2.0.4</version>
-            <scope>runtime</scope>
-        </dependency>

        <!-- Include optional dependencies -->
        <dependency>
@@ -1,2 +1,2 @@
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/struts2-core-2.0.12.jar -destjar struts2-core-j4-2.0.12.jar
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/xwork-2.0.6.jar -destjar xwork-j4-2.0.6.jar 
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/struts2-core-2.0.8.jar -destjar struts2-core-j4-2.0.8.jar
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/xwork-2.0.3.jar -destjar xwork-j4-2.0.3.jar 
@@ -1,3 +0,0 @@
-#!/bin/sh
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/struts2-core-2.0.12.jar -destjar struts2-core-j4-2.0.12.jar
-java -jar retrotranslator-transformer-1.2.2.jar -advanced -srcjar ../lib/xwork-2.0.6.jar -destjar xwork-j4-2.0.6.jar 
@@ -1,32 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * $Id$
- *
- * 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.
- */
-->
-<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">
+<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-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.8</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-core</artifactId>
@@ -54,9 +33,9 @@
                        <configuration>
                            <artifactItems>
                                <artifactItem>
-                                    <groupId>com.opensymphony</groupId>
+                                    <groupId>opensymphony</groupId>
                                    <artifactId>xwork</artifactId>
-                                    <version>2.0.6</version>
+                                    <version>2.0.3</version>
                                    <classifier>sources</classifier>
                                </artifactItem>
                            </artifactItems>
@@ -128,26 +107,6 @@
                    </links>
                </configuration>
            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rat-maven-plugin</artifactId>
-                <version>1.0-alpha-2</version>
-                <configuration>
-                    <includes>
-                        <include>pom.xml</include>
-                        <include>src/**</include>
-                    </includes>
-                    <excludes>
-                        <exclude>src/test/resources/org/apache/struts2/views/jsp/ui/*</exclude>
-                        <exclude>src/main/etc/**</exclude>
-                        <exclude>src/main/resources/org/apache/struts2/static/dojo/src/**</exclude>
-                        <exclude>src/main/resources/org/apache/struts2/static/dojo/*</exclude>
-                        <exclude>src/main/resources/org/apache/struts2/static/niftycorners/**</exclude>
-                        <exclude>src/test/resources/org/apache/struts2/interceptor/validation/*</exclude>
-                        <exclude>src/site/resources/tags/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
        </plugins>
    </reporting>

@@ -159,7 +118,7 @@
                Samples:
                $ cd struts/struts2/
                $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-                $ mvn clean install -Papps,j4 -Djava14.jar="$JAVA_HOME/jre/lib/rt.jar"
+                $ mvn clean install -Papps,j4 -Djava14.jar="$JAVA_HOME/jre/lib/rt.jar"                

             -->
          <id>j4</id>
@@ -292,9 +251,9 @@

    <dependencies>
        <dependency>
-            <groupId>com.opensymphony</groupId>
+            <groupId>opensymphony</groupId>
            <artifactId>xwork</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.3</version>
        </dependency>

        <dependency>
@@ -76,9 +76,6 @@ public final class StrutsConstants {
    /** The org.apache.struts2.views.freemarker.FreemarkerManager implementation class */
    public static final String STRUTS_FREEMARKER_MANAGER_CLASSNAME = "struts.freemarker.manager.classname";

-    /** Cache Freemarker templates */
-    public static final String STRUTS_FREEMARKER_TEMPLATES_CACHE = "struts.freemarker.templatesCache";
-
    /** org.apache.struts2.views.velocity.VelocityManager implementation class */
    public static final String STRUTS_VELOCITY_MANAGER_CLASSNAME = "struts.velocity.manager.classname";

@@ -60,7 +60,7 @@ public abstract class AbstractRemoteCallUIBean extends ClosingUIBean implements
        super.evaluateExtraParams();

        if (href != null)
-             addParameter("href", ensureAttributeSafelyNotEscaped(findString(href)));
+            addParameter("href", findString(href));
        if (errorText != null)
            addParameter("errorText", findString(errorText));
        if (loadingText != null)
@@ -41,7 +41,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 * <!-- START SNIPPET: example -->
 *
 *    &lt;s:actionerror /&gt;
- *    &lt;s:form .... &gt;
+ *    &lt;s:form .... &gt;>
 *       ....
 *    &lt;/s:form&gt;
 *
@@ -70,7 +70,7 @@ public class Component {
    }

    /**
-     * Gets the name of this component.
+     * Get's the name of this component.
     * @return the name of this component.
     */
    private String getComponentName() {
@@ -87,7 +87,7 @@ public class Component {
    }
    
    /**
-     * Gets the OGNL value stack assoicated with this component.
+     * Get's the OGNL value stack assoicated with this component.
     * @return the OGNL value stack assoicated with this component.
     */
    public ValueStack getStack() {
@@ -95,7 +95,7 @@ public class Component {
    }

    /**
-     * Gets the component stack of this component.
+     * Get's the component stack of this component.
     * @return the component stack of this component, never <tt>null</tt>.
     */
    public Stack getComponentStack() {
@@ -215,7 +215,7 @@ public class Component {
    }

    /**
-     * Constructs a <code>RuntimeException</code> based on the given information.
+     * Constructs?a <code>RuntimeException</code> based on the given information.
     * <p/>
     * A message is constructed and logged at ERROR level before being returned
     * as a <code>RuntimeException</code>.
@@ -323,26 +323,6 @@ public class Component {
        }
    }

-	/**
-     * Renders an action URL by consulting the {@link org.apache.struts2.dispatcher.mapper.ActionMapper}.
-     * @param action      the action
-     * @param namespace   the namespace
-     * @param method      the method
-     * @param req         HTTP request
-     * @param res         HTTP response
-     * @param parameters  parameters
-     * @param scheme      http or https
-     * @param includeContext  should the context path be included or not
-     * @param encodeResult    should the url be encoded
-     * @return the action url.
-     */
-	 @Deprecated
-    protected String determineActionURL(String action, String namespace, String method,
-                                        HttpServletRequest req, HttpServletResponse res, Map parameters, String scheme,
-                                        boolean includeContext, boolean encodeResult) {
-        return determineActionURL(action, namespace, method, req, res, parameters, scheme, includeContext, encodeResult, false, true);
-    }
-
    /**
     * Renders an action URL by consulting the {@link org.apache.struts2.dispatcher.mapper.ActionMapper}.
     * @param action      the action
@@ -354,20 +334,16 @@ public class Component {
     * @param scheme      http or https
     * @param includeContext  should the context path be included or not
     * @param encodeResult    should the url be encoded
-	 * @param forceAddSchemeHostAndPort    should the scheme host and port be added to the url no matter what
-	 * @param escapeAmp    should the ampersands used separate parameters be escaped or not
     * @return the action url.
     */
    protected String determineActionURL(String action, String namespace, String method,
                                        HttpServletRequest req, HttpServletResponse res, Map parameters, String scheme,
-                                        boolean includeContext, boolean encodeResult, boolean forceAddSchemeHostAndPort,
-                                        boolean escapeAmp) {
+                                        boolean includeContext, boolean encodeResult) {
        String finalAction = findString(action);
-        String finalMethod = method != null ? findString(method) : method;
        String finalNamespace = determineNamespace(namespace, getStack(), req);
-        ActionMapping mapping = new ActionMapping(finalAction, finalNamespace, finalMethod, parameters);
+        ActionMapping mapping = new ActionMapping(finalAction, finalNamespace, method, parameters);
        String uri = actionMapper.getUriFromActionMapping(mapping);
-        return UrlHelper.buildUrl(uri, req, res, parameters, scheme, includeContext, encodeResult, forceAddSchemeHostAndPort, escapeAmp);
+        return UrlHelper.buildUrl(uri, req, res, parameters, scheme, includeContext, encodeResult);
    }

    /**
@@ -431,7 +407,7 @@ public class Component {
    }

    /**
-     * Gets the parameters.
+     * Get's the parameters.
     * @return the parameters. Is never <tt>null</tt>.
     */
    public Map getParameters() {
@@ -439,7 +415,7 @@ public class Component {
    }

    /**
-     * Adds all the given parameters to this component's own parameters.
+     * Add's all the given parameters to this componenets own parameters.
     * @param params the parameters to add.
     */
    public void addAllParameters(Map params) {
@@ -447,9 +423,9 @@ public class Component {
    }

    /**
-     * Adds the given key and value to this component's own parameter.
+     * Add's the given key and value to this components own parameter.
     * <p/>
-     * If the provided key is <tt>null</tt> nothing happens.
+     * If the provided key is <tt>null</tt> nothing happends.
     * If the provided value is <tt>null</tt> any existing parameter with
     * the given key name is removed.
     * @param key  the key of the new parameter to add.
@@ -468,7 +444,7 @@ public class Component {
    }

    /**
-     * Gets the id for referencing element.
+     * Get's the id for referencing element.
     * @return the id for referencing element.
     */
    public String getId() {
@@ -489,4 +465,5 @@ public class Component {
    public boolean usesBody() {
        return false;
    }
+
 }
@@ -21,9 +21,7 @@
 package org.apache.struts2.components;

 import java.text.ParseException;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;

 import javax.servlet.http.HttpServletRequest;
@@ -131,10 +129,8 @@ import com.opensymphony.xwork2.util.ValueStack;
 public class DateTimePicker extends UIBean {

    final public static String TEMPLATE = "datetimepicker";
-//  Backported changes from s2 trunk (r657936)
-//    final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-	final private static String RFC3339_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
-    final private static String RFC3339_PATTERN = "{0,date," + RFC3339_FORMAT + "}";
+    final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat(
+    "yyyy-MM-dd'T'HH:mm:ss");
    final protected static Log LOG = LogFactory.getLog(DateTimePicker.class);
    
    protected String iconPath;
@@ -298,14 +294,12 @@ public class DateTimePicker extends UIBean {
            return null;

        if(obj instanceof Date) {
-            return MessageFormat.format(RFC3339_PATTERN, (Date) obj);
-        } else if(obj instanceof Calendar) {
-            return MessageFormat.format(RFC3339_PATTERN, ((Calendar) obj).getTime());
+            return RFC3339_FORMAT.format((Date) obj);
        } else {
            // try to parse a date
            String dateStr = obj.toString();
            if(dateStr.equalsIgnoreCase("today"))
-                return MessageFormat.format(RFC3339_PATTERN, new Date());
+                return RFC3339_FORMAT.format(new Date());

            try {
                Date date = null;
@@ -313,7 +307,7 @@ public class DateTimePicker extends UIBean {
                    SimpleDateFormat format = new SimpleDateFormat(
                            (String) getParameters().get("displayFormat"));
                    date = format.parse(dateStr);
-                    return MessageFormat.format(RFC3339_PATTERN, date);
+                    return RFC3339_FORMAT.format(date);
                } else {
                    // last resource to assume already in correct/default format
                    return dateStr;
@@ -192,8 +192,6 @@ public abstract class DoubleListUIBean extends ListUIBean {
            }
        } else if (form != null) {
            addParameter("doubleId", form.getParameters().get("id") + "_" +escape(this.doubleName));
-        } else {
-            addParameter("doubleId", escape(doubleName !=null ? findString(doubleName) : null));
        }

        if (doubleOnclick != null) {
@@ -51,7 +51,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 *         &lt;s:param&gt;field1&lt;/s:param&gt;
 *         &lt;s:param&gt;field2&lt;/s:param&gt;
 *    &lt;/s:fielderror&gt;
- *    &lt;s:form .... &gt;
+ *    &lt;s:form .... &gt;>
 *       ....
 *    &lt;/s:form&gt;
 *
@@ -61,7 +61,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 *          &lt;s:param value="%{'field1'}" /&gt;
 *          &lt;s:param value="%{'field2'}" /&gt;
 *    &lt;/s:fielderror&gt;
- *    &lt;s:form .... &gt;
+ *    &lt;s:form .... &gt;>
 *       ....
 *    &lt;/s:form&gt;
 *
@@ -20,6 +20,24 @@
 */
 package org.apache.struts2.components;

+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.portlet.context.PortletActionContext;
+import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.views.util.UrlHelper;
+
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.ObjectFactory;
@@ -29,29 +47,12 @@ import com.opensymphony.xwork2.config.entities.ActionConfig;
 import com.opensymphony.xwork2.config.entities.InterceptorMapping;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.MethodFilterInterceptorUtil;
-import com.opensymphony.xwork2.util.TextUtils;
 import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.TextUtils;
 import com.opensymphony.xwork2.validator.ActionValidatorManagerFactory;
 import com.opensymphony.xwork2.validator.FieldValidator;
 import com.opensymphony.xwork2.validator.ValidationInterceptor;
 import com.opensymphony.xwork2.validator.Validator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.portlet.context.PortletActionContext;
-import org.apache.struts2.portlet.util.PortletUrlHelper;
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import org.apache.struts2.views.util.UrlHelper;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;

 /**
 * <!-- START SNIPPET: javadoc -->
@@ -94,11 +95,6 @@ import java.util.Set;
 */
@StrutsTag(name="form", tldTagClass="org.apache.struts2.views.jsp.ui.FormTag", description="Renders an input form")
 public class Form extends ClosingUIBean {
-    /**
-     * Provide a logging instance.
-     */
-    private static final Log LOG = LogFactory.getLog(Form.class);
-
    public static final String OPEN_TEMPLATE = "form";
    public static final String TEMPLATE = "form-close";

@@ -208,7 +204,7 @@ public class Form extends ClosingUIBean {
    }

    /**
-     * The Form component determines its HTML element id as follows:-
+     * Form component determine the its HTML element id as follows:-
     * <ol>
     *    <li>if an 'id' attribute is specified.</li>
     *    <li>if an 'action' attribute is specified, it will be used as the id.</li>
@@ -226,9 +222,6 @@ public class Form extends ClosingUIBean {
        if (id != null) {
            addParameter("id", escape(id));
        }
-
-        // if no id given, it will be tried to generate it from the action attribute in the
-        // corresponding evaluateExtraParams method
        if (Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest()) {
            evaluateExtraParamsPortletRequest(namespace, action);
        } else {
@@ -294,20 +287,14 @@ public class Form extends ClosingUIBean {
            }

            // if the id isn't specified, use the action name
-            if (id == null && action!=null) {
-                addParameter("id", escape(action));
+            if (id == null) {
+                addParameter("id", action);
            }
        } else if (action != null) {
            // Since we can't find an action alias in the configuration, we just assume
-            // the action attribute supplied is the path to be used as the URI this
+            // the action attribute supplied is the path to be used as the uri this
            // form is submitting to.

-            // Warn user that the specified namespace/action combo
-            // was not found in the configuration.
-            if (namespace != null) {
-                LOG.warn("No configuration found for the specified action: '" + action + "' in namespace: '" + namespace + "'. Form action defaulting to 'action' attribute's literal value.");
-            }
-
            String result = UrlHelper.buildUrl(action, request, response, null);
            addParameter("action", result);

@@ -342,7 +329,7 @@ public class Form extends ClosingUIBean {

        // Only evaluate if Client-Side js is to be enable when validate=true
        Boolean validate = (Boolean) getParameters().get("validate");
-        if (validate != null && validate) {
+        if (validate != null && validate.booleanValue()) {

            addParameter("performValidation", Boolean.FALSE);

@@ -350,8 +337,9 @@ public class Form extends ClosingUIBean {
            ActionConfig actionConfig = runtimeConfiguration.getActionConfig(namespace, actionName);

            if (actionConfig != null) {
-                List<InterceptorMapping> interceptors = actionConfig.getInterceptors();
-                for (InterceptorMapping interceptorMapping : interceptors) {
+                List interceptors = actionConfig.getInterceptors();
+                for (Iterator i = interceptors.iterator(); i.hasNext();) {
+                    InterceptorMapping interceptorMapping = (InterceptorMapping) i.next();
                    if (ValidationInterceptor.class.isInstance(interceptorMapping.getInterceptor())) {
                        ValidationInterceptor validationInterceptor = (ValidationInterceptor) interceptorMapping.getInterceptor();

@@ -375,6 +363,11 @@ public class Form extends ClosingUIBean {
     */
    private void evaluateExtraParamsPortletRequest(String namespace, String action) {

+        if (this.action != null) {
+            // if it isn't specified, we'll make somethig up
+            action = findString(this.action);
+        }
+
        String type = "action";
        if (TextUtils.stringSet(method)) {
            if ("GET".equalsIgnoreCase(method.trim())) {
@@ -382,7 +375,7 @@ public class Form extends ClosingUIBean {
            }
        }
        if (action != null) {
-            String result = PortletUrlHelper.buildUrl(action, namespace, null,
+            String result = PortletUrlHelper.buildUrl(action, namespace,
                    getParameters(), type, portletMode, windowState);
            addParameter("action", result);

@@ -416,9 +409,10 @@ public class Form extends ClosingUIBean {
            return Collections.EMPTY_LIST;
        }

-        List<Validator> all = ActionValidatorManagerFactory.getInstance().getValidators(actionClass, (String) getParameters().get("actionName"));
-        List<Validator> validators = new ArrayList<Validator>();
-        for (Validator validator : all) {
+        List all = ActionValidatorManagerFactory.getInstance().getValidators(actionClass, (String) getParameters().get("actionName"));
+        List validators = new ArrayList();
+        for (Iterator iterator = all.iterator(); iterator.hasNext();) {
+            Validator validator = (Validator) iterator.next();
            if (validator instanceof FieldValidator) {
                FieldValidator fieldValidator = (FieldValidator) validator;
                if (fieldValidator.getFieldName().equals(name)) {
@@ -446,7 +440,7 @@ public class Form extends ClosingUIBean {
        this.onsubmit = onsubmit;
    }

-    @StrutsTagAttribute(description="Set action name to submit to, without .action suffix", defaultValue="current action")
+    @StrutsTagAttribute(description="Set action nane to submit to, without .action suffix", defaultValue="current action")
    public void setAction(String action) {
        this.action = action;
    }
@@ -477,7 +471,7 @@ public class Form extends ClosingUIBean {
        this.validate = validate;
    }

-    @StrutsTagAttribute(description="The portlet mode to display after the form submit")
+    @StrutsTagAttribute(description="he portlet mode to display after the form submit")
    public void setPortletMode(String portletMode) {
        this.portletMode = portletMode;
    }
@@ -123,14 +123,6 @@ public class OptionTransferSelect extends DoubleListUIBean {
    protected String rightUpLabel;
    protected String rightDownLabel;

-    protected String addToLeftOnclick;
-    protected String addToRightOnclick;
-    protected String addAllToLeftOnclick;
-    protected String addAllToRightOnclick;
-    protected String selectAllOnclick;
-    protected String upDownOnLeftOnclick;
-    protected String upDownOnRightOnclick;
-

    public OptionTransferSelect(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
        super(stack, request, response);
@@ -260,34 +252,6 @@ public class OptionTransferSelect extends DoubleListUIBean {
                rightDownLabel != null ? findValue(rightDownLabel, String.class) : "v");


-        // selectAllOnclick
-        addParameter("selectAllOnclick",
-                selectAllOnclick != null ? findValue(selectAllOnclick, String.class) : "");
-
-        // addToLeftOnclick
-        addParameter("addToLeftOnclick",
-                addToLeftOnclick != null ? findValue(addToLeftOnclick, String.class) : "");
-
-        // addToRightOnclick
-        addParameter("addToRightOnclick",
-                addToRightOnclick != null ? findValue(addToRightOnclick, String.class) : "");
-
-        // addAllToLeftOnclick
-        addParameter("addAllToLeftOnclick",
-                addAllToLeftOnclick != null ? findValue(addAllToLeftOnclick, String.class) : "");
-
-        // addAllToRightOnclick
-        addParameter("addAllToRightOnclick",
-                addAllToRightOnclick != null ? findValue(addAllToRightOnclick, String.class) : "");
-
-        // upDownOnLeftOnclick
-        addParameter("upDownOnLeftOnclick",
-                upDownOnLeftOnclick != null ? findValue(upDownOnLeftOnclick, String.class) : "");
-
-        // upDownOnRightOnclick
-        addParameter("upDownOnRightOnclick",
-                upDownOnRightOnclick != null ? findValue(upDownOnRightOnclick, String.class) : "");
-

        // inform the form component our select tag infos, so they know how to select
        // its elements upon onsubmit
@@ -512,66 +476,5 @@ public class OptionTransferSelect extends DoubleListUIBean {
        return rightDownLabel;
    }

-    public String getAddAllToLeftOnclick() {
-        return addAllToLeftOnclick;
-    }

-    @StrutsTagAttribute(description="Javascript to run after Add All To Left button pressed")
-    public void setAddAllToLeftOnclick(String addAllToLeftOnclick) {
-        this.addAllToLeftOnclick = addAllToLeftOnclick;
-    }
-
-    public String getAddAllToRightOnclick() {
-        return addAllToRightOnclick;
-    }
-
-    @StrutsTagAttribute(description="Javascript to run after Add All To Right button pressed")
-    public void setAddAllToRightOnclick(String addAllToRightOnclick) {
-        this.addAllToRightOnclick = addAllToRightOnclick;
-    }
-
-    public String getAddToLeftOnclick() {
-        return addToLeftOnclick;
-    }
-
-    @StrutsTagAttribute(description="Javascript to run after Add To Left button pressed")
-    public void setAddToLeftOnclick(String addToLeftOnclick) {
-        this.addToLeftOnclick = addToLeftOnclick;
-    }
-
-    public String getAddToRightOnclick() {
-        return addToRightOnclick;
-    }
-
-    @StrutsTagAttribute(description="Javascript to run after Add To Right button pressed")
-    public void setAddToRightOnclick(String addToRightOnclick) {
-        this.addToRightOnclick = addToRightOnclick;
-    }
-
-    @StrutsTagAttribute(description="Javascript to run after up / down on the left side buttons pressed")
-    public void setUpDownOnLeftOnclick(String upDownOnLeftOnclick) {
-        this.upDownOnLeftOnclick = upDownOnLeftOnclick;
-    }
-
-    public String getUpDownOnLeftOnclick() {
-        return this.upDownOnLeftOnclick;
-    }
-
-    @StrutsTagAttribute(description="Javascript to run after up / down on the right side buttons pressed")
-    public void setUpDownOnRightOnclick(String upDownOnRightOnclick) {
-        this.upDownOnRightOnclick = upDownOnRightOnclick;
-    }
-
-    public String getUpDownOnRightOnclick() {
-        return this.upDownOnRightOnclick;
-    }
-
-    @StrutsTagAttribute(description="Javascript to run after Select All button pressed")
-    public void setSelectAllOnclick(String selectAllOnclick) {
-        this.selectAllOnclick = selectAllOnclick;
-    }
-
-    public String getSelectAllOnclick() {
-        return this.selectAllOnclick;
-    }
 }
@@ -48,19 +48,19 @@ import com.opensymphony.xwork2.util.ValueStack;
 * <p/> <b>Examples</b>
 * <pre>
 * <!-- START SNIPPET: example -->
- * &lt;s:submit value="%{'Submit the form'}" /&gt;
+ * &lt;s:submit value="%{'Submit'}" /&gt;
 * <!-- END SNIPPET: example -->
 * </pre>
 * <pre>
 * <!-- START SNIPPET: example2 -->
 * Render an image submit:
- * &lt;s:submit type="image" value="%{'Submit the form'}" src="submit.gif"/&gt;
+ * &lt;s:submit type="image" value="%{'Submit'}" label="Submit the form" src="submit.gif"/&gt;
 * <!-- END SNIPPET: example2 -->
 * </pre>
 * <pre>
 * <!-- START SNIPPET: example3 -->
 * Render an button submit:
- * &lt;s:submit type="button" value="%{'Submit the form'}"/&gt;
+ * &lt;s:submit type="button" value="%{'Submit'}" label="Submit the form"/&gt;
 * <!-- END SNIPPET: example3 -->
 * </pre>
 *
@@ -32,11 +32,6 @@ import com.opensymphony.xwork2.util.ValueStack;
 * <!-- START SNIPPET: javadoc -->
 * The tabbedpanel widget is primarily an AJAX component, where each tab can either be local content or remote
 * content (refreshed each time the user selects that tab).</p>
- * If the useSelectedTabCookie attribute is set to true, the id of the selected tab is saved in a cookie on activation.
- * When coming back to this view, the cookie is read and the tab will be activated again, unless an actual value for the
- * selectedTab attribute is specified.</p>
- * If you want to use the cookie feature, please be sure that you provide a unique id for your tabbedpanel component,
- * since this will also be the identifying name component of the stored cookie.</p>
 * <!-- END SNIPPET: javadoc -->
 *
 * <p/> <b>Examples</b>
@@ -72,7 +67,6 @@ public class TabbedPanel extends ClosingUIBean {
    protected String closeButton;
    protected String doLayout ;
    protected String templateCssPath;
-    protected String useSelectedTabCookie;

    public TabbedPanel(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
        super(stack, request, response);
@@ -98,9 +92,6 @@ public class TabbedPanel extends ClosingUIBean {
        }
        if(templateCssPath != null)
            addParameter("templateCssPath", findString(templateCssPath));
-        if(useSelectedTabCookie != null) {
-            addParameter("useSelectedTabCookie", findString(useSelectedTabCookie));
-        }
    }

    public String getDefaultOpenTemplate() {
@@ -141,11 +132,4 @@ public class TabbedPanel extends ClosingUIBean {
    public void setTemplateCssPath(String templateCssPath) {
        this.templateCssPath = templateCssPath;
    }
-
-    @StrutsTagAttribute(required = false, defaultValue = "false", description = "If set to true, the id of the last selected " +
-            "tab will be stored in cookie. If the view is rendered, it will be tried to read this cookie and activate " +
-            "the corresponding tab on success, unless overridden by the selectedTab attribute. The cookie name is \"Struts2TabbedPanel_selectedTab_\"+id.")
-    public void setUseSelectedTabCookie( String useSelectedTabCookie ) {
-        this.useSelectedTabCookie = useSelectedTabCookie;
-    }
 }
@@ -790,20 +790,6 @@ public abstract class UIBean extends Component {
        }
    }

-    /**
-     * Ensures an unescaped attribute value cannot be vulnerable to XSS attacks
-     *
-     * @param val The value to check
-     * @return The escaped value
-     */
-    protected String ensureAttributeSafelyNotEscaped(String val) {
-        if (val != null) {
-            return val.replaceAll("\"", "&#34;");
-        } else {
-            return "";
-        }
-    }
-
    protected void evaluateExtraParams() {
    }

@@ -866,8 +852,7 @@ public abstract class UIBean extends Component {

    /**
     * Create HTML id element for the component and populate this component parmaeter
-     * map. Additionally, a parameter named escapedId is populated which contains the found id value filtered by
-     * {@link #escape(String)}, needed eg. for naming Javascript identifiers based on the id value.
+     * map.
     *
     * The order is as follows :-
     * <ol>
@@ -879,22 +864,19 @@ public abstract class UIBean extends Component {
     * @param form
     */
    protected void populateComponentHtmlId(Form form) {
-        String tryId;
        if (id != null) {
            // this check is needed for backwards compatibility with 2.1.x
            if (altSyntax()) {
-                tryId = findString(id);
+                addParameter("id", findString(id));
            } else {
-                tryId = id;
+                addParameter("id", id);
            }
        } else if (form != null) {
-            tryId = form.getParameters().get("id") + "_"
-                    + escape(name != null ? findString(name) : null);
+            addParameter("id", form.getParameters().get("id") + "_" 
+                    + escape(name != null ? findString(name) : null));
        } else {
-            tryId = escape(name != null ? findString(name) : null);
+            addParameter("id", escape(name != null ? findString(name) : null));
        }
-        addParameter("id", tryId);
-        addParameter("escapedId", escape(tryId));
    }

    @StrutsTagAttribute(description="The template directory.")
@@ -921,7 +903,7 @@ public abstract class UIBean extends Component {
        this.cssClass = cssClass;
    }

-    @StrutsTagAttribute(description="The css style definitions for element to use")
+    @StrutsTagAttribute(description="The css style definitions for element ro use")
    public void setCssStyle(String cssStyle) {
        this.cssStyle = cssStyle;
    }
@@ -53,12 +53,6 @@ import com.opensymphony.xwork2.util.ValueStack;
 * additional request parameters.</p>
 *
 * <b>NOTE:</b>
- * <p>By default request parameters will be separated using escaped ampersands (i.e., &amp;amp;).
- * This is necessary for XHTML compliance, however, when using the URL generated by this tag
- * with the &lt;s:property&gt; tag, the <b>escapeAmp</b> attribute should be used to disable
- * ampersand escaping.</p>
- *
- * <b>NOTE:</b>
 * <p>When includeParams is 'all' or 'get', the parameter defined in param tag will take
 * precedence and will not be overriden if they exists in the parameter submitted. For
 * example, in Example 3 below, if there is a id parameter in the url where the page this
@@ -74,21 +68,16 @@ import com.opensymphony.xwork2.util.ValueStack;
 * <ul>
 *      <li>action (String) - (value or action choose either one, if both exist value takes precedence) action's name (alias) <li>
 *      <li>value (String) - (value or action choose either one, if both exist value takes precedence) the url itself</li>
- *      <li>scheme (String) - http scheme (http, https) defaults to the scheme this request is in</li>
+ *      <li>scheme (String) - http scheme (http, https) default to the scheme this request is in</li>
 *      <li>namespace - action's namespace</li>
- *      <li>method (String) - action's method name, defaults to 'execute'</li>
- *      <li>encode (Boolean) - url encode the generated url. Defaults to 'true'.</li>
- *      <li>includeParams (String) - The includeParams attribute may have the value 'none', 'get' or 'all'. Defaults to 'get'.
+ *      <li>method (String) - action's method, default to execute() </li>
+ *      <li>encode (Boolean) - url encode the generated url. Default is true</li>
+ *      <li>includeParams (String) - The includeParams attribute may have the value 'none', 'get' or 'all'. Default is 'get'.
 *                                   none - include no parameters in the URL
 *                                   get  - include only GET parameters in the URL (default)
 *                                   all  - include both GET and POST parameters in the URL
 *      </li>
- *      <li>includeContext (Boolean) - Specifies whether to include the web app context path. Defaults to 'true'.</li>
- *      <li>escapeAmp (Boolean) - Specifies whether to escape ampersand (&amp;) to (&amp;amp;) or not. Defaults to 'true'.</li>
- *      <li>portletMode (String) - The resulting portlet mode.</li>
- *      <li>windowState (String) - The resulting portlet window state.</li>
- *      <li>portletUrlType (String) - Specifies if this should be a portlet render or action URL.</li>
- *      <li>forceAddSchemeHostAndPort (Boolean) - Specifies whether to force the addition of scheme, host and port or not.</li>
+ *      <li>includeContext (Boolean) - determine wheather to include the web app context path. Default is true.</li>
 * </ul>
 *
 * <!-- END SNIPPET: params -->
@@ -146,12 +135,10 @@ public class URL extends Component {
    protected String method;
    protected boolean encode = true;
    protected boolean includeContext = true;
-    protected boolean escapeAmp = true;
    protected String portletMode;
    protected String windowState;
    protected String portletUrlType;
    protected String anchor;
-    protected boolean forceAddSchemeHostAndPort;
    protected String urlIncludeParams;
    protected ExtraParameterProvider extraParameterProvider;

@@ -249,14 +236,14 @@ public class URL extends Component {

        String result;
        if (value == null && action != null) {
-            if (Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest()) {
-                result = PortletUrlHelper.buildUrl(action, namespace, method, parameters, portletUrlType, portletMode, windowState);
+            if(Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest()) {
+                result = PortletUrlHelper.buildUrl(action, namespace, parameters, portletUrlType, portletMode, windowState);
            }
            else {
-                result = determineActionURL(action, namespace, method, req, res, parameters, scheme, includeContext, encode, forceAddSchemeHostAndPort, escapeAmp);
+                result = determineActionURL(action, namespace, method, req, res, parameters, scheme, includeContext, encode);
            }
        } else {
-            if (Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest()) {
+            if(Dispatcher.getInstance().isPortletSupportActive() && PortletActionContext.isPortletRequest()) {
                result = PortletUrlHelper.buildResourceUrl(value, parameters);
            }
            else {
@@ -267,7 +254,7 @@ public class URL extends Component {
                if (_value != null && _value.indexOf("?") > 0) {
                    _value = _value.substring(0, _value.indexOf("?"));
                }
-                result = UrlHelper.buildUrl(_value, req, res, parameters, scheme, includeContext, encode, forceAddSchemeHostAndPort, escapeAmp);
+                result = UrlHelper.buildUrl(_value, req, res, parameters, scheme, includeContext, encode);
            }
        }
        if ( anchor != null && anchor.length() > 0 ) {
@@ -306,7 +293,7 @@ public class URL extends Component {
        this.value = value;
    }

-    @StrutsTagAttribute(description="The action to generate the URL for, if not using value")
+    @StrutsTagAttribute(description="he action generate url for, if not using value")
    public void setAction(String action) {
        this.action = action;
    }
@@ -326,7 +313,7 @@ public class URL extends Component {
        this.encode = encode;
    }

-    @StrutsTagAttribute(description="Whether actual context should be included in URL", type="Boolean", defaultValue="true")
+    @StrutsTagAttribute(description="Whether actual context should be included in url", type="Boolean", defaultValue="true")
    public void setIncludeContext(boolean includeContext) {
        this.includeContext = includeContext;
    }
@@ -341,7 +328,7 @@ public class URL extends Component {
        this.windowState = windowState;
    }

-    @StrutsTagAttribute(description="Specifies if this should be a portlet render or action URL. Default is \"render\". To create an action URL, use \"action\".")
+    @StrutsTagAttribute(description="Specifies if this should be a portlet render or action url")
    public void setPortletUrlType(String portletUrlType) {
        this.portletUrlType = portletUrlType;
    }
@@ -351,16 +338,6 @@ public class URL extends Component {
        this.anchor = anchor;
    }

-    @StrutsTagAttribute(description="Specifies whether to escape ampersand (&amp;) to (&amp;amp;) or not", type="Boolean", defaultValue="true")
-    public void setEscapeAmp(boolean escapeAmp) {
-        this.escapeAmp = escapeAmp;
-    }
-
-    @StrutsTagAttribute(description="Specifies whether to force the addition of scheme, host and port or not", type="Boolean", defaultValue="false")
-    public void setForceAddSchemeHostAndPort(boolean forceAddSchemeHostAndPort) {
-        this.forceAddSchemeHostAndPort = forceAddSchemeHostAndPort;
-    }
-

    /**
     * Merge request parameters into current parameters. If a parameter is
@@ -1,23 +1 @@
-<!--
-/*
- * $Id: pom.xml 560558 2007-07-28 15:47:10Z apetrelli $
- *
- * 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.
- */
-->
 <body>JSP UI tags for rendering table output in HTML.</body>
@@ -52,7 +52,7 @@ public abstract class BaseTemplateEngine implements TemplateEngine {
            if (props == null) {
                String propName = template.getDir() + "/" + template.getTheme() + "/"+getThemePropertiesFileName();

-                // WW-1292
+//              WW-1292
                // let's try getting it from the filesystem
                File propFile = new File(propName);
                InputStream is = null;
@@ -77,12 +77,6 @@ public abstract class BaseTemplateEngine implements TemplateEngine {
                        props.load(is);
                    } catch (IOException e) {
                        LOG.error("Could not load " + propName, e);
-                    } finally {
-                        try {
-                            is.close();
-                        } catch(IOException io) {
-                            LOG.warn("Unable to close input stream", io);
-                        }
                    }
                }

@@ -22,7 +22,9 @@ package org.apache.struts2.components.template;

 import java.io.IOException;
 import java.io.Writer;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;

 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -31,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.views.freemarker.FreemarkerManager;

 import com.opensymphony.xwork2.inject.Inject;
@@ -40,7 +41,8 @@ import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.util.ValueStack;

-import freemarker.template.*;
+import freemarker.template.Configuration;
+import freemarker.template.SimpleHash;

 /**
 * Freemarker based template engine.
@@ -49,10 +51,6 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
    static Class bodyContent = null;
    private FreemarkerManager freemarkerManager;

-    private final HashMap<String, freemarker.template.Template> templates = new HashMap<String, freemarker.template.Template>();
-    private final HashSet<String> missingTemplates = new HashSet<String>();
-    private boolean freemarkerCaching = false;
-
    static {
        try {
            bodyContent = ClassLoaderUtil.loadClass("javax.servlet.jsp.tagext.BodyContent",
@@ -84,40 +82,22 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
        Configuration config = freemarkerManager.getConfiguration(servletContext);

        // get the list of templates we can use
-        List<Template> templates = templateContext.getTemplate().getPossibleTemplates(this);
+        List templates = templateContext.getTemplate().getPossibleTemplates(this);

        // find the right template
        freemarker.template.Template template = null;
        String templateName = null;
        Exception exception = null;
-        for (Template t : templates) {
+        for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
+            Template t = (Template) iterator.next();
            templateName = getFinalTemplateName(t);
-            if (freemarkerCaching) {
-                if (!isTemplateMissing(templateName)) {
-                    try {
-                        template = findInCache(templateName);  // look in cache first
-                        if (template == null) {
-                            // try to load, and if it works, stop at the first one
-                            template = config.getTemplate(templateName);
-                            addToCache(templateName, template);
-                        }
-                        break;
-                    } catch (IOException e) {
-                        addToMissingTemplateCache(templateName);
-                        if (exception == null) {
-                            exception = e;
-                        }
-                    }
-                }
-            } else {
-                try {
-                    // try to load, and if it works, stop at the first one
-                    template = config.getTemplate(templateName);
-                    break;
-                } catch (IOException e) {
-                    if (exception == null) {
-                        exception = e;
-                    }
+            try {
+                // try to load, and if it works, stop at the first one
+                template = config.getTemplate(templateName);
+                break;
+            } catch (IOException e) {
+                if (exception == null) {
+                    exception = e;
                }
            }
        }
@@ -174,40 +154,4 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
    protected String getSuffix() {
        return "ftl";
    }
-
-    protected void addToMissingTemplateCache(String templateName) {
-        synchronized(missingTemplates) {
-            missingTemplates.add(templateName);
-        }
-    }
-
-    protected boolean isTemplateMissing(String templateName) {
-        synchronized(missingTemplates) {
-            return missingTemplates.contains(templateName);
-        }
-    }
-
-    protected void addToCache(String templateName,
-        freemarker.template.Template template) {
-        synchronized(templates) {
-            templates.put(templateName, template);
-        }
-    }
-
-    protected freemarker.template.Template findInCache(String templateName) {
-        synchronized(templates) {
-            return templates.get(templateName);
-        }
-    }
-
-    /**
-     * Enables or disables Struts caching of Freemarker templates. By default disabled.
-     * Set struts.freemarker.templatesCache=true to enable cache
-     * @param cacheTemplates "true" if the template engine should cache freemarker template
-     * internally
-     */
-    @Inject(StrutsConstants.STRUTS_FREEMARKER_TEMPLATES_CACHE)
-    public void setCacheTemplates(String cacheTemplates) {
-        freemarkerCaching = "true".equals(cacheTemplates);
-    }
 }
@@ -20,16 +20,19 @@
 */
 package org.apache.struts2.components.template;

-import com.opensymphony.xwork2.util.ValueStack;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.components.Include;
 import org.apache.struts2.components.UIBean;

-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-import java.util.List;
+import com.opensymphony.xwork2.util.ValueStack;

 /**
 * JSP based template engine.
@@ -47,10 +50,11 @@ public class JspTemplateEngine extends BaseTemplateEngine {
        ValueStack stack = templateContext.getStack();
        stack.push(tag);
        PageContext pageContext = (PageContext) stack.getContext().get(ServletActionContext.PAGE_CONTEXT);
-        List<Template> templates = template.getPossibleTemplates(this);
+        List templates = template.getPossibleTemplates(this);
        Exception exception = null;
        boolean success = false;
-        for (Template t : templates) {
+        for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
+            Template t = (Template) iterator.next();
            try {
                Include.include(getFinalTemplateName(t), pageContext.getOut(),
                        pageContext.getRequest(), (HttpServletResponse) pageContext.getResponse());
@@ -59,8 +59,8 @@ public class Template implements Cloneable {
        return name;
    }

-    public List<Template> getPossibleTemplates(TemplateEngine engine) {
-        List<Template> list = new ArrayList<Template>(3);
+    public List getPossibleTemplates(TemplateEngine engine) {
+        List list = new ArrayList(3);
        Template template = this;
        String parentTheme;
        list.add(template);
@@ -20,7 +20,16 @@
 */
 package org.apache.struts2.components.template;

-import com.opensymphony.xwork2.inject.Inject;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
@@ -28,13 +37,7 @@ import org.apache.struts2.views.velocity.VelocityManager;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;

-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-import java.util.Map;
+import com.opensymphony.xwork2.inject.Inject;

 /**
 * Velocity based template engine.
@@ -61,13 +64,14 @@ public class VelocityTemplateEngine extends BaseTemplateEngine {
        VelocityEngine velocityEngine = velocityManager.getVelocityEngine();

        // get the list of templates we can use
-        List<Template> templates = templateContext.getTemplate().getPossibleTemplates(this);
+        List templates = templateContext.getTemplate().getPossibleTemplates(this);

        // find the right template
        org.apache.velocity.Template template = null;
        String templateName = null;
        Exception exception = null;
-        for (Template t : templates) {
+        for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
+            Template t = (Template) iterator.next();
            templateName = getFinalTemplateName(t);
            try {
                // try to load, and if it works, stop at the first one
@@ -163,7 +163,6 @@ public class BeanSelectionProvider implements ConfigurationProvider {
        if ("true".equalsIgnoreCase(props.getProperty(StrutsConstants.STRUTS_DEVMODE))) {
            props.setProperty(StrutsConstants.STRUTS_I18N_RELOAD, "true");
            props.setProperty(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "true");
-            props.setProperty(StrutsConstants.STRUTS_FREEMARKER_TEMPLATES_CACHE, "false");
            // Convert struts properties into ones that xwork expects
            props.setProperty("devMode", "true");
        } else {
@@ -1,23 +1 @@
-<!--
-/*
- * $Id: Action.java 502296 2007-02-01 17:33:39Z niallp $
- *
- * 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.
- */
-->
 <body>Classes for Struts configuration and property handling.</body>
@@ -746,15 +746,12 @@ Caused by: com.opensymphony.xwork2.inject.ContainerImpl$MissingDependencyExcepti
            }
        } else {
            try {
-                // WW-1977: Only put errors in the request when code is a 500 error
-                if (code == HttpServletResponse.SC_INTERNAL_SERVER_ERROR) {
-                    // send a http error response to use the servlet defined error handler
-                    // make the exception availible to the web.xml defined error page
-                    request.setAttribute("javax.servlet.error.exception", e);
+                // send a http error response to use the servlet defined error handler
+                // make the exception availible to the web.xml defined error page
+                request.setAttribute("javax.servlet.error.exception", e);

-                    // for compatibility
-                    request.setAttribute("javax.servlet.jsp.jspException", e);
-                }
+                // for compatibility
+                request.setAttribute("javax.servlet.jsp.jspException", e);

                // send the error response
                response.sendError(code, e.getMessage());
@@ -23,9 +23,7 @@ package org.apache.struts2.dispatcher;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Enumeration;
@@ -433,31 +431,62 @@ public class FilterDispatcher implements StrutsStatics, Filter {
     * Locate a static resource and copy directly to the response,
     * setting the appropriate caching headers. 
     *
-     * @param path The resource path
+     * @param name The resource name
     * @param request The request
     * @param response The response
     * @throws IOException If anything goes wrong
     */
-    public void findStaticResource(String path, HttpServletRequest request, HttpServletResponse response)
-            throws IOException {
-        String name = cleanupPath(path);
-        for (String pathPrefix : pathPrefixes) {
-            URL resourceUrl = findResource(buildPath(name, pathPrefix));
-            if (resourceUrl != null) {
-                InputStream is = null;
-                try {
-                    //check that the resource path is under the pathPrefix path
-                    String pathEnding = buildPath(name, pathPrefix);
-                    if (resourceUrl.getFile().endsWith(pathEnding))
-                        is = resourceUrl.openStream();
-                } catch (Exception ex) {
-                    // just ignore it
-                    continue;
-                }
-
-                //not inside the try block, as this could throw IOExceptions also
+    protected void findStaticResource(String name, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        if (!name.endsWith(".class")) {
+            for (String pathPrefix : pathPrefixes) {
+                InputStream is = findInputStream(name, pathPrefix);
                if (is != null) {
-                    process(is, path, request, response);
+                    Calendar cal = Calendar.getInstance();
+                    
+                    // check for if-modified-since, prior to any other headers
+                    long ifModifiedSince = 0;
+                    try {
+                    	ifModifiedSince = request.getDateHeader("If-Modified-Since");
+                    } catch (Exception e) {
+                    	LOG.warn("Invalid If-Modified-Since header value: '" + request.getHeader("If-Modified-Since") + "', ignoring");
+                    }
+    				long lastModifiedMillis = lastModifiedCal.getTimeInMillis();
+    				long now = cal.getTimeInMillis();
+                    cal.add(Calendar.DAY_OF_MONTH, 1);
+                    long expires = cal.getTimeInMillis();
+                    
+    				if (ifModifiedSince > 0 && ifModifiedSince <= lastModifiedMillis) {
+    					// not modified, content is not sent - only basic headers and status SC_NOT_MODIFIED
+                        response.setDateHeader("Expires", expires);
+    					response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+    					is.close();
+    					return;
+    				}
+                	
+                	// set the content-type header
+                    String contentType = getContentType(name);
+                    if (contentType != null) {
+                        response.setContentType(contentType);
+                    }
+
+                    if (serveStaticBrowserCache) {
+                    	// set heading information for caching static content
+                        response.setDateHeader("Date", now);
+                        response.setDateHeader("Expires", expires);
+                        response.setDateHeader("Retry-After", expires);
+                        response.setHeader("Cache-Control", "public");
+                        response.setDateHeader("Last-Modified", lastModifiedMillis);
+                    } else {
+                        response.setHeader("Cache-Control", "no-cache");
+                        response.setHeader("Pragma", "no-cache");
+                        response.setHeader("Expires", "-1");
+                    }
+
+                    try {
+                        copy(is, response.getOutputStream());
+                    } finally {
+                        is.close();
+                    }
                    return;
                }
            }
@@ -466,88 +495,6 @@ public class FilterDispatcher implements StrutsStatics, Filter {
        response.sendError(HttpServletResponse.SC_NOT_FOUND);
    }

-    /**
-     * Look for a static resource in the classpath.
-     *
-     * @param path The resource path
-     * @return The inputstream of the resource
-     * @throws IOException If there is a problem locating the resource
-     */
-    protected URL findResource(String path) throws IOException {
-        return ClassLoaderUtil.getResource(path, getClass());
-    }
-
-    /**
-     * @param name resource name
-     * @param packagePrefix The package prefix to use to locate the resource
-     * @return full path
-     * @throws java.io.UnsupportedEncodingException
-     * @throws IOException
-     */
-    protected String buildPath(String name, String packagePrefix) throws UnsupportedEncodingException {
-        String resourcePath;
-        if (packagePrefix.endsWith("/") && name.startsWith("/")) {
-            resourcePath = packagePrefix + name.substring(1);
-        } else {
-            resourcePath = packagePrefix + name;
-        }
-
-        return URLDecoder.decode(resourcePath, encoding);
-    }
-
-    protected void process(InputStream is, String path, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        if (is != null) {
-            Calendar cal = Calendar.getInstance();
-
-            // check for if-modified-since, prior to any other headers
-            long ifModifiedSince = 0;
-            try {
-                ifModifiedSince = request.getDateHeader("If-Modified-Since");
-            } catch (Exception e) {
-                LOG.warn("Invalid If-Modified-Since header value: '"
-                        + request.getHeader("If-Modified-Since") + "', ignoring");
-            }
-            long lastModifiedMillis = lastModifiedCal.getTimeInMillis();
-            long now = cal.getTimeInMillis();
-            cal.add(Calendar.DAY_OF_MONTH, 1);
-            long expires = cal.getTimeInMillis();
-
-            if (ifModifiedSince > 0 && ifModifiedSince <= lastModifiedMillis) {
-                // not modified, content is not sent - only basic
-                // headers and status SC_NOT_MODIFIED
-                response.setDateHeader("Expires", expires);
-                response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-                is.close();
-                return;
-            }
-
-            // set the content-type header
-            String contentType = getContentType(path);
-            if (contentType != null) {
-                response.setContentType(contentType);
-            }
-
-            if (serveStaticBrowserCache) {
-                // set heading information for caching static content
-                response.setDateHeader("Date", now);
-                response.setDateHeader("Expires", expires);
-                response.setDateHeader("Retry-After", expires);
-                response.setHeader("Cache-Control", "public");
-                response.setDateHeader("Last-Modified", lastModifiedMillis);
-            } else {
-                response.setHeader("Cache-Control", "no-cache");
-                response.setHeader("Pragma", "no-cache");
-                response.setHeader("Expires", "-1");
-            }
-
-            try {
-                copy(is, response.getOutputStream());
-            } finally {
-                is.close();
-            }
-        }
-    }
-
    /**
     * Determine the content type for the resource name.
     *
@@ -612,13 +559,4 @@ public class FilterDispatcher implements StrutsStatics, Filter {

        return ClassLoaderUtil.getResourceAsStream(resourcePath, getClass());
    }
-
-    /**
-     * @param path requested path
-     * @return path without leading "/struts" or "/static"
-     */
-    protected String cleanupPath(String path) {
-        //path will start with "/struts" or "/static", remove them
-        return path.substring(7);
-    }
 }
@@ -33,7 +33,7 @@ import com.opensymphony.xwork2.ActionInvocation;
 /**
 * <!-- START SNIPPET: description -->
 *
- * A custom Result type for sending raw data (via an InputStream) directly to the
+ * A custom Result type for send raw data (via an InputStream) directly to the
 * HttpServletResponse. Very useful for allowing users to download content.
 *
 * <!-- END SNIPPET: description -->
@@ -117,7 +117,7 @@ public abstract class StrutsResultSupport implements Result, StrutsStatics {
    }

    public StrutsResultSupport(String location) {
-        this(location, true, false);
+        this(location, false, false);
    }

    public StrutsResultSupport(String location, boolean parse, boolean encode) {
@@ -115,12 +115,6 @@ public class JakartaMultiPartRequest implements MultiPartRequest {
                } else {
                    log.debug("Item is a file upload");

-                    // Skip file uploads that don't have a file name - meaning that no file was selected.
-                    if (item.getName() == null || item.getName().trim().length() < 1) {
-                        log.debug("No file has been uploaded for the field: " + item.getFieldName());
-                        continue;
-                    }
-
                    List<FileItem> values;
                    if (files.get(item.getFieldName()) != null) {
                        values = files.get(item.getFieldName());
@@ -1,23 +1 @@
-<!--
-/*
- * $Id$
- *
- * 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.
- */
-->
 <body>Classes to help dispatch multipart HTTP requests.</body>
@@ -1,23 +1 @@
-<!--
-/*
- * $Id$
- *
- * 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.
- */
-->
 <body>Classes for action dispatching in Struts (the Controller part of MVC).</body>
@@ -26,10 +26,10 @@ import java.util.Map;
 /**
 * Actions that want access to the user's HTTP session should implement this interface.<p>
 * <p/>
- * This will give them access to a Map where they can put objects that can be made available
- * to subsequent requests.<p/>
+ * This interface is only relevant if the Action is used in a servlet environment.<p>
 * <p/>
- * Typical uses may be cached user data such as name, or a shopping cart.
+ * Note that using this interface makes the Action tied to a servlet environment, so it should be
+ * avoided if possible since things like unit testing will become more difficult.
 *
 */
 public interface SessionAware {
@@ -103,24 +103,4 @@ public interface PortletActionConstants {
     * {@link org.apache.struts2.portlet.context.PortletActionContext}.
     */
    String DEFAULT_ACTION_FOR_MODE = "struts.portlet.defaultActionForMode";
-
-    /**
-     * Key for request attribute indicating if the action has been reset.
-     */
-    String ACTION_RESET = "struts.portlet.actionReset";
-
-    /**
-     * Key for session attribute indicating the location of the render direct action.
-     */
-    String RENDER_DIRECT_LOCATION = "struts.portlet.renderDirectLocation";
-
-    /**
-     * Session key where the value stack from the event phase is stored.
-     */
-    String STACK_FROM_EVENT_PHASE = "struts.portlet.valueStackFromEventPhase";
-
-    /**
-     * Default name of dispatcher servlet in web.xml
-     */
-    String DEFAULT_DISPATCHER_SERVLET_NAME = "Struts2PortletDispatcherServlet";
 }
@@ -22,11 +22,16 @@ package org.apache.struts2.portlet.context;

 import java.util.Map;

-import javax.portlet.*;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;

 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.portlet.PortletActionConstants;
-import org.apache.struts2.StrutsStatics;

 import com.opensymphony.xwork2.ActionContext;

@@ -189,12 +194,4 @@ public class PortletActionContext implements PortletActionConstants {
        return (Map)getContext().get(MODE_NAMESPACE_MAP);
    }

-    /**
-     * Get the portlet context.
-     * @return The portlet context.
-     */
-    public static PortletContext getPortletContext() {
-    	return (PortletContext)getContext().get(StrutsStatics.STRUTS_PORTLET_CONTEXT);
-    }
-
 }
@@ -0,0 +1,66 @@
+/*
+ * $Id$
+ *
+ * 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.portlet.context;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsStatics;
+
+import com.opensymphony.xwork2.ActionContext;
+
+/**
+ * Since a portlet is not dispatched the same way as a servlet, the
+ * {@link org.apache.struts2.ServletActionContext} is not immediately available, as it
+ * depends on objects from the servlet API. However, the WW2 view implementations require access
+ * to the objects in the {@link org.apache.struts2.ServletActionContext}, and this servlet
+ * makes sure that these are available when the portlet actions are executing the render results.
+ *
+ */
+public class PreparatorServlet extends HttpServlet implements StrutsStatics {
+
+    private static final long serialVersionUID = 1853399729352984089L;
+
+    private final static Log LOG = LogFactory.getLog(PreparatorServlet.class);
+
+    /**
+     * Prepares the {@link org.apache.struts2.ServletActionContext} with the
+     * {@link ServletContext}, {@link HttpServletRequest} and {@link HttpServletResponse}.
+     */
+    public void service(HttpServletRequest servletRequest,
+            HttpServletResponse servletResponse) throws ServletException,
+            IOException {
+        LOG.debug("Preparing servlet objects for dispatch");
+        ServletContext ctx = getServletContext();
+        ActionContext.getContext().put(SERVLET_CONTEXT, ctx);
+        ActionContext.getContext().put(HTTP_REQUEST, servletRequest);
+        ActionContext.getContext().put(HTTP_RESPONSE, servletResponse);
+        LOG.debug("Preparation complete");
+    }
+
+}
@@ -0,0 +1,63 @@
+/*
+ * $Id$
+ *
+ * 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.portlet.context;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Some of the factory/managers (e.g. the ObjectFactory) need access to
+ * the {@link org.apache.struts2.ServletActionContext} object when initializing.
+ * This {@link javax.servlet.ServletContextListener} keeps a reference to the
+ * {@link javax.servlet.ServletContext} and exposes it through a <code>public static</code>
+ * method.
+ *
+ */
+public class ServletContextHolderListener implements ServletContextListener {
+
+    private static ServletContext context = null;
+
+    /**
+     * @return The current servlet context
+     */
+    public static ServletContext getServletContext() {
+        return context;
+    }
+
+    /**
+     * Stores the reference to the {@link ServletContext}.
+     *
+     * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
+     */
+    public void contextInitialized(ServletContextEvent event) {
+        context = event.getServletContext();
+
+    }
+
+    /**
+     * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
+     */
+    public void contextDestroyed(ServletContextEvent event) {
+        context = null;
+    }
+
+}
@@ -23,10 +23,6 @@ package org.apache.struts2.portlet.dispatcher;
 import com.opensymphony.xwork2.Action;

 import java.io.Serializable;
-import java.util.Map;
-
-import org.apache.struts2.interceptor.SessionAware;
-import org.apache.struts2.portlet.PortletActionConstants;

 /**
 * When a portlet is targetted for an <code>event</code>, the portlet will receive two
@@ -42,7 +38,7 @@ import org.apache.struts2.portlet.PortletActionConstants;
 * specifying this action and the location of the view, which then will be executed in the
 * following render request.
 */
-public class DirectRenderFromEventAction implements SessionAware, PortletActionConstants, Action, Serializable {
+public class DirectRenderFromEventAction implements Action, Serializable {

    private static final long serialVersionUID = -1814807772308405785L;

@@ -57,6 +53,15 @@ public class DirectRenderFromEventAction implements SessionAware, PortletActionC
        return location;
    }

+    /**
+     * Set the location of the view.
+     *
+     * @param location The location to set.
+     */
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
    /**
     * Always return success.
     *
@@ -65,8 +70,4 @@ public class DirectRenderFromEventAction implements SessionAware, PortletActionC
    public String execute() throws Exception {
        return SUCCESS;
    }
-
-    public void setSession(Map session) {
-        location = (String)session.get(RENDER_DIRECT_LOCATION);
-    }
 }
@@ -20,14 +20,23 @@
 */
 package org.apache.struts2.portlet.dispatcher;

-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.ActionProxyFactory;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import com.opensymphony.xwork2.util.TextUtils;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsConstants;
@@ -44,20 +53,19 @@ import org.apache.struts2.portlet.PortletApplicationMap;
 import org.apache.struts2.portlet.PortletRequestMap;
 import org.apache.struts2.portlet.PortletSessionMap;
 import org.apache.struts2.portlet.context.PortletActionContext;
-import org.apache.struts2.portlet.servlet.PortletServletContext;
-import org.apache.struts2.portlet.servlet.PortletServletRequest;
-import org.apache.struts2.portlet.servlet.PortletServletResponse;
+import org.apache.struts2.portlet.context.ServletContextHolderListener;
+import org.apache.struts2.portlet.util.HttpServletRequestMock;
 import org.apache.struts2.util.AttributeMap;

-import javax.portlet.*;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import com.opensymphony.xwork2.util.FileManager;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.TextUtils;

 /**
 * <!-- START SNIPPET: javadoc -->
@@ -68,7 +76,7 @@ import java.util.Map;
 * </p>
 * <!-- END SNIPPET: javadoc -->
 *
- * @author Nils-Helge Garli
+ * @author <a href="nils-helge.garli@bekk.no">Nils-Helge Garli </a>
 * @author Rainer Hermanns
 *
 * <p><b>Init parameters</b></p>
@@ -179,10 +187,9 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
            String value = cfg.getInitParameter(name);
            params.put(name, value);
        }
-
-        // TODO: CHECK IF NEEDED (RG Portlet Refactoring Backports)
+        
        Dispatcher.setPortletSupportActive(true);
-        dispatcherUtils = new Dispatcher(new PortletServletContext(cfg.getPortletContext()), params);
+        dispatcherUtils = new Dispatcher(ServletContextHolderListener.getServletContext(), params);
        dispatcherUtils.init();
        
        // For testability
@@ -293,7 +300,6 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
        LOG.debug("Entering render");
        resetActionContext();
        response.setTitle(getTitle(request));
-        if(!request.getWindowState().equals(WindowState.MINIMIZED)) {
        try {
            // Check to see if an event set the render to be included directly
            serviceAction(request, response, getActionMapping(request),
@@ -304,7 +310,6 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
        } finally {
            resetActionContext();
        }
-	}
    }

    /**
@@ -331,22 +336,11 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
     */
    public HashMap createContextMap(Map requestMap, Map parameterMap,
            Map sessionMap, Map applicationMap, PortletRequest request,
-            PortletResponse response, PortletConfig portletConfig, Integer phase) throws IOException {
+            PortletResponse response, PortletConfig portletConfig, Integer phase) {

        // TODO Must put http request/response objects into map for use with
        // ServletActionContext
-        HttpServletResponse dummyResponse = new PortletServletResponse(response);
-        HttpServletRequest dummyRequest = new PortletServletRequest(request, getPortletContext());
-        ServletContext dummyServletContext = new PortletServletContext(getPortletContext());
-        if(EVENT_PHASE.equals(phase)) {
-            dummyRequest = dispatcherUtils.wrapRequest(dummyRequest, dummyServletContext);
-        }
        HashMap<String,Object> extraContext = new HashMap<String,Object>();
-        // The dummy servlet objects. Eases reuse of existing interceptors that uses the servlet objects.
-        extraContext.put(StrutsStatics.HTTP_REQUEST, dummyRequest);
-        extraContext.put(StrutsStatics.HTTP_RESPONSE, dummyResponse);
-        extraContext.put(StrutsStatics.SERVLET_CONTEXT, dummyServletContext);
-        // End dummy servlet objects
        extraContext.put(ActionContext.PARAMETERS, parameterMap);
        extraContext.put(ActionContext.SESSION, sessionMap);
        extraContext.put(ActionContext.APPLICATION, applicationMap);
@@ -403,13 +397,13 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
            Map sessionMap, Map applicationMap, String portletNamespace,
            Integer phase) throws PortletException {
        LOG.debug("serviceAction");
+        HashMap extraContext = createContextMap(requestMap, parameterMap,
+                sessionMap, applicationMap, request, response,
+                getPortletConfig(), phase);
        String actionName = mapping.getName();
        String namespace = mapping.getNamespace();
        Dispatcher.setInstance(dispatcherUtils);
        try {
-            HashMap extraContext = createContextMap(requestMap, parameterMap,
-                    sessionMap, applicationMap, request, response,
-                    getPortletConfig(), phase);
            LOG.debug("Creating action proxy for name = " + actionName
                    + ", namespace = " + namespace);
            ActionProxy proxy = factory.createActionProxy(namespace,
@@ -417,7 +411,27 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
            proxy.setMethod(mapping.getMethod());
            request.setAttribute("struts.valueStack", proxy.getInvocation()
                    .getStack());
+            if (PortletActionConstants.RENDER_PHASE.equals(phase)
+                    && TextUtils.stringSet(request
+                            .getParameter(EVENT_ACTION))) {
+
+                ActionProxy action = (ActionProxy) request.getPortletSession()
+                        .getAttribute(EVENT_ACTION);
+                if (action != null) {
+                    ValueStack stack = proxy.getInvocation().getStack();
+                    Object top = stack.pop();
+                    stack.push(action.getInvocation().getAction());
+                    stack.push(top);
+                }
+            }
            proxy.execute();
+            if (PortletActionConstants.EVENT_PHASE.equals(phase)) {
+                // Store the executed action in the session for retrieval in the
+                // render phase.
+                ActionResponse actionResp = (ActionResponse) response;
+                request.getPortletSession().setAttribute(EVENT_ACTION, proxy);
+                actionResp.setRenderParameter(EVENT_ACTION, "true");
+            }
        } catch (ConfigurationException e) {
            LOG.error("Could not find action", e);
            throw new PortletException("Could not find action " + actionName, e);
@@ -453,18 +467,20 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
        ActionMapping mapping = null;
        String actionPath = null;
        if (resetAction(request)) {
-            mapping = actionMap.get(request.getPortletMode());
+            mapping = (ActionMapping) actionMap.get(request.getPortletMode());
        } else {
            actionPath = request.getParameter(ACTION_PARAM);
            if (!TextUtils.stringSet(actionPath)) {
-                mapping = actionMap.get(request
+                mapping = (ActionMapping) actionMap.get(request
                        .getPortletMode());
            } else {
                
                // Use the usual action mapper, but it is expecting an action extension
                // on the uri, so we add the default one, which should be ok as the
                // portlet is a portlet first, a servlet second
-                PortletServletRequest httpRequest = new PortletServletRequest(request, getPortletContext());
+                HttpServletRequestMock httpRequest = new HttpServletRequestMock()
+                    .setServletPath(actionPath + ".action")
+                    .setParameterMap(request.getParameterMap());
                mapping = actionMapper.getMapping(httpRequest, dispatcherUtils.getConfigurationManager());
            }
        }
@@ -568,12 +584,6 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
                reset = true;
            }
        }
-        if(reset) {
-        	request.setAttribute(ACTION_RESET, Boolean.TRUE);
-        }
-        else {
-        	request.setAttribute(ACTION_RESET, Boolean.FALSE);
-        }
        return reset;
    }

@@ -1,84 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.interceptor;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.interceptor.PrincipalAware;
-import org.apache.struts2.portlet.PortletActionConstants;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-
-public class PortletAwareInterceptor extends AbstractInterceptor implements PortletActionConstants, StrutsStatics {
-
-	private static final long serialVersionUID = 2476509721059587700L;
-	
-	private static final Log LOG = LogFactory.getLog(PortletAwareInterceptor.class);
-
-	/**
-     * Sets action properties based on the interfaces an action implements. Things like application properties,
-     * parameters, session attributes, etc are set based on the implementing interface.
-     *
-     * @param invocation an encapsulation of the action execution state.
-     * @throws Exception if an error occurs when setting action properties.
-     */
-    public String intercept(ActionInvocation invocation) throws Exception {
-        final Object action = invocation.getAction();
-        final ActionContext context = invocation.getInvocationContext();
-
-        if (action instanceof PortletRequestAware) {
-            PortletRequest request = (PortletRequest) context.get(REQUEST);
-            ((PortletRequestAware) action).setPortletRequest(request);
-        }
-
-        if (action instanceof PortletResponseAware) {
-            PortletResponse response = (PortletResponse) context.get(RESPONSE);
-            ((PortletResponseAware) action).setPortletResponse(response);
-        }
-        if (action instanceof PrincipalAware) {
-            PortletRequest request = (PortletRequest) context.get(REQUEST);
-            ((PrincipalAware) action).setPrincipalProxy(new PortletPrincipalProxy(request));
-        }
-        if (action instanceof PortletContextAware) {
-            PortletContext portletContext = (PortletContext) context.get(STRUTS_PORTLET_CONTEXT);
-            ((PortletContextAware) action).setPortletContext(portletContext);
-        }
-        if (action instanceof PortletPreferencesAware) {
-        	PortletRequest request = (PortletRequest) context.get(REQUEST);
-            
-            // Check if running in a servlet environment
-            if (request == null) {
-                LOG.warn("This portlet preferences implementation should only be used during development");
-                ((PortletPreferencesAware)action).setPortletPreferences(new ServletPortletPreferences(ActionContext.getContext().getSession()));
-            } else {
-            	((PortletPreferencesAware)action).setPortletPreferences(request.getPreferences());
-            }
-        }
-        return invocation.invoke();
-    }
-}
@@ -1,29 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.interceptor;
-
-import javax.portlet.PortletContext;
-
-public interface PortletContextAware {
-
-	void setPortletContext(PortletContext portletContext);
-
-}
@@ -1,23 +1,3 @@
-/*
- * $Id$
- *
- * 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.portlet.interceptor;

 import org.apache.struts2.interceptor.PrincipalProxy;
@@ -1,29 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.interceptor;
-
-import javax.portlet.PortletRequest;
-
-public interface PortletRequestAware {
-
-	void setPortletRequest(PortletRequest request);
-
-}
@@ -1,29 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.interceptor;
-
-import javax.portlet.PortletResponse;
-
-public interface PortletResponseAware {
-
-	void setPortletResponse(PortletResponse response);
-
-}
@@ -1,95 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.interceptor;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.util.CompoundRoot;
-import com.opensymphony.xwork2.util.TextUtils;
-import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.portlet.PortletActionConstants;
-import org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.RenderRequest;
-import java.util.Map;
-
-public class PortletStateInterceptor extends AbstractInterceptor implements PortletActionConstants {
-
-	private final static Log LOG = LogFactory.getLog(PortletStateInterceptor.class);
-
-	private static final long serialVersionUID = 6138452063353911784L;
-
-	@Override
-	public String intercept(ActionInvocation invocation) throws Exception {
-		Integer phase = (Integer) invocation.getInvocationContext().get(PHASE);
-		if (RENDER_PHASE.equals(phase)) {
-			restoreStack(invocation);
-			return invocation.invoke();
-		} else if (EVENT_PHASE.equals(phase)) {
-			try {
-				return invocation.invoke();
-			} finally {
-				saveStack(invocation);
-			}
-		} else {
-			return invocation.invoke();
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private void saveStack(ActionInvocation invocation) {
-		Map session = invocation.getInvocationContext().getSession();
-		session.put(STACK_FROM_EVENT_PHASE, invocation.getStack());
-		ActionResponse actionResponse = (ActionResponse) invocation.getInvocationContext().get(RESPONSE);
-		actionResponse.setRenderParameter(EVENT_ACTION, "true");
-	}
-
-	@SuppressWarnings("unchecked")
-	private void restoreStack(ActionInvocation invocation) {
-		RenderRequest request = (RenderRequest) invocation.getInvocationContext().get(REQUEST);
-		if (TextUtils.stringSet(request.getParameter(EVENT_ACTION))) {
-			Map session = invocation.getInvocationContext().getSession();
-			if(!isProperPrg(invocation)) {
-				LOG.debug("Restoring value stack from event phase");
-				ValueStack oldStack = (ValueStack) invocation.getInvocationContext().getSession().get(
-				STACK_FROM_EVENT_PHASE);
-				if (oldStack != null) {
-					CompoundRoot oldRoot = oldStack.getRoot();
-					ValueStack currentStack = invocation.getStack();
-					CompoundRoot root = currentStack.getRoot();
-					root.addAll(oldRoot);
-					LOG.debug("Restored stack");
-				}
-			}
-			else {
-				LOG.debug("Won't restore stack from event phase since it's a proper PRG request");
-			}
-		}
-	}
-
-	private boolean isProperPrg(ActionInvocation invocation) {
-		return !(invocation.getAction() instanceof DirectRenderFromEventAction);
-	}
-
-}
@@ -1,238 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.result;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.struts2.dispatcher.ServletActionRedirectResult;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.views.util.UrlHelper;
-
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.inject.Inject;
-
-/**
- *
- * Portlet modification of the {@link ServletActionRedirectResult}.
- *
- * <!-- START SNIPPET: description -->
-
- * This result uses the {@link ActionMapper} provided by the {@link ActionMapperFactory} to instruct the render phase to
- * invoke the specified action and (optional) namespace. This is better than the {@link PortletResult}
- * because it does not require you to encode the URL patterns processed by the {@link ActionMapper} in to your struts.xml
- * configuration files. This means you can change your URL patterns at any point and your application will still work.
- * It is strongly recommended that if you are redirecting to another action, you use this result rather than the
- * standard redirect result.
- *
- * See examples below for an example of how request parameters could be passed in.
- *
- * <!-- END SNIPPET: description -->
- *
- * <b>This result type takes the following parameters:</b>
- *
- * <!-- START SNIPPET: params -->
- *
- * <ul>
- *
- * <li><b>actionName (default)</b> - the name of the action that will be redirect to</li>
- *
- * <li><b>namespace</b> - used to determine which namespace the action is in that we're redirecting to . If namespace is
- * null, this defaults to the current namespace</li>
- *
- * </ul>
- *
- * <!-- END SNIPPET: params -->
- *
- * <b>Example:</b>
- *
- * <pre><!-- START SNIPPET: example -->
- * &lt;package name="public" extends="struts-default"&gt;
- *     &lt;action name="login" class="..."&gt;
- *         &lt;!-- Redirect to another namespace --&gt;
- *         &lt;result type="redirect-action"&gt;
- *             &lt;param name="actionName"&gt;dashboard&lt;/param&gt;
- *             &lt;param name="namespace"&gt;/secure&lt;/param&gt;
- *         &lt;/result&gt;
- *     &lt;/action&gt;
- * &lt;/package&gt;
- *
- * &lt;package name="secure" extends="struts-default" namespace="/secure"&gt;
- *     &lt;-- Redirect to an action in the same namespace --&gt;
- *     &lt;action name="dashboard" class="..."&gt;
- *         &lt;result&gt;dashboard.jsp&lt;/result&gt;
- *         &lt;result name="error" type="redirect-action"&gt;error&lt;/result&gt;
- *     &lt;/action&gt;
- *
- *     &lt;action name="error" class="..."&gt;
- *         &lt;result&gt;error.jsp&lt;/result&gt;
- *     &lt;/action&gt;
- * &lt;/package&gt;
- *
- * &lt;package name="passingRequestParameters" extends="struts-default" namespace="/passingRequestParameters"&gt;
- *    &lt;-- Pass parameters (reportType, width and height) --&gt;
- *    &lt;!--
- *    The redirect-action url generated will be :
- *    /genReport/generateReport.action?reportType=pie&width=100&height=100
- *    --&gt;
- *    &lt;action name="gatherReportInfo" class="..."&gt;
- *       &lt;result name="showReportResult" type="redirect-action"&gt;
- *          &lt;param name="actionName"&gt;generateReport&lt;/param&gt;
- *          &lt;param name="namespace"&gt;/genReport&lt;/param&gt;
- *          &lt;param name="reportType"&gt;pie&lt;/param&gt;
- *          &lt;param name="width"&gt;100&lt;/param&gt;
- *          &lt;param name="height"&gt;100&lt;/param&gt;
- *       &lt;/result&gt;
- *    &lt;/action&gt;
- * &lt;/package&gt;
- *
- *
- * <!-- END SNIPPET: example --></pre>
- *
- * @see ActionMapper
- */
-public class PortletActionRedirectResult extends PortletResult {
-
-	private static final long serialVersionUID = -7627388936683562557L;
-
-	/** The default parameter */
-    public static final String DEFAULT_PARAM = "actionName";
-
-    protected String actionName;
-    protected String namespace;
-    protected String method;
-
-    private Map<String, String> requestParameters = new LinkedHashMap<String, String>();
-
-    private ActionMapper actionMapper;
-
-    public PortletActionRedirectResult() {
-        super();
-    }
-
-    public PortletActionRedirectResult(String actionName) {
-        this(null, actionName, null);
-    }
-
-    public PortletActionRedirectResult(String actionName, String method) {
-        this(null, actionName, method);
-    }
-
-    public PortletActionRedirectResult(String namespace, String actionName, String method) {
-        super(null);
-        this.namespace = namespace;
-        this.actionName = actionName;
-        this.method = method;
-    }
-
-    protected List<String> prohibitedResultParam = Arrays.asList(new String[] {
-            DEFAULT_PARAM, "namespace", "method", "encode", "parse", "location",
-            "prependServletContext" });
-
-    @Inject
-    public void setActionMapper(ActionMapper actionMapper) {
-    	this.actionMapper = actionMapper;
-    }
-
-    /**
-     * @see com.opensymphony.xwork2.Result#execute(com.opensymphony.xwork2.ActionInvocation)
-     */
-    public void execute(ActionInvocation invocation) throws Exception {
-        actionName = conditionalParse(actionName, invocation);
-        if (namespace == null) {
-            namespace = invocation.getProxy().getNamespace();
-        } else {
-            namespace = conditionalParse(namespace, invocation);
-        }
-        if (method == null) {
-            method = "";
-        }
-        else {
-            method = conditionalParse(method, invocation);
-        }
-
-        String resultCode = invocation.getResultCode();
-        if (resultCode != null) {
-            ResultConfig resultConfig = invocation.getProxy().getConfig().getResults().get(
-                    resultCode);
-            Map resultConfigParams = resultConfig.getParams();
-            for (Iterator i = resultConfigParams.entrySet().iterator(); i.hasNext(); ) {
-                Map.Entry e = (Map.Entry) i.next();
-                if (! prohibitedResultParam.contains(e.getKey())) {
-                    requestParameters.put(e.getKey().toString(),
-                            e.getValue() == null ? "":
-                                conditionalParse(e.getValue().toString(), invocation));
-                }
-            }
-        }
-
-        StringBuffer tmpLocation = new StringBuffer(actionMapper.getUriFromActionMapping(new ActionMapping(actionName, namespace, method, null)));
-        UrlHelper.buildParametersString(requestParameters, tmpLocation, "&");
-
-        setLocation(tmpLocation.toString());
-
-        super.execute(invocation);
-    }
-
-    /**
-     * Sets the action name
-     *
-     * @param actionName The name
-     */
-    public void setActionName(String actionName) {
-        this.actionName = actionName;
-    }
-
-    /**
-     * Sets the namespace
-     *
-     * @param namespace The namespace
-     */
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    /**
-     * Sets the method
-     *
-     * @param method The method
-     */
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    /**
-     * Adds a request parameter to be added to the redirect url
-     *
-     * @param key The parameter name
-     * @param value The parameter value
-     */
-    public PortletActionRedirectResult addParameter(String key, Object value) {
-        requestParameters.put(key, String.valueOf(value));
-        return this;
-    }
-
-}
@@ -20,8 +20,20 @@
 */
 package org.apache.struts2.portlet.result;

-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.util.TextUtils;
+import java.io.IOException;
+import java.util.StringTokenizer;
+
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
@@ -29,20 +41,14 @@ import org.apache.struts2.dispatcher.StrutsResultSupport;
 import org.apache.struts2.portlet.PortletActionConstants;
 import org.apache.struts2.portlet.context.PortletActionContext;

-import javax.portlet.*;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.StringTokenizer;
-import java.util.Map;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.TextUtils;

 /**
 * Result type that includes a JSP to render.
 *
 */
-public class PortletResult extends StrutsResultSupport implements PortletActionConstants {
+public class PortletResult extends StrutsResultSupport {

    private static final long serialVersionUID = 434251393926178567L;

@@ -110,26 +116,28 @@ public class PortletResult extends StrutsResultSupport implements PortletActionC
     * @param finalLocation
     * @param invocation
     */
-    protected void executeActionResult(String finalLocation, ActionInvocation invocation) {
+    protected void executeActionResult(String finalLocation,
+            ActionInvocation invocation) {
        LOG.debug("Executing result in Event phase");
        ActionResponse res = PortletActionContext.getActionResponse();
-        Map sessionMap = invocation.getInvocationContext().getSession();
        LOG.debug("Setting event render parameter: " + finalLocation);
        if (finalLocation.indexOf('?') != -1) {
-            convertQueryParamsToRenderParams(res, finalLocation.substring(finalLocation.indexOf('?') + 1));
-            finalLocation = finalLocation.substring(0, finalLocation.indexOf('?'));
+            convertQueryParamsToRenderParams(res, finalLocation
+                    .substring(finalLocation.indexOf('?') + 1));
+            finalLocation = finalLocation.substring(0, finalLocation
+                    .indexOf('?'));
        }
        if (finalLocation.endsWith(".action")) {
            // View is rendered with a view action...luckily...
            finalLocation = finalLocation.substring(0, finalLocation
                    .lastIndexOf("."));
-            res.setRenderParameter(ACTION_PARAM, finalLocation);
+            res.setRenderParameter(PortletActionConstants.ACTION_PARAM, finalLocation);
        } else {
            // View is rendered outside an action...uh oh...
            res.setRenderParameter(PortletActionConstants.ACTION_PARAM, "renderDirect");
-            sessionMap.put(RENDER_DIRECT_LOCATION, finalLocation);
+            res.setRenderParameter("location", finalLocation);
        }
-        res.setRenderParameter(MODE_PARAM, PortletActionContext
+        res.setRenderParameter(PortletActionConstants.MODE_PARAM, PortletActionContext
                .getRequest().getPortletMode().toString());
    }

@@ -170,6 +178,20 @@ public class PortletResult extends StrutsResultSupport implements PortletActionC
            res.setTitle(title);
        }
        LOG.debug("Location: " + finalLocation);
+        PortletRequestDispatcher preparator = cfg.getPortletContext()
+                .getNamedDispatcher("preparator");
+        if(preparator == null) {
+            throw new PortletException("Cannot look up 'preparator' servlet. Make sure that you" +
+                    "have configured it correctly in the web.xml file.");
+        }
+        new IncludeTemplate() {
+            protected void when(PortletException e) {
+                LOG.error("PortletException while dispatching to 'preparator' servlet", e);
+            }
+            protected void when(IOException e) {
+                LOG.error("IOException while dispatching to 'preparator' servlet", e);
+            }
+        }.include(preparator, req, res);
        PortletRequestDispatcher dispatcher = cfg.getPortletContext().getRequestDispatcher(finalLocation);
        if(dispatcher == null) {
            throw new PortletException("Could not locate dispatcher for '" + finalLocation + "'");
@@ -20,10 +20,20 @@
 */
 package org.apache.struts2.portlet.result;

-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspFactory;
+import javax.servlet.jsp.PageContext;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
@@ -37,15 +47,10 @@ import org.apache.velocity.Template;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;

-import javax.portlet.ActionResponse;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspFactory;
-import javax.servlet.jsp.PageContext;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;

 /**
 * <!-- START SNIPPET: description -->
@@ -155,6 +160,7 @@ public class PortletVelocityResult extends StrutsResultSupport {
     */
    public void executeRenderResult(String finalLocation,
            ActionInvocation invocation) throws Exception {
+        prepareServletActionContext();
        ValueStack stack = ActionContext.getContext().getValueStack();

        HttpServletRequest request = ServletActionContext.getRequest();
@@ -186,7 +192,7 @@ public class PortletVelocityResult extends StrutsResultSupport {
            if (encoding != null) {
                contentType = contentType + ";charset=" + encoding;
            }
-            response.setContentType(contentType);
+
            Template t = getTemplate(stack,
                    velocityManager.getVelocityEngine(), invocation,
                    finalLocation, encoding);
@@ -196,6 +202,8 @@ public class PortletVelocityResult extends StrutsResultSupport {
            Writer writer = new OutputStreamWriter(response.getOutputStream(),
                    encoding);

+            response.setContentType(contentType);
+
            t.merge(context, writer);

            // always flush the writer (we used to only flush it if this was a
@@ -286,4 +294,14 @@ public class PortletVelocityResult extends StrutsResultSupport {
        return velocityManager.createContext(stack, request, response);
    }

+    /**
+     *  Prepares the servlet action context for this request
+     */
+    private void prepareServletActionContext() throws PortletException,
+            IOException {
+        PortletRequestDispatcher disp = PortletActionContext.getPortletConfig()
+                .getPortletContext().getNamedDispatcher("preparator");
+        disp.include(PortletActionContext.getRenderRequest(),
+                PortletActionContext.getRenderResponse());
+    }
 }
@@ -1,214 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.portlet.PortletSession;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
-
-/**
- * Wrapper object exposing a {@link PortletSession} as a {@link HttpSession} instance.
- * Clients accessing this session object will in fact operate on the
- * {@link PortletSession} object wrapped by this session object.
- */
-public class PortletHttpSession implements HttpSession {
-
-	private PortletSession portletSession;
-
-	public PortletHttpSession(PortletSession portletSession) {
-		this.portletSession = portletSession;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String name) {
-		return portletSession.getAttribute(name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getAttributeNames()
-	 */
-	public Enumeration getAttributeNames() {
-		return portletSession.getAttributeNames();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getCreationTime()
-	 */
-	public long getCreationTime() {
-		return portletSession.getCreationTime();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getId()
-	 */
-	public String getId() {
-		return portletSession.getId();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getLastAccessedTime()
-	 */
-	public long getLastAccessedTime() {
-		return portletSession.getLastAccessedTime();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getMaxInactiveInterval()
-	 */
-	public int getMaxInactiveInterval() {
-		return portletSession.getMaxInactiveInterval();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getServletContext()
-	 */
-	public ServletContext getServletContext() {
-		return new PortletServletContext(portletSession.getPortletContext());
-	}
-
-	/**
-	 * @see javax.servlet.http.HttpSession#getSessionContext()
-	 * @throws IllegalStateException
-	 *             Not supported in a portlet.
-	 */
-	public HttpSessionContext getSessionContext() {
-		throw new IllegalStateException("Not supported in a portlet");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getValue(java.lang.String)
-	 */
-	public Object getValue(String name) {
-		return getAttribute(name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#getValueNames()
-	 */
-	public String[] getValueNames() {
-		List<String> names = new ArrayList<String>();
-		Enumeration attrNames = getAttributeNames();
-		while (attrNames.hasMoreElements()) {
-			names.add((String) attrNames.nextElement());
-		}
-		return names.toArray(new String[0]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#invalidate()
-	 */
-	public void invalidate() {
-		portletSession.invalidate();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#isNew()
-	 */
-	public boolean isNew() {
-		return portletSession.isNew();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#putValue(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	public void putValue(String name, Object value) {
-		setAttribute(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String)
-	 */
-	public void removeAttribute(String name) {
-		portletSession.removeAttribute(name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#removeValue(java.lang.String)
-	 */
-	public void removeValue(String name) {
-		removeAttribute(name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	public void setAttribute(String name, Object value) {
-		portletSession.setAttribute(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int)
-	 */
-	public void setMaxInactiveInterval(int interval) {
-		portletSession.setMaxInactiveInterval(interval);
-	}
-
-	/**
-	 * Get the wrapped portlet session.
-	 * 
-	 * @return The wrapped portlet session.
-	 */
-	public PortletSession getPortletSession() {
-		return portletSession;
-	}
-
-}
@@ -1,81 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.util.Enumeration;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
-/**
- * Wrapper object exposing a {@link PortletConfig} as a {@link ServletConfig} instance.
- * Clients accessing this config object will in fact operate on the
- * {@link PortletConfig} object wrapped by this config object.
- */
-public class PortletServletConfig implements ServletConfig {
-
-	private PortletConfig portletConfig;
-	
-	public PortletServletConfig(PortletConfig portletConfig) {
-		this.portletConfig = portletConfig;
-	}
-	
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletConfig#getInitParameter(java.lang.String)
-	 */
-	public String getInitParameter(String name) {
-		return portletConfig.getInitParameter(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletConfig#getInitParameterNames()
-	 */
-	public Enumeration getInitParameterNames() {
-		return portletConfig.getInitParameterNames();
-	}
-
-	/**
-	 * Get the {@link PortletContext} as a {@link PortletServletContext} instance.
-	 * @see javax.servlet.ServletConfig#getServletContext()
-	 */
-	public ServletContext getServletContext() {
-		return new PortletServletContext(portletConfig.getPortletContext());
-	}
-
-	/**
-	 * Will return the portlet name.
-	 * @see javax.servlet.ServletConfig#getServletName()
-	 */
-	public String getServletName() {
-		return portletConfig.getPortletName();
-	}
-	
-	/**
-	 * Get the wrapped {@link PortletConfig} instance.
-	 * @return The wrapped {@link PortletConfig} instance.
-	 */
-	public PortletConfig getPortletConfig() {
-		return portletConfig;
-	}
-
-}
@@ -1,235 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Set;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequestDispatcher;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-/**
- * Wrapper object exposing a {@link PortletContext} as a {@link ServletContext} instance.
- * Clients accessing this context object will in fact operate on the
- * {@link PortletContext} object wrapped by this context object.
- */
-public class PortletServletContext implements ServletContext {
-
-	private PortletContext portletContext;
-	
-	public PortletServletContext(PortletContext portletContext) {
-		this.portletContext = portletContext;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String name) {
-		return portletContext.getAttribute(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getAttributeNames()
-	 */
-	public Enumeration getAttributeNames() {
-		return portletContext.getAttributeNames();
-	}
-
-	/**
-	 * @see javax.servlet.ServletContext#getContext(java.lang.String)
-	 * @throws IllegalStateException Not supported in a portlet.
-	 */
-	public ServletContext getContext(String uripath) {
-		throw new IllegalStateException("Not supported in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getInitParameter(java.lang.String)
-	 */
-	public String getInitParameter(String name) {
-		return portletContext.getInitParameter(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getInitParameterNames()
-	 */
-	public Enumeration getInitParameterNames() {
-		return portletContext.getInitParameterNames();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getMajorVersion()
-	 */
-	public int getMajorVersion() {
-		return portletContext.getMajorVersion();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getMimeType(java.lang.String)
-	 */
-	public String getMimeType(String file) {
-		return portletContext.getMimeType(file);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getMinorVersion()
-	 */
-	public int getMinorVersion() {
-		return portletContext.getMinorVersion();
-	}
-
-	/**
-	 * Returns a {@link PortletServletRequestDispatcher} wrapping the {@link PortletRequestDispatcher}
-	 * as a {@link RequestDispatcher} instance.
-	 * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String)
-	 * @return PortletServletRequestDispatcher
-	 */
-	public RequestDispatcher getNamedDispatcher(String name) {
-		return new PortletServletRequestDispatcher(portletContext.getNamedDispatcher(name));
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getRealPath(java.lang.String)
-	 */
-	public String getRealPath(String path) {
-		return portletContext.getRealPath(path);
-	}
-
-	/**
-	 * Returns a {@link PortletServletRequestDispatcher} wrapping the {@link PortletRequestDispatcher}
-	 * as a {@link RequestDispatcher} instance.
-	 * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String)
-	 * @return PortletServletRequestDispatcher
-	 */
-	public RequestDispatcher getRequestDispatcher(String path) {
-		return new PortletServletRequestDispatcher(portletContext.getRequestDispatcher(path));
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getResource(java.lang.String)
-	 */
-	public URL getResource(String path) throws MalformedURLException {
-		return portletContext.getResource(path);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String)
-	 */
-	public InputStream getResourceAsStream(String path) {
-		return portletContext.getResourceAsStream(path);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getResourcePaths(java.lang.String)
-	 */
-	public Set getResourcePaths(String path) {
-		return portletContext.getResourcePaths(path);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getServerInfo()
-	 */
-	public String getServerInfo() {
-		return portletContext.getServerInfo();
-	}
-
-	/**
-	 * @see javax.servlet.ServletContext#getServlet(java.lang.String)
-	 * @throws IllegalStateException Not supported in a portlet.
-	 */
-	public Servlet getServlet(String name) throws ServletException {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#getServletContextName()
-	 */
-	public String getServletContextName() {
-		return portletContext.getPortletContextName();
-	}
-
-	/**
-	 * @see javax.servlet.ServletContext#getServletNames()
- 	 * @throws IllegalStateException Not supported in a portlet.
-	 */
-	public Enumeration getServletNames() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * @see javax.servlet.ServletContext#getServlets()
-	 * @throws IllegalStateException Not supported in a portlet.
-	 */
-	public Enumeration getServlets() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#log(java.lang.String)
-	 */
-	public void log(String msg) {
-		portletContext.log(msg);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#log(java.lang.Exception, java.lang.String)
-	 */
-	public void log(Exception exception, String msg) {
-		log(msg, exception);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#log(java.lang.String, java.lang.Throwable)
-	 */
-	public void log(String message, Throwable throwable) {
-		portletContext.log(message, throwable);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#removeAttribute(java.lang.String)
-	 */
-	public void removeAttribute(String name) {
-		portletContext.removeAttribute(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletContext#setAttribute(java.lang.String, java.lang.Object)
-	 */
-	public void setAttribute(String name, Object object) {
-		portletContext.setAttribute(name, object);
-	}
-	
-	/**
-	 * Get the wrapped {@link PortletContext} instance.
-	 * @return The wrapped {@link PortletContext} instance.
-	 */
-	public PortletContext getPortletContext() {
-		return portletContext;
-	}
-
-}
@@ -1,121 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.servlet.ServletInputStream;
-
-/**
- * Wrapper object exposing a {@link InputStream} from a portlet as a {@link ServletInputStream} instance.
- * Clients accessing this stream object will in fact operate on the
- * {@link InputStream} object wrapped by this stream object.
- */
-public class PortletServletInputStream extends ServletInputStream {
-
-	private InputStream portletInputStream;
-	
-	public PortletServletInputStream(InputStream portletInputStream) {
-		this.portletInputStream = portletInputStream;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#read()
-	 */
-	@Override
-	public int read() throws IOException {
-		return portletInputStream.read();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#available()
-	 */
-	@Override
-	public int available() throws IOException {
-		return portletInputStream.available();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#close()
-	 */
-	@Override
-	public void close() throws IOException {
-		portletInputStream.close();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#mark(int)
-	 */
-	@Override
-	public synchronized void mark(int readlimit) {
-		portletInputStream.mark(readlimit);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#markSupported()
-	 */
-	@Override
-	public boolean markSupported() {
-		return portletInputStream.markSupported();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#read(byte[], int, int)
-	 */
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		return portletInputStream.read(b, off, len);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#read(byte[])
-	 */
-	@Override
-	public int read(byte[] b) throws IOException {
-		return portletInputStream.read(b);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#reset()
-	 */
-	@Override
-	public synchronized void reset() throws IOException {
-		portletInputStream.reset();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#skip(long)
-	 */
-	@Override
-	public long skip(long n) throws IOException {
-		return portletInputStream.skip(n);
-	}
-	
-	/**
-	 * Get the wrapped {@link InputStream} instance.
-	 * @return The wrapped {@link InputStream} instance.
-	 */
-	public InputStream getInputStream() {
-		return portletInputStream;
-	}
-
-}
@@ -1,88 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.servlet.ServletOutputStream;
-
-/**
- * Wrapper object exposing a {@link OutputStream} from a portlet as a {@link ServletOutputStream} instance.
- * Clients accessing this stream object will in fact operate on the
- * {@link OutputStream} object wrapped by this stream object.
- */
-public class PortletServletOutputStream extends ServletOutputStream {
-
-	private OutputStream portletOutputStream;
-	
-	public PortletServletOutputStream(OutputStream portletOutputStream) {
-		this.portletOutputStream = portletOutputStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.OutputStream#write(int)
-	 */
-	@Override
-	public void write(int ch) throws IOException {
-		portletOutputStream.write(ch);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.OutputStream#close()
-	 */
-	@Override
-	public void close() throws IOException {
-		portletOutputStream.close();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.OutputStream#flush()
-	 */
-	@Override
-	public void flush() throws IOException {
-		portletOutputStream.flush();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.OutputStream#write(byte[])
-	 */
-	@Override
-	public void write(byte[] b) throws IOException {
-		portletOutputStream.write(b);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.io.OutputStream#write(byte[], int, int)
-	 */
-	@Override
-	public void write(byte[] b, int off, int len) throws IOException {
-		portletOutputStream.write(b, off, len);
-	}
-	
-	/**
-	 * Get the wrapped {@link OutputStream} instance.
-	 * @return The wrapped {@link OutputStream} instance.
-	 */
-	public OutputStream getOutputStream() {
-		return portletOutputStream;
-	}
-}
@@ -1,558 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletSession;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.struts2.portlet.PortletActionConstants;
-
-/**
- * Wrapper object exposing a {@link PortletRequest} as a {@link HttpServletRequest} instance.
- * Clients accessing this request object will in fact operate on the
- * {@link PortletRequest} object wrapped by this request object.
- */
-public class PortletServletRequest implements HttpServletRequest, PortletActionConstants {
-
-	private PortletRequest portletRequest;
-	private PortletContext portletContext;
-	
-	public PortletServletRequest(PortletRequest portletRequest, PortletContext portletContext) {
-		this.portletRequest = portletRequest;
-		this.portletContext = portletContext;
-	}
-	
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getAuthType()
-	 */
-	public String getAuthType() {
-		return portletRequest.getAuthType();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getContextPath()
-	 */
-	public String getContextPath() {
-		return portletRequest.getContextPath();
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public Cookie[] getCookies() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getCookies();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public long getDateHeader(String name) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Gets a property from the {@link PortletRequest}. Note that a {@link PortletRequest} is not 
-	 * guaranteed to map properties to headers.
-	 * @see PortletRequest#getProperty(String)
-	 * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String)
-	 */
-	public String getHeader(String name) {
-		return portletRequest.getProperty(name);
-	}
-
-	/**
-	 * Gets the property names from the {@link PortletRequest}. Note that a {@link PortletRequest} is not 
-	 * guaranteed to map properties to headers.
-	 * @see PortletRequest#getPropertyNames()
-	 * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
-	 */
-	public Enumeration getHeaderNames() {
-		return portletRequest.getPropertyNames();
-	}
-
-	/**
-	 * Gets the values for the specified property from the {@link PortletRequest}. Note that a 
-	 * {@link PortletRequest} is not guaranteed to map properties to headers.
-	 * @see PortletRequest#getProperties(String)
-	 * @see HttpServletRequest#getHeaders(String)
-	 */
-	public Enumeration getHeaders(String name) {
-		return portletRequest.getProperties(name);
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public int getIntHeader(String name) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getMethod()
-	 */
-	public String getMethod() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getPathInfo()
-	 */
-	public String getPathInfo() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getPathTranslated()
-	 */
-	public String getPathTranslated() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getQueryString()
-	 */
-	public String getQueryString() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getRemoteUser()
-	 */
-	public String getRemoteUser() {
-		return portletRequest.getRemoteUser();
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public String getRequestURI() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public StringBuffer getRequestURL() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId()
-	 */
-	public String getRequestedSessionId() {
-		return portletRequest.getRequestedSessionId();
-	}
-
-	/**
-	 * A {@link PortletRequest} has no servlet path. But for compatibility with Struts 2 components and
-	 * interceptors, the action parameter on the request is mapped to the servlet path.
-	 * @see javax.servlet.http.HttpServletRequest#getServletPath()
-	 */
-	public String getServletPath() {
-		String actionPath = getParameter(ACTION_PARAM);
-		if(actionPath != null && !actionPath.endsWith(".action")) {
-			actionPath += ".action";
-		}
-		return actionPath;
-	}
-
-	/**
-	 * Get the {@link PortletSession} as a {@link PortletHttpSession} instance.
-	 * @see javax.servlet.http.HttpServletRequest#getSession()
-	 */
-	public HttpSession getSession() {
-		return new PortletHttpSession(portletRequest.getPortletSession());
-	}
-
-	/**
-	 * Get the {@link PortletSession} as a {@link PortletHttpSession} instance.
-	 * @see javax.servlet.http.HttpServletRequest#getSession(boolean)
-	 */
-	public HttpSession getSession(boolean create) {
-		return new PortletHttpSession(portletRequest.getPortletSession(create));
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
-	 */
-	public Principal getUserPrincipal() {
-		return portletRequest.getUserPrincipal();
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public boolean isRequestedSessionIdFromCookie() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public boolean isRequestedSessionIdFromURL() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public boolean isRequestedSessionIdFromUrl() {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
-	 */
-	public boolean isRequestedSessionIdValid() {
-		return portletRequest.isRequestedSessionIdValid();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.http.HttpServletRequest#isUserInRole(java.lang.String)
-	 */
-	public boolean isUserInRole(String role) {
-		return portletRequest.isUserInRole(role);
-	}
-
-	/**
-	 * Gets an attribute value on the {@link PortletRequest}. If the attribute name is 
-	 * <tt>javax.servlet.include.servlet_path</tt>, it returns the same as
-	 * {@link PortletServletRequest#getServletPath()}
-	 * @see javax.servlet.ServletRequest#getAttribute(java.lang.String)
-	 */
-	public Object getAttribute(String name) {
-		if("javax.servlet.include.servlet_path".equals(name)) {
-			return getServletPath();
-		}
-		else {
-			return portletRequest.getAttribute(name);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getAttributeNames()
-	 */
-	public Enumeration getAttributeNames() {
-		return portletRequest.getAttributeNames();
-	}
-
-	/**
-	 * Can only be invoked in the event phase.
-	 * @see ServletRequest#getCharacterEncoding()
-	 * @throws IllegalStateException If the portlet is not in the event phase.
-	 */
-	public String getCharacterEncoding() {
-		if(portletRequest instanceof ActionRequest) {
-			return ((ActionRequest)portletRequest).getCharacterEncoding();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in render phase");
-		}
-	}
-
-	/**
-	 * Can only be invoked in the event phase.
-	 * @see ServletRequest#getContentLength()
-	 * @throws IllegalStateException If the portlet is not in the event phase.
-	 */
-	public int getContentLength() {
-		if(portletRequest instanceof ActionRequest) {
-			return ((ActionRequest)portletRequest).getContentLength();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in render phase");
-		}
-	}
-
-	/**
-	 * Can only be invoked in the event phase.
-	 * @see ServletRequest#getContentType()
-	 * @throws IllegalStateException If the portlet is not in the event phase.
-	 */
-	public String getContentType() {
-		if(portletRequest instanceof ActionRequest) {
-			return ((ActionRequest)portletRequest).getContentType();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in render phase");
-		}
-	}
-
-	/**
-	 * Can only be invoked in the event phase. When invoked in the event phase, it will wrap the
-	 * portlet's {@link InputStream} as a {@link PortletServletInputStream}.
-	 * @see ServletRequest#getInputStream()
-	 * @throws IllegalStateException If the portlet is not in the event phase.
-	 */
-	public ServletInputStream getInputStream() throws IOException {
-		if(portletRequest instanceof ActionRequest) {
-			return new PortletServletInputStream(((ActionRequest)portletRequest).getPortletInputStream());
-		}
-		else {
-			throw new IllegalStateException("Not allowed in render phase");
-		}
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public String getLocalAddr() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getLocalAddr();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public String getLocalName() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getLocalName();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public int getLocalPort() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getLocalPort();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getLocale()
-	 */
-	public Locale getLocale() {
-		return portletRequest.getLocale();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getLocales()
-	 */
-	public Enumeration getLocales() {
-		return portletRequest.getLocales();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getParameter(java.lang.String)
-	 */
-	public String getParameter(String name) {
-		return portletRequest.getParameter(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getParameterMap()
-	 */
-	public Map getParameterMap() {
-		return portletRequest.getParameterMap();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getParameterNames()
-	 */
-	public Enumeration getParameterNames() {
-		return portletRequest.getParameterNames();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getParameterValues(java.lang.String)
-	 */
-	public String[] getParameterValues(String name) {
-		return portletRequest.getParameterValues(name);
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public String getProtocol() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getProtocol();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Can only be invoked in the event phase.
-	 * @see ServletRequest#getReader()
-	 * @throws IllegalStateException If the portlet is not in the event phase.
-	 */
-	public BufferedReader getReader() throws IOException {
-		if(portletRequest instanceof ActionRequest) {
-			return ((ActionRequest)portletRequest).getReader();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in render phase");
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getRealPath(java.lang.String)
-	 */
-	public String getRealPath(String path) {
-		return portletContext.getRealPath(path);
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public String getRemoteAddr() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getRemoteAddr();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public String getRemoteHost() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getRemoteHost();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public int getRemotePort() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getRemotePort();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/**
-	 * Get the {@link PortletRequestDispatcher} as a {@link PortletServletRequestDispatcher} instance.
-	 * @see javax.servlet.ServletRequest#getRequestDispatcher(java.lang.String)
-	 */
-	public RequestDispatcher getRequestDispatcher(String path) {
-		return new PortletServletRequestDispatcher(portletContext.getRequestDispatcher(path));
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getScheme()
-	 */
-	public String getScheme() {
-		return portletRequest.getScheme();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#getServerName()
-	 */
-	public String getServerName() {
-		return portletRequest.getServerName();
-	}
-
-	/**
-	 * Not allowed in a portlet. 
-	 * @throws IllegalStateException Not allowed in a portlet.
-	 */
-	public int getServerPort() {
-		if(portletRequest instanceof HttpServletRequest) {
-			return ((HttpServletRequest)portletRequest).getServerPort();
-		}
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#isSecure()
-	 */
-	public boolean isSecure() {
-		return portletRequest.isSecure();
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String)
-	 */
-	public void removeAttribute(String name) {
-		portletRequest.removeAttribute(name);
-	}
-
-	/* (non-Javadoc)
-	 * @see javax.servlet.ServletRequest#setAttribute(java.lang.String, java.lang.Object)
-	 */
-	public void setAttribute(String name, Object o) {
-		portletRequest.setAttribute(name, o);
-	}
-
-	/**
-	 * Can only be invoked in the event phase.
-	 * @see ServletRequest#setCharacterEncoding(String)
-	 * @throws IllegalStateException If the portlet is not in the event phase.
-	 */
-	public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
-		if(portletRequest instanceof ActionRequest) {
-			((ActionRequest)portletRequest).setCharacterEncoding(env);
-		}
-		else {
-			throw new IllegalStateException("Not allowed in render phase");
-		}
-	}
-	
-	/**
-	 * Get the wrapped {@link PortletRequest} instance. 
-	 * @return The wrapped {@link PortletRequest} instance.
-	 */
-	public PortletRequest getPortletRequest() {
-		return portletRequest;
-	}
-}
@@ -1,70 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.io.IOException;
-
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-public class PortletServletRequestDispatcher implements RequestDispatcher {
-
-	private PortletRequestDispatcher portletRequestDispatcher;
-	
-	public PortletServletRequestDispatcher(PortletRequestDispatcher portletRequestDispatcher) {
-		this.portletRequestDispatcher = portletRequestDispatcher;
-	}
-
-	public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-		throw new IllegalStateException("Not allowed in a portlet");
-		
-	}
-
-	public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-		if(request instanceof PortletServletRequest && response instanceof PortletServletResponse) {
-			PortletRequest req = ((PortletServletRequest)request).getPortletRequest();
-			PortletResponse resp = ((PortletServletResponse)response).getPortletResponse();
-			if(req instanceof RenderRequest && resp instanceof RenderResponse) {
-				try {
-					portletRequestDispatcher.include((RenderRequest)req, (RenderResponse)resp);
-				}
-				catch(PortletException e) {
-					throw new ServletException(e);
-				}
-			}
-			else {
-				throw new IllegalStateException("Can only be invoked in the render phase");
-			}
-		}
-		else {
-			throw new IllegalStateException("Can only be invoked in a portlet");
-		}
-	}
-
-}
@@ -1,233 +0,0 @@
-/*
- * $Id: $
- *
- * 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.portlet.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Locale;
-
-import javax.portlet.PortletResponse;
-import javax.portlet.RenderResponse;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-public class PortletServletResponse implements HttpServletResponse {
-
-	private PortletResponse portletResponse;
-	
-	public PortletServletResponse(PortletResponse portletResponse) {
-		this.portletResponse = portletResponse;
-	}
-	
-	public void addCookie(Cookie cookie) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void addDateHeader(String name, long date) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void addHeader(String name, String value) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void addIntHeader(String name, int value) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public boolean containsHeader(String name) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public String encodeRedirectURL(String url) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public String encodeRedirectUrl(String url) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public String encodeURL(String url) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public String encodeUrl(String url) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void sendError(int sc) throws IOException {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void sendError(int sc, String msg) throws IOException {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void sendRedirect(String location) throws IOException {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setDateHeader(String name, long date) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setHeader(String name, String value) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setIntHeader(String name, int value) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setStatus(int sc) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setStatus(int sc, String sm) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void flushBuffer() throws IOException {
-		if(portletResponse instanceof RenderResponse) {
-			((RenderResponse)portletResponse).flushBuffer();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public int getBufferSize() {
-		if(portletResponse instanceof RenderResponse) {
-			return ((RenderResponse)portletResponse).getBufferSize();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public String getCharacterEncoding() {
-		if(portletResponse instanceof RenderResponse) {
-			return ((RenderResponse)portletResponse).getCharacterEncoding();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public String getContentType() {
-		if(portletResponse instanceof RenderResponse) {
-			return ((RenderResponse)portletResponse).getContentType();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public Locale getLocale() {
-		if(portletResponse instanceof RenderResponse) {
-			return ((RenderResponse)portletResponse).getLocale();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public ServletOutputStream getOutputStream() throws IOException {
-		if(portletResponse instanceof RenderResponse) {
-			return new PortletServletOutputStream(((RenderResponse)portletResponse).getPortletOutputStream());
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public PrintWriter getWriter() throws IOException {
-		if(portletResponse instanceof RenderResponse) {
-			return ((RenderResponse)portletResponse).getWriter();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public boolean isCommitted() {
-		if(portletResponse instanceof RenderResponse) {
-			return ((RenderResponse)portletResponse).isCommitted();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public void reset() {
-		if(portletResponse instanceof RenderResponse) {
-			((RenderResponse)portletResponse).reset();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public void resetBuffer() {
-		if(portletResponse instanceof RenderResponse) {
-			((RenderResponse)portletResponse).resetBuffer();
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public void setBufferSize(int size) {
-		if(portletResponse instanceof RenderResponse) {
-			((RenderResponse)portletResponse).setBufferSize(size);
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public void setCharacterEncoding(String charset) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setContentLength(int len) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public void setContentType(String type) {
-		if(portletResponse instanceof RenderResponse) {
-			((RenderResponse)portletResponse).setContentType(type);
-		}
-		else {
-			throw new IllegalStateException("Not allowed in event phase");
-		}
-	}
-
-	public void setLocale(Locale loc) {
-		throw new IllegalStateException("Not allowed in a portlet");
-	}
-
-	public PortletResponse getPortletResponse() {
-		return portletResponse;
-	}
-
-}
@@ -1,27 +0,0 @@
-<!--
-/*
- * $Id: package.html 559206 2007-07-24 21:01:18Z apetrelli $
- *
- * 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.
- */
-->
-<body>
-	Portlet wrapper objects for some of the servlet api objects. The wrappers simply delegate to the 
-	underlying, corresponding portlet objects. The portlet wrapper objects makes it easier to reuse 
-	interceptors and components from struts2 core.
-</body>
@@ -0,0 +1,278 @@
+/*
+ * $Id$
+ *
+ * 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.portlet.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * A simple mock class to interact with Struts 2 API's that require a servlet request
+ */
+public class HttpServletRequestMock implements HttpServletRequest {
+
+    private String servletPath;
+    private Map parameterMap;
+    
+    public String getAuthType() {
+        return null;
+    }
+
+    public String getContextPath() {
+        return null;
+    }
+
+    public Cookie[] getCookies() {
+        return null;
+    }
+
+    public long getDateHeader(String arg0) {
+        return 0;
+    }
+
+    public String getHeader(String arg0) {
+        return null;
+    }
+
+    public Enumeration getHeaderNames() {
+        return null;
+    }
+
+    public Enumeration getHeaders(String arg0) {
+        return null;
+    }
+
+    public int getIntHeader(String arg0) {
+        return 0;
+    }
+
+    public String getMethod() {
+        return null;
+    }
+
+    public String getPathInfo() {
+        return null;
+    }
+
+    public String getPathTranslated() {
+        return null;
+    }
+
+    public String getQueryString() {
+        return null;
+    }
+
+    public String getRemoteUser() {
+        return null;
+    }
+
+    public String getRequestURI() {
+        return null;
+    }
+
+    public StringBuffer getRequestURL() {
+        return null;
+    }
+
+    public String getRequestedSessionId() {
+        return null;
+    }
+
+    public String getServletPath() {
+        return servletPath;
+    }
+
+    public HttpSession getSession() {
+        return null;
+    }
+
+    public HttpSession getSession(boolean arg0) {
+        return null;
+    }
+
+    public Principal getUserPrincipal() {
+        return null;
+    }
+
+    public boolean isRequestedSessionIdFromCookie() {
+        return false;
+    }
+
+    public boolean isRequestedSessionIdFromURL() {
+        return false;
+    }
+
+    public boolean isRequestedSessionIdFromUrl() {
+        return false;
+    }
+
+    public boolean isRequestedSessionIdValid() {
+        return false;
+    }
+
+    public boolean isUserInRole(String arg0) {
+        return false;
+    }
+
+    public Object getAttribute(String arg0) {
+        return null;
+    }
+
+    public Enumeration getAttributeNames() {
+        return null;
+    }
+
+    public String getCharacterEncoding() {
+        return null;
+    }
+
+    public int getContentLength() {
+        return 0;
+    }
+
+    public String getContentType() {
+        return null;
+    }
+
+    public ServletInputStream getInputStream() throws IOException {
+        return null;
+    }
+
+    public String getLocalAddr() {
+        return null;
+    }
+
+    public String getLocalName() {
+        return null;
+    }
+
+    public int getLocalPort() {
+        return 0;
+    }
+
+    public Locale getLocale() {
+        return null;
+    }
+
+    public Enumeration getLocales() {
+        return null;
+    }
+
+    public String getParameter(String arg0) {
+        return null;
+    }
+
+    public Map getParameterMap() {
+        return parameterMap;
+    }
+
+    public Enumeration getParameterNames() {
+        return null;
+    }
+
+    public String[] getParameterValues(String arg0) {
+        return null;
+    }
+
+    public String getProtocol() {
+        return null;
+    }
+
+    public BufferedReader getReader() throws IOException {
+        return null;
+    }
+
+    public String getRealPath(String arg0) {
+        return null;
+    }
+
+    public String getRemoteAddr() {
+        return null;
+    }
+
+    public String getRemoteHost() {
+        return null;
+    }
+
+    public int getRemotePort() {
+        return 0;
+    }
+
+    public RequestDispatcher getRequestDispatcher(String arg0) {
+        return null;
+    }
+
+    public String getScheme() {
+        return null;
+    }
+
+    public String getServerName() {
+        return null;
+    }
+
+    public int getServerPort() {
+        return 0;
+    }
+
+    public boolean isSecure() {
+        return false;
+    }
+
+    public void removeAttribute(String arg0) {
+    }
+
+    public void setAttribute(String arg0, Object arg1) {
+    }
+
+    public void setCharacterEncoding(String arg0)
+            throws UnsupportedEncodingException {
+
+    }
+
+    /**
+     * @param parameterMap the parameterMap to set
+     */
+    public HttpServletRequestMock setParameterMap(Map parameterMap) {
+        this.parameterMap = parameterMap;
+        return this;
+    }
+
+    /**
+     * @param servletPath the servletPath to set
+     */
+    public HttpServletRequestMock setServletPath(String servletPath) {
+        this.servletPath = servletPath;
+        return this;
+    }
+    
+    
+
+}
--- a/Show More
+++ b/Show More