diff --git a/apps/showcase/src/main/resources/globalMessages.properties b/apps/showcase/src/main/resources/globalMessages.properties
deleted file mode 100644
index 24a39d45c..000000000
--- a/apps/showcase/src/main/resources/globalMessages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-save=Save
-
-item.edit=Edit {0}
-item.create=Create {0}
-item.list={0} List
-
-token.transfer.time=The bank transfer was executed at {0,date,HH:mm:ss MM-dd-yyyy}
diff --git a/apps/showcase/src/main/resources/globalMessages_de.properties b/apps/showcase/src/main/resources/globalMessages_de.properties
deleted file mode 100644
index 0dc66efa8..000000000
--- a/apps/showcase/src/main/resources/globalMessages_de.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-save=Speichern
-
-item.edit={0} bearbeiten
-item.create={0} neu anlegen
-item.list={0}-Liste
-
-token.transfer.time=Die \u00dcberweisung wurde am {0,date,HH:mm:ss MM-dd-yyyy} durchgef\u00fchrt
diff --git a/apps/showcase/src/main/resources/log4j.properties b/apps/showcase/src/main/resources/log4j.properties
deleted file mode 100644
index 44a410e3b..000000000
--- a/apps/showcase/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Log4J Settings for log4j 1.2.x (via jakarta-commons-logging)
-#
-# The five logging levels used by Log are (in order):
-#
-#   1. DEBUG (the least serious)
-#   2. INFO
-#   3. WARN
-#   4. ERROR
-#   5. FATAL (the most serious)
-
-
-# Set root logger level to WARN and append to stdout
-log4j.rootLogger=WARN, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
-
-# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=FATAL
-
-# OpenSymphony Stuff
-log4j.logger.com.opensymphony=INFO
-log4j.logger.org.apache.struts.action2=DEBUG
-
-# Spring Stuff
-log4j.logger.org.springframework=INFO
-
diff --git a/apps/showcase/src/main/resources/struts.properties b/apps/showcase/src/main/resources/struts.properties
deleted file mode 100644
index 523c856b1..000000000
--- a/apps/showcase/src/main/resources/struts.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-struts.i18n.reload=true
-struts.devMode = true
-struts.configuration.xml.reload=true
-struts.continuations.package = org.apache.struts.action2.showcase
-struts.objectFactory = spring
-struts.custom.i18n.resources=globalMessages
-#struts.action.extension=jspa
-struts.url.http.port = 8080
-struts.freemarker.manager.classname=customFreemarkerManager
-
-struts.serve.static=true
-struts.serve.static.browserCache=false
diff --git a/apps/showcase/src/main/resources/xwork-actionchaining.xml b/apps/showcase/src/main/resources/xwork-actionchaining.xml
deleted file mode 100644
index 9809fd920..000000000
--- a/apps/showcase/src/main/resources/xwork-actionchaining.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN"
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-	
-<xwork>
-	<include file="struts-default.xml" />
-	
-	<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
-		<action name="actionChain1" class="org.apache.struts.action2.showcase.actionchaining.ActionChain1">
-			<result type="chain">actionChain2</result>		
-		</action>
-		<action name="actionChain2" class="org.apache.struts.action2.showcase.actionchaining.ActionChain2">
-			<result type="chain">actionChain3</result>
-		</action>
-		<action name="actionChain3" class="org.apache.struts.action2.showcase.actionchaining.ActionChain3">
-			<result>/actionchaining/actionChainingResult.jsp</result>
-		</action>
-	</package>
-</xwork>
-
-
diff --git a/apps/showcase/src/main/resources/xwork-ajax.xml b/apps/showcase/src/main/resources/xwork-ajax.xml
deleted file mode 100644
index 2b88ed20b..000000000
--- a/apps/showcase/src/main/resources/xwork-ajax.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-
-<xwork>
-    <include file="struts-default.xml"/>
-
-    <package name="ajax" extends="struts-default">
-        <action name="AjaxTest" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
-            <result>/ajax/AjaxResult.jsp</result>
-        </action>
-
-        <action name="AjaxRemoteLink" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
-            <result>/ajax/AjaxResult2.js</result>
-        </action>
-
-        <action name="AjaxRemoteForm" class="org.apache.struts.action2.showcase.ajax.AjaxTestAction">
-            <result>/ajax/AjaxResult3.jsp</result>
-        </action>
-
-        <action name="Test1">
-            <result>/ajax/remoteforms/test2.jsp</result>
-        </action>
-
-        <action name="Test2">
-            <result>/ajax/remoteforms/test3.jsp</result>
-        </action>
-
-        <action name="Test3">
-            <result>/ajax/testjs.jsp</result>
-        </action>
-
-        <action name="tree">
-            <result>/ajax/tree/tree.jsp</result>
-        </action>
-
-        <action name="getCategory" class="org.apache.struts.action2.showcase.ajax.tree.GetCategory">
-            <result>/ajax/tree/getCategory.jsp</result>
-        </action>
-
-        <action name="toggle" class="org.apache.struts.action2.showcase.ajax.tree.Toggle">
-            <result>/ajax/tree/toggle.jsp</result>
-        </action>
-    </package>
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork-continuations.xml b/apps/showcase/src/main/resources/xwork-continuations.xml
deleted file mode 100644
index a59e2a92b..000000000
--- a/apps/showcase/src/main/resources/xwork-continuations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-<xwork>
-    <include file="struts-default.xml"/>
-
-    <package name="continuations" extends="struts-default" namespace="/continuations">
-        <action name="guess" class="org.apache.struts.action2.showcase.Guess">
-            <result type="freemarker">guess.ftl</result>
-        </action>
-    </package>
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork-conversion.xml b/apps/showcase/src/main/resources/xwork-conversion.xml
deleted file mode 100644
index d05420d0f..000000000
--- a/apps/showcase/src/main/resources/xwork-conversion.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN" 
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-	
-<xwork>
-	<include file="struts-default.xml" />
-	
-	<package name="conversion" namespace="/conversion" extends="struts-default">
-		<action name="enterPersonsInfo" method="input"
-				class="org.apache.struts.action2.showcase.conversion.PersonAction">
-			<result>enterPersonInfo.jsp</result>
-		</action>
-		<action name="submitPersonInfo" method="submit"
-				class="org.apache.struts.action2.showcase.conversion.PersonAction">
-			<result>showPersonInfo.jsp</result>	
-			<result name="input">enterPersonInfo.jsp</result>
-		</action>
-		<action name="showJspCode">
-			<result type="plaintext">/conversion/enterPersonInfo.jsp</result>
-		</action>
-		<action name="showPersonActionJavaCode">
-			<result type="plaintext">/conversion/PersonAction.java.txt</result>
-		</action>
-		<action name="showPersonJavaCode">
-			<result type="plaintext">/conversion/Person.java.txt</result>
-		</action>
-	</package>
-</xwork>	
diff --git a/apps/showcase/src/main/resources/xwork-filedownload.xml b/apps/showcase/src/main/resources/xwork-filedownload.xml
deleted file mode 100644
index dc6f70b13..000000000
--- a/apps/showcase/src/main/resources/xwork-filedownload.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xwork PUBLIC
-	"-//OpenSymphony Group//XWork 1.1.1//EN"
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-
-<xwork>
-	<include file="struts-default.xml" />
-
-	<package name="filedownload" extends="struts-default" namespace="/filedownload">
-
-        <default-action-ref name="download"/>
-
-        <action name="download" class="org.apache.struts.action2.showcase.filedownload.FileDownloadAction">
-			<result name="success" type="stream">
-                <param name="contentType">image/jpeg</param>
-                <param name="inputName">imageStream</param>
-                <param name="contentDisposition">filename="logo.png"</param>
-                <param name="bufferSize">4096</param>
-            </result>
-        </action>
-
-    </package>
-</xwork>
-
-
diff --git a/apps/showcase/src/main/resources/xwork-fileupload.xml b/apps/showcase/src/main/resources/xwork-fileupload.xml
deleted file mode 100644
index 89464630f..000000000
--- a/apps/showcase/src/main/resources/xwork-fileupload.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xwork PUBLIC
-	"-//OpenSymphony Group//XWork 1.1.1//EN"
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-
-<xwork>
-	<include file="struts-default.xml" />
-
-	<package name="fileupload" extends="struts-default" namespace="/fileupload">
-        
-        <default-action-ref name="upload"/>
-
-        <action name="upload" class="org.apache.struts.action2.showcase.fileupload.FileUploadAction" method="input">
-			<result>upload.jsp</result>
-		</action>
-
-        <action name="doUpload" class="org.apache.struts.action2.showcase.fileupload.FileUploadAction" method="upload">
-			<result>upload-success.jsp</result>
-		</action>
-
-    </package>
-</xwork>
-
-
diff --git a/apps/showcase/src/main/resources/xwork-freemarker.xml b/apps/showcase/src/main/resources/xwork-freemarker.xml
deleted file mode 100644
index c6dbf112b..000000000
--- a/apps/showcase/src/main/resources/xwork-freemarker.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN" 
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-	
-
-<xwork>
-	<include file="struts-default.xml" />
-
-	<package name="freemarker" namespace="/freemarker" extends="struts-default">
-		<action name="customFreemarkerManagerDemo">
-			<result type="freemarker">/freemarker/customFreemarkerManagerUsage.ftl</result>
-		</action>
-	</package>
-</xwork>	
diff --git a/apps/showcase/src/main/resources/xwork-jsf.xml b/apps/showcase/src/main/resources/xwork-jsf.xml
deleted file mode 100644
index e72d8ef8c..000000000
--- a/apps/showcase/src/main/resources/xwork-jsf.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-<xwork>
-    <include file="struts-default.xml"/>
-    <include file="struts-jsf.xml"/>
-
-    <package name="jsf" extends="struts-default, struts-jsf" namespace="/jsf">
-    
-        <action name="index" class="org.apache.struts.action2.showcase.jsf.IndexAction">
-            <interceptor-ref name="jsfStack"/>
-            <result name="success" type="jsf" />
-        </action>
-    
-        <action name="employee" class="org.apache.struts.action2.showcase.jsf.EmployeeAction">
-            <interceptor-ref name="basicStack"/>
-            <interceptor-ref name="jsfStack"/>
-            <result name="success" type="jsf" />
-            <result name="index" type="redirect-action">index</result>
-        </action>
-
-    </package>
-
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork-model-driven.xml b/apps/showcase/src/main/resources/xwork-model-driven.xml
deleted file mode 100644
index dd217e804..000000000
--- a/apps/showcase/src/main/resources/xwork-model-driven.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN" 
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-
-<xwork>
-	<include file="struts-default.xml" />
-
-	<package name="modelDriven" extends="struts-default" namespace="/modelDriven">
-	    <!-- Diplay entry page that uses Model-Driven technique -->
-		<action name="modelDriven" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction" method="input">
-			<result>modelDriven.jsp</result>
-		</action>
-		
-		<!-- Display the result page whose content is populated using the Model-Driven technique -->
-		<action name="modelDrivenResult" class="org.apache.struts.action2.showcase.modelDriven.ModelDrivenAction">
-			<result>modelDrivenResult.jsp</result>
-		</action>
-	</package>
-</xwork>	
-	
\ No newline at end of file
diff --git a/apps/showcase/src/main/resources/xwork-person.xml b/apps/showcase/src/main/resources/xwork-person.xml
deleted file mode 100644
index e0b54cab3..000000000
--- a/apps/showcase/src/main/resources/xwork-person.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-
-<!-- START SNIPPET: xworkSample -->
-
-<xwork>
-    <include file="struts-default.xml"/>
-
-    <package name="person" extends="struts-default" namespace="/person">
-        <action name="listPeople" class="org.apache.struts.action2.showcase.person.ListPeople">
-            <interceptor-ref name="validationWorkflowStack"/>
-            <result type="freemarker">listPeople.ftl</result>
-        </action>
-
-        <action name="newPerson" class="org.apache.struts.action2.showcase.person.CreatePerson">
-            <result type="redirect">listPeople.action</result>
-            <result name="input" type="freemarker">newPerson.ftl</result>
-        </action>
-
-        <action name="editPerson" class="org.apache.struts.action2.showcase.person.EditPerson">
-            <result>editPeople.jsp</result>
-        </action>
-
-        <action name="doEditPerson" class="org.apache.struts.action2.showcase.person.EditPerson" method="save">
-            <result name="error">editPeople.jsp</result>
-            <result type="redirect">listPeople.action</result>
-        </action>
-    </package>
-</xwork>
-
-<!--  END SNIPPET: xworkSample -->
-
diff --git a/apps/showcase/src/main/resources/xwork-tags-non-ui.xml b/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
deleted file mode 100644
index b17f29af6..000000000
--- a/apps/showcase/src/main/resources/xwork-tags-non-ui.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN"
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-	
-<xwork>
-	
-	<include file="struts-default.xml" />
-	
-	<!-- ================================== -->
-	<!-- === Package for ActionTag Demo === -->
-	<!-- ================================== -->
-	
-	<package name="actionTag" extends="struts-default" namespace="/tags/non-ui/actionTag">
-		<action name="showActionTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="show">
-			<result>/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
-		</action>
-		<action name="includePage" class="org.apache.struts.action2.showcase.tag.nonui.actiontag.ActionTagDemo" method="doInclude">
-			<result>/tags/non-ui/actionTag/includedPage.jsp</result>
-		</action>
-		<action name="includePage2">
-			<result>/tags/non-ui/actionTag/includedPage2.jsp</result>
-		</action>
-		<action name="includePage3">
-			<result>/tags/non-ui/actionTag/includedPage3.jsp</result>
-		</action>
-		<action name="lookAtSource">
-			<result type="plaintext">/tags/non-ui/actionTag/showActionTagDemo.jsp</result>
-		</action>
-	</package>
-	
-	<!-- ==================================== -->
-	<!-- === Package for IteratorGeneratorTag Demo === -->
-	<!-- ==================================== -->
-	
-	<package name="iteratorGeneratorTag" extends="struts-default" namespace="/tags/non-ui/iteratorGeneratorTag">
-		<action name="showGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
-		</action>
-		<action name="submitGeneratorTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.IteratorGeneratorTagDemo" method="submit">
-			<result name="input">/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp</result>
-		</action>
-	</package>
-	
-	
-	<!-- ===================================== -->
-	<!-- === Package for AppendIteratorTag Demo ===  -->
-	<!-- ========================================== -->
-	<package name="appendIteratorTag" extends="struts-default" namespace="/tags/non-ui/appendIteratorTag">
-		<action name="showAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
-		</action>
-		<action name="submitAppendTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.AppendIteratorTagDemo" method="submit">
-			<result name="input">/tag/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp</result>
-		</action>
-	</package>
-	
-	
-	<!-- ====================================== -->
-	<!-- === Package for MergeIteratorTag Demo === -->
-	<!-- ========================================= -->
-	<package name="mergeIteratorTag" extends="struts-default" namespace="/tags/non-ui/mergeIteratorTag">
-		<action name="showMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
-		</action>
-		<action name="submitMergeTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.MergeIteratorTagDemo" method="submit">
-			<result name="input">/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp</result>
-		</action>
-	</package>
-	
-	<!-- ============================================= -->
-	<!-- === Package for SubsetIteratorTag Demo === -->
-	<!-- =========================================== -->
-	<package name="subsetIteratorTag" extends="struts-default" namespace="/tags/non-ui/subsetIteratorTag">
-		<action name="showSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="input">
-			<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
-		</action>
-		<action name="submitSubsetTagDemo" class="org.apache.struts.action2.showcase.tag.nonui.iteratortag.SubsetIteratorTagDemo" method="submit">
-			<result name="input">/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp</result>
-			<result>/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp</result>
-		</action>
-	</package>
-	
-	
-	
-</xwork>
-
diff --git a/apps/showcase/src/main/resources/xwork-tags-ui.xml b/apps/showcase/src/main/resources/xwork-tags-ui.xml
deleted file mode 100644
index 1e9722aa9..000000000
--- a/apps/showcase/src/main/resources/xwork-tags-ui.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN" 
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-	
-<xwork>
-    <include file="struts-default.xml"/>
-
-    <package name="ui-tags" extends="struts-default" namespace="/tags/ui">
-        <action name="example" class="org.apache.struts.action2.showcase.UITagExample">
-            <result>example.jsp</result>
-            <result name="input">example.jsp</result>
-        </action>
-        <action name="exampleSubmit" class="org.apache.struts.action2.showcase.UITagExample" method="doSubmit">
-        	<result>exampleSubmited.jsp</result>
-        	<result name="input">example.jsp</result>
-        </action>
-        <action name="exampleVelocity" class="org.apache.struts.action2.showcase.UITagExample">
-            <result type="velocity">example.vm</result>
-            <result name="input" type="velocity">example.vm</result>
-        </action>
-        <action name="exampleSubmitVelocity" class="org.apache.struts.action2.showcase.UITagExample" method="doSubmit">
-        	<result type="velocity">exampleSubmited.vm</result>
-        	<result name="input" type="velocity">example.vm</result>
-        </action>
-        <action name="lotsOfOptiontransferselect" class="org.apache.struts.action2.showcase.LotsOfOptiontransferselectAction" method="input">
-        	<result>lotsOfOptiontransferselect.jsp</result>
-        </action>
-        <action name="lotsOfOptiontransferselectSubmit" class="org.apache.struts.action2.showcase.LotsOfOptiontransferselectAction" method="submit">
-        	<result name="input">lotsOfOptiontransferselect.jsp</result>
-        	<result>lotsOfOptiontransferselectSubmit.jsp</result>
-        </action>
-        <action name="lotsOfRichtexteditor" class="org.apache.struts.action2.showcase.LotsOfRichtexteditorAction" method="input">
-        	<result>lotsOfRichtexteditor.jsp</result>
-        </action>
-        <action name="lotsOfRichtexteditorSubmit" class="org.apache.struts.action2.showcase.LotsOfRichtexteditorAction" method="submit">
-        	<result name="input">lotsOfRichtexteditor.jsp</result>
-			<result>lotsOfRichtexteditorSubmit.jsp</result>        
-        </action>
-        <action name="tooltipExample">
-        	<result>tooltipExample.jsp</result>
-        </action>
-        
-        <!--  START SNIPPET: treeExampleDynamicXWorkXml -->
-        
-        <action name="showDynamicTreeAction" class="org.apache.struts.action2.showcase.ShowDynamicTreeAction">
-        	<result>/tags/ui/treeExampleDynamic.jsp</result>
-        </action>
-        
-        <!--  END SNIPPET: treeExampleDynamicXWorkXml -->
-        
-        
-        <action name="showComponentTagExampleCode">
-        	<result type="plaintext">/tags/ui/componentTagExample.jsp</result>
-        </action>
-        
-	</package>
-	
-	<!--  START SNIPPET: treeExampleXWorkXml -->
-	
-	<package name="ui-tags-ajax" namespace="/tags/ui/ajax" extends="struts-default">        
-        <!-- Actions dealing with Tree Example  -->
-        <action name="staticTreeSelectAction">
-        	<result>/tags/ui/staticTreeSelect.jsp</result>
-        </action>
-        <action name="dynamicTreeSelectAction" class="org.apache.struts.action2.showcase.DynamicTreeSelectAction">
-        	<result>/tags/ui/dynamicTreeSelect.jsp</result>
-        </action>
-    </package>
-    
-    <!--  END SNIPPET: treeExampleXWorkXml -->
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork-tags.xml b/apps/showcase/src/main/resources/xwork-tags.xml
deleted file mode 100644
index 610ab2e47..000000000
--- a/apps/showcase/src/main/resources/xwork-tags.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-<xwork>
-    <include file="xwork-tags-ui.xml"/>
-    <include file="xwork-tags-non-ui.xml" />
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork-token.xml b/apps/showcase/src/main/resources/xwork-token.xml
deleted file mode 100644
index d5aad93ae..000000000
--- a/apps/showcase/src/main/resources/xwork-token.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-<xwork>
-    <include file="struts-default.xml"/>
-
-    <package name="token" extends="struts-default" namespace="/token">
-
-        <action name="tokenPrepare" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <result name="input">example1.jsp</result>
-        </action>
-
-        <action name="transfer" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="token"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success">transferDone.jsp</result>
-        </action>
-
-
-
-        <action name="tokenPrepare2" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <result name="input">example2.jsp</result>
-        </action>
-
-        <action name="transfer2" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="token"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success" type="redirect">transferDone.jsp</result>
-        </action>
-
-
-
-        <action name="tokenPrepare3" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <result name="input">example3.jsp</result>
-        </action>
-
-        <action name="transfer3" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="token-session"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success" type="redirect">transferDone.jsp</result>
-        </action>
-
-
-        <action name="tokenPrepare4" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="createSession"/> <!-- we must have a session when using freemarker and the @ww.token tag -->
-            <result name="input" type="freemarker">example4.ftl</result>
-        </action>
-
-        <action name="transfer4" class="org.apache.struts.action2.showcase.token.TokenAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="token"/>
-            <result name="invalid.token">doublePost.jsp</result>
-            <result name="success">transferDone.jsp</result>
-        </action>
-
-    </package>
-
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork-validation.xml b/apps/showcase/src/main/resources/xwork-validation.xml
deleted file mode 100755
index 7b280d245..000000000
--- a/apps/showcase/src/main/resources/xwork-validation.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE xwork PUBLIC 
-	"-//OpenSymphony Group//XWork 1.1.1//EN"
-	"http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-	
-<xwork>
-	<include file="struts-default.xml" />
-
-	<package name="validation" extends="struts-default" namespace="/validation">
-	    <action name="quizBasic" class="org.apache.struts.action2.showcase.validation.QuizAction">
-            <result name="input">quiz-basic.jsp</result>
-            <result>quiz-success.jsp</result>
-        </action>
-
-        <action name="quizClient" class="org.apache.struts.action2.showcase.validation.QuizAction">
-            <result name="input">quiz-client.jsp</result>
-            <result>quiz-success.jsp</result>
-        </action>
-
-        <action name="quizClientCss" class="org.apache.struts.action2.showcase.validation.QuizAction">
-            <result name="input">quiz-client-css.jsp</result>
-            <result>quiz-success.jsp</result>
-        </action>
-
-        <action name="quizAjax" class="org.apache.struts.action2.showcase.validation.QuizAction">
-            <result name="input">quiz-ajax.jsp</result>
-            <result>quiz-success.jsp</result>
-        </action>
-	</package>
-
-
-	<package name="validationExamples" extends="struts-default" namespace="/validation" >
-
-		<action name="list">
-			<result>index.jsp</result>
-		</action>
-		
-		
-		<!-- ======================== -->
-		<!-- === Field Validators === -->
-		<!-- ======================== -->
-		
-		<action name="showFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="input">
-			<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
-		</action>
-		
-		<action name="submitFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="submit">
-			<result name="input" type="dispatcher">/validation/fieldValidatorsExample.jsp</result>
-			<result type="dispatcher">/validation/successFieldValidatorsExample.jsp</result>
-		</action>
-		
-		
-		
-		<!-- ============================ -->
-		<!-- === Non Field Validators === -->
-		<!-- ============================ -->
-		
-		<action name="showNonFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.NonFieldValidatorsExampleAction" method="input">
-			<result name="input">/validation/nonFieldValidatorsExample.jsp</result>		
-		</action>
-		
-		<action name="submitNonFieldValidatorsExamples" class="org.apache.struts.action2.showcase.validation.NonFieldValidatorsExampleAction" method="submit">
-			<result name="input">/validation/nonFieldValidatorsExample.jsp</result>		
-			<result>/validation/successNonFieldValidatorsExample.jsp</result>
-		</action>
-		
-		
-		
-		<!-- ========================== -->
-		<!-- === Visitor Validators === -->
-		<!-- ========================== -->
-		
-		<action name="showVisitorValidatorsExamples" class="org.apache.struts.action2.showcase.validation.VisitorValidatorsExampleAction" method="input">
-			<result name="input">/validation/visitorValidatorsExample.jsp</result>
-		</action>
-		
-		<action name="submitVisitorValidatorsExamples" class="org.apache.struts.action2.showcase.validation.VisitorValidatorsExampleAction" method="submit">
-			<result name="input">/validation/visitorValidatorsExample.jsp</result>
-			<result>/validation/successVisitorValidatorsExample.jsp</result>
-		</action>
-
-
-
-		<!-- ========================== -->
-		<!-- === Visitor Validators === -->
-		<!-- ========================== -->
-
-		<action name="clientSideValidationExample" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="input">
-			<result name="input">/validation/clientSideValidationExample.jsp</result>
-		</action>
-
-		<action name="submitClientSideValidationExample" class="org.apache.struts.action2.showcase.validation.FieldValidatorsExampleAction" method="submit">
-			<result name="input">/validation/clientSideValidationExample.jsp</result>
-			<result>/validation/successClientSideValidationExample.jsp</result>
-		</action>
-
-
-
-    </package>
-</xwork>
-	
diff --git a/apps/showcase/src/main/resources/xwork-wait.xml b/apps/showcase/src/main/resources/xwork-wait.xml
deleted file mode 100644
index aac4426b6..000000000
--- a/apps/showcase/src/main/resources/xwork-wait.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
-<xwork>
-    <include file="struts-default.xml"/>
-
-    <package name="wait" extends="struts-default" namespace="/wait">
-
-        <action name="longProcess1" class="org.apache.struts.action2.showcase.wait.LongProcessAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="execAndWait"/>
-            <result name="wait">wait.jsp</result>
-            <result name="success">complete.jsp</result>
-        </action>
-
-        <action name="longProcess2" class="org.apache.struts.action2.showcase.wait.LongProcessAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="execAndWait">
-                <param name="delay">2000</param>
-            </interceptor-ref>
-            <result name="wait">wait.jsp</result>
-            <result name="success">complete.jsp</result>
-        </action>
-
-        <action name="longProcess3" class="org.apache.struts.action2.showcase.wait.LongProcessAction">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="execAndWait">
-                <param name="delay">3000</param>
-                <param name="delaySleepInterval">1000</param>
-            </interceptor-ref>
-            <result name="wait">wait.jsp</result>
-            <result name="success">complete.jsp</result>
-        </action>
-
-    </package>
-
-</xwork>
diff --git a/apps/showcase/src/main/resources/xwork.xml b/apps/showcase/src/main/resources/xwork.xml
index 6cd461d9b..2ca435e6f 100644
--- a/apps/showcase/src/main/resources/xwork.xml
+++ b/apps/showcase/src/main/resources/xwork.xml
@@ -12,6 +12,8 @@
 
     <include file="config-browser.xml"/>
     
+    <include file="xwork-tmjee.xml" />
+    
     <include file="xwork-continuations.xml"/>
 
     <include file="xwork-tags.xml"/>