struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [2/2] struts git commit: WW-4660 Moves example portlet app into struts-examples
Date Thu, 14 Jul 2016 09:47:19 GMT
WW-4660 Moves example portlet app into struts-examples


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f21a3fd1
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f21a3fd1
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f21a3fd1

Branch: refs/heads/master
Commit: f21a3fd10f12a25f22318e5623eb0fafb3690eba
Parents: 633552d
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Thu Jul 14 11:47:08 2016 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Thu Jul 14 11:47:08 2016 +0200

----------------------------------------------------------------------
 apps/pom.xml                                    |   1 -
 apps/portlet/README.txt                         |  22 --
 apps/portlet/pom.xml                            | 218 -----------
 apps/portlet/src/main/etc/exo/web.xml           |  63 ---
 .../main/etc/gridsphere/README-gridsphere.txt   |   2 -
 .../main/etc/gridsphere/gridsphere-portlet.xml  |  24 --
 apps/portlet/src/main/etc/gridsphere/group.xml  |  10 -
 apps/portlet/src/main/etc/gridsphere/layout.xml |  19 -
 .../src/main/etc/gridsphere/struts-portlet      |   0
 apps/portlet/src/main/etc/gridsphere/web.xml    |  63 ---
 .../src/main/etc/jbossportal2.0/jboss-app.xml   |   3 -
 .../main/etc/jbossportal2.0/jboss-portlet.xml   |  12 -
 .../src/main/etc/jbossportal2.0/jboss-web.xml   |   3 -
 .../etc/jbossportal2.0/portlet-instances.xml    |  11 -
 .../etc/jbossportal2.0/struts-portlet-pages.xml |  18 -
 .../src/main/etc/jbossportal2.2/jboss-app.xml   |   3 -
 .../main/etc/jbossportal2.2/jboss-portlet.xml   |  12 -
 .../src/main/etc/jbossportal2.2/jboss-web.xml   |   3 -
 .../jbossportal2.2/struts-portlet-object.xml    |  25 --
 .../src/main/etc/jetspeed2/README-jetspeed2.txt |   1 -
 .../src/main/etc/jetspeed2/struts-portlet.psml  |  20 -
 apps/portlet/src/main/etc/liferay3.6.1/web.xml  |  75 ----
 .../struts2/portlet/example/ExampleAction.java  |  39 --
 .../struts2/portlet/example/FormExample.java    |  50 ---
 .../portlet/example/FormExampleModelDriven.java |  37 --
 .../example/FormExampleWithValidation.java      |  47 ---
 .../portlet/example/FormResultAction.java       |  49 ---
 .../struts2/portlet/example/FormTestAction.java |  36 --
 .../portlet/example/SavePrefsAction.java        |  62 ---
 .../portlet/example/eventing/ProcessAction.java |  61 ---
 .../portlet/example/eventing/PublishAction.java |  52 ---
 .../example/fileupload/FileUploadAction.java    |  81 ----
 .../struts2/portlet/example/model/Name.java     |  18 -
 .../portlet/example/spring/SpringAction.java    |  58 ---
 .../portlet/example/spring/ThingManager.java    |  38 --
 apps/portlet/src/main/resources/LICENSE.txt     | 174 ---------
 apps/portlet/src/main/resources/NOTICE.txt      |   5 -
 apps/portlet/src/main/resources/log4j2.xml      |  15 -
 .../FormExample-formExamplePrg-validation.xml   |  13 -
 ...processTilesFreemarkerExample-validation.xml |  13 -
 ...mple-processValidationExample-validation.xml |  13 -
 .../pluto-portal-driver-services-config.xml     | 155 --------
 apps/portlet/src/main/resources/struts-edit.xml |  48 ---
 .../src/main/resources/struts-eventing.xml      |  21 -
 apps/portlet/src/main/resources/struts-help.xml |  14 -
 .../portlet/src/main/resources/struts-tiles.xml |  27 --
 apps/portlet/src/main/resources/struts-view.xml | 130 -------
 apps/portlet/src/main/resources/struts.xml      |  12 -
 .../template/xhtml/components/checkbox.vm       |  12 -
 .../template/xhtml/components/datefield.vm      |   8 -
 .../template/xhtml/components/mytextfield.vm    |  15 -
 apps/portlet/src/main/resources/validators.xml  |  18 -
 .../src/main/resources/velocity.properties      |   1 -
 .../main/webapp/WEB-INF/applicationContext.xml  |  22 --
 .../main/webapp/WEB-INF/edit/defaultEdit.jsp    |   5 -
 .../main/webapp/WEB-INF/edit/formExample.jsp    |   5 -
 .../webapp/WEB-INF/edit/formExampleInput.jsp    |   8 -
 .../src/main/webapp/WEB-INF/edit/index.jsp      |  11 -
 .../main/webapp/WEB-INF/edit/namespaceTest.jsp  |   4 -
 .../src/main/webapp/WEB-INF/edit/prefsForm.jsp  |   6 -
 .../src/main/webapp/WEB-INF/edit/prefsSaved.jsp |   5 -
 .../src/main/webapp/WEB-INF/edit/test.jsp       |   4 -
 .../src/main/webapp/WEB-INF/eventing/index.jsp  |  11 -
 .../main/webapp/WEB-INF/eventing/process.jsp    |  12 -
 .../main/webapp/WEB-INF/help/defaultHelp.jsp    |   1 -
 .../src/main/webapp/WEB-INF/help/index.jsp      |   1 -
 .../webapp/WEB-INF/jetty-pluto-web-default.xml  | 384 -------------------
 .../portlet/src/main/webapp/WEB-INF/portlet.xml | 214 -----------
 apps/portlet/src/main/webapp/WEB-INF/readme.txt |  10 -
 apps/portlet/src/main/webapp/WEB-INF/tiles.xml  |  46 ---
 .../src/main/webapp/WEB-INF/view/fileUpload.jsp |  13 -
 .../webapp/WEB-INF/view/fileUploadSuccess.jsp   |  14 -
 .../main/webapp/WEB-INF/view/formExample.jsp    |   5 -
 .../webapp/WEB-INF/view/formExampleInput.jsp    |   8 -
 .../view/formExampleInputModelDriven.jsp        |   8 -
 .../webapp/WEB-INF/view/formExampleInputPrg.jsp |   8 -
 .../WEB-INF/view/formExampleInputValidation.jsp |   8 -
 .../formExampleSubmitToSelfWithValidation.jsp   |   6 -
 .../webapp/WEB-INF/view/freeMarkerExample.ftl   |   3 -
 .../WEB-INF/view/freeMarkerExampleInput.ftl     |   5 -
 .../src/main/webapp/WEB-INF/view/helloWorld.vm  |   4 -
 .../src/main/webapp/WEB-INF/view/index.jsp      |  18 -
 .../main/webapp/WEB-INF/view/notImplemented.jsp |   1 -
 .../main/webapp/WEB-INF/view/springExample.jsp  |  16 -
 .../main/webapp/WEB-INF/view/tokenExample.jsp   |   5 -
 .../webapp/WEB-INF/view/tokenExampleInput.jsp   |  20 -
 apps/portlet/src/main/webapp/WEB-INF/web.xml    |  31 --
 apps/portlet/src/main/webapp/styles/styles.css  |   7 -
 apps/portlet/src/main/webapp/tiles/footer.ftl   |   5 -
 apps/portlet/src/main/webapp/tiles/footer.jsp   |   6 -
 .../src/main/webapp/tiles/formExample.jsp       |   5 -
 .../webapp/tiles/formExampleInputValidation.jsp |   8 -
 apps/portlet/src/main/webapp/tiles/header.jsp   |   2 -
 apps/portlet/src/main/webapp/tiles/index.jsp    |  13 -
 apps/portlet/src/main/webapp/tiles/layout.jsp   |  13 -
 .../src/test/java/JettyPlutoLauncher.java       |  19 -
 .../struts2/portlet/test/BasePortletTest.java   |  97 -----
 .../portlet/test/Struts2PortletTest.java        |  87 -----
 98 files changed, 3114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 353f834..9ebc8eb 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -32,7 +32,6 @@
     <packaging>pom</packaging>
     <name>Struts 2 Webapps</name>
     <modules>
-        <module>portlet</module>
         <module>showcase</module>
         <module>rest-showcase</module>
     </modules>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/README.txt
----------------------------------------------------------------------
diff --git a/apps/portlet/README.txt b/apps/portlet/README.txt
deleted file mode 100644
index ce8a425..0000000
--- a/apps/portlet/README.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-README.txt - portlet
-
-This is a simple example of using the portlet API with Struts applications. 
-
-For more on getting started with Struts, see 
-
-* http://cwiki.apache.org/WW/home.html
-
-WARNING - Additional configuration required for deployment
-
-Due to difference in portlet container implementations, the portlet
-WAR is not ready-to-run. Extract the portlet WAR, and then copy the
-contents of apps/portlet/src/main/etc/<your_portal_server>/ into the
-WAR's WEB-INF directory.
-
-I18N:
-=====
-Please note that this project was created with the assumption that it will be run
-in an environment where the default locale is set to English. This means that
-the default messages defined in package.properties are in English. If the default
-locale for your server is different, then rename package.properties to package_en.properties
-and create a new package.properties with proper values for your default locale.

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
deleted file mode 100644
index 2d8025f..0000000
--- a/apps/portlet/pom.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.struts</groupId>
-        <artifactId>struts2-apps</artifactId>
-        <version>2.5.3-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>struts2-portlet</artifactId>
-    <packaging>war</packaging>
-    <name>Struts 2 Portlet Webapp</name>
-
-    <profiles>
-        <profile>
-            <id>pluto</id>
-            <build>
-                <plugins>
-                    <!-- configure maven-war-plugin to use updated web.xml -->
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-                        </configuration>
-                    </plugin>
-                    <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle -->
-                    <plugin>
-                        <groupId>org.apache.pluto</groupId>
-                        <artifactId>maven-pluto-plugin</artifactId>
-                        <version>1.1.7</version>
-                        <executions>
-                            <execution>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>assemble</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <version>6.1.26</version>
-                        <configuration>
-                            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-                            <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
-                            <systemProperties>
-                                <systemProperty>
-                                    <name>org.apache.pluto.embedded.portletIds</name>
-                                    <value>StrutsPortlet</value>
-                                </systemProperty>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>com.bekk.boss</groupId>
-                    <artifactId>maven-jetty-pluto-embedded</artifactId>
-                    <version>1.0.1</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.portlet</groupId>
-             <artifactId>portlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-spring-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-portlet-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-dwr-plugin</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-portlet-tiles-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-tools</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>${log4j2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>${log4j2.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.jwebunit</groupId>
-            <artifactId>jwebunit-htmlunit-plugin</artifactId>
-            <version>3.3</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.bekk.boss</groupId>
-            <artifactId>maven-jetty-pluto-embedded</artifactId>
-            <version>1.0.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jsp-2.1</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <reporting>
-        <plugins>
-            <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/main/etc/gridsphere/README-gridsphere.txt</exclude>
-                        <exclude>src/main/etc/gridsphere/struts-portlet</exclude>
-                        <exclude>src/main/etc/jetspeed2/README-jetspeed2.txt</exclude>
-                        <exclude>src/main/etc/jetspeed2/struts-portlet.psml</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-    <properties>
-    	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-</project>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/exo/web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/exo/web.xml b/apps/portlet/src/main/etc/exo/web.xml
deleted file mode 100644
index a6357e9..0000000
--- a/apps/portlet/src/main/etc/exo/web.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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">
-<web-app>
-	<display-name>struts-portlet</display-name>
-	<!-- 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>
-		<filter-name>action2</filter-name>
-		<filter-class>
-			org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
-		</filter-class>
-	</filter>
-
-	<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>
-		<listener-class>
-			org.apache.struts2.portlet.context.ServletContextHolderListener
-		</listener-class>
-	</listener>
-	<listener>
-		<listener-class>
-			org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener
-		</listener-class>
-	</listener>
-
-	<servlet>
-		<servlet-name>preparator</servlet-name>
-		<servlet-class>
-			org.apache.struts2.portlet.context.PreparatorServlet
-		</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>dwr</servlet-name>
-		<servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>PortletWrapper</servlet-name>
-		<servlet-class>
-			org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper
-		</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>dwr</servlet-name>
-		<url-pattern>/dwr/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>PortletWrapper</servlet-name>
-		<url-pattern>/PortletWrapper</url-pattern>
-	</servlet-mapping>
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt b/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
deleted file mode 100644
index e502e06..0000000
--- a/apps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Put the empty 'struts-portlet' file in the $CATALINA_HOME/webapps/gridsphere/WEB-INF/CustomPortal/portlets
-folder of your Gridsphere installation.  You will need to add the gridsphere-ui-tags-2.1.2.jar to your project.

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml b/apps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
deleted file mode 100644
index ed15d11..0000000
--- a/apps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-app-collection>
-
-<portlet-app-def>
-
-<portlet-app id="org.gridlab.gridsphere.provider.portlet.jsr.PortletServlet">
-    <portlet-name>JSR Portlet Servlet</portlet-name>
-    <servlet-name>PortletServlet</servlet-name>
-</portlet-app>
-
-<concrete-portlet-app id="org.gridlab.gridsphere.provider.portlet.jsr.PortletServlet.1">
-    <concrete-portlet>
-        <portlet-name>Portlet Servlet</portlet-name>
-        <default-locale>en</default-locale>
-        <language locale="en">
-            <title>Portlet Servlet</title>
-            <title-short>Portlet Servlet</title-short>
-            <description>A JSR Portlet Loader</description>
-            <keywords>portlet servlet</keywords>
-        </language>
-    </concrete-portlet>
-</concrete-portlet-app>
-</portlet-app-def>
-</portlet-app-collection>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/gridsphere/group.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/gridsphere/group.xml b/apps/portlet/src/main/etc/gridsphere/group.xml
deleted file mode 100644
index d04e4e7..0000000
--- a/apps/portlet/src/main/etc/gridsphere/group.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<portlet-group>
-	<group-name>StrutsPortlet</group-name>
-	<group-description>StrutsPortlet Example Application</group-description>
-	<group-visibility>PUBLIC</group-visibility>
-	<portlet-role-info>
-		<portlet-class>struts-portlet#StrutsPortlet</portlet-class>
-		<required-role>USER</required-role>
-	</portlet-role-info>
-</portlet-group>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/gridsphere/layout.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/gridsphere/layout.xml b/apps/portlet/src/main/etc/gridsphere/layout.xml
deleted file mode 100644
index 14a160b..0000000
--- a/apps/portlet/src/main/etc/gridsphere/layout.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<portlet-tabbed-pane>
-    <portlet-tab label="StrutsPortlet">
-        <title lang="en">StrutsPortlet Example</title>
-        <portlet-tabbed-pane style="sub-menu">
-            <portlet-tab label="strutsportlettab">
-                <title lang="en">StrutsPortlet Example Application</title>
-                <table-layout>
-                    <row-layout>
-                        <column-layout>
-                            <portlet-frame label="strutsportlet">
-                                <portlet-class>struts-portlet#StrutsPortlet</portlet-class>
-                            </portlet-frame>
-                        </column-layout>
-                    </row-layout>
-                </table-layout>
-            </portlet-tab>
-        </portlet-tabbed-pane>
-    </portlet-tab>
-</portlet-tabbed-pane>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/gridsphere/struts-portlet
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/gridsphere/struts-portlet b/apps/portlet/src/main/etc/gridsphere/struts-portlet
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/gridsphere/web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/gridsphere/web.xml b/apps/portlet/src/main/etc/gridsphere/web.xml
deleted file mode 100644
index 0653b25..0000000
--- a/apps/portlet/src/main/etc/gridsphere/web.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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">
-<web-app>
-	<display-name>struts-portlet</display-name>
-	<!-- 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>
-		<filter-name>action2</filter-name>
-		<filter-class>
-			org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
-		</filter-class>
-	</filter>
-
-	<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>
-		<listener-class>
-			org.apache.struts2.portlet.context.ServletContextHolderListener
-		</listener-class>
-	</listener>
-	<listener>
-		<listener-class>
-			org.gridlab.gridsphere.provider.portlet.jsr.PortletServlet
-		</listener-class>
-	</listener>
-
-	<servlet>
-		<servlet-name>preparator</servlet-name>
-		<servlet-class>
-			org.apache.struts2.portlet.context.PreparatorServlet
-		</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>dwr</servlet-name>
-		<servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>PortletServlet</servlet-name>
-		<servlet-class>
-			org.gridlab.gridsphere.provider.portlet.jsr.PortletServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>dwr</servlet-name>
-		<url-pattern>/dwr/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>PortletServlet</servlet-name>
-		<url-pattern>/jsr/struts-portlet</url-pattern>
-	</servlet-mapping>
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml b/apps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
deleted file mode 100644
index 02e09d5..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<jboss-app>
-   <app-name>struts-portlet</app-name>
-</jboss-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml b/apps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
deleted file mode 100644
index 663eaf3..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<portlet-app>
-   <portlet>
-      <portlet-name>StrutsPortlet</portlet-name>
-      <security>
-      </security>
-   </portlet>
-   <portlet>
-      <portlet-name>StrutsPortlet2</portlet-name>
-      <security>
-      </security>
-   </portlet>
-</portlet-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml b/apps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
deleted file mode 100644
index 9d9c645..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<jboss-web>
-</jboss-web>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml b/apps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
deleted file mode 100644
index c22073d..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<instances>
-   <instance>
-      <instance-name>StrutsPortletInstance</instance-name>
-      <component-ref>StrutsPortlet</component-ref>
-   </instance>
-   <instance>
-      <instance-name>StrutsPortlet2Instance</instance-name>
-      <component-ref>StrutsPortlet2</component-ref>
-   </instance>
-</instances>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml b/apps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
deleted file mode 100644
index 255c453..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.0/struts-portlet-pages.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<pages>
-   <portal-name>default</portal-name>
-   <page>
-      <page-name>struts-portlet</page-name>
-      <window>
-         <window-name>StrutsPortletWindow</window-name>
-         <instance-ref>struts-portlet.StrutsPortlet.StrutsPortletInstance</instance-ref>
-         <region>left</region>
-         <height>0</height>
-      </window>
-      <window>
-         <window-name>StrutsPortletWindow2</window-name>
-         <instance-ref>struts-portlet.StrutsPortlet2.StrutsPortlet2Instance</instance-ref>
-         <region>right</region>
-         <height>0</height>
-      </window>
-   </page>
-</pages>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml b/apps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
deleted file mode 100644
index 02e09d5..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<jboss-app>
-   <app-name>struts-portlet</app-name>
-</jboss-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml b/apps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
deleted file mode 100644
index 663eaf3..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<portlet-app>
-   <portlet>
-      <portlet-name>StrutsPortlet</portlet-name>
-      <security>
-      </security>
-   </portlet>
-   <portlet>
-      <portlet-name>StrutsPortlet2</portlet-name>
-      <security>
-      </security>
-   </portlet>
-</portlet-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml b/apps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
deleted file mode 100644
index 9d9c645..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<jboss-web>
-</jboss-web>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml b/apps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
deleted file mode 100644
index 2e062ad..0000000
--- a/apps/portlet/src/main/etc/jbossportal2.2/struts-portlet-object.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployments>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<parent-ref>default</parent-ref>
-		<properties />
-		<page>
-			<page-name>StrutsPortlet Example</page-name>
-			<properties />
-			<window>
-				<window-name>StrutsWindow</window-name>
-				<instance-ref>StrutsPortletInstance</instance-ref>
-				<region>center</region>
-				<height>0</height>
-			</window>
-		</page>
-	</deployment>
-	<deployment>
-		<if-exists>overwrite</if-exists>
-		<instance>
-			<instance-name>StrutsPortletInstance</instance-name>
-			<component-ref>struts-portlet.StrutsPortlet</component-ref>
-		</instance>
-	</deployment>
-</deployments>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt b/apps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
deleted file mode 100644
index acde566..0000000
--- a/apps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
+++ /dev/null
@@ -1 +0,0 @@
-Copy the struts-portlet.psml file to the JETSPEED2_INSTALL_DIR/webapps/jetspeed/WEB-INF/pages directory.

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml b/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
deleted file mode 100644
index bf865ba..0000000
--- a/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
+++ /dev/null
@@ -1,20 +0,0 @@
-<page>
-  <defaults
-     skin="orange"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
-  />
-  <title>Struts Portlet Example Application</title>
-  <metadata name="title" xml:lang="en">Struts Portlet Example Application</metadata>
-
-  <fragment id="simplest" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="struts-portlet-1" type="portlet" name="struts-portlet::StrutsPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="0" />
-    </fragment>
-  </fragment>
-
-  <security-constraints>
-    <security-constraints-ref>public-view</security-constraints-ref>
-  </security-constraints>
-</page>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/etc/liferay3.6.1/web.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/etc/liferay3.6.1/web.xml b/apps/portlet/src/main/etc/liferay3.6.1/web.xml
deleted file mode 100644
index 73c769f..0000000
--- a/apps/portlet/src/main/etc/liferay3.6.1/web.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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">
-<web-app>
-	<display-name>struts-portlet</display-name>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext*.xml</param-value>
-	</context-param>
-	<context-param>
-		<param-name>company_id</param-name>
-		<param-value>struts.apache.org</param-value>
-	</context-param>
-	<filter>
-		<filter-name>action2</filter-name>
-		<filter-class>
-			org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
-		</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>action2</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	<listener>
-		<listener-class>
-			com.liferay.portal.servlet.PortletContextListener
-		</listener-class>
-	</listener>
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-	<listener>
-		<listener-class>
-			org.apache.struts2.portlet.context.ServletContextHolderListener
-		</listener-class>
-	</listener>
-
-
-	<servlet>
-		<servlet-name>StrutsPortlet</servlet-name>
-		<servlet-class>
-			com.liferay.portal.servlet.PortletServlet
-		</servlet-class>
-		<init-param>
-			<param-name>portlet-class</param-name>
-			<param-value>
-				org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher
-			</param-value>
-		</init-param>
-		<load-on-startup>0</load-on-startup>
-	</servlet>
-
-	<servlet>
-		<servlet-name>preparator</servlet-name>
-		<servlet-class>
-			org.apache.struts2.portlet.context.PreparatorServlet
-		</servlet-class>
-	</servlet>
-	<servlet>
-		<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>
-	<servlet-mapping>
-		<servlet-name>StrutsPortlet</servlet-name>
-		<url-pattern>/StrutsPortlet/*</url-pattern>
-	</servlet-mapping>
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
deleted file mode 100644
index d3e0741..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/ExampleAction.java
+++ /dev/null
@@ -1,39 +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;
-
-import java.util.Map;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-
-public class ExampleAction extends ActionSupport {
-
-    private String name = "PortletWork Example";
-
-    public String getName() {
-        return name;
-    }
-
-    public Map getRenderParameters() {
-        return ActionContext.getContext().getParameters();
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
deleted file mode 100644
index 98b8517..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExample.java
+++ /dev/null
@@ -1,50 +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;
-
-import org.apache.struts2.dispatcher.DefaultActionSupport;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- */
-public class FormExample extends DefaultActionSupport {
-
-    String firstName = null;
-    String lastName = null;
-
-    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;
-    }
-    
-    public String displayResult() {
-    	return "displayResult";
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java
deleted file mode 100644
index 0ad526e..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleModelDriven.java
+++ /dev/null
@@ -1,37 +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;
-
-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;
-	}
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
deleted file mode 100644
index a26609c..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormExampleWithValidation.java
+++ /dev/null
@@ -1,47 +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;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- */
-public class FormExampleWithValidation extends ActionSupport {
-    private String firstName = null;
-    private String lastName = null;
-
-    public String input() {
-        return SUCCESS;
-    }
-
-    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;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
deleted file mode 100644
index 6e9aeae..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormResultAction.java
+++ /dev/null
@@ -1,49 +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;
-
-import java.util.Collection;
-import java.util.Map;
-
-import javax.portlet.RenderRequest;
-
-import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- */
-public class FormResultAction extends ActionSupport {
-
-    private String result = null;
-
-    public String getResult() {
-        return result;
-    }
-    public void setResult(String result) {
-        this.result = result;
-    }
-
-    public Collection getRenderParams() {
-        RenderRequest req = PortletActionContext.getRenderRequest();
-        Map params = req.getParameterMap();
-        return params.entrySet();
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
deleted file mode 100644
index ebbe102..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/FormTestAction.java
+++ /dev/null
@@ -1,36 +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;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- */
-public class FormTestAction extends ActionSupport {
-
-    private String name = null;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
deleted file mode 100644
index 1998e37..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/SavePrefsAction.java
+++ /dev/null
@@ -1,62 +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;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletPreferences;
-
-import org.apache.struts2.portlet.context.PortletActionContext;
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- */
-public class SavePrefsAction extends ActionSupport {
-    private String preferenceOne = null;
-    private String preferenceTwo = null;
-    public String getPreferenceOne() {
-        return preferenceOne;
-    }
-    public void setPreferenceOne(String preferenceOne) {
-        this.preferenceOne = preferenceOne;
-    }
-    public String getPreferenceTwo() {
-        return preferenceTwo;
-    }
-    public void setPreferenceTwo(String preferenceTwo) {
-        this.preferenceTwo = preferenceTwo;
-    }
-
-    public String execute() throws Exception {
-        ActionRequest req = PortletActionContext.getActionRequest();
-        PortletPreferences prefs = req.getPreferences();
-        prefs.setValue("preferenceOne", preferenceOne);
-        prefs.setValue("preferenceTwo", preferenceTwo);
-        prefs.store();
-        return SUCCESS;
-    }
-
-    public String showForm() throws Exception {
-        PortletPreferences prefs = PortletActionContext.getRequest().getPreferences();
-        preferenceOne = prefs.getValue("preferenceOne", "not set");
-        preferenceTwo = prefs.getValue("preferenceTwo", "not set");
-        return SUCCESS;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java
deleted file mode 100644
index 81efcef..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/ProcessAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.eventing;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.portlet.interceptor.PortletRequestAware;
-import org.apache.struts2.portlet.interceptor.PortletResponseAware;
-
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-public class ProcessAction extends ActionSupport implements PortletRequestAware, PortletResponseAware {
-
-    private PortletRequest request;
-    private PortletResponse response;
-    private String name;
-
-    public String execute() throws Exception {
-
-        if (request instanceof EventRequest) {
-            EventRequest req = (EventRequest) request;
-            EventResponse res = (EventResponse) response;
-            res.setRenderParameter("eventName", (String) req.getEvent().getValue());
-            return "forward";
-        } else {
-            name = request.getParameter("eventName");
-        }
-
-        return SUCCESS;
-    }
-
-    public void setPortletRequest(PortletRequest request) {
-        this.request = request;
-    }
-
-    public void setPortletResponse(PortletResponse response) {
-        this.response = response;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java
deleted file mode 100644
index 439b4d4..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/eventing/PublishAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.eventing;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.portlet.interceptor.PortletResponseAware;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletResponse;
-import javax.xml.namespace.QName;
-
-public class PublishAction extends ActionSupport implements PortletResponseAware {
-
-    private PortletResponse response;
-    private String name;
-
-    public String execute() throws Exception {
-
-        if (name != null) {
-            ((ActionResponse) response).setEvent(new QName("http://org.apache.struts2.portlets/events", "name"), name);
-
-            addActionMessage("Publishing Event with Parameter name : " + name);
-        }
-
-        return SUCCESS;
-    }
-
-    public void setPortletResponse(PortletResponse response) {
-        this.response = response;
-
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
deleted file mode 100644
index 398078c..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
+++ /dev/null
@@ -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;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/model/Name.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/model/Name.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/model/Name.java
deleted file mode 100644
index 21856bb..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/model/Name.java
+++ /dev/null
@@ -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;
-	}
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
deleted file mode 100644
index 6db753c..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/SpringAction.java
+++ /dev/null
@@ -1,58 +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.spring;
-
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- */
-public class SpringAction extends ActionSupport {
-
-    private ThingManager thingManager = null;
-    private String thing = null;
-
-    public void setThingManager(ThingManager thingManager) {
-        this.thingManager = thingManager;
-    }
-
-    public List getThings() {
-        return thingManager.getThings();
-    }
-
-    public String getThing() {
-        return thing;
-    }
-
-    public void setThing(String thing) {
-        this.thing = thing;
-    }
-
-    public String execute() {
-        if(StringUtils.isNotEmpty(thing)) {
-            thingManager.addThing(thing);
-        }
-        return SUCCESS;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java b/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java
deleted file mode 100644
index ba117a5..0000000
--- a/apps/portlet/src/main/java/org/apache/struts2/portlet/example/spring/ThingManager.java
+++ /dev/null
@@ -1,38 +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.spring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- */
-public class ThingManager {
-    private List things = new ArrayList();
-
-    public void addThing(String thing) {
-        things.add(thing);
-    }
-
-    public List getThings() {
-        return things;
-    }
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/LICENSE.txt
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/LICENSE.txt b/apps/portlet/src/main/resources/LICENSE.txt
deleted file mode 100644
index dd5b3a5..0000000
--- a/apps/portlet/src/main/resources/LICENSE.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/NOTICE.txt b/apps/portlet/src/main/resources/NOTICE.txt
deleted file mode 100644
index bfba90c..0000000
--- a/apps/portlet/src/main/resources/NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Struts
-Copyright 2000-2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/log4j2.xml b/apps/portlet/src/main/resources/log4j2.xml
deleted file mode 100644
index 092d5f6..0000000
--- a/apps/portlet/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <Appenders>
-        <Console name="STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Logger name="com.opensymphony.xwork2" level="info"/>
-        <Logger name="org.apache.struts2" level="info"/>
-        <Root level="warn">
-            <AppenderRef ref="STDOUT"/>
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml
deleted file mode 100644
index 3151f29..0000000
--- a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-formExamplePrg-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-<validators>
-    <field name="firstName">
-        <field-validator type="requiredstring">
-            <message>You must enter a first name</message>
-        </field-validator>
-    </field>
-    <field name="lastName">
-        <field-validator type="requiredstring">
-            <message>You must enter a last name</message>
-        </field-validator>
-    </field>
-</validators>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
deleted file mode 100644
index 3151f29..0000000
--- a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processTilesFreemarkerExample-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-<validators>
-    <field name="firstName">
-        <field-validator type="requiredstring">
-            <message>You must enter a first name</message>
-        </field-validator>
-    </field>
-    <field name="lastName">
-        <field-validator type="requiredstring">
-            <message>You must enter a last name</message>
-        </field-validator>
-    </field>
-</validators>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processValidationExample-validation.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processValidationExample-validation.xml b/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processValidationExample-validation.xml
deleted file mode 100644
index 3151f29..0000000
--- a/apps/portlet/src/main/resources/org/apache/struts2/portlet/example/FormExample-processValidationExample-validation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-<validators>
-    <field name="firstName">
-        <field-validator type="requiredstring">
-            <message>You must enter a first name</message>
-        </field-validator>
-    </field>
-    <field name="lastName">
-        <field-validator type="requiredstring">
-            <message>You must enter a last name</message>
-        </field-validator>
-    </field>
-</validators>

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml b/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml
deleted file mode 100644
index 6803d03..0000000
--- a/apps/portlet/src/main/resources/pluto-portal-driver-services-config.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-          http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <!--
-    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.
-    -->
-    <!--
-
-      ************************************************************
-
-      NOTE:
-
-      The following configuration file contains the spring bean
-      configuration needed to run the pluto-portal in memory
-      mode.  Optional services are available which allow
-      persistence to an rdbms, xml files, etc. . . however,
-      we strongly recomend that if you are looking at these
-      advanced features that you consider an enterprise portal
-      such as Apache Jetspeed.
-
-      Service Functions Include:
-       - Preference Persistence
-       - User Attribute Persistence
-       - Portlet Registry
-       - Page Registry
-      ************************************************************
-
-      -->
-
-    <bean id="RequiredContainerServices"
-          name="OptionalContainerServices"
-          class="org.apache.pluto.driver.services.container.ContainerServicesImpl"
-          scope="singleton">
-        <constructor-arg>
-            <ref bean="PortalContext"/>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="DriverConfiguration"/>
-        </constructor-arg>
-    </bean>
-
-    <bean id="PortalContext"
-          class="org.apache.pluto.driver.services.container.PortalContextImpl">
-        <constructor-arg>
-            <ref bean="DriverConfiguration"/>
-        </constructor-arg>
-    </bean>
-
-
-    <!-- ================================================ -->
-    <!-- The single top element of the configuration tree -->
-    <!-- ================================================ -->
-    <bean id="DriverConfiguration"
-          class="org.apache.pluto.driver.config.impl.DriverConfigurationImpl">
-
-        <!-- ===== Portal Services ===== -->
-        <constructor-arg>
-            <ref bean="PortalURLParser"/>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="PropertyConfigService"/>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="RenderConfigService"/>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="SupportedModesService"/>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="SupportedWindowStatesService"/>
-        </constructor-arg>
-
-        <!-- === Container Services === -->
-        <constructor-arg>
-            <ref bean="PortalCallbackService"/>
-        </constructor-arg>
-
-        <!--  Optional Container Services -->
-        <!--
-        <property name="portletPreferencesService"><ref bean="PortletPreferencesService"/></property>
-        <property name="userAttributeService"><ref bean="UserAttributeService"/></property>
-        -->
-    </bean>
-
-    <!-- ================================================ -->
-    <!-- The single top element of the administration tree -->
-    <!-- ================================================ -->
-    <bean id="AdminConfiguration" class="org.apache.pluto.driver.config.impl.AdminConfigurationImpl">
-        <property name="renderConfigAdminService">
-            <ref bean="RenderConfigService"/>
-        </property>
-    </bean>
-
-
-    <!-- ================================================ -->
-    <!-- Portal Services injected into the Configuration  -->
-    <!-- ================================================ -->
-    <bean id="PortalURLParser"
-          class="org.apache.pluto.driver.url.impl.PortalURLParserImpl"
-          factory-method="getParser"
-          scope="singleton">
-    </bean>
-
-    <bean id="PropertyConfigService"
-          class="org.apache.pluto.driver.services.impl.resource.PropertyConfigServiceImpl"
-          scope="singleton">
-    </bean>
-
-    <bean id="RenderConfigService"
-          class="org.apache.pluto.driver.services.impl.resource.RenderConfigServiceImpl"
-          scope="singleton">
-    </bean>
-
-    <bean id="SupportedModesService"
-          class="org.apache.pluto.driver.services.impl.resource.SupportedModesServiceImpl"
-          scope="singleton">
-        <constructor-arg>
-            <ref bean="PropertyConfigService"/>
-        </constructor-arg>
-    </bean>
-
-    <bean id="SupportedWindowStatesService"
-          class="org.apache.pluto.driver.services.impl.resource.SupportedWindowStateServiceImpl"
-          scope="singleton">
-        <constructor-arg>
-            <ref bean="PropertyConfigService"/>
-        </constructor-arg>
-    </bean>
-
-    <!-- ================================================ -->
-    <!-- Container Services injected into  Configuration  -->
-    <!-- ================================================ -->
-    <bean id="PortalCallbackService"
-          class="org.apache.pluto.driver.services.container.PortalCallbackServiceImpl"
-          scope="singleton">
-    </bean>
-
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/f21a3fd1/apps/portlet/src/main/resources/struts-edit.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/src/main/resources/struts-edit.xml b/apps/portlet/src/main/resources/struts-edit.xml
deleted file mode 100644
index a31691c..0000000
--- a/apps/portlet/src/main/resources/struts-edit.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE struts PUBLIC
-	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.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>
\ No newline at end of file


Mime
View raw message